mvebu: refresh 3.18 patches

Signed-off-by: Imre Kaloz <kaloz@openwrt.org>

SVN-Revision: 44462

7 files changed, 11 insertions, 57 deletions

diff --git a/target/linux/mvebu/patches-3.18/019-mtd-nand-pxa3xx-Fix-PIO-FIFO-draining.patch b/target/linux/mvebu/patches-3.18/019-mtd-nand-pxa3xx-Fix-PIO-FIFO-draining.patch
index bf2006927e..a841f5eadd 100644
--- a/target/linux/mvebu/patches-3.18/019-mtd-nand-pxa3xx-Fix-PIO-FIFO-draining.patch
+++ b/target/linux/mvebu/patches-3.18/019-mtd-nand-pxa3xx-Fix-PIO-FIFO-draining.patch
@@ -20,8 +20,6 @@ Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
  drivers/mtd/nand/pxa3xx_nand.c | 45 ++++++++++++++++++++++++++++++++++++------
  1 file changed, 39 insertions(+), 6 deletions(-)
 
-diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c
-index 96b0b1d27df1..e6918befb951 100644
 --- a/drivers/mtd/nand/pxa3xx_nand.c
 +++ b/drivers/mtd/nand/pxa3xx_nand.c
 @@ -23,6 +23,7 @@
@@ -32,7 +30,7 @@ index 96b0b1d27df1..e6918befb951 100644
  #include <linux/slab.h>
  #include <linux/of.h>
  #include <linux/of_device.h>
-@@ -480,6 +481,38 @@ static void disable_int(struct pxa3xx_nand_info *info, uint32_t int_mask)
+@@ -480,6 +481,38 @@ static void disable_int(struct pxa3xx_na
  	nand_writel(info, NDCR, ndcr | int_mask);
  }
  
