From f40e7946ce7ec24de65a60fe4e5eb50f3477d5f7 Mon Sep 17 00:00:00 2001 From: Luka Perkov Date: Thu, 5 Mar 2015 23:43:27 +0000 Subject: kirkwood: drop support for 3.14 Signed-off-by: Luka Perkov SVN-Revision: 44610 --- .../linux/kirkwood/patches-3.14/110-ib62x0.patch | 20 --- .../kirkwood/patches-3.14/120-iomega_ix2_200.patch | 13 -- .../linux/kirkwood/patches-3.14/130-iconnect.patch | 41 ----- .../linux/kirkwood/patches-3.14/140-dockstar.patch | 32 ---- .../kirkwood/patches-3.14/150-pogoplug_e02.patch | 127 --------------- .../linux/kirkwood/patches-3.14/160-ea4500.patch | 180 --------------------- .../linux/kirkwood/patches-3.14/170-ea3500.patch | 173 -------------------- .../patches-3.14/171-ix2_200_poweroff.patch | 13 -- 8 files changed, 599 deletions(-) delete mode 100644 target/linux/kirkwood/patches-3.14/110-ib62x0.patch delete mode 100644 target/linux/kirkwood/patches-3.14/120-iomega_ix2_200.patch delete mode 100644 target/linux/kirkwood/patches-3.14/130-iconnect.patch delete mode 100644 target/linux/kirkwood/patches-3.14/140-dockstar.patch delete mode 100644 target/linux/kirkwood/patches-3.14/150-pogoplug_e02.patch delete mode 100644 target/linux/kirkwood/patches-3.14/160-ea4500.patch delete mode 100644 target/linux/kirkwood/patches-3.14/170-ea3500.patch delete mode 100644 target/linux/kirkwood/patches-3.14/171-ix2_200_poweroff.patch (limited to 'target/linux/kirkwood/patches-3.14') diff --git a/target/linux/kirkwood/patches-3.14/110-ib62x0.patch b/target/linux/kirkwood/patches-3.14/110-ib62x0.patch deleted file mode 100644 index aae804a64b..0000000000 --- a/target/linux/kirkwood/patches-3.14/110-ib62x0.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/arch/arm/boot/dts/kirkwood-ib62x0.dts -+++ b/arch/arm/boot/dts/kirkwood-ib62x0.dts -@@ -118,13 +118,13 @@ - }; - - partition@100000 { -- label = "uImage"; -- reg = <0x0100000 0x600000>; -+ label = "second stage u-boot"; -+ reg = <0x100000 0x200000>; - }; - -- partition@700000 { -+ partition@200000 { - label = "root"; -- reg = <0x0700000 0xf900000>; -+ reg = <0x200000 0xfe00000>; - }; - - }; diff --git a/target/linux/kirkwood/patches-3.14/120-iomega_ix2_200.patch b/target/linux/kirkwood/patches-3.14/120-iomega_ix2_200.patch deleted file mode 100644 index 975e6176f8..0000000000 --- a/target/linux/kirkwood/patches-3.14/120-iomega_ix2_200.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts -+++ b/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts -@@ -191,8 +191,8 @@ - }; - - partition@400000 { -- label = "uInitrd"; -- reg = <0x540000 0x1000000>; -+ label = "rootfs"; -+ reg = <0x400000 0x1C00000>; - }; - }; - diff --git a/target/linux/kirkwood/patches-3.14/130-iconnect.patch b/target/linux/kirkwood/patches-3.14/130-iconnect.patch deleted file mode 100644 index ba5807e43c..0000000000 --- a/target/linux/kirkwood/patches-3.14/130-iconnect.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- a/arch/arm/boot/dts/kirkwood-iconnect.dts -+++ b/arch/arm/boot/dts/kirkwood-iconnect.dts -@@ -154,28 +154,23 @@ - status = "okay"; - - partition@0 { -- label = "uboot"; -- reg = <0x0000000 0xc0000>; -+ label = "u-boot"; -+ reg = <0x0000000 0xe0000>; - }; - -- partition@a0000 { -- label = "env"; -- reg = <0xa0000 0x20000>; -+ partition@e0000 { -+ label = "u-boot environment"; -+ reg = <0xe0000 0x100000>; - }; - - partition@100000 { -- label = "zImage"; -- reg = <0x100000 0x300000>; -+ label = "second stage u-boot"; -+ reg = <0x100000 0x200000>; - }; - -- partition@540000 { -- label = "initrd"; -- reg = <0x540000 0x300000>; -- }; -- -- partition@980000 { -- label = "boot"; -- reg = <0x980000 0x1f400000>; -+ partition@200000 { -+ label = "root"; -+ reg = <0x200000 0x1fe00000>; - }; - }; - diff --git a/target/linux/kirkwood/patches-3.14/140-dockstar.patch b/target/linux/kirkwood/patches-3.14/140-dockstar.patch deleted file mode 100644 index 21d04ba13c..0000000000 --- a/target/linux/kirkwood/patches-3.14/140-dockstar.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/arch/arm/boot/dts/kirkwood-dockstar.dts -+++ b/arch/arm/boot/dts/kirkwood-dockstar.dts -@@ -76,18 +76,22 @@ - - partition@0 { - label = "u-boot"; -- reg = <0x0000000 0x100000>; -- read-only; -+ reg = <0x0000000 0xe0000>; -+ }; -+ -+ partition@e0000 { -+ label = "u-boot environment"; -+ reg = <0xe0000 0x100000>; - }; - - partition@100000 { -- label = "uImage"; -- reg = <0x0100000 0x400000>; -+ label = "second stage u-boot"; -+ reg = <0x100000 0x200000>; - }; - -- partition@500000 { -- label = "data"; -- reg = <0x0500000 0xfb00000>; -+ partition@200000 { -+ label = "root"; -+ reg = <0x200000 0xfe00000>; - }; - }; - diff --git a/target/linux/kirkwood/patches-3.14/150-pogoplug_e02.patch b/target/linux/kirkwood/patches-3.14/150-pogoplug_e02.patch deleted file mode 100644 index 44b4c52556..0000000000 --- a/target/linux/kirkwood/patches-3.14/150-pogoplug_e02.patch +++ /dev/null @@ -1,127 +0,0 @@ ---- a/arch/arm/boot/dts/Makefile -+++ b/arch/arm/boot/dts/Makefile -@@ -112,6 +112,7 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood- - kirkwood-nsa310a.dtb \ - kirkwood-openblocks_a6.dtb \ - kirkwood-openblocks_a7.dtb \ -+ kirkwood-pogo_e02.dtb \ - kirkwood-sheevaplug.dtb \ - kirkwood-sheevaplug-esata.dtb \ - kirkwood-topkick.dtb \ ---- /dev/null -+++ b/arch/arm/boot/dts/kirkwood-pogo_e02.dts -@@ -0,0 +1,114 @@ -+/dts-v1/; -+ -+#include "kirkwood.dtsi" -+#include "kirkwood-6281.dtsi" -+ -+/ { -+ model = "Cloud Engines Pogoplug E02"; -+ compatible = "cloudengines,pogoe02", "marvell,kirkwood-88f6281", "marvell,kirkwood"; -+ -+ memory { -+ device_type = "memory"; -+ reg = <0x00000000 0x10000000>; -+ }; -+ -+ chosen { -+ bootargs = "console=ttyS0,115200n8 earlyprintk"; -+ }; -+ -+ ocp@f1000000 { -+ pinctrl: pinctrl@10000 { -+ pmx_usb_power_enable: pmx-usb-power-enable { -+ marvell,pins = "mpp29"; -+ marvell,function = "gpio"; -+ }; -+ pmx_led_green: pmx-led_green { -+ marvell,pins = "mpp48"; -+ marvell,function = "gpio"; -+ }; -+ pmx_led_orange: pmx-led_orange { -+ marvell,pins = "mpp49"; -+ marvell,function = "gpio"; -+ }; -+ }; -+ serial@12000 { -+ status = "ok"; -+ }; -+ }; -+ gpio-leds { -+ compatible = "gpio-leds"; -+ pinctrl-0 = < &pmx_usb_power_enable &pmx_led_orange -+ &pmx_led_green >; -+ pinctrl-names = "default"; -+ -+ health { -+ label = "status:green:health"; -+ gpios = <&gpio1 16 GPIO_ACTIVE_LOW>; -+ default-state = "keep"; -+ }; -+ fault { -+ label = "status:orange:fault"; -+ gpios = <&gpio1 17 GPIO_ACTIVE_LOW>; -+ }; -+ }; -+ regulators { -+ compatible = "simple-bus"; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ pinctrl-0 = <&pmx_usb_power_enable>; -+ pinctrl-names = "default"; -+ -+ usb_power: regulator@1 { -+ compatible = "regulator-fixed"; -+ reg = <1>; -+ regulator-name = "USB Power"; -+ regulator-min-microvolt = <5000000>; -+ regulator-max-microvolt = <5000000>; -+ enable-active-high; -+ regulator-always-on; -+ regulator-boot-on; -+ gpio = <&gpio0 29 GPIO_ACTIVE_HIGH>; -+ }; -+ }; -+}; -+ -+&nand { -+ chip-delay = <40>; -+ status = "okay"; -+ -+ partition@0 { -+ label = "u-boot"; -+ reg = <0x0000000 0x100000>; -+ read-only; -+ }; -+ -+ partition@100000 { -+ label = "uImage"; -+ reg = <0x0100000 0x400000>; -+ }; -+ -+ partition@500000 { -+ label = "pogoplug"; -+ reg = <0x0500000 0x2000000>; -+ }; -+ -+ partition@2500000 { -+ label = "root"; -+ reg = <0x02500000 0x5b00000>; -+ }; -+}; -+ -+&mdio { -+ status = "okay"; -+ -+ ethphy0: ethernet-phy@0 { -+ reg = <0>; -+ }; -+}; -+ -+ð0 { -+ status = "okay"; -+ ethernet0-port@0 { -+ phy-handle = <ðphy0>; -+ }; -+}; diff --git a/target/linux/kirkwood/patches-3.14/160-ea4500.patch b/target/linux/kirkwood/patches-3.14/160-ea4500.patch deleted file mode 100644 index d1301dfa4b..0000000000 --- a/target/linux/kirkwood/patches-3.14/160-ea4500.patch +++ /dev/null @@ -1,180 +0,0 @@ ---- a/arch/arm/boot/dts/Makefile -+++ b/arch/arm/boot/dts/Makefile -@@ -90,6 +90,7 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood- - kirkwood-dns325.dtb \ - kirkwood-dockstar.dtb \ - kirkwood-dreamplug.dtb \ -+ kirkwood-ea4500.dtb \ - kirkwood-goflexnet.dtb \ - kirkwood-guruplug-server-plus.dtb \ - kirkwood-ib62x0.dtb \ ---- /dev/null -+++ b/arch/arm/boot/dts/kirkwood-ea4500.dts -@@ -0,0 +1,167 @@ -+/* -+ * kirkwood-ea4500.dts - Device Tree file for Linksys EA4500 -+ * -+ * (c) 2013 Jonas Gorski -+ * (c) 2013 Deutsche Telekom Innovation Laboratories -+ * (c) 2014 Luka Perkov -+ * -+ * This file is licensed under the terms of the GNU General Public -+ * License version 2. This program is licensed "as is" without any -+ * warranty of any kind, whether express or implied. -+ */ -+ -+/dts-v1/; -+ -+#include "kirkwood.dtsi" -+#include "kirkwood-6282.dtsi" -+ -+/ { -+ model = "Linksys EA4500"; -+ compatible = "linksys,ea4500", "marvell,kirkwood-88f6282", "marvell,kirkwood"; -+ -+ memory { -+ device_type = "memory"; -+ reg = <0x00000000 0x8000000>; -+ }; -+ -+ chosen { -+ bootargs = "console=ttyS0,115200n8 earlyprintk"; -+ }; -+ -+ mbus { -+ pcie-controller { -+ status = "okay"; -+ -+ pcie@1,0 { -+ status = "okay"; -+ }; -+ -+ pcie@2,0 { -+ status = "okay"; -+ }; -+ }; -+ }; -+ -+ ocp@f1000000 { -+ pinctrl: pinctrl@10000 { -+ pmx_led_white_health: pmx-led-white-health { -+ marvell,pins = "mpp7"; -+ marvell,function = "gpo"; -+ }; -+ pmx_led_white_pulse: pmx-led-white-pulse { -+ marvell,pins = "mpp14"; -+ marvell,function = "gpio"; -+ }; -+ pmx_btn_wps: pmx-btn-wps { -+ marvell,pins = "mpp47"; -+ marvell,function = "gpio"; -+ }; -+ pmx_btn_reset: pmx-btn-reset { -+ marvell,pins = "mpp48"; -+ marvell,function = "gpio"; -+ }; -+ }; -+ -+ rtc@10300 { -+ status = "disabled"; -+ }; -+ -+ serial@12000 { -+ status = "okay"; -+ }; -+ -+ }; -+ -+ gpio_keys { -+ compatible = "gpio-keys"; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ pinctrl-0 = < &pmx_btn_wps &pmx_btn_reset >; -+ pinctrl-names = "default"; -+ -+ button@15 { -+ label = "WPS Button"; -+ linux,code = ; -+ gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; -+ }; -+ -+ button@16 { -+ label = "Reset Button"; -+ linux,code = ; -+ gpios = <&gpio1 16 GPIO_ACTIVE_LOW>; -+ }; -+ }; -+ -+ gpio-leds { -+ compatible = "gpio-leds"; -+ pinctrl-0 = < &pmx_led_white_health &pmx_led_white_pulse >; -+ pinctrl-names = "default"; -+ -+ white-health { -+ label = "ea4500:white:health"; -+ gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>; -+ }; -+ -+ white-pulse { -+ label = "ea4500:white:pulse"; -+ gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>; -+ }; -+ }; -+ -+ mvsw61xx { -+ compatible = "marvell,88e6171"; -+ status = "okay"; -+ reg = <0x10>; -+ -+ mii-bus = <&mdio>; -+ cpu-port-0 = <5>; -+ cpu-port-1 = <6>; -+ is-indirect; -+ }; -+}; -+ -+&nand { -+ status = "okay"; -+ pinctrl-0 = <&pmx_nand>; -+ pinctrl-names = "default"; -+ -+ partition@0 { -+ label = "u-boot"; -+ reg = <0x0000000 0x80000>; -+ }; -+ -+ partition@80000 { -+ label = "u-boot environment"; -+ reg = <0x80000 0x20000>; -+ }; -+ -+ partition@200000 { -+ label = "kernel"; -+ reg = <0x200000 0x200000>; -+ }; -+ -+ partition@400000 { -+ label = "root"; -+ reg = <0x400000 0x1c00000>; -+ }; -+}; -+ -+&mdio { -+ status = "okay"; -+}; -+ -+ð0 { -+ status = "okay"; -+ ethernet0-port@0 { -+ speed = <1000>; -+ duplex = <1>; -+ }; -+}; -+ -+ð1 { -+ status = "okay"; -+ ethernet1-port@0 { -+ speed = <1000>; -+ duplex = <1>; -+ }; -+}; diff --git a/target/linux/kirkwood/patches-3.14/170-ea3500.patch b/target/linux/kirkwood/patches-3.14/170-ea3500.patch deleted file mode 100644 index 58e7a1fbd1..0000000000 --- a/target/linux/kirkwood/patches-3.14/170-ea3500.patch +++ /dev/null @@ -1,173 +0,0 @@ ---- a/arch/arm/boot/dts/Makefile -+++ b/arch/arm/boot/dts/Makefile -@@ -90,6 +90,7 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood- - kirkwood-dns325.dtb \ - kirkwood-dockstar.dtb \ - kirkwood-dreamplug.dtb \ -+ kirkwood-ea3500.dtb \ - kirkwood-ea4500.dtb \ - kirkwood-goflexnet.dtb \ - kirkwood-guruplug-server-plus.dtb \ ---- /dev/null -+++ b/arch/arm/boot/dts/kirkwood-ea3500.dts -@@ -0,0 +1,160 @@ -+/* -+ * kirkwood-ea3500.dts - Device Tree file for Linksys EA3500 -+ * -+ * (c) 2013 Jonas Gorski -+ * (c) 2013 Deutsche Telekom Innovation Laboratories -+ * (c) 2014 Luka Perkov -+ * (c) 2014 Dan Walters -+ * -+ * This file is licensed under the terms of the GNU General Public -+ * License version 2. This program is licensed "as is" without any -+ * warranty of any kind, whether express or implied. -+ */ -+ -+/dts-v1/; -+ -+#include "kirkwood.dtsi" -+#include "kirkwood-6282.dtsi" -+ -+/ { -+ model = "Linksys EA3500"; -+ compatible = "linksys,ea3500", "marvell,kirkwood-88f6282", "marvell,kirkwood"; -+ -+ memory { -+ device_type = "memory"; -+ reg = <0x00000000 0x4000000>; -+ }; -+ -+ chosen { -+ bootargs = "console=ttyS0,115200n8 earlyprintk"; -+ }; -+ -+ mbus { -+ pcie-controller { -+ status = "okay"; -+ -+ pcie@1,0 { -+ status = "okay"; -+ }; -+ -+ pcie@2,0 { -+ status = "okay"; -+ }; -+ }; -+ }; -+ -+ ocp@f1000000 { -+ pinctrl: pinctrl@10000 { -+ pmx_led_green_power: pmx-led-green-power { -+ marvell,pins = "mpp7"; -+ marvell,function = "gpo"; -+ }; -+ pmx_btn_wps: pmx-btn-wps { -+ marvell,pins = "mpp47"; -+ marvell,function = "gpio"; -+ }; -+ pmx_btn_reset: pmx-btn-reset { -+ marvell,pins = "mpp48"; -+ marvell,function = "gpio"; -+ }; -+ }; -+ -+ rtc@10300 { -+ status = "disabled"; -+ }; -+ -+ serial@12000 { -+ status = "okay"; -+ }; -+ -+ }; -+ -+ gpio_keys { -+ compatible = "gpio-keys"; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ pinctrl-0 = < &pmx_btn_wps &pmx_btn_reset >; -+ pinctrl-names = "default"; -+ -+ button@15 { -+ label = "WPS Button"; -+ linux,code = ; -+ gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; -+ }; -+ -+ button@16 { -+ label = "Reset Button"; -+ linux,code = ; -+ gpios = <&gpio1 16 GPIO_ACTIVE_LOW>; -+ }; -+ }; -+ -+ gpio-leds { -+ compatible = "gpio-leds"; -+ pinctrl-0 = < &pmx_led_green_power >; -+ pinctrl-names = "default"; -+ -+ green-power { -+ label = "ea3500:green:power"; -+ gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>; -+ }; -+ }; -+ -+ mvsw61xx { -+ compatible = "marvell,88e6171"; -+ status = "okay"; -+ reg = <0x10>; -+ -+ mii-bus = <&mdio>; -+ cpu-port-0 = <5>; -+ cpu-port-1 = <6>; -+ is-indirect; -+ }; -+}; -+ -+&nand { -+ status = "okay"; -+ pinctrl-0 = <&pmx_nand>; -+ pinctrl-names = "default"; -+ -+ partition@0 { -+ label = "u-boot"; -+ reg = <0x0000000 0x80000>; -+ read-only; -+ }; -+ -+ partition@80000 { -+ label = "u-boot environment"; -+ reg = <0x80000 0x20000>; -+ }; -+ -+ partition@200000 { -+ label = "kernel"; -+ reg = <0x200000 0x200000>; -+ }; -+ -+ partition@400000 { -+ label = "root"; -+ reg = <0x400000 0x1200000>; -+ }; -+}; -+ -+&mdio { -+ status = "okay"; -+}; -+ -+ð0 { -+ status = "okay"; -+ ethernet0-port@0 { -+ speed = <1000>; -+ duplex = <1>; -+ }; -+}; -+ -+ð1 { -+ status = "okay"; -+ ethernet1-port@0 { -+ speed = <1000>; -+ duplex = <1>; -+ }; -+}; diff --git a/target/linux/kirkwood/patches-3.14/171-ix2_200_poweroff.patch b/target/linux/kirkwood/patches-3.14/171-ix2_200_poweroff.patch deleted file mode 100644 index 62f244cd9a..0000000000 --- a/target/linux/kirkwood/patches-3.14/171-ix2_200_poweroff.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts -+++ b/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts -@@ -168,6 +168,10 @@ - gpios = <&gpio1 3 GPIO_ACTIVE_LOW>; - }; - }; -+ gpio-poweroff { -+ compatible = "gpio-poweroff"; -+ gpios = <&gpio0 17 GPIO_ACTIVE_LOW>; -+ }; - }; - - &nand { -- cgit v1.2.3