linux-imx (2.6.35.3): Add SSI3 address and AUDMUX pin fixes

These patches has been send by Eric Bénard to meta-freescale
mailing list and are still not applied in
Freescale GIT server.

Apply them here as a interim solution.

Change-Id: I75c768f7340e9e5dae45e2def889fac3f6b1dec2
Signed-off-by: Daiane Angolini <daiane.angolini@freescale.com>

diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/2.6.35-maintain-1-2-mx53-fix-ssi3-addresses.patch b/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/2.6.35-maintain-1-2-mx53-fix-ssi3-addresses.patch
new file mode 100644 (file)
index 0000000..a73bd66
--- /dev/null
+++ b/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/2.6.35-maintain-1-2-mx53-fix-ssi3-addresses.patch
@@ -0,0 +1,33 @@
+From patchwork Fri Jun 14 07:00:03 2013
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 8bit
+Subject: [2.6.35-maintain,1/2] mx53: fix ssi3 addresses
+Date: Fri, 14 Jun 2013 07:00:03 -0000
+From: Eric BENARD <eric@eukrea.com>
+X-Patchwork-Id: 51699
+Message-Id: <1371193204-2866-1-git-send-email-eric@eukrea.com>
+To: r9aadq@freescale.com
+Cc: meta-freescale@yoctoproject.org
+
+else its mapped at the i.MX51's address so the peripheral doesn't works.
+
+Signed-off-by: Eric Bénard <eric@eukrea.com>
+
+---
+arch/arm/mach-mx5/devices.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/arch/arm/mach-mx5/devices.c b/arch/arm/mach-mx5/devices.c
+index e75a486..d439b02 100644
+--- a/arch/arm/mach-mx5/devices.c
++++ b/arch/arm/mach-mx5/devices.c
+@@ -1850,6 +1850,8 @@ int __init mxc_init_devices(void)
+               ssi1_resources[0].end -= MX53_OFFSET;
+               ssi2_resources[0].start -= MX53_OFFSET;
+               ssi2_resources[0].end -= MX53_OFFSET;
++              ssi3_resources[0].start -= MX53_OFFSET;
++              ssi3_resources[0].end -= MX53_OFFSET;
+               esai_resources[0].start -= MX53_OFFSET;
+               esai_resources[0].end -= MX53_OFFSET;
+               tve_resources[0].start -= MX53_OFFSET;

diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/2.6.35-maintain-2-2-SD2_DATA1__AUDMUX_AUD4_TXFS-fix-pin-defintion.patch b/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/2.6.35-maintain-2-2-SD2_DATA1__AUDMUX_AUD4_TXFS-fix-pin-defintion.patch
new file mode 100644 (file)
index 0000000..66101e8
--- /dev/null
+++ b/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/2.6.35-maintain-2-2-SD2_DATA1__AUDMUX_AUD4_TXFS-fix-pin-defintion.patch
@@ -0,0 +1,33 @@
+From patchwork Fri Jun 14 07:00:04 2013
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 8bit
+Subject: [2.6.35-maintain,2/2] SD2_DATA1__AUDMUX_AUD4_TXFS: fix pin defintion
+Date: Fri, 14 Jun 2013 07:00:04 -0000
+From: Eric BENARD <eric@eukrea.com>
+X-Patchwork-Id: 51701
+Message-Id: <1371193204-2866-2-git-send-email-eric@eukrea.com>
+To: r9aadq@freescale.com
+Cc: meta-freescale@yoctoproject.org
+
+else the wrong input is selected for the AUDMUX4_TXFS
+
+Signed-off-by: Eric Bénard <eric@eukrea.com>
+
+---
+arch/arm/plat-mxc/include/mach/iomux-mx53.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/arm/plat-mxc/include/mach/iomux-mx53.h b/arch/arm/plat-mxc/include/mach/iomux-mx53.h
+index 7712729..2ab9f46 100644
+--- a/arch/arm/plat-mxc/include/mach/iomux-mx53.h
++++ b/arch/arm/plat-mxc/include/mach/iomux-mx53.h
+@@ -1122,7 +1122,7 @@
+ #define _MX53_PAD_SD2_DATA1__ESDHC2_DAT1      IOMUX_PAD(0x698, 0x30C, 0, 0x0, 0, 0)
+ #define _MX53_PAD_SD2_DATA1__GPIO1_14 IOMUX_PAD(0x698, 0x30C, 1, 0x0, 0, 0)
+ #define _MX53_PAD_SD2_DATA1__KPP_COL_7        IOMUX_PAD(0x698, 0x30C, 2, 0x848, 1, 0)
+-#define _MX53_PAD_SD2_DATA1__AUDMUX_AUD4_TXFS IOMUX_PAD(0x698, 0x30C, 3, 0x744, 0, 0)
++#define _MX53_PAD_SD2_DATA1__AUDMUX_AUD4_TXFS IOMUX_PAD(0x698, 0x30C, 3, 0x744, 1, 0)
+ #define _MX53_PAD_SD2_DATA1__CSPI_SS0 IOMUX_PAD(0x698, 0x30C, 5, 0x78C, 4, 0)
+ #define _MX53_PAD_SD2_DATA1__RTIC_SEC_VIO     IOMUX_PAD(0x698, 0x30C, 7, 0x0, 0, 0)
+ #define _MX53_PAD_SD2_DATA0__ESDHC2_DAT0      IOMUX_PAD(0x69C, 0x310, 0, 0x0, 0, 0)

diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx_2.6.35.3.bb b/meta-fsl-arm/recipes-kernel/linux/linux-imx_2.6.35.3.bb
index ec6c64a562bff1e291778b4ce6310eb9699af169..8600a60479c76b04ea3a40c82b408f7b64e9043c 100644 (file)
--- a/meta-fsl-arm/recipes-kernel/linux/linux-imx_2.6.35.3.bb
+++ b/meta-fsl-arm/recipes-kernel/linux/linux-imx_2.6.35.3.bb
@@ -14,6 +14,8 @@ LOCALVERSION = "-maintain+yocto"
 SRC_URI += "file://NFS-Fix-nfsroot-support.patch \
             file://NFS-allow-nfs-root-mount-to-use-alternate-rpc-ports.patch \
             file://perf-avoid-use-sysroot-headers.patch \
+            file://2.6.35-maintain-1-2-mx53-fix-ssi3-addresses.patch \
+            file://2.6.35-maintain-2-2-SD2_DATA1__AUDMUX_AUD4_TXFS-fix-pin-defintion.patch \
 "
 
 SRC_URI_append_mx28 = " \