@@ -71,7 +69,7 @@ index 96b0b1d27df1..e6918befb951 100644
  static void handle_data_pio(struct pxa3xx_nand_info *info)
  {
  	unsigned int do_bytes = min(info->data_size, info->chunk_size);
-@@ -496,14 +529,14 @@ static void handle_data_pio(struct pxa3xx_nand_info *info)
+@@ -496,14 +529,14 @@ static void handle_data_pio(struct pxa3x
  				      DIV_ROUND_UP(info->oob_size, 4));
  		break;
  	case STATE_PIO_READING:
@@ -92,6 +90,3 @@ index 96b0b1d27df1..e6918befb951 100644
  		break;
  	default:
  		dev_err(&info->pdev->dev, "%s: invalid state %d\n", __func__,
--- 
-2.2.2
-
diff --git a/target/linux/mvebu/patches-3.18/020-ARM-mvebu-Add-a-number-of-pinctrl-functions.patch b/target/linux/mvebu/patches-3.18/020-ARM-mvebu-Add-a-number-of-pinctrl-functions.patch
index 7e27ae2b41..551d5bf510 100644
--- a/target/linux/mvebu/patches-3.18/020-ARM-mvebu-Add-a-number-of-pinctrl-functions.patch
+++ b/target/linux/mvebu/patches-3.18/020-ARM-mvebu-Add-a-number-of-pinctrl-functions.patch
@@ -15,13 +15,11 @@ Signed-off-by: Andrew Lunn <andrew@lunn.ch>
  arch/arm/boot/dts/armada-38x.dtsi | 39 +++++++++++++++++++++++++++++++++++++++
  1 file changed, 39 insertions(+)
 
-diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi
-index 40200084c6c8..98885c58be29 100644
 --- a/arch/arm/boot/dts/armada-38x.dtsi
 +++ b/arch/arm/boot/dts/armada-38x.dtsi
-@@ -195,6 +195,45 @@
- 
- 			pinctrl@18000 {
+@@ -196,6 +196,45 @@
+ 			pinctrl {
+ 				compatible = "marvell,mv88f6820-pinctrl";
  				reg = <0x18000 0x20>;
 +
 +				ge0_rgmii_pins: ge-rgmii-pins-0 {
@@ -65,6 +63,3 @@ index 40200084c6c8..98885c58be29 100644
  			};
  
  			gpio0: gpio@18100 {
--- 
-2.2.1
-
diff --git a/target/linux/mvebu/patches-3.18/021-ARM-mvebu-Add-Armada-385-Access-Point-Development-Bo.patch b/target/linux/mvebu/patches-3.18/021-ARM-mvebu-Add-Armada-385-Access-Point-Development-Bo.patch
index a40c957fb3..cc9311b608 100644
--- a/target/linux/mvebu/patches-3.18/021-ARM-mvebu-Add-Armada-385-Access-Point-Development-Bo.patch
+++ b/target/linux/mvebu/patches-3.18/021-ARM-mvebu-Add-Armada-385-Access-Point-Development-Bo.patch
@@ -19,11 +19,9 @@ Signed-off-by: Andrew Lunn <andrew@lunn.ch>
  2 files changed, 179 insertions(+)
  create mode 100644 arch/arm/boot/dts/armada-385-db-ap.dts
 
-diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index 6dc9c17f9ff5..d34837104949 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
-@@ -536,6 +536,7 @@ dtb-$(CONFIG_MACH_ARMADA_375) += \
+@@ -500,6 +500,7 @@ dtb-$(CONFIG_MACH_ARMADA_375) += \
  	armada-375-db.dtb
  dtb-$(CONFIG_MACH_ARMADA_38X) += \
  	armada-385-db.dtb \
@@ -31,9 +29,6 @@ index 6dc9c17f9ff5..d34837104949 100644
  	armada-385-rd.dtb
  dtb-$(CONFIG_MACH_ARMADA_XP) += \
  	armada-xp-axpwifiap.dtb \
-diff --git a/arch/arm/boot/dts/armada-385-db-ap.dts b/arch/arm/boot/dts/armada-385-db-ap.dts
-new file mode 100644
-index 000000000000..57b9119fb3e0
 --- /dev/null
 +++ b/arch/arm/boot/dts/armada-385-db-ap.dts
 @@ -0,0 +1,178 @@
@@ -215,6 +210,3 @@ index 000000000000..57b9119fb3e0
 +		};
 +	};
 +};
--- 
-2.2.1
-
diff --git a/target/linux/mvebu/patches-3.18/022-ARM-mvebu-A385-AP-Enable-the-NAND-controller.patch b/target/linux/mvebu/patches-3.18/022-ARM-mvebu-A385-AP-Enable-the-NAND-controller.patch
index 85a9511547..3c4a111e4a 100644
--- a/target/linux/mvebu/patches-3.18/022-ARM-mvebu-A385-AP-Enable-the-NAND-controller.patch
+++ b/target/linux/mvebu/patches-3.18/022-ARM-mvebu-A385-AP-Enable-the-NAND-controller.patch
@@ -10,11 +10,9 @@ Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
  arch/arm/boot/dts/armada-385-db-ap.dts | 13 +++++++++++++
  1 file changed, 13 insertions(+)
 
-diff --git a/arch/arm/boot/dts/armada-385-db-ap.dts b/arch/arm/boot/dts/armada-385-db-ap.dts
-index 3a51531eb37b..02db04867d8f 100644
 --- a/arch/arm/boot/dts/armada-385-db-ap.dts
 +++ b/arch/arm/boot/dts/armada-385-db-ap.dts
-@@ -122,6 +122,19 @@
+@@ -150,6 +150,19 @@
  				phy = <&phy0>;
  				phy-mode = "rgmii-id";
  			};
@@ -34,6 +32,3 @@ index 3a51531eb37b..02db04867d8f 100644
  		};
  
  		pcie-controller {
--- 
-2.2.1
-
diff --git a/target/linux/mvebu/patches-3.18/023-pinctrl-mvebu-a38x-Add-UART1-muxing-options.patch b/target/linux/mvebu/patches-3.18/023-pinctrl-mvebu-a38x-Add-UART1-muxing-options.patch
index cd85d9d155..fd75366e38 100644
--- a/target/linux/mvebu/patches-3.18/023-pinctrl-mvebu-a38x-Add-UART1-muxing-options.patch
+++ b/target/linux/mvebu/patches-3.18/023-pinctrl-mvebu-a38x-Add-UART1-muxing-options.patch
@@ -15,11 +15,9 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
  drivers/pinctrl/mvebu/pinctrl-armada-38x.c | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-38x.c b/drivers/pinctrl/mvebu/pinctrl-armada-38x.c
-index 224c6cff6aa2..7302f66f4f19 100644
 --- a/drivers/pinctrl/mvebu/pinctrl-armada-38x.c
 +++ b/drivers/pinctrl/mvebu/pinctrl-armada-38x.c
-@@ -145,14 +145,16 @@ static struct mvebu_mpp_mode armada_38x_mpp_modes[] = {
+@@ -145,14 +145,16 @@ static struct mvebu_mpp_mode armada_38x_
  		 MPP_VAR_FUNCTION(2, "ptp",   "event_req",  V_88F6810_PLUS),
  		 MPP_VAR_FUNCTION(3, "pcie0", "clkreq",     V_88F6810_PLUS),
  		 MPP_VAR_FUNCTION(4, "sata1", "prsnt",      V_88F6810_PLUS),
@@ -38,6 +36,3 @@ index 224c6cff6aa2..7302f66f4f19 100644
  	MPP_MODE(21,
  		 MPP_VAR_FUNCTION(0, "gpio",  NULL,         V_88F6810_PLUS),
  		 MPP_VAR_FUNCTION(1, "spi0",  "cs1",        V_88F6810_PLUS),
--- 
-2.2.1
-
diff --git a/target/linux/mvebu/patches-3.18/024-ARM-mvebu-a38x-Fix-node-names.patch b/target/linux/mvebu/patches-3.18/024-ARM-mvebu-a38x-Fix-node-names.patch
index 7b506e75a8..37dd4c257c 100644
--- a/target/linux/mvebu/patches-3.18/024-ARM-mvebu-a38x-Fix-node-names.patch
+++ b/target/linux/mvebu/patches-3.18/024-ARM-mvebu-a38x-Fix-node-names.patch
@@ -19,8 +19,6 @@ Signed-off-by: Andrew Lunn <andrew@lunn.ch>
  arch/arm/boot/dts/armada-38x.dtsi   | 4 ++--
  5 files changed, 6 insertions(+), 6 deletions(-)
 
-diff --git a/arch/arm/boot/dts/armada-380.dtsi b/arch/arm/boot/dts/armada-380.dtsi
-index 4173a8ab34e7..13400ce88c54 100644
 --- a/arch/arm/boot/dts/armada-380.dtsi
 +++ b/arch/arm/boot/dts/armada-380.dtsi
 @@ -32,7 +32,7 @@
@@ -32,8 +30,6 @@ index 4173a8ab34e7..13400ce88c54 100644
  				compatible = "marvell,mv88f6810-pinctrl";
  				reg = <0x18000 0x20>;
  			};
-diff --git a/arch/arm/boot/dts/armada-385-db.dts b/arch/arm/boot/dts/armada-385-db.dts
-index 2aaa9d2ac284..212605ccc7b6 100644
 --- a/arch/arm/boot/dts/armada-385-db.dts
 +++ b/arch/arm/boot/dts/armada-385-db.dts
 @@ -74,7 +74,7 @@
@@ -45,8 +41,6 @@ index 2aaa9d2ac284..212605ccc7b6 100644
  				phy0: ethernet-phy@0 {
  					reg = <0>;
  				};
-diff --git a/arch/arm/boot/dts/armada-385-rd.dts b/arch/arm/boot/dts/armada-385-rd.dts
-index aaca2861dc87..74a3bfe6efd7 100644
 --- a/arch/arm/boot/dts/armada-385-rd.dts
 +++ b/arch/arm/boot/dts/armada-385-rd.dts
 @@ -67,7 +67,7 @@
@@ -58,8 +52,6 @@ index aaca2861dc87..74a3bfe6efd7 100644
  				phy0: ethernet-phy@0 {
  					reg = <0>;
  				};
-diff --git a/arch/arm/boot/dts/armada-385.dtsi b/arch/arm/boot/dts/armada-385.dtsi
-index 6283d7912f71..5249a4d3c207 100644
 --- a/arch/arm/boot/dts/armada-385.dtsi
 +++ b/arch/arm/boot/dts/armada-385.dtsi
 @@ -37,7 +37,7 @@
@@ -71,8 +63,6 @@ index 6283d7912f71..5249a4d3c207 100644
  				compatible = "marvell,mv88f6820-pinctrl";
  				reg = <0x18000 0x20>;
  			};
-diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi
-index 74391dace9e7..ada1f206028b 100644
 --- a/arch/arm/boot/dts/armada-38x.dtsi
 +++ b/arch/arm/boot/dts/armada-38x.dtsi
 @@ -193,7 +193,7 @@
@@ -83,8 +73,8 @@ index 74391dace9e7..ada1f206028b 100644
 +			pinctrl@18000 {
  				compatible = "marvell,mv88f6820-pinctrl";
  				reg = <0x18000 0x20>;
- 			};
-@@ -373,7 +373,7 @@
+ 
+@@ -412,7 +412,7 @@
  				status = "disabled";
  			};
  
