From fd897a8532261c900562f1101caf75bb4213082b Mon Sep 17 00:00:00 2001 From: MichaIng Date: Mon, 13 May 2024 22:38:36 +0200 Subject: [PATCH] nanopineo: remove LED patch conflicting with upstream Upstream kernel defines the exact same LEDs already. having both defined leads to unusable LED sysfs nodes: https://github.com/MichaIng/DietPi/issues/5401 Signed-off-by: MichaIng --- ...3-nanopi-neo-Add-regulator-leds-mmc2.patch | 22 +------------------ ...3-nanopi-neo-Add-regulator-leds-mmc2.patch | 22 +------------------ ...3-nanopi-neo-Add-regulator-leds-mmc2.patch | 22 +------------------ 3 files changed, 3 insertions(+), 63 deletions(-) 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.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.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";