3 files changed, 102 insertions, 8 deletions

diff --git a/recipes-kernel/linux/linux-imx-2.6.35.3/mx23-do-not-use-safe-write.patch b/recipes-kernel/linux/linux-imx-2.6.35.3/mx23-do-not-use-safe-write.patch
new file mode 100644
index 0000000..d25a3ec
--- /dev/null
+++ b/recipes-kernel/linux/linux-imx-2.6.35.3/mx23-do-not-use-safe-write.patch
@@ -0,0 +1,31 @@
+From: Otavio Salvador <otavio@ossystems.com.br>
+Subject: [PATCH 2/2] [MX23] Do not use safe write when building for MX23 arch
+
+The change 105ae4a60 include a safe write support for use with MX23
+but does not include a dummy implementation for other architecture
+making build to fail. This add a dummy version to allow the use with
+MX23 arch.
+
+Upstream-Status: Pending
+
+Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
+---
+ arch/arm/plat-mxs/usb_common.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/arch/arm/plat-mxs/usb_common.c b/arch/arm/plat-mxs/usb_common.c
+index 700d168..c3bc9a9 100644
+--- a/arch/arm/plat-mxs/usb_common.c
++++ b/arch/arm/plat-mxs/usb_common.c
+@@ -53,6 +53,8 @@ static void fsl_safe_writel(u32 val32, volatile u32 *addr)
+ {
+        __asm__ ("swp %0, %0, [%1]" : : "r"(val32), "r"(addr));
+ }
++#else
++static void fsl_safe_writel(u32 val32, volatile u32 *addr) { }
+ #endif
+ 
+ void fsl_usb_xcvr_register(struct fsl_xcvr_ops *xcvr_ops)
+-- 
+1.7.10.4
+
diff --git a/recipes-kernel/linux/linux-imx-2.6.35.3/mx23-dont-mange-IRQ_VDDA_BRNOUT.patch b/recipes-kernel/linux/linux-imx-2.6.35.3/mx23-dont-mange-IRQ_VDDA_BRNOUT.patch
new file mode 100644
index 0000000..a98878a
--- /dev/null
+++ b/recipes-kernel/linux/linux-imx-2.6.35.3/mx23-dont-mange-IRQ_VDDA_BRNOUT.patch
@@ -0,0 +1,51 @@
+From: Otavio Salvador <otavio@ossystems.com.br>
+Subject: [PATCH 1/2] [MX23] Don't mangle IRQ_VDDA_BRNOUT for MX23 arch
+
+This has been introduced on commit e93820b3 and makes the kernel to
+fail to build for MX23 arch so we avoid the IRQ_VDDA_BRNOUT
+manipulation for MX23 arch as this IRQ is not available on MX23.
+
+Upstream-Status: Pending
+
+Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
+---
+ drivers/power/mxs/linux.c |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/drivers/power/mxs/linux.c b/drivers/power/mxs/linux.c
+index d5185fa..0d6c729 100644
+--- a/drivers/power/mxs/linux.c
++++ b/drivers/power/mxs/linux.c
+@@ -1171,7 +1171,9 @@ static int __init mxs_bat_init(void)
+                disable_irq(IRQ_DCDC4P2_BRNOUT);
+                disable_irq(IRQ_BATT_BRNOUT);
+                disable_irq(IRQ_VDDD_BRNOUT);
++#ifndef CONFIG_ARCH_MX23
+                disable_irq(IRQ_VDDA_BRNOUT);
++#endif
+                if (no_battery)
+                        disable_irq(IRQ_VDDIO_BRNOUT);
+ #ifndef CONFIG_ARCH_MX28
+@@ -1184,7 +1186,9 @@ static int __init mxs_bat_init(void)
+                mxs_set_irq_fiq(IRQ_DCDC4P2_BRNOUT, 1);
+                mxs_set_irq_fiq(IRQ_BATT_BRNOUT, 1);
+                mxs_set_irq_fiq(IRQ_VDDD_BRNOUT, 1);
++#ifndef CONFIG_ARCH_MX23
+                mxs_set_irq_fiq(IRQ_VDDA_BRNOUT, 1);
++#endif
+                if (no_battery)
+                        mxs_set_irq_fiq(IRQ_VDDIO_BRNOUT, 1);
+ #ifndef CONFIG_ARCH_MX28
+@@ -1199,7 +1203,9 @@ static int __init mxs_bat_init(void)
+                enable_irq(IRQ_DCDC4P2_BRNOUT);
+                enable_irq(IRQ_BATT_BRNOUT);
+                enable_irq(IRQ_VDDD_BRNOUT);
++#ifndef CONFIG_ARCH_MX23
+                enable_irq(IRQ_VDDA_BRNOUT);
++#endif
+                if (no_battery)
+                        enable_irq(IRQ_VDDIO_BRNOUT);
+ #ifndef CONFIG_ARCH_MX28
+-- 
+1.7.10.4
+
diff --git a/recipes-kernel/linux/linux-imx_2.6.35.3.bb b/recipes-kernel/linux/linux-imx_2.6.35.3.bb
index 289b536..e74924a 100644
--- a/recipes-kernel/linux/linux-imx_2.6.35.3.bb
+++ b/recipes-kernel/linux/linux-imx_2.6.35.3.bb
@@ -1,27 +1,39 @@
 # Copyright (C) 2011-2012 Freescale Semiconductor
 # Released under the MIT license (see COPYING.MIT for the terms)
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 include linux-imx.inc
 
 COMPATIBLE_MACHINE = "(mxs|mx5)"
 