@@ -93,6 +83,3 @@ index 74391dace9e7..ada1f206028b 100644
  				#address-cells = <1>;
  				#size-cells = <0>;
  				compatible = "marvell,orion-mdio";
--- 
-2.2.1
-
diff --git a/target/linux/mvebu/patches-3.18/208-ARM-mvebu-385-ap-Add-partitions.patch b/target/linux/mvebu/patches-3.18/208-ARM-mvebu-385-ap-Add-partitions.patch
index 0c59d47956..2845181104 100644
--- a/target/linux/mvebu/patches-3.18/208-ARM-mvebu-385-ap-Add-partitions.patch
+++ b/target/linux/mvebu/patches-3.18/208-ARM-mvebu-385-ap-Add-partitions.patch
@@ -8,11 +8,9 @@ Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
  arch/arm/boot/dts/armada-385-db-ap.dts | 15 +++++++++++++++
  1 file changed, 15 insertions(+)
 
-diff --git a/arch/arm/boot/dts/armada-385-db-ap.dts b/arch/arm/boot/dts/armada-385-db-ap.dts
-index 02db04867d8f..2a58443e2504 100644
 --- a/arch/arm/boot/dts/armada-385-db-ap.dts
 +++ b/arch/arm/boot/dts/armada-385-db-ap.dts
-@@ -134,6 +134,21 @@
+@@ -162,6 +162,21 @@
  				marvell,nand-keep-config;
  				marvell,nand-enable-arbiter;
  				nand-on-flash-bbt;
@@ -34,6 +32,3 @@ index 02db04867d8f..2a58443e2504 100644
  			};
  		};
  
--- 
-2.2.1
-