upgrade 3.13 targets to 3.13.2, refresh patches

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


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39582 3c298f89-4303-0410-b956-a3cf2f4a3e73

7 files changed, 26 insertions, 30 deletions

diff --git a/target/linux/mxs/Makefile b/target/linux/mxs/Makefile
index 30b167bbe0..1cade1486f 100644
--- a/target/linux/mxs/Makefile
+++ b/target/linux/mxs/Makefile
@@ -13,7 +13,7 @@ FEATURES:=ext4 rtc usb gpio
 CPU_TYPE:=arm926ej-s
 
 MAINTAINER:=Zoltan HERPAI <wigyori@uid0.hu>
-LINUX_VERSION:=3.13.1
+LINUX_VERSION:=3.13.2
 KERNELNAME:="zImage dtbs"
 
 define Target/Description
diff --git a/target/linux/mxs/patches-3.13/100-soc-audio-support.patch b/target/linux/mxs/patches-3.13/100-soc-audio-support.patch
index ef07f92c78..f122f1b41c 100644
--- a/target/linux/mxs/patches-3.13/100-soc-audio-support.patch
+++ b/target/linux/mxs/patches-3.13/100-soc-audio-support.patch
@@ -1,6 +1,6 @@
 --- a/sound/soc/codecs/Kconfig
 +++ b/sound/soc/codecs/Kconfig
-@@ -125,6 +125,7 @@ config SND_SOC_ALL_CODECS
+@@ -132,6 +132,7 @@ config SND_SOC_ALL_CODECS
  	select SND_SOC_WM9705 if SND_SOC_AC97_BUS
  	select SND_SOC_WM9712 if SND_SOC_AC97_BUS
  	select SND_SOC_WM9713 if SND_SOC_AC97_BUS
@@ -8,7 +8,7 @@
          help
            Normally ASoC codec drivers are only built if a machine driver which
            uses them is also built since they are only usable with a machine
-@@ -507,6 +508,9 @@ config SND_SOC_WM9712
+@@ -534,6 +535,9 @@ config SND_SOC_WM9712
  config SND_SOC_WM9713
  	tristate
  
@@ -20,7 +20,7 @@
  	tristate
 --- a/sound/soc/codecs/Makefile
 +++ b/sound/soc/codecs/Makefile
-@@ -118,6 +118,7 @@ snd-soc-wm9705-objs := wm9705.o
+@@ -124,6 +124,7 @@ snd-soc-wm9705-objs := wm9705.o
  snd-soc-wm9712-objs := wm9712.o
  snd-soc-wm9713-objs := wm9713.o
  snd-soc-wm-hubs-objs := wm_hubs.o
@@ -28,7 +28,7 @@
  
  # Amp
  snd-soc-max9877-objs := max9877.o
-@@ -242,6 +243,7 @@ obj-$(CONFIG_SND_SOC_WM9712)	+= snd-soc-
+@@ -254,6 +255,7 @@ obj-$(CONFIG_SND_SOC_WM9712)	+= snd-soc-
  obj-$(CONFIG_SND_SOC_WM9713)	+= snd-soc-wm9713.o
  obj-$(CONFIG_SND_SOC_WM_ADSP)	+= snd-soc-wm-adsp.o
  obj-$(CONFIG_SND_SOC_WM_HUBS)	+= snd-soc-wm-hubs.o
@@ -1997,7 +1997,7 @@
 +#endif /* __MXS_ADC_CODEC_H */
 --- a/sound/soc/mxs/Kconfig
 +++ b/sound/soc/mxs/Kconfig
-@@ -18,3 +18,13 @@ config SND_SOC_MXS_SGTL5000
+@@ -19,3 +19,13 @@ config SND_SOC_MXS_SGTL5000
  	  a sgtl5000 codec.
  
  endif	# SND_MXS_SOC
