mirror of
https://github.com/armbian/build
synced 2025-09-24 19:47:06 +07:00
73691a9e24
* meson64-edge/5.19: use `tag:v5.19-rc2`, meson64 kernel config and kernel patches, by @adeepv * meson64-edge/5.19: we don't need `CONFIG_ARCH_ROCKCHIP=y` for meson64, right? * meson64-edge/5.19: remove `meson_drv_shutdown` revert patch, instead `CONFIG_DRM_MESON=y` and its dependencies in .config - this allows other meson64's to shutdown properly, while allowing the N2(+) to reboot without kernel-side hangs * meson64-edge/5.19: odroidn2(+): remove SD UHS modes patch for ODROID N2(+) - it works when cold-booted - but changes voltage to enable - when rebooted, voltage persists and uboot can't read the SD anymore - adding the "odroid,reboot" driver+dt that is supposed to fix this, doesn't - so for now remove it * meson64-edge/5.19: odroidn2(+): add dumb gpio fan at 30 celsius - backport from rework in 5.10 * meson64-edge/5.19: odroidhc4: bring back `fan1_input` by adding fan details to DT - yeah, I know; the cooling map is right there too, so empty, poor thing. for later. * meson64-edge/5.19: bump to 5.19-rc3 * meson64-edge/5.19: radxa-zero: add patch to remove UHS mode so `wifi` works - sent by @pyavitz: https://raw.githubusercontent.com/pyavitz/debian-image-builder/feature/patches/amlogic/radxazero/wifi/001-arm64-dts-amlogic-radxa-zero-sdio-card-speed.patch - tested by @lanefu * meson64-edge/5.19: bump to 5.19-rc4 * meson64-edge/5.19: bump to 5.19-rc5 * meson64-edge/5.19: bump to 5.19-rc7 * meson64-edge/5.19: bump to 5.19.y branch, which is 5.19.0 right now * Add kernel config - tested on Odroid N2+ Co-authored-by: Vyacheslav Bocharov <adeep@lexina.in> Co-authored-by: Igor Pecovnik <igor.pecovnik@gmail.com>
263 lines
7.8 KiB
Diff
263 lines
7.8 KiB
Diff
From 58c5526eb1798e61e4e76d37140cf10c8d325bc7 Mon Sep 17 00:00:00 2001
|
|
From: Zhang Ning <832666+zhangn1985@users.noreply.github.com>
|
|
Date: Thu, 19 Sep 2019 16:20:31 +0800
|
|
Subject: [PATCH] general: meson64 overlays
|
|
|
|
Signed-off-by: Zhang Ning <832666+zhangn1985@users.noreply.github.com>
|
|
---
|
|
arch/arm64/boot/dts/amlogic/Makefile | 2 ++
|
|
arch/arm64/boot/dts/amlogic/overlay/Makefile | 20 ++++++++++++
|
|
.../dts/amlogic/overlay/README.meson-overlays | 20 ++++++++++++
|
|
.../dts/amlogic/overlay/meson-fixup.scr-cmd | 4 +++
|
|
.../boot/dts/amlogic/overlay/meson-i2cA.dts | 17 ++++++++++
|
|
.../boot/dts/amlogic/overlay/meson-i2cB.dts | 17 ++++++++++
|
|
.../boot/dts/amlogic/overlay/meson-uartA.dts | 11 +++++++
|
|
.../boot/dts/amlogic/overlay/meson-uartC.dts | 11 +++++++
|
|
.../dts/amlogic/overlay/meson-w1-gpio.dts | 20 ++++++++++++
|
|
.../dts/amlogic/overlay/meson-w1AB-gpio.dts | 32 +++++++++++++++++++
|
|
scripts/Makefile.lib | 3 ++
|
|
11 files changed, 157 insertions(+)
|
|
create mode 100644 arch/arm64/boot/dts/amlogic/overlay/Makefile
|
|
create mode 100644 arch/arm64/boot/dts/amlogic/overlay/README.meson-overlays
|
|
create mode 100644 arch/arm64/boot/dts/amlogic/overlay/meson-fixup.scr-cmd
|
|
create mode 100644 arch/arm64/boot/dts/amlogic/overlay/meson-i2cA.dts
|
|
create mode 100644 arch/arm64/boot/dts/amlogic/overlay/meson-i2cB.dts
|
|
create mode 100644 arch/arm64/boot/dts/amlogic/overlay/meson-uartA.dts
|
|
create mode 100644 arch/arm64/boot/dts/amlogic/overlay/meson-uartC.dts
|
|
create mode 100644 arch/arm64/boot/dts/amlogic/overlay/meson-w1-gpio.dts
|
|
create mode 100644 arch/arm64/boot/dts/amlogic/overlay/meson-w1AB-gpio.dts
|
|
|
|
diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile
|
|
index da3225d31e38..5387963c0ee4 100644
|
|
--- a/arch/arm64/boot/dts/amlogic/Makefile
|
|
+++ b/arch/arm64/boot/dts/amlogic/Makefile
|
|
@@ -67,3 +67,5 @@ dtb-$(CONFIG_ARCH_MESON) += meson-sm1-odroid-hc4.dtb
|
|
dtb-$(CONFIG_ARCH_MESON) += meson-sm1-sei610.dtb
|
|
dtb-$(CONFIG_ARCH_MESON) += meson-sm1-x96-air-gbit.dtb
|
|
dtb-$(CONFIG_ARCH_MESON) += meson-sm1-x96-air.dtb
|
|
+
|
|
+subdir-y := $(dts-dirs) overlay
|
|
diff --git a/arch/arm64/boot/dts/amlogic/overlay/Makefile b/arch/arm64/boot/dts/amlogic/overlay/Makefile
|
|
new file mode 100644
|
|
index 000000000000..8630fd1a182d
|
|
--- /dev/null
|
|
+++ b/arch/arm64/boot/dts/amlogic/overlay/Makefile
|
|
@@ -0,0 +1,20 @@
|
|
+# SPDX-License-Identifier: GPL-2.0
|
|
+dtbo-$(CONFIG_ARCH_MESON) += \
|
|
+ meson-i2cA.dtbo \
|
|
+ meson-i2cB.dtbo \
|
|
+ meson-uartA.dtbo \
|
|
+ meson-uartC.dtbo \
|
|
+ meson-w1-gpio.dtbo \
|
|
+ meson-w1AB-gpio.dtbo
|
|
+
|
|
+scr-$(CONFIG_ARCH_MESON) += \
|
|
+ meson-fixup.scr
|
|
+
|
|
+dtbotxt-$(CONFIG_ARCH_MESON) += \
|
|
+ README.meson-overlays
|
|
+
|
|
+targets += $(dtbo-y) $(scr-y) $(dtbotxt-y)
|
|
+
|
|
+always := $(dtbo-y) $(scr-y) $(dtbotxt-y)
|
|
+clean-files := *.dtbo *.scr
|
|
+
|
|
diff --git a/arch/arm64/boot/dts/amlogic/overlay/README.meson-overlays b/arch/arm64/boot/dts/amlogic/overlay/README.meson-overlays
|
|
new file mode 100644
|
|
index 000000000000..1b169a7a1525
|
|
--- /dev/null
|
|
+++ b/arch/arm64/boot/dts/amlogic/overlay/README.meson-overlays
|
|
@@ -0,0 +1,20 @@
|
|
+This document describes overlays provided in the kernel packages
|
|
+For generic Armbian overlays documentation please see
|
|
+https://docs.armbian.com/User-Guide_Allwinner_overlays/
|
|
+
|
|
+### Platform:
|
|
+
|
|
+meson (Amlogic)
|
|
+
|
|
+### Provided overlays:
|
|
+
|
|
+- i2c8
|
|
+
|
|
+### Overlay details:
|
|
+
|
|
+### i2c8
|
|
+
|
|
+Activates TWI/I2C bus 8
|
|
+
|
|
+I2C8 pins (SCL, SDA): GPIO1-C4, GPIO1-C5
|
|
+
|
|
diff --git a/arch/arm64/boot/dts/amlogic/overlay/meson-fixup.scr-cmd b/arch/arm64/boot/dts/amlogic/overlay/meson-fixup.scr-cmd
|
|
new file mode 100644
|
|
index 000000000000..d4c39e20a3a2
|
|
--- /dev/null
|
|
+++ b/arch/arm64/boot/dts/amlogic/overlay/meson-fixup.scr-cmd
|
|
@@ -0,0 +1,4 @@
|
|
+# overlays fixup script
|
|
+# implements (or rather substitutes) overlay arguments functionality
|
|
+# using u-boot scripting, environment variables and "fdt" command
|
|
+
|
|
diff --git a/arch/arm64/boot/dts/amlogic/overlay/meson-i2cA.dts b/arch/arm64/boot/dts/amlogic/overlay/meson-i2cA.dts
|
|
new file mode 100644
|
|
index 000000000000..bfb72feb7e36
|
|
--- /dev/null
|
|
+++ b/arch/arm64/boot/dts/amlogic/overlay/meson-i2cA.dts
|
|
@@ -0,0 +1,17 @@
|
|
+/dts-v1/;
|
|
+
|
|
+/ {
|
|
+ compatible = "amlogic,meson-gxbb";
|
|
+ fragment@0 {
|
|
+ target-path = "/aliases";
|
|
+ __overlay__ {
|
|
+ i2cA = "/soc/bus@c1100000/i2c@8500";
|
|
+ };
|
|
+ };
|
|
+ fragment@1 {
|
|
+ target-path = "/soc/bus@c1100000/i2c@8500";
|
|
+ __overlay__ {
|
|
+ status = "okay";
|
|
+ };
|
|
+ };
|
|
+};
|
|
diff --git a/arch/arm64/boot/dts/amlogic/overlay/meson-i2cB.dts b/arch/arm64/boot/dts/amlogic/overlay/meson-i2cB.dts
|
|
new file mode 100644
|
|
index 000000000000..d75867bce99b
|
|
--- /dev/null
|
|
+++ b/arch/arm64/boot/dts/amlogic/overlay/meson-i2cB.dts
|
|
@@ -0,0 +1,17 @@
|
|
+/dts-v1/;
|
|
+
|
|
+/ {
|
|
+ compatible = "amlogic,meson-gxbb";
|
|
+ fragment@0 {
|
|
+ target-path = "/aliases";
|
|
+ __overlay__ {
|
|
+ i2cA = "/soc/bus@c1100000/i2c@87c0";
|
|
+ };
|
|
+ };
|
|
+ fragment@1 {
|
|
+ target-path = "/soc/bus@c1100000/i2c@87c0";
|
|
+ __overlay__ {
|
|
+ status = "okay";
|
|
+ };
|
|
+ };
|
|
+};
|
|
diff --git a/arch/arm64/boot/dts/amlogic/overlay/meson-uartA.dts b/arch/arm64/boot/dts/amlogic/overlay/meson-uartA.dts
|
|
new file mode 100644
|
|
index 000000000000..3aecd60aaf64
|
|
--- /dev/null
|
|
+++ b/arch/arm64/boot/dts/amlogic/overlay/meson-uartA.dts
|
|
@@ -0,0 +1,11 @@
|
|
+/dts-v1/;
|
|
+
|
|
+/ {
|
|
+ compatible = "amlogic,meson-gxbb";
|
|
+ fragment@0 {
|
|
+ target-path = "/soc/bus@c1100000/serial@84c0";
|
|
+ __overlay__ {
|
|
+ status = "okay";
|
|
+ };
|
|
+ };
|
|
+};
|
|
diff --git a/arch/arm64/boot/dts/amlogic/overlay/meson-uartC.dts b/arch/arm64/boot/dts/amlogic/overlay/meson-uartC.dts
|
|
new file mode 100644
|
|
index 000000000000..2b40ee4c02d3
|
|
--- /dev/null
|
|
+++ b/arch/arm64/boot/dts/amlogic/overlay/meson-uartC.dts
|
|
@@ -0,0 +1,11 @@
|
|
+/dts-v1/;
|
|
+
|
|
+/ {
|
|
+ compatible = "amlogic,meson-gxbb";
|
|
+ fragment@0 {
|
|
+ target-path = "/soc/bus@c1100000/serial@8700";
|
|
+ __overlay__ {
|
|
+ status = "okay";
|
|
+ };
|
|
+ };
|
|
+};
|
|
diff --git a/arch/arm64/boot/dts/amlogic/overlay/meson-w1-gpio.dts b/arch/arm64/boot/dts/amlogic/overlay/meson-w1-gpio.dts
|
|
new file mode 100644
|
|
index 000000000000..ac76a4f20ab7
|
|
--- /dev/null
|
|
+++ b/arch/arm64/boot/dts/amlogic/overlay/meson-w1-gpio.dts
|
|
@@ -0,0 +1,20 @@
|
|
+// Definitions for w1-gpio module (without external pullup)
|
|
+/dts-v1/;
|
|
+/plugin/;
|
|
+
|
|
+/ {
|
|
+ compatible = "amlogic,meson-gxbb";
|
|
+
|
|
+ fragment@0 {
|
|
+ target-path = "/";
|
|
+ __overlay__ {
|
|
+
|
|
+ w1: onewire@0 {
|
|
+ compatible = "w1-gpio";
|
|
+ pinctrl-names = "default";
|
|
+ gpios = <&gpio 91 6>; // GPIOY_16
|
|
+ status = "okay";
|
|
+ };
|
|
+ };
|
|
+ };
|
|
+};
|
|
diff --git a/arch/arm64/boot/dts/amlogic/overlay/meson-w1AB-gpio.dts b/arch/arm64/boot/dts/amlogic/overlay/meson-w1AB-gpio.dts
|
|
new file mode 100644
|
|
index 000000000000..f6b0d7eff158
|
|
--- /dev/null
|
|
+++ b/arch/arm64/boot/dts/amlogic/overlay/meson-w1AB-gpio.dts
|
|
@@ -0,0 +1,32 @@
|
|
+// Definitions for w1-gpio module (without external pullup)
|
|
+/dts-v1/;
|
|
+/plugin/;
|
|
+
|
|
+/ {
|
|
+ compatible = "amlogic,meson-gxbb";
|
|
+
|
|
+ fragment@0 {
|
|
+ target-path = "/";
|
|
+ __overlay__ {
|
|
+
|
|
+ w1a: onewire@0 {
|
|
+ compatible = "w1-gpio";
|
|
+ pinctrl-names = "default";
|
|
+ gpios = <&gpio 91 6>; // GPIOY_16
|
|
+ status = "okay";
|
|
+ };
|
|
+ };
|
|
+ };
|
|
+ fragment@1 {
|
|
+ target-path = "/";
|
|
+ __overlay__ {
|
|
+
|
|
+ w1b: onewire@1 {
|
|
+ compatible = "w1-gpio";
|
|
+ pinctrl-names = "default";
|
|
+ gpios = <&gpio 90 6>; // GPIOY_15
|
|
+ status = "okay";
|
|
+ };
|
|
+ };
|
|
+ };
|
|
+};
|
|
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
|
|
index a28448cebd7c..175e7b53eccf 100644
|
|
--- a/scripts/Makefile.lib
|
|
+++ b/scripts/Makefile.lib
|
|
@@ -87,6 +87,9 @@ base-dtb-y := $(foreach m, $(multi-dtb-y), $(firstword $(call suffix-search, $m,
|
|
|
|
always-y += $(dtb-y)
|
|
|
|
+# Overlay targets
|
|
+extra-y += $(dtbo-y) $(scr-y) $(dtbotxt-y)
|
|
+
|
|
# Add subdir path
|
|
|
|
extra-y := $(addprefix $(obj)/,$(extra-y))
|
|
--
|
|
2.30.2
|
|
|