From cb7baca845745b6c4b6c88bb8d97a86c0bc103ed Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Tue, 16 Jul 2013 20:09:03 +0000 Subject: [PATCH] linux-imx (2.6.35): Update maintain branch to commit f19246ce Update 2.6.35 maintain branch to commit f19246ce (ENGR00271139 SD2_DATA1__AUDMUX_AUD4_TXFS: fix pin defintion). Signed-off-by: Fabio Estevam --- ...maintain-1-2-mx53-fix-ssi3-addresses.patch | 33 ------------------- ...__AUDMUX_AUD4_TXFS-fix-pin-defintion.patch | 33 ------------------- .../linux/linux-imx_2.6.35.3.bb | 4 +-- 3 files changed, 1 insertion(+), 69 deletions(-) delete mode 100644 meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/2.6.35-maintain-1-2-mx53-fix-ssi3-addresses.patch delete mode 100644 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 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 deleted file mode 100644 index a73bd666..00000000 --- a/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/2.6.35-maintain-1-2-mx53-fix-ssi3-addresses.patch +++ /dev/null @@ -1,33 +0,0 @@ -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 -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 - ---- -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 deleted file mode 100644 index 66101e86..00000000 --- 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 +++ /dev/null @@ -1,33 +0,0 @@ -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 -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 - ---- -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 f4259ca2..c4b08b9b 100644 --- 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 @@ -8,14 +8,12 @@ include linux-imx.inc COMPATIBLE_MACHINE = "(mx28|mx5)" # Revision of imx_2.6.35_maintain branch -SRCREV = "a0de0f94dd9868d2280aa8cdb8295231e00d5ef6" +SRCREV = "f19246cea172fca7ea32618b607e5e7198da04dc" 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 = " \ -- 2.40.1