diff --git a/target/linux/mxs/patches-3.13/101-soc-audio-dts.patch b/target/linux/mxs/patches-3.13/101-soc-audio-dts.patch
index 924cbebb08..99bdf5f6fc 100644
--- a/target/linux/mxs/patches-3.13/101-soc-audio-dts.patch
+++ b/target/linux/mxs/patches-3.13/101-soc-audio-dts.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/boot/dts/imx23-olinuxino.dts
 +++ b/arch/arm/boot/dts/imx23-olinuxino.dts
-@@ -84,6 +84,25 @@
+@@ -88,6 +88,25 @@
  			usbphy0: usbphy@8007c000 {
  				status = "okay";
  			};
@@ -26,7 +26,7 @@
  		};
  	};
  
-@@ -118,4 +137,10 @@
+@@ -122,4 +141,10 @@
  			gpios = <&gpio2 1 1>;
  		};
  	};
diff --git a/target/linux/mxs/patches-3.13/105-dt-add-dcp.patch b/target/linux/mxs/patches-3.13/105-dt-add-dcp.patch
index ddb223c38c..dcb8d638fb 100644
--- a/target/linux/mxs/patches-3.13/105-dt-add-dcp.patch
+++ b/target/linux/mxs/patches-3.13/105-dt-add-dcp.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/boot/dts/imx23.dtsi
 +++ b/arch/arm/boot/dts/imx23.dtsi
-@@ -337,6 +337,7 @@
+@@ -338,6 +338,7 @@
  
  			dcp@80028000 {
  				reg = <0x80028000 0x2000>;
diff --git a/target/linux/mxs/patches-3.13/110-dt-add-lradc.path b/target/linux/mxs/patches-3.13/110-dt-add-lradc.path
index a2b9886959..4b024ce66c 100644
--- a/target/linux/mxs/patches-3.13/110-dt-add-lradc.path
+++ b/target/linux/mxs/patches-3.13/110-dt-add-lradc.path
@@ -1,6 +1,6 @@
 --- a/arch/arm/boot/dts/imx23-olinuxino.dts
 +++ b/arch/arm/boot/dts/imx23-olinuxino.dts
-@@ -109,6 +109,11 @@
+@@ -113,6 +113,11 @@
  				dmas = <&dma_apbx 0>, <&dma_apbx 1>;
  				dma-names = "rx", "tx";
  			};
