From 2c55674246b6f7600f86df516360f6e91fa11082 Mon Sep 17 00:00:00 2001
From: Gabor Juhos <juhosg@openwrt.org>
Date: Mon, 22 Jul 2013 15:31:13 +0000
Subject: kernel: update 3.10 to 3.10.2

Also refresh 3.10 patches.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37502 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/linux/imx6/Makefile                         |  2 +-
 target/linux/imx6/patches-3.10/110-gw5400-a.patch  | 12 ++++++------
 target/linux/imx6/patches-3.10/200-imx6_pcie.patch |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'target/linux/imx6')

diff --git a/target/linux/imx6/Makefile b/target/linux/imx6/Makefile
index db8956fd91..abc53e9432 100644
--- a/target/linux/imx6/Makefile
+++ b/target/linux/imx6/Makefile
@@ -13,7 +13,7 @@ FEATURES:=audio display gpio pcie usb usbgadget squashfs targz
 CFLAGS:=-Os -pipe -mtune=cortex-a9 -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp
 MAINTAINER:=Luka Perkov <luka@openwrt.org>
 
-LINUX_VERSION:=3.10.1
+LINUX_VERSION:=3.10.2
 
 include $(INCLUDE_DIR)/target.mk
 
diff --git a/target/linux/imx6/patches-3.10/110-gw5400-a.patch b/target/linux/imx6/patches-3.10/110-gw5400-a.patch
index 3f7f1fc7f3..ac0721d925 100644
--- a/target/linux/imx6/patches-3.10/110-gw5400-a.patch
+++ b/target/linux/imx6/patches-3.10/110-gw5400-a.patch
@@ -10,7 +10,7 @@
  	imx6q-sabresd.dtb \
 --- a/arch/arm/boot/dts/imx6q.dtsi
 +++ b/arch/arm/boot/dts/imx6q.dtsi
-@@ -94,6 +94,14 @@
+@@ -98,6 +98,14 @@
  							MX6Q_PAD_CSI0_DAT6__AUD3_TXFS 0x80000000
  						>;
  					};
@@ -25,7 +25,7 @@
  				};
  
  				ecspi1 {
-@@ -201,6 +209,12 @@
+@@ -205,6 +213,12 @@
  							MX6Q_PAD_EIM_D16__I2C2_SDA 0x4001b8b1
  						>;
  					};
@@ -38,7 +38,7 @@
  				};
  
  				i2c3 {
-@@ -210,6 +224,12 @@
+@@ -214,6 +228,12 @@
  							MX6Q_PAD_EIM_D18__I2C3_SDA 0x4001b8b1
  						>;
  					};
@@ -51,7 +51,7 @@
  				};
  
  				uart1 {
-@@ -219,6 +239,12 @@
+@@ -223,6 +243,12 @@
  							MX6Q_PAD_CSI0_DAT11__UART1_RX_DATA 0x1b0b1
  						>;
  					};
@@ -64,7 +64,7 @@
  				};
  
  				uart2 {
-@@ -228,6 +254,21 @@
+@@ -232,6 +258,21 @@
  							MX6Q_PAD_EIM_D27__UART2_RX_DATA 0x1b0b1
  						>;
  					};
@@ -86,7 +86,7 @@
  				};
  
  				uart4 {
-@@ -238,6 +279,15 @@
+@@ -242,6 +283,15 @@
  						>;
  					};
  				};
diff --git a/target/linux/imx6/patches-3.10/200-imx6_pcie.patch b/target/linux/imx6/patches-3.10/200-imx6_pcie.patch
index 1f84d5eb72..6aee13fb70 100644
--- a/target/linux/imx6/patches-3.10/200-imx6_pcie.patch
+++ b/target/linux/imx6/patches-3.10/200-imx6_pcie.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/boot/dts/imx6q.dtsi
 +++ b/arch/arm/boot/dts/imx6q.dtsi
-@@ -328,6 +328,15 @@
+@@ -382,6 +382,15 @@
  			};
  		};
  
-- 
cgit v1.2.3