From 5c457db8e5cd45d2f54a78ab8e680057fbc90fbd Mon Sep 17 00:00:00 2001 From: Luka Perkov Date: Mon, 14 Mar 2016 17:06:20 +0000 Subject: kirkwood: add 4.4 support Dropped patches because they applied upstream: - 120-iomega_ix2_200.patch - 150-pogoplug_e02.patch Tested on dockstar and goflexnet. Signed-off-by: Alexander Couzens Signed-off-by: Luka Perkov SVN-Revision: 49019 --- .../patches-4.4/100-find_active_root.patch | 61 +++++ target/linux/kirkwood/patches-4.4/110-ib62x0.patch | 20 ++ .../linux/kirkwood/patches-4.4/130-iconnect.patch | 41 +++ .../linux/kirkwood/patches-4.4/140-dockstar.patch | 32 +++ target/linux/kirkwood/patches-4.4/160-ea4500.patch | 200 ++++++++++++++ target/linux/kirkwood/patches-4.4/170-ea3500.patch | 192 +++++++++++++ .../kirkwood/patches-4.4/180-goflexhome.patch | 130 +++++++++ .../linux/kirkwood/patches-4.4/181-goflexnet.patch | 25 ++ .../linux/kirkwood/patches-4.4/190-nsa310s.patch | 300 +++++++++++++++++++++ .../kirkwood/patches-4.4/200-disable-tso.patch | 35 +++ 10 files changed, 1036 insertions(+) create mode 100644 target/linux/kirkwood/patches-4.4/100-find_active_root.patch create mode 100644 target/linux/kirkwood/patches-4.4/110-ib62x0.patch create mode 100644 target/linux/kirkwood/patches-4.4/130-iconnect.patch create mode 100644 target/linux/kirkwood/patches-4.4/140-dockstar.patch create mode 100644 target/linux/kirkwood/patches-4.4/160-ea4500.patch create mode 100644 target/linux/kirkwood/patches-4.4/170-ea3500.patch create mode 100644 target/linux/kirkwood/patches-4.4/180-goflexhome.patch create mode 100644 target/linux/kirkwood/patches-4.4/181-goflexnet.patch create mode 100644 target/linux/kirkwood/patches-4.4/190-nsa310s.patch create mode 100644 target/linux/kirkwood/patches-4.4/200-disable-tso.patch (limited to 'target/linux/kirkwood/patches-4.4') diff --git a/target/linux/kirkwood/patches-4.4/100-find_active_root.patch b/target/linux/kirkwood/patches-4.4/100-find_active_root.patch new file mode 100644 index 0000000000..b39afedaa2 --- /dev/null +++ b/target/linux/kirkwood/patches-4.4/100-find_active_root.patch @@ -0,0 +1,61 @@ +The WRT1900AC among other Linksys routers uses a dual-firmware layout. +Dynamically rename the active partition to "ubi". + +Signed-off-by: Imre Kaloz + +--- a/drivers/mtd/ofpart.c ++++ b/drivers/mtd/ofpart.c +@@ -25,12 +25,15 @@ static bool node_has_compatible(struct d + return of_get_property(pp, "compatible", NULL); + } + ++static int mangled_rootblock; ++ + static int parse_ofpart_partitions(struct mtd_info *master, + struct mtd_partition **pparts, + struct mtd_part_parser_data *data) + { + struct device_node *mtd_node; + struct device_node *ofpart_node; ++ const char *owrtpart = "ubi"; + const char *partname; + struct device_node *pp; + int nr_parts, i, ret = 0; +@@ -110,9 +113,15 @@ static int parse_ofpart_partitions(struc + (*pparts)[i].offset = of_read_number(reg, a_cells); + (*pparts)[i].size = of_read_number(reg + a_cells, s_cells); + +- partname = of_get_property(pp, "label", &len); +- if (!partname) +- partname = of_get_property(pp, "name", &len); ++ if (mangled_rootblock && (i == mangled_rootblock)) { ++ partname = owrtpart; ++ } else { ++ partname = of_get_property(pp, "label", &len); ++ ++ if (!partname) ++ partname = of_get_property(pp, "name", &len); ++ } ++ + (*pparts)[i].name = partname; + + if (of_get_property(pp, "read-only", &len)) +@@ -215,6 +224,18 @@ static int __init ofpart_parser_init(voi + return 0; + } + ++static int __init active_root(char *str) ++{ ++ get_option(&str, &mangled_rootblock); ++ ++ if (!mangled_rootblock) ++ return 1; ++ ++ return 1; ++} ++ ++__setup("mangled_rootblock=", active_root); ++ + static void __exit ofpart_parser_exit(void) + { + deregister_mtd_parser(&ofpart_parser); diff --git a/target/linux/kirkwood/patches-4.4/110-ib62x0.patch b/target/linux/kirkwood/patches-4.4/110-ib62x0.patch new file mode 100644 index 0000000000..153c41b782 --- /dev/null +++ b/target/linux/kirkwood/patches-4.4/110-ib62x0.patch @@ -0,0 +1,20 @@ +--- a/arch/arm/boot/dts/kirkwood-ib62x0.dts ++++ b/arch/arm/boot/dts/kirkwood-ib62x0.dts +@@ -117,13 +117,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-4.4/130-iconnect.patch b/target/linux/kirkwood/patches-4.4/130-iconnect.patch new file mode 100644 index 0000000000..c95579d793 --- /dev/null +++ b/target/linux/kirkwood/patches-4.4/130-iconnect.patch @@ -0,0 +1,41 @@ +--- a/arch/arm/boot/dts/kirkwood-iconnect.dts ++++ b/arch/arm/boot/dts/kirkwood-iconnect.dts +@@ -155,28 +155,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-4.4/140-dockstar.patch b/target/linux/kirkwood/patches-4.4/140-dockstar.patch new file mode 100644 index 0000000000..f66e19d27f --- /dev/null +++ b/target/linux/kirkwood/patches-4.4/140-dockstar.patch @@ -0,0 +1,32 @@ +--- a/arch/arm/boot/dts/kirkwood-dockstar.dts ++++ b/arch/arm/boot/dts/kirkwood-dockstar.dts +@@ -77,18 +77,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 = "ubi"; ++ reg = <0x200000 0xfe00000>; + }; + }; + diff --git a/target/linux/kirkwood/patches-4.4/160-ea4500.patch b/target/linux/kirkwood/patches-4.4/160-ea4500.patch new file mode 100644 index 0000000000..baf6e01bae --- /dev/null +++ b/target/linux/kirkwood/patches-4.4/160-ea4500.patch @@ -0,0 +1,200 @@ +--- a/arch/arm/boot/dts/Makefile ++++ b/arch/arm/boot/dts/Makefile +@@ -183,6 +183,7 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \ + kirkwood-is2.dtb \ + kirkwood-km_kirkwood.dtb \ + kirkwood-laplug.dtb \ ++ kirkwood-linksys-viper.dtb \ + kirkwood-lschlv2.dtb \ + kirkwood-lswvl.dtb \ + kirkwood-lswxl.dtb \ +--- /dev/null ++++ b/arch/arm/boot/dts/kirkwood-linksys-viper.dts +@@ -0,0 +1,187 @@ ++/* ++ * kirkwood-linksys-viper.dts - Device Tree file for Linksys E4200v2/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 E4200v2 / EA4500"; ++ compatible = "linksys,viper", "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: pin-controller@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 = "viper:white:health"; ++ gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>; ++ }; ++ ++ white-pulse { ++ label = "viper: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 = <0x0 0x80000>; ++ }; ++ ++ partition@80000 { ++ label = "u_env"; ++ reg = <0x80000 0x20000>; ++ }; ++ ++ partition@a0000 { ++ label = "s_env"; ++ reg = <0xa0000 0x20000>; ++ }; ++ ++ partition@200000 { ++ label = "kernel1"; ++ reg = <0x200000 0x1a00000>; ++ }; ++ ++ partition@4a0000 { ++ label = "rootfs1"; ++ reg = <0x4a0000 0x1760000>; ++ }; ++ ++ partition@1c00000 { ++ label = "kernel2"; ++ reg = <0x1c00000 0x1a00000>; ++ }; ++ ++ partition@1ea0000 { ++ label = "rootfs2"; ++ reg = <0x1ea0000 0x1760000>; ++ }; ++ ++ partition@3600000 { ++ label = "syscfg"; ++ reg = <0x3600000 0x4a00000>; ++ }; ++}; ++ ++&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-4.4/170-ea3500.patch b/target/linux/kirkwood/patches-4.4/170-ea3500.patch new file mode 100644 index 0000000000..bc7ce347f5 --- /dev/null +++ b/target/linux/kirkwood/patches-4.4/170-ea3500.patch @@ -0,0 +1,192 @@ +--- a/arch/arm/boot/dts/Makefile ++++ b/arch/arm/boot/dts/Makefile +@@ -183,6 +183,7 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \ + kirkwood-is2.dtb \ + kirkwood-km_kirkwood.dtb \ + kirkwood-laplug.dtb \ ++ kirkwood-linksys-audi.dtb \ + kirkwood-linksys-viper.dtb \ + kirkwood-lschlv2.dtb \ + kirkwood-lswvl.dtb \ +--- /dev/null ++++ b/arch/arm/boot/dts/kirkwood-linksys-audi.dts +@@ -0,0 +1,179 @@ ++/* ++ * kirkwood-linksys-audi.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,audi", "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: pin-controller@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 = "audi: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 = <0x0 0x80000>; ++ }; ++ ++ partition@80000 { ++ label = "u_env"; ++ reg = <0x80000 0x4000>; ++ }; ++ ++ partition@84000 { ++ label = "s_env"; ++ reg = <0x84000 0x4000>; ++ }; ++ ++ partition@200000 { ++ label = "kernel1"; ++ reg = <0x200000 0x1400000>; ++ }; ++ ++ partition@490000 { ++ label = "rootfs1"; ++ reg = <0x490000 0x1170000>; ++ }; ++ ++ partition@1600000 { ++ label = "kernel2"; ++ reg = <0x1600000 0x1400000>; ++ }; ++ ++ partition@1890000 { ++ label = "rootfs2"; ++ reg = <0x1890000 0x1170000>; ++ }; ++ ++ partition@2a00000 { ++ label = "syscfg"; ++ reg = <0x2a00000 0x1600000>; ++ }; ++}; ++ ++&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-4.4/180-goflexhome.patch b/target/linux/kirkwood/patches-4.4/180-goflexhome.patch new file mode 100644 index 0000000000..6a8d3502e7 --- /dev/null +++ b/target/linux/kirkwood/patches-4.4/180-goflexhome.patch @@ -0,0 +1,130 @@ +--- a/arch/arm/boot/dts/Makefile ++++ b/arch/arm/boot/dts/Makefile +@@ -175,6 +175,7 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \ + kirkwood-ds411.dtb \ + kirkwood-ds411j.dtb \ + kirkwood-ds411slim.dtb \ ++ kirkwood-goflexhome.dtb \ + kirkwood-goflexnet.dtb \ + kirkwood-guruplug-server-plus.dtb \ + kirkwood-ib62x0.dtb \ +--- /dev/null ++++ b/arch/arm/boot/dts/kirkwood-goflexhome.dts +@@ -0,0 +1,117 @@ ++/dts-v1/; ++ ++#include "kirkwood.dtsi" ++#include "kirkwood-6281.dtsi" ++ ++/ { ++ model = "Seagate GoFlex Home"; ++ compatible = "seagate,goflexhome", "marvell,kirkwood-88f6281", "marvell,kirkwood"; ++ ++ memory { ++ device_type = "memory"; ++ reg = <0x00000000 0x8000000>; ++ }; ++ ++ chosen { ++ bootargs = "console=ttyS0,115200n8 earlyprintk root=/dev/sda1 rootdelay=10"; ++ stdout-path = &uart0; ++ }; ++ ++ ocp@f1000000 { ++ pinctrl: pin-controller@10000 { ++ pmx_usb_power_enable: pmx-usb-power-enable { ++ marvell,pins = "mpp29"; ++ marvell,function = "gpio"; ++ }; ++ pmx_led_white: pmx-led-white { ++ marvell,pins = "mpp40"; ++ marvell,function = "gpio"; ++ }; ++ pmx_led_green: pmx-led_green { ++ marvell,pins = "mpp46"; ++ marvell,function = "gpio"; ++ }; ++ pmx_led_orange: pmx-led-orange { ++ marvell,pins = "mpp47"; ++ marvell,function = "gpio"; ++ }; ++ }; ++ serial@12000 { ++ status = "ok"; ++ }; ++ ++ sata@80000 { ++ status = "okay"; ++ nr-ports = <2>; ++ }; ++ ++ }; ++ gpio-leds { ++ compatible = "gpio-leds"; ++ ++ health { ++ label = "status:green:health"; ++ gpios = <&gpio1 14 1>; ++ linux,default-trigger = "default-on"; ++ }; ++ fault { ++ label = "status:orange:fault"; ++ gpios = <&gpio1 15 1>; ++ }; ++ misc { ++ label = "status:white:misc"; ++ gpios = <&gpio1 8 1>; ++ linux,default-trigger = "ide-disk"; ++ }; ++ }; ++ 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 = "ubi"; ++ reg = <0x100000 0x0ff00000>; ++ }; ++}; ++ ++&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-4.4/181-goflexnet.patch b/target/linux/kirkwood/patches-4.4/181-goflexnet.patch new file mode 100644 index 0000000000..fc19e396d5 --- /dev/null +++ b/target/linux/kirkwood/patches-4.4/181-goflexnet.patch @@ -0,0 +1,25 @@ +Index: linux-4.4.4/arch/arm/boot/dts/kirkwood-goflexnet.dts +=================================================================== +--- linux-4.4.4.orig/arch/arm/boot/dts/kirkwood-goflexnet.dts ++++ linux-4.4.4/arch/arm/boot/dts/kirkwood-goflexnet.dts +@@ -158,18 +158,8 @@ + }; + + partition@100000 { +- label = "uImage"; +- reg = <0x0100000 0x400000>; +- }; +- +- partition@500000 { +- label = "pogoplug"; +- reg = <0x0500000 0x2000000>; +- }; +- +- partition@2500000 { +- label = "root"; +- reg = <0x02500000 0xd800000>; ++ label = "ubi"; ++ reg = <0x0100000 0x0ff00000>; + }; + }; + diff --git a/target/linux/kirkwood/patches-4.4/190-nsa310s.patch b/target/linux/kirkwood/patches-4.4/190-nsa310s.patch new file mode 100644 index 0000000000..54c0e81510 --- /dev/null +++ b/target/linux/kirkwood/patches-4.4/190-nsa310s.patch @@ -0,0 +1,300 @@ +--- /dev/null ++++ b/arch/arm/boot/dts/kirkwood-nsa310s.dts +@@ -0,0 +1,287 @@ ++/dts-v1/; ++ ++#include "kirkwood.dtsi" ++#include "kirkwood-6281.dtsi" ++ ++/ { ++ model = "ZyXEL NSA310S"; ++ compatible = "zyxel,nsa320s", "marvell,kirkwood-88f6702", "marvell,kirkwood"; ++ ++ memory { ++ device_type = "memory"; ++ reg = <0x00000000 0x10000000>; ++ }; ++ ++ chosen { ++ bootargs = "console=ttyS0,115200n8 earlyprintk"; ++ stdout-path = &uart0; ++ }; ++ ++ mbus { ++ pcie-controller { ++ status = "okay"; ++ ++ pcie@1,0 { ++ status = "okay"; ++ }; ++ }; ++ }; ++ ++ ocp@f1000000 { ++ pinctrl: pin-controller@10000 { ++ pinctrl-names = "default"; ++ ++ pmx_sata0: pmx-sata0 { ++ marvell,pins; ++ marvell,function = "sata0"; ++ }; ++ pmx_sata1: pmx-sata1 { ++ marvell,pins; ++ marvell,function = "sata1"; ++ }; ++ pmx_usb_power: pmx-usb-power { ++ marvell,pins = "mpp21"; ++ marvell,function = "gpio"; ++ }; ++ pmx_pwr_off: pmx-pwr-off { ++ marvell,pins = "mpp27"; ++ marvell,function = "gpio"; ++ }; ++ pmx_btn_reset: pmx-btn-reset { ++ marvell,pins = "mpp24"; ++ marvell,function = "gpio"; ++ }; ++ pmx_btn_copy: pmx-btn-copy { ++ marvell,pins = "mpp25"; ++ marvell,function = "gpio"; ++ }; ++ pmx_btn_power: pmx-btn-power { ++ marvell,pins = "mpp26"; ++ marvell,function = "gpio"; ++ }; ++ pmx_led_hdd2_green: pmx-led-hdd2-green { ++ marvell,pins = "mpp34"; ++ marvell,function = "gpio"; ++ }; ++ pmx_led_hdd2_red: pmx-led-hdd2-red { ++ marvell,pins = "mpp12"; ++ marvell,function = "gpio"; ++ }; ++ pmx_led_usb_green: pmx-led-usb-green { ++ marvell,pins = "mpp15"; ++ marvell,function = "gpio"; ++ }; ++ pmx_led_copy_green: pmx-led-copy-green { ++ marvell,pins = "mpp22"; ++ marvell,function = "gpio"; ++ }; ++ pmx_led_copy_red: pmx-led-copy-red { ++ marvell,pins = "mpp23"; ++ marvell,function = "gpio"; ++ }; ++ pmx_led_sys_green: pmx-led-sys-green { ++ marvell,pins = "mpp28"; ++ marvell,function = "gpio"; ++ }; ++ pmx_led_sys_orange: pmx-led-sys-orange { ++ marvell,pins = "mpp29"; ++ marvell,function = "gpio"; ++ }; ++ pmx_led_hdd1_green: pmx-led-hdd1-green { ++ marvell,pins = "mpp16"; ++ marvell,function = "gpio"; ++ }; ++ pmx_led_hdd1_red: pmx-led-hdd1-red { ++ marvell,pins = "mpp13"; ++ marvell,function = "gpio"; ++ }; ++ pmx_pwr_sata1: pmx-pwr-sata1 { ++ marvell,pins = "mpp33"; ++ marvell,function = "gpio"; ++ }; ++ }; ++ ++ serial@12000 { ++ status = "okay"; ++ }; ++ ++ sata@80000 { ++ status = "okay"; ++ nr-ports = <2>; ++ }; ++ ++ rtc@10300 { ++ status = "disabled"; ++ }; ++ ++ i2c@11000 { ++ status = "okay"; ++ ht1382: rtc@68 { ++ compatible = "htk,ht1382"; ++ reg = <0x68>; ++ }; ++ }; ++ }; ++ ++ regulators { ++ compatible = "simple-bus"; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pmx_usb_power &pmx_pwr_sata1>; ++ ++ usb0_power: regulator@1 { ++ compatible = "regulator-fixed"; ++ reg = <1>; ++ regulator-name = "USB Power"; ++ regulator-min-microvolt = <5000000>; ++ regulator-max-microvolt = <5000000>; ++ regulator-always-on; ++ regulator-boot-on; ++ enable-active-high; ++ gpio = <&gpio0 21 GPIO_ACTIVE_HIGH>; ++ }; ++ ++ sata1_power: regulator@2 { ++ compatible = "regulator-fixed"; ++ reg = <2>; ++ regulator-name = "SATA1 Power"; ++ regulator-min-microvolt = <5000000>; ++ regulator-max-microvolt = <5000000>; ++ regulator-always-on; ++ regulator-boot-on; ++ enable-active-high; ++ gpio = <&gpio1 1 GPIO_ACTIVE_HIGH>; ++ }; ++ }; ++ ++ ++ gpio_keys { ++ compatible = "gpio-keys"; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ pinctrl-0 = <&pmx_btn_reset &pmx_btn_copy &pmx_btn_power>; ++ pinctrl-names = "default"; ++ ++ button@1 { ++ label = "Power Button"; ++ linux,code = ; ++ gpios = <&gpio0 26 GPIO_ACTIVE_HIGH>; ++ }; ++ button@2 { ++ label = "Copy Button"; ++ linux,code = ; ++ gpios = <&gpio0 25 GPIO_ACTIVE_LOW>; ++ }; ++ button@3 { ++ label = "Reset Button"; ++ linux,code = ; ++ gpios = <&gpio0 24 GPIO_ACTIVE_LOW>; ++ }; ++ }; ++ ++ gpio-leds { ++ compatible = "gpio-leds"; ++ pinctrl-0 = <&pmx_led_hdd2_green &pmx_led_hdd2_red ++ &pmx_led_usb_green ++ &pmx_led_sys_green &pmx_led_sys_orange ++ &pmx_led_copy_green &pmx_led_copy_red ++ &pmx_led_hdd1_green &pmx_led_hdd1_red>; ++ pinctrl-names = "default"; ++ ++ green-sys { ++ label = "nsa310s:green:sys"; ++ gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>; ++ linux,default-trigger = "timer"; ++ }; ++ orange-sys { ++ label = "nsa310s:orange:sys"; ++ gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>; ++ }; ++ green-hdd1 { ++ label = "nsa310s:green:hdd1"; ++ gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>; ++ }; ++ red-hdd1 { ++ label = "nsa310s:red:hdd1"; ++ gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>; ++ }; ++ green-hdd2 { ++ label = "nsa310s:green:hdd2"; ++ gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>; ++ }; ++ red-hdd2 { ++ label = "nsa310s:red:hdd2"; ++ gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>; ++ }; ++ green-usb { ++ label = "nsa310s:green:usb"; ++ gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>; ++ }; ++ green-copy { ++ label = "nsa310s:green:copy"; ++ gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>; ++ linux,default-trigger = "ide-disk"; ++ }; ++ red-copy { ++ label = "nsa310s:red:copy"; ++ gpios = <&gpio0 23 GPIO_ACTIVE_HIGH>; ++ }; ++ }; ++ ++ gpio_poweroff { ++ compatible = "gpio-poweroff"; ++ pinctrl-0 = <&pmx_pwr_off>; ++ pinctrl-names = "default"; ++ gpios = <&gpio0 27 GPIO_ACTIVE_HIGH>; ++ }; ++}; ++ ++&nand { ++ status = "okay"; ++ chip-delay = <35>; ++ ++ partition@0 { ++ label = "u-boot"; ++ reg = <0x0000000 0xe0000>; ++ }; ++ ++ partition@e0000 { ++ label = "u-boot environment"; ++ reg = <0xe0000 0x100000>; ++ }; ++ ++ partition@100000 { ++ label = "second stage u-boot"; ++ reg = <0x100000 0x200000>; ++ }; ++ ++ partition@200000 { ++ label = "root"; ++ reg = <0x200000 0x7e00000>; ++ }; ++}; ++ ++&mdio { ++ status = "okay"; ++ ethphy0: ethernet-phy@1 { ++ compatible = "marvell,88e1318s"; ++ reg = <1>; ++ marvell,reg-init = <0x1 0x16 0x0 0x3>, ++ <0x1 0x10 0x0 0x1017>, ++ <0x1 0x11 0x0 0x4408>, ++ <0x1 0x16 0x0 0x0>, ++ <0x1 0x4 0x0 0x1e1>, ++ <0x1 0x9 0x0 0x300>, ++ <0x1 0x10 0x0 0x3860>, ++ <0x1 0x0 0x0 0x9140>; ++ }; ++}; ++ ++ð0 { ++ status = "okay"; ++ ++ ethernet0-port@0 { ++ phy-handle = <ðphy0>; ++ }; ++}; +--- a/arch/arm/boot/dts/Makefile ++++ b/arch/arm/boot/dts/Makefile +@@ -203,6 +203,7 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \ + kirkwood-ns2mini.dtb \ + kirkwood-nsa310.dtb \ + kirkwood-nsa310a.dtb \ ++ kirkwood-nsa310s.dtb \ + kirkwood-openblocks_a6.dtb \ + kirkwood-openblocks_a7.dtb \ + kirkwood-openrd-base.dtb \ diff --git a/target/linux/kirkwood/patches-4.4/200-disable-tso.patch b/target/linux/kirkwood/patches-4.4/200-disable-tso.patch new file mode 100644 index 0000000000..af6ec20c57 --- /dev/null +++ b/target/linux/kirkwood/patches-4.4/200-disable-tso.patch @@ -0,0 +1,35 @@ +From: Ezequiel Garcia +Subject: [PATCH] net: mv643xx_eth: Make TSO disabled by default + +Data corruption has been observed to be produced by TSO. For instance, +accessing files on a NFS-server with TSO enabled results in different data +transferred each time. + +This has been observed only on Kirkwood platforms, i.e. with the mv643xx_eth +driver. Same tests on platforms using the mvneta ethernet driver have +passed without errors. + +Make TSO disabled by default for now, until we can found a proper fix +for the regression. + +Fixes: 3ae8f4e0b98 ('net: mv643xx_eth: Implement software TSO') +Reported-by: Slawomir Gajzner gmail.com> +Reported-by: Julien D'Ascenzio yahoo.fr> +Signed-off-by: Ezequiel Garcia free-electrons.com> +--- +--- a/drivers/net/ethernet/marvell/mv643xx_eth.c ++++ b/drivers/net/ethernet/marvell/mv643xx_eth.c +@@ -3178,11 +3178,11 @@ static int mv643xx_eth_probe(struct plat + dev->watchdog_timeo = 2 * HZ; + dev->base_addr = 0; + +- dev->features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO; ++ dev->features = NETIF_F_SG | NETIF_F_IP_CSUM; + dev->vlan_features = dev->features; + + dev->features |= NETIF_F_RXCSUM; +- dev->hw_features = dev->features; ++ dev->hw_features = dev->features | NETIF_F_TSO; + + dev->priv_flags |= IFF_UNICAST_FLT; + dev->gso_max_segs = MV643XX_MAX_TSO_SEGS; -- cgit v1.2.3