diff --git a/target/linux/mxs/patches-3.13/120-dt-add-i2c.patch b/target/linux/mxs/patches-3.13/120-dt-add-i2c.patch
index 4e8986d4bb..3f89fff706 100644
--- a/target/linux/mxs/patches-3.13/120-dt-add-i2c.patch
+++ b/target/linux/mxs/patches-3.13/120-dt-add-i2c.patch
@@ -1,8 +1,7 @@
-diff -ruN old/arch/arm/boot/dts/imx23.dtsi new/arch/arm/boot/dts/imx23.dtsi
---- old/arch/arm/boot/dts/imx23.dtsi	2013-11-19 11:52:31.000000000 +0100
-+++ new/arch/arm/boot/dts/imx23.dtsi	2013-11-19 13:08:47.787452900 +0100
-@@ -145,6 +145,39 @@
- 					fsl,pull-up = <0>;
+--- a/arch/arm/boot/dts/imx23.dtsi
++++ b/arch/arm/boot/dts/imx23.dtsi
+@@ -146,6 +146,39 @@
+ 					fsl,pull-up = <MXS_PULL_DISABLE>;
  				};
  
 +				i2c0_pins_a: i2c0@0 {
@@ -41,7 +40,7 @@ diff -ruN old/arch/arm/boot/dts/imx23.dtsi new/arch/arm/boot/dts/imx23.dtsi
  				auart0_pins_a: auart0@0 {
  					reg = <0>;
  					fsl,pinmux-ids = <
-@@ -441,7 +474,12 @@
+@@ -443,7 +476,12 @@
  			};
  
  			i2c@80058000 {
@@ -54,9 +53,8 @@ diff -ruN old/arch/arm/boot/dts/imx23.dtsi new/arch/arm/boot/dts/imx23.dtsi
  				dmas = <&dma_apbx 3>;
  				dma-names = "rx-tx";
  				status = "disabled";
-diff -ruN old/arch/arm/boot/dts/imx23-olinuxino.dts new/arch/arm/boot/dts/imx23-olinuxino.dts
---- old/arch/arm/boot/dts/imx23-olinuxino.dts	2013-11-19 11:52:31.000000000 +0100
-+++ new/arch/arm/boot/dts/imx23-olinuxino.dts	2013-11-19 12:18:53.000000000 +0100
+--- a/arch/arm/boot/dts/imx23-olinuxino.dts
++++ b/arch/arm/boot/dts/imx23-olinuxino.dts
 @@ -79,6 +79,12 @@
  				status = "okay";
  			};
diff --git a/target/linux/mxs/patches-3.13/200-duckbill.patch b/target/linux/mxs/patches-3.13/200-duckbill.patch
index c58d9684e5..f4fda0261f 100644
--- a/target/linux/mxs/patches-3.13/200-duckbill.patch
+++ b/target/linux/mxs/patches-3.13/200-duckbill.patch
@@ -1,7 +1,6 @@
-diff -ruN old/arch/arm/boot/dts/Makefile new/arch/arm/boot/dts/Makefile
---- old/arch/arm/boot/dts/Makefile	2014-02-05 13:08:14.000000000 +0100
-+++ new/arch/arm/boot/dts/Makefile	2014-02-05 13:12:40.493773522 +0100
-@@ -164,6 +164,7 @@
+--- a/arch/arm/boot/dts/Makefile
++++ b/arch/arm/boot/dts/Makefile
+@@ -164,6 +164,7 @@ dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dtb
  	imx28-cfa10057.dtb \
  	imx28-cfa10058.dtb \
  	imx28-evk.dtb \
@@ -9,10 +8,9 @@ diff -ruN old/arch/arm/boot/dts/Makefile new/arch/arm/boot/dts/Makefile
  	imx28-m28cu3.dtb \
  	imx28-m28evk.dtb \
  	imx28-sps1.dtb \
-diff -ruN old/arch/arm/mach-mxs/mach-mxs.c new/arch/arm/mach-mxs/mach-mxs.c
---- old/arch/arm/mach-mxs/mach-mxs.c	2014-02-05 13:08:14.000000000 +0100
-+++ new/arch/arm/mach-mxs/mach-mxs.c	2014-02-05 13:13:27.121772897 +0100
-@@ -157,6 +157,7 @@
+--- a/arch/arm/mach-mxs/mach-mxs.c
++++ b/arch/arm/mach-mxs/mach-mxs.c
+@@ -157,6 +157,7 @@ enum mac_oui {
  	OUI_FSL,
  	OUI_DENX,
  	OUI_CRYSTALFONTZ,
@@ -20,7 +18,7 @@ diff -ruN old/arch/arm/mach-mxs/mach-mxs.c new/arch/arm/mach-mxs/mach-mxs.c
  };
  
  static void __init update_fec_mac_prop(enum mac_oui oui)
-@@ -211,6 +212,11 @@
+@@ -211,6 +212,11 @@ static void __init update_fec_mac_prop(e
  			macaddr[1] = 0xb9;
  			macaddr[2] = 0xe1;
  			break;
@@ -32,7 +30,7 @@ diff -ruN old/arch/arm/mach-mxs/mach-mxs.c new/arch/arm/mach-mxs/mach-mxs.c
  		}
  		val = ocotp[i];
  		macaddr[3] = (val >> 16) & 0xff;
-@@ -426,6 +432,11 @@
+@@ -426,6 +432,11 @@ static int __init mxs_restart_init(void)
  	return 0;
  }
  
@@ -44,7 +42,7 @@ diff -ruN old/arch/arm/mach-mxs/mach-mxs.c new/arch/arm/mach-mxs/mach-mxs.c
  static void __init mxs_machine_init(void)
  {
  	struct device_node *root;
-@@ -464,6 +475,8 @@
+@@ -464,6 +475,8 @@ static void __init mxs_machine_init(void
  		crystalfontz_init();
  	else if (of_machine_is_compatible("msr,m28cu3"))
  		m28cu3_init();