+# Revision of imx_2.6.35_10.12.01 branch
+SRCREV_mxs = "a0e8d80376957175e959f70aba51a1cae487e414"
+LOCALVERSION = "-10.12.01+yocto-${DATE}"
+
 # Revision of imx_2.6.35_11.09.01 branch
-SRCREV = "3e2396eddb362ff70ee6eac43fb1f27f217dc0d1"
+SRCREV_mx5 = "3e2396eddb362ff70ee6eac43fb1f27f217dc0d1"
+LOCALVERSION = "-11.09.01+yocto-${DATE}"
 
 SRC_URI += "file://0002-cgroupfs-create-sys-fs-cgroup-to-mount-cgroupfs-on.patch \
-            file://egalax_ts-enable-single-event-support.patch \
             file://NFS-Fix-nfsroot-support.patch \
             file://NFS-allow-nfs-root-mount-to-use-alternate-rpc-ports.patch \
             file://no-unaligned-access.patch \
-            file://mx28-removecpufreq.patch \
-            file://mxs-duart-use-ttyAMA-for-device-name.patch \
             file://w1-fix-support-multiple-master.patch \
             file://smsc95xx-randomize-mac-once.patch \
             file://dm9601-support-for-usb-ethernet-0x0fe6-0x9700.patch \
             file://wire-up-sys_accept4-on-ARM.patch \
-            file://0001-mx53_loco-add-USR-led-support.patch \
-            file://002_Return_ERESTARTSYS_from_IPU_GET_EVENT.patch \
-            file://003_Sanitise_ipu_interrupt_return_value.patch \
+"
+
+SRC_URI_append_mxs = " \
+           file://mx23-do-not-use-safe-write.patch \
+           file://mx23-dont-mange-IRQ_VDDA_BRNOUT.patch \
+           file://mxs-duart-use-ttyAMA-for-device-name.patch \
+"
+
+SRC_URI_append_mx5 = " \
+           file://egalax_ts-enable-single-event-support.patch \
+           file://0001-mx53_loco-add-USR-led-support.patch \
+           file://002_Return_ERESTARTSYS_from_IPU_GET_EVENT.patch \
+           file://003_Sanitise_ipu_interrupt_return_value.patch \
 "