aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/imx6/patches-3.10
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2013-07-22 15:31:13 +0000
committerGabor Juhos <juhosg@openwrt.org>2013-07-22 15:31:13 +0000
commitef944dcb85dea57bdc4b42b8b6fcecacf00b2e92 (patch)
tree111f67b615233af594bc5e29460af254bf85274e /target/linux/imx6/patches-3.10
parent6a5b4ec7dc2abeecd47345e2fb5aeb83ea50f322 (diff)
downloadupstream-ef944dcb85dea57bdc4b42b8b6fcecacf00b2e92.tar.gz
upstream-ef944dcb85dea57bdc4b42b8b6fcecacf00b2e92.tar.bz2
upstream-ef944dcb85dea57bdc4b42b8b6fcecacf00b2e92.zip
kernel: update 3.10 to 3.10.2
Also refresh 3.10 patches. Signed-off-by: Gabor Juhos <juhosg@openwrt.org> SVN-Revision: 37502
Diffstat (limited to 'target/linux/imx6/patches-3.10')
-rw-r--r--target/linux/imx6/patches-3.10/110-gw5400-a.patch12
-rw-r--r--target/linux/imx6/patches-3.10/200-imx6_pcie.patch2
2 files changed, 7 insertions, 7 deletions
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 @@
};
};