diff --git a/patch/kernel/mvebu-default/95-helios4-device-tree.patch b/patch/kernel/mvebu-default/95-helios4-device-tree.patch index 404468fe0b..b715095554 100644 --- a/patch/kernel/mvebu-default/95-helios4-device-tree.patch +++ b/patch/kernel/mvebu-default/95-helios4-device-tree.patch @@ -13,16 +13,16 @@ Subject: Initial device tree - Enable IO expander interrupt - Allocate GPIOs for fans --- - arch/arm/boot/dts/armada-388-helios4.dts | 346 +++++++++++++++++++++ - 1 file changed, 346 insertions(+) + arch/arm/boot/dts/armada-388-helios4.dts | 329 +++++++++++++++++++++ + 1 file changed, 329 insertions(+) create mode 100644 arch/arm/boot/dts/armada-388-helios4.dts diff --git a/arch/arm/boot/dts/armada-388-helios4.dts b/arch/arm/boot/dts/armada-388-helios4.dts new file mode 100644 -index 0000000..295f962 +index 0000000..19a0256 --- /dev/null +++ b/arch/arm/boot/dts/armada-388-helios4.dts -@@ -0,0 +1,346 @@ +@@ -0,0 +1,329 @@ +/* + * Device Tree file for Helios4 + * based on SolidRun Clearfog revision A1 rev 2.0 (88F6828) @@ -92,19 +92,6 @@ index 0000000..295f962 + vin-supply = <®_12v>; + }; + -+ gpio-keys { -+ compatible = "gpio-keys"; -+ pinctrl-0 = <&user_button_pins>; -+ pinctrl-names = "default"; -+ -+ button_0 { -+ label = "User Button"; -+ gpios = <&gpio0 23 GPIO_ACTIVE_LOW>; -+ linux,can-disable; -+ linux,code = ; -+ }; -+ }; -+ + system-leds { + compatible = "gpio-leds"; + status-led { @@ -205,7 +192,7 @@ index 0000000..295f962 + pinctrl-names = "default"; + pinctrl-0 = <&pca0_pins>; + interrupt-parent = <&gpio0>; -+ interrupts = <18 IRQ_TYPE_EDGE_FALLING>; ++ interrupts = <23 IRQ_TYPE_EDGE_FALLING>; + interrupt-controller; + #interrupt-cells = <2>; + @@ -361,10 +348,6 @@ index 0000000..295f962 + marvell,pins = "mpp59"; + marvell,function = "spi1"; + }; -+ user_button_pins: user-button-pins { -+ marvell,pins = "mpp23"; -+ marvell,function = "gpio"; -+ }; + }; + }; + }; diff --git a/patch/kernel/mvebu-default/95-helios4-remove-spi-nor-flash.patch b/patch/kernel/mvebu-default/95-helios4-remove-spi-nor-flash.patch index 4b88135e82..dab0a34810 100644 --- a/patch/kernel/mvebu-default/95-helios4-remove-spi-nor-flash.patch +++ b/patch/kernel/mvebu-default/95-helios4-remove-spi-nor-flash.patch @@ -2,7 +2,7 @@ diff --git a/arch/arm/boot/dts/armada-388-helios4.dts b/arch/arm/boot/dts/armada index 1075535..2045dc0 100644 --- a/arch/arm/boot/dts/armada-388-helios4.dts +++ b/arch/arm/boot/dts/armada-388-helios4.dts -@@ -258,16 +258,6 @@ +@@ -244,16 +244,6 @@ µsom_spi1_cs_pins>; pinctrl-names = "default"; status = "okay";