nanopineo: remove LED patch conflicting with upstream

Upstream kernel defines the exact same LEDs already. having both defined leads to unusable LED sysfs nodes: MichaIng/DietPi#5401 Signed-off-by: MichaIng <[email protected]>
MichaIng · Jan 2, 2025 · b229398 · b229398
1 parent b9575b5
commit b229398
Show file tree

Hide file tree

Showing 15 changed files with 3 additions and 233 deletions.
diff --git a/...nel/archive/sunxi-6.1/patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch b/...nel/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
@@ -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
@@ -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/...el/archive/sunxi-6.10/patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch b/...el/archive/sunxi-6.10/patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch
diff --git 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
@@ -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/...el/archive/sunxi-6.11/patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch b/...el/archive/sunxi-6.11/patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch
diff --git 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
@@ -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/...nel/archive/sunxi-6.6/patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch b/...nel/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
@@ -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
@@ -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/...nel/archive/sunxi-6.7/patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch b/...nel/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
@@ -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
@@ -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