diff --git a/patch/kernel/archive/sunxi-6.1/patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch b/patch/kernel/archive/sunxi-6.1/patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch index b9e2773a674a..76506b3b5323 100644 --- a/patch/kernel/archive/sunxi-6.1/patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch +++ b/patch/kernel/archive/sunxi-6.1/patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch @@ -11,31 +11,11 @@ diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts b/arch/arm/boot/dts/sun8i index df71fab3c..032849663 100644 --- a/arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts +++ b/arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts -@@ -49,6 +49,63 @@ / { +@@ -49,6 +49,43 @@ / { aliases { ethernet0 = &emac; }; + -+ /* Warning: sunxi-5.18: -+ * The leds node is present in the sun8i-h3-nanopi.dtsi file -+ * You will have to fix this situation yourself -+ */ -+ leds { -+ compatible = "gpio-leds"; -+ -+ pwr { -+ label = "nanopi:red:pwr"; -+ gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>; /* PL10 */ -+ linux,default-trigger = "default-on"; -+ }; -+ -+ status { -+ label = "nanopi:green:status"; -+ gpios = <&pio 0 10 GPIO_ACTIVE_HIGH>; /* PA10 */ -+ linux,default-trigger = "heartbeat"; -+ }; -+ }; -+ + vdd_cpux: gpio-regulator { + compatible = "regulator-gpio"; + pinctrl-names = "default"; diff --git a/patch/kernel/archive/sunxi-6.1/series.armbian b/patch/kernel/archive/sunxi-6.1/series.armbian index 004395d76bb3..856f0dde2187 100644 --- a/patch/kernel/archive/sunxi-6.1/series.armbian +++ b/patch/kernel/archive/sunxi-6.1/series.armbian @@ -58,7 +58,6 @@ patches.armbian/arm-dts-a10-cubiebord-a20-cubietruck-green-LED-mmc0-default-tri.patch patches.armbian/arm-dts-Add-sun8i-h2-plus-nanopi-duo-device.patch patches.armbian/arm-dts-Add-sun8i-h2-plus-sunvell-r69-device.patch - patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch patches.armbian/arm-dts-h3-nanopi-neo-air-Add-regulator-camera-wifi-bluetooth-o.patch patches.armbian/arm-dts-h3-orangepi-2-Add-regulator-vdd-cpu.patch patches.armbian/arm-dts-sun8i-r40-bananapi-m2-ultra-add-codec-analog.patch diff --git a/patch/kernel/archive/sunxi-6.1/series.conf b/patch/kernel/archive/sunxi-6.1/series.conf index 091ea5d54a4f..a11a9d4d038c 100644 --- a/patch/kernel/archive/sunxi-6.1/series.conf +++ b/patch/kernel/archive/sunxi-6.1/series.conf @@ -463,7 +463,6 @@ patches.armbian/arm-dts-a10-cubiebord-a20-cubietruck-green-LED-mmc0-default-tri.patch patches.armbian/arm-dts-Add-sun8i-h2-plus-nanopi-duo-device.patch patches.armbian/arm-dts-Add-sun8i-h2-plus-sunvell-r69-device.patch - patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch patches.armbian/arm-dts-h3-nanopi-neo-air-Add-regulator-camera-wifi-bluetooth-o.patch patches.armbian/arm-dts-h3-orangepi-2-Add-regulator-vdd-cpu.patch patches.armbian/arm-dts-sun8i-r40-bananapi-m2-ultra-add-codec-analog.patch diff --git a/patch/kernel/archive/sunxi-6.10/patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch b/patch/kernel/archive/sunxi-6.10/patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch deleted file mode 100644 index ad81ccf01ee7..000000000000 --- a/patch/kernel/archive/sunxi-6.10/patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: The-going <48602507+The-going@users.noreply.github.com> -Date: Mon, 24 Jan 2022 15:34:01 +0300 -Subject: arm:dts: h3-nanopi-neo Add regulator, leds, mmc2 - ---- - arch/arm/boot/dts/allwinner/sun8i-h3-nanopi-neo.dts | 57 ++++++++++ - 1 file changed, 57 insertions(+) - -diff --git a/arch/arm/boot/dts/allwinner/sun8i-h3-nanopi-neo.dts b/arch/arm/boot/dts/allwinner/sun8i-h3-nanopi-neo.dts -index df71fab3cf4e..032849663443 100644 ---- a/arch/arm/boot/dts/allwinner/sun8i-h3-nanopi-neo.dts -+++ b/arch/arm/boot/dts/allwinner/sun8i-h3-nanopi-neo.dts -@@ -49,6 +49,63 @@ / { - aliases { - ethernet0 = &emac; - }; -+ -+ /* Warning: sunxi-5.18: -+ * The leds node is present in the sun8i-h3-nanopi.dtsi file -+ * You will have to fix this situation yourself -+ */ -+ leds { -+ compatible = "gpio-leds"; -+ -+ pwr { -+ label = "nanopi:red:pwr"; -+ gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>; /* PL10 */ -+ linux,default-trigger = "default-on"; -+ }; -+ -+ status { -+ label = "nanopi:green:status"; -+ gpios = <&pio 0 10 GPIO_ACTIVE_HIGH>; /* PA10 */ -+ linux,default-trigger = "heartbeat"; -+ }; -+ }; -+ -+ vdd_cpux: gpio-regulator { -+ compatible = "regulator-gpio"; -+ pinctrl-names = "default"; -+ regulator-name = "vdd-cpux"; -+ regulator-type = "voltage"; -+ regulator-boot-on; -+ regulator-always-on; -+ regulator-min-microvolt = <1100000>; -+ regulator-max-microvolt = <1300000>; -+ regulator-ramp-delay = <50>; /* 4ms */ -+ gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>; /* PL6 */ -+ gpios-states = <0x1>; -+ states = <1100000 0x0 -+ 1300000 0x1>; -+ }; -+}; -+ -+&cpu0 { -+ cpu-supply = <&vdd_cpux>; -+}; -+ -+&mmc2 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&mmc2_8bit_pins>; -+ vmmc-supply = <®_vcc3v3>; -+ bus-width = <8>; -+ non-removable; -+ cap-mmc-hw-reset; -+ status = "okay"; -+}; -+ -+&mmc2_8bit_pins { -+ /* Increase drive strength for DDR modes */ -+ drive-strength = <40>; -+ /* eMMC is missing pull-ups */ -+ bias-pull-up; - }; - - &ehci0 { --- -Armbian - diff --git a/patch/kernel/archive/sunxi-6.10/series.armbian b/patch/kernel/archive/sunxi-6.10/series.armbian index 33c451fbedc2..fa17cde61782 100644 --- a/patch/kernel/archive/sunxi-6.10/series.armbian +++ b/patch/kernel/archive/sunxi-6.10/series.armbian @@ -44,7 +44,6 @@ patches.armbian/arm-dts-a10-cubiebord-a20-cubietruck-green-LED-mmc0-default-tri.patch patches.armbian/arm-dts-Add-sun8i-h2-plus-nanopi-duo-device.patch patches.armbian/arm-dts-Add-sun8i-h2-plus-sunvell-r69-device.patch - patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch patches.armbian/arm-dts-h3-nanopi-neo-air-Add-regulator-camera-wifi-bluetooth-o.patch patches.armbian/arm-dts-h3-orangepi-2-Add-regulator-vdd-cpu.patch patches.armbian/arm-dts-sun8i-r40-bananapi-m2-ultra-add-codec-analog.patch diff --git a/patch/kernel/archive/sunxi-6.10/series.conf b/patch/kernel/archive/sunxi-6.10/series.conf index 8a80f65645db..7c2047740e8e 100644 --- a/patch/kernel/archive/sunxi-6.10/series.conf +++ b/patch/kernel/archive/sunxi-6.10/series.conf @@ -308,7 +308,6 @@ patches.armbian/arm-dts-a10-cubiebord-a20-cubietruck-green-LED-mmc0-default-tri.patch patches.armbian/arm-dts-Add-sun8i-h2-plus-nanopi-duo-device.patch patches.armbian/arm-dts-Add-sun8i-h2-plus-sunvell-r69-device.patch - patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch patches.armbian/arm-dts-h3-nanopi-neo-air-Add-regulator-camera-wifi-bluetooth-o.patch patches.armbian/arm-dts-h3-orangepi-2-Add-regulator-vdd-cpu.patch patches.armbian/arm-dts-sun8i-r40-bananapi-m2-ultra-add-codec-analog.patch diff --git a/patch/kernel/archive/sunxi-6.11/patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch b/patch/kernel/archive/sunxi-6.11/patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch deleted file mode 100644 index ad81ccf01ee7..000000000000 --- a/patch/kernel/archive/sunxi-6.11/patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: The-going <48602507+The-going@users.noreply.github.com> -Date: Mon, 24 Jan 2022 15:34:01 +0300 -Subject: arm:dts: h3-nanopi-neo Add regulator, leds, mmc2 - ---- - arch/arm/boot/dts/allwinner/sun8i-h3-nanopi-neo.dts | 57 ++++++++++ - 1 file changed, 57 insertions(+) - -diff --git a/arch/arm/boot/dts/allwinner/sun8i-h3-nanopi-neo.dts b/arch/arm/boot/dts/allwinner/sun8i-h3-nanopi-neo.dts -index df71fab3cf4e..032849663443 100644 ---- a/arch/arm/boot/dts/allwinner/sun8i-h3-nanopi-neo.dts -+++ b/arch/arm/boot/dts/allwinner/sun8i-h3-nanopi-neo.dts -@@ -49,6 +49,63 @@ / { - aliases { - ethernet0 = &emac; - }; -+ -+ /* Warning: sunxi-5.18: -+ * The leds node is present in the sun8i-h3-nanopi.dtsi file -+ * You will have to fix this situation yourself -+ */ -+ leds { -+ compatible = "gpio-leds"; -+ -+ pwr { -+ label = "nanopi:red:pwr"; -+ gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>; /* PL10 */ -+ linux,default-trigger = "default-on"; -+ }; -+ -+ status { -+ label = "nanopi:green:status"; -+ gpios = <&pio 0 10 GPIO_ACTIVE_HIGH>; /* PA10 */ -+ linux,default-trigger = "heartbeat"; -+ }; -+ }; -+ -+ vdd_cpux: gpio-regulator { -+ compatible = "regulator-gpio"; -+ pinctrl-names = "default"; -+ regulator-name = "vdd-cpux"; -+ regulator-type = "voltage"; -+ regulator-boot-on; -+ regulator-always-on; -+ regulator-min-microvolt = <1100000>; -+ regulator-max-microvolt = <1300000>; -+ regulator-ramp-delay = <50>; /* 4ms */ -+ gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>; /* PL6 */ -+ gpios-states = <0x1>; -+ states = <1100000 0x0 -+ 1300000 0x1>; -+ }; -+}; -+ -+&cpu0 { -+ cpu-supply = <&vdd_cpux>; -+}; -+ -+&mmc2 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&mmc2_8bit_pins>; -+ vmmc-supply = <®_vcc3v3>; -+ bus-width = <8>; -+ non-removable; -+ cap-mmc-hw-reset; -+ status = "okay"; -+}; -+ -+&mmc2_8bit_pins { -+ /* Increase drive strength for DDR modes */ -+ drive-strength = <40>; -+ /* eMMC is missing pull-ups */ -+ bias-pull-up; - }; - - &ehci0 { --- -Armbian - diff --git a/patch/kernel/archive/sunxi-6.11/series.armbian b/patch/kernel/archive/sunxi-6.11/series.armbian index 1f4349dcd155..a7464217ee90 100644 --- a/patch/kernel/archive/sunxi-6.11/series.armbian +++ b/patch/kernel/archive/sunxi-6.11/series.armbian @@ -44,7 +44,6 @@ patches.armbian/arm-dts-a10-cubiebord-a20-cubietruck-green-LED-mmc0-default-tri.patch patches.armbian/arm-dts-Add-sun8i-h2-plus-nanopi-duo-device.patch patches.armbian/arm-dts-Add-sun8i-h2-plus-sunvell-r69-device.patch - patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch patches.armbian/arm-dts-h3-nanopi-neo-air-Add-regulator-camera-wifi-bluetooth-o.patch patches.armbian/arm-dts-h3-orangepi-2-Add-regulator-vdd-cpu.patch patches.armbian/arm-dts-sun8i-r40-bananapi-m2-ultra-add-codec-analog.patch diff --git a/patch/kernel/archive/sunxi-6.11/series.conf b/patch/kernel/archive/sunxi-6.11/series.conf index 8a7bca00539b..cfc64aaafd88 100644 --- a/patch/kernel/archive/sunxi-6.11/series.conf +++ b/patch/kernel/archive/sunxi-6.11/series.conf @@ -296,7 +296,6 @@ patches.armbian/arm-dts-a10-cubiebord-a20-cubietruck-green-LED-mmc0-default-tri.patch patches.armbian/arm-dts-Add-sun8i-h2-plus-nanopi-duo-device.patch patches.armbian/arm-dts-Add-sun8i-h2-plus-sunvell-r69-device.patch - patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch patches.armbian/arm-dts-h3-nanopi-neo-air-Add-regulator-camera-wifi-bluetooth-o.patch patches.armbian/arm-dts-h3-orangepi-2-Add-regulator-vdd-cpu.patch patches.armbian/arm-dts-sun8i-r40-bananapi-m2-ultra-add-codec-analog.patch diff --git a/patch/kernel/archive/sunxi-6.6/patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch b/patch/kernel/archive/sunxi-6.6/patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch index ad81ccf01ee7..37fd4c9fcfce 100644 --- a/patch/kernel/archive/sunxi-6.6/patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch +++ b/patch/kernel/archive/sunxi-6.6/patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch @@ -11,31 +11,11 @@ diff --git a/arch/arm/boot/dts/allwinner/sun8i-h3-nanopi-neo.dts b/arch/arm/boot index df71fab3cf4e..032849663443 100644 --- a/arch/arm/boot/dts/allwinner/sun8i-h3-nanopi-neo.dts +++ b/arch/arm/boot/dts/allwinner/sun8i-h3-nanopi-neo.dts -@@ -49,6 +49,63 @@ / { +@@ -49,6 +49,43 @@ / { aliases { ethernet0 = &emac; }; + -+ /* Warning: sunxi-5.18: -+ * The leds node is present in the sun8i-h3-nanopi.dtsi file -+ * You will have to fix this situation yourself -+ */ -+ leds { -+ compatible = "gpio-leds"; -+ -+ pwr { -+ label = "nanopi:red:pwr"; -+ gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>; /* PL10 */ -+ linux,default-trigger = "default-on"; -+ }; -+ -+ status { -+ label = "nanopi:green:status"; -+ gpios = <&pio 0 10 GPIO_ACTIVE_HIGH>; /* PA10 */ -+ linux,default-trigger = "heartbeat"; -+ }; -+ }; -+ + vdd_cpux: gpio-regulator { + compatible = "regulator-gpio"; + pinctrl-names = "default"; diff --git a/patch/kernel/archive/sunxi-6.6/series.armbian b/patch/kernel/archive/sunxi-6.6/series.armbian index afbc6a001eaf..64648ed30043 100644 --- a/patch/kernel/archive/sunxi-6.6/series.armbian +++ b/patch/kernel/archive/sunxi-6.6/series.armbian @@ -57,7 +57,6 @@ patches.armbian/arm-dts-a10-cubiebord-a20-cubietruck-green-LED-mmc0-default-tri.patch patches.armbian/arm-dts-Add-sun8i-h2-plus-nanopi-duo-device.patch patches.armbian/arm-dts-Add-sun8i-h2-plus-sunvell-r69-device.patch - patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch patches.armbian/arm-dts-h3-nanopi-neo-air-Add-regulator-camera-wifi-bluetooth-o.patch patches.armbian/arm-dts-h3-orangepi-2-Add-regulator-vdd-cpu.patch patches.armbian/arm-dts-sun8i-r40-bananapi-m2-ultra-add-codec-analog.patch diff --git a/patch/kernel/archive/sunxi-6.6/series.conf b/patch/kernel/archive/sunxi-6.6/series.conf index ccf35bf65a09..e27e25d83850 100644 --- a/patch/kernel/archive/sunxi-6.6/series.conf +++ b/patch/kernel/archive/sunxi-6.6/series.conf @@ -309,7 +309,6 @@ patches.armbian/arm-dts-a10-cubiebord-a20-cubietruck-green-LED-mmc0-default-tri.patch patches.armbian/arm-dts-Add-sun8i-h2-plus-nanopi-duo-device.patch patches.armbian/arm-dts-Add-sun8i-h2-plus-sunvell-r69-device.patch - patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch patches.armbian/arm-dts-h3-nanopi-neo-air-Add-regulator-camera-wifi-bluetooth-o.patch patches.armbian/arm-dts-h3-orangepi-2-Add-regulator-vdd-cpu.patch patches.armbian/arm-dts-sun8i-r40-bananapi-m2-ultra-add-codec-analog.patch diff --git a/patch/kernel/archive/sunxi-6.7/patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch b/patch/kernel/archive/sunxi-6.7/patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch index ad81ccf01ee7..37fd4c9fcfce 100644 --- a/patch/kernel/archive/sunxi-6.7/patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch +++ b/patch/kernel/archive/sunxi-6.7/patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch @@ -11,31 +11,11 @@ diff --git a/arch/arm/boot/dts/allwinner/sun8i-h3-nanopi-neo.dts b/arch/arm/boot index df71fab3cf4e..032849663443 100644 --- a/arch/arm/boot/dts/allwinner/sun8i-h3-nanopi-neo.dts +++ b/arch/arm/boot/dts/allwinner/sun8i-h3-nanopi-neo.dts -@@ -49,6 +49,63 @@ / { +@@ -49,6 +49,43 @@ / { aliases { ethernet0 = &emac; }; + -+ /* Warning: sunxi-5.18: -+ * The leds node is present in the sun8i-h3-nanopi.dtsi file -+ * You will have to fix this situation yourself -+ */ -+ leds { -+ compatible = "gpio-leds"; -+ -+ pwr { -+ label = "nanopi:red:pwr"; -+ gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>; /* PL10 */ -+ linux,default-trigger = "default-on"; -+ }; -+ -+ status { -+ label = "nanopi:green:status"; -+ gpios = <&pio 0 10 GPIO_ACTIVE_HIGH>; /* PA10 */ -+ linux,default-trigger = "heartbeat"; -+ }; -+ }; -+ + vdd_cpux: gpio-regulator { + compatible = "regulator-gpio"; + pinctrl-names = "default"; diff --git a/patch/kernel/archive/sunxi-6.7/series.armbian b/patch/kernel/archive/sunxi-6.7/series.armbian index aec7f06b338c..397a3c3c5938 100644 --- a/patch/kernel/archive/sunxi-6.7/series.armbian +++ b/patch/kernel/archive/sunxi-6.7/series.armbian @@ -67,7 +67,6 @@ patches.armbian/arm-dts-a10-cubiebord-a20-cubietruck-green-LED-mmc0-default-tri.patch patches.armbian/arm-dts-Add-sun8i-h2-plus-nanopi-duo-device.patch patches.armbian/arm-dts-Add-sun8i-h2-plus-sunvell-r69-device.patch - patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch patches.armbian/arm-dts-h3-nanopi-neo-air-Add-regulator-camera-wifi-bluetooth-o.patch patches.armbian/arm-dts-h3-orangepi-2-Add-regulator-vdd-cpu.patch patches.armbian/arm-dts-sun8i-r40-bananapi-m2-ultra-add-codec-analog.patch diff --git a/patch/kernel/archive/sunxi-6.7/series.conf b/patch/kernel/archive/sunxi-6.7/series.conf index 6f673c115e8c..a345cabb1862 100644 --- a/patch/kernel/archive/sunxi-6.7/series.conf +++ b/patch/kernel/archive/sunxi-6.7/series.conf @@ -389,7 +389,6 @@ patches.armbian/arm-dts-a10-cubiebord-a20-cubietruck-green-LED-mmc0-default-tri.patch patches.armbian/arm-dts-Add-sun8i-h2-plus-nanopi-duo-device.patch patches.armbian/arm-dts-Add-sun8i-h2-plus-sunvell-r69-device.patch - patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch patches.armbian/arm-dts-h3-nanopi-neo-air-Add-regulator-camera-wifi-bluetooth-o.patch patches.armbian/arm-dts-h3-orangepi-2-Add-regulator-vdd-cpu.patch patches.armbian/arm-dts-sun8i-r40-bananapi-m2-ultra-add-codec-analog.patch