kernel: kirkwood: fix iConnect leds and modell name

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/lfs/linux b/lfs/linux
index 76e847813142b5d154324b137e1a3300f99b1d99..5db41c434d0ccb39bd922dfe7ae99e9587e9a826 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -144,6 +144,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
 ifeq "$(KCFG)" "-kirkwood"
 #      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.10-mv_cesa_disable_failing_hmac_sha1.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.14.40-kirkwood-dtb.patch
 endif
 
 ifeq "$(KCFG)" "-multi"

diff --git a/src/patches/linux/linux-4.14.40-kirkwood-dtb.patch b/src/patches/linux/linux-4.14.40-kirkwood-dtb.patch
new file mode 100644 (file)
index 0000000..f3c8820
--- /dev/null
+++ b/src/patches/linux/linux-4.14.40-kirkwood-dtb.patch
@@ -0,0 +1,59 @@
+diff --git a/arch/arm/boot/dts/kirkwood-iconnect.dts b/arch/arm/boot/dts/kirkwood-iconnect.dts
+index 4a512d8..f550bba 100644
+--- a/arch/arm/boot/dts/kirkwood-iconnect.dts
++++ b/arch/arm/boot/dts/kirkwood-iconnect.dts
+@@ -5,7 +5,7 @@
+ #include "kirkwood-6281.dtsi"
+ 
+ / {
+-      model = "Iomega Iconnect";
++      model = "Iomega iConnect";
+       compatible = "iom,iconnect-1.1", "iom,iconnect", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+ 
+       memory {
+@@ -85,37 +85,37 @@
+               pinctrl-names = "default";
+ 
+               led-level {
+-                      label = "led_level";
++                      label = "iconnect::led_level";
+                       gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
+                       default-state = "on";
+               };
+               power-blue {
+-                      label = "power:blue";
++                      label = "iconnect:blue:power";
+                       gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
+                       default-state = "keep";
+               };
+               power-red {
+-                      label = "power:red";
++                      label = "iconnect:red:power";
+                       gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>;
+               };
+               usb1 {
+-                      label = "usb1:blue";
++                      label = "iconnect:blue:usb_1";
+                       gpios = <&gpio1 12 GPIO_ACTIVE_HIGH>;
+               };
+               usb2 {
+-                      label = "usb2:blue";
++                      label = "iconnect:blue:usb_2";
+                       gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>;
+               };
+               usb3 {
+-                      label = "usb3:blue";
++                      label = "iconnect:blue:usb_3";
+                       gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;
+               };
+               usb4 {
+-                      label = "usb4:blue";
++                      label = "iconnect:blue:usb_4";
+                       gpios = <&gpio1 15 GPIO_ACTIVE_HIGH>;
+               };
+               otb {
+-                      label = "otb:blue";
++                      label = "iconnect:blue:otb";
+                       gpios = <&gpio1 16 GPIO_ACTIVE_HIGH>;
+               };
+       };