Merge remote branch 'freescale/denzil' into master

* freescale/denzil:
  linux-imx (2.6.35.3): reduce delta against kernel source imx23evk_defconfig
  linux-imx (2.6.35.3): use 10.12.01 based kernel for mxs SoC family
  linux-imx (3.0.15): update to use linux-imx
  linux-imx (2.6.35.3): update to use linux-imx.inc
  linux-imx.inc: add to avoid duplicating code among linux-imx' recipes

Conflicts:
	recipes-kernel/linux/linux-imx_2.6.35.3.bb

6 files changed, 206 insertions, 84 deletions

diff --git a/recipes-kernel/linux/linux-imx-2.6.35.3/imx23evk/defconfig b/recipes-kernel/linux/linux-imx-2.6.35.3/imx23evk/defconfig
index 57c027a..2cb8a9d 100644
--- a/recipes-kernel/linux/linux-imx-2.6.35.3/imx23evk/defconfig
+++ b/recipes-kernel/linux/linux-imx-2.6.35.3/imx23evk/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.35.3
-# Mon May 21 10:06:01 2012
+# Sat Aug  4 14:59:15 2012
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -18,6 +18,7 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_ARCH_HAS_CPUFREQ=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_ZONE_DMA=y
@@ -67,8 +68,6 @@ CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_CGROUPS is not set
-#CONFIG_SYSFS_DEPRECATED is not set
-#CONFIG_SYSFS_DEPRECATED_V2 is not set
 # CONFIG_RELAY is not set
 # CONFIG_NAMESPACES is not set
 CONFIG_BLK_DEV_INITRD=y
@@ -97,6 +96,7 @@ CONFIG_SIGNALFD=y
 CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
+# CONFIG_ASHMEM is not set
 CONFIG_AIO=y
 CONFIG_HAVE_PERF_EVENTS=y
 CONFIG_PERF_USE_VMALLOC=y
@@ -355,6 +355,21 @@ CONFIG_CMDLINE=""
 #
 # CPU Power Management
 #
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_TABLE=y
+# CONFIG_CPU_FREQ_DEBUG is not set
+CONFIG_CPU_FREQ_STAT=y
+# CONFIG_CPU_FREQ_STAT_DETAILS is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set
+# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set
 # CONFIG_CPU_IDLE is not set
 
 #
@@ -534,6 +549,7 @@ CONFIG_RFKILL_INPUT=y
 #
 CONFIG_UEVENT_HELPER_PATH=""
 CONFIG_DEVTMPFS=y
+# CONFIG_DEVTMPFS_MOUNT is not set
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
@@ -597,7 +613,6 @@ CONFIG_MTD_CFI_I2=y
 #
 # CONFIG_MTD_DATAFLASH is not set
 # CONFIG_MTD_MXC_DATAFLASH is not set
-# CONFIG_MTD_MXC_M25P80 is not set
 # CONFIG_MTD_M25P80 is not set
 # CONFIG_MTD_SST25L is not set
 # CONFIG_MTD_SLRAM is not set
@@ -638,7 +653,7 @@ CONFIG_MTD_NAND_GPMI_NFC=y
 CONFIG_MTD_UBI=y
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
 CONFIG_MTD_UBI_BEB_RESERVE=1
-# CONFIG_MTD_UBI_GLUEBI is not set
+CONFIG_MTD_UBI_GLUEBI=y
 
 #
 # UBI debugging options
@@ -672,6 +687,8 @@ CONFIG_MISC_DEVICES=y
 # CONFIG_DS1682 is not set
 # CONFIG_TI_DAC7512 is not set
 CONFIG_MXS_PERSISTENT=y
+# CONFIG_ANDROID_PMEM is not set
+# CONFIG_UID_STAT is not set
 # CONFIG_C2PORT is not set
 
 #
@@ -760,6 +777,7 @@ CONFIG_NETDEV_10000=y
 CONFIG_WLAN=y
 # CONFIG_USB_ZD1201 is not set
 # CONFIG_HOSTAP is not set
+# CONFIG_ATH6K_LEGACY is not set
 
 #
 # Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -821,7 +839,6 @@ CONFIG_INPUT_KEYBOARD=y
 # CONFIG_KEYBOARD_SUNKBD is not set
 # CONFIG_KEYBOARD_XTKBD is not set
 CONFIG_KEYBOARD_MXS=y
-# CONFIG_KEYBOARD_MPR121 is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
 # CONFIG_INPUT_TABLET is not set
@@ -834,7 +851,6 @@ CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_DYNAPRO is not set
 # CONFIG_TOUCHSCREEN_HAMPSHIRE is not set
 # CONFIG_TOUCHSCREEN_EETI is not set
-# CONFIG_TOUCHSCREEN_EGALAX is not set
 # CONFIG_TOUCHSCREEN_FUJITSU is not set
 # CONFIG_TOUCHSCREEN_GUNZE is not set
 # CONFIG_TOUCHSCREEN_ELO is not set
@@ -852,8 +868,6 @@ CONFIG_TOUCHSCREEN_MXS=y
 # CONFIG_TOUCHSCREEN_TSC2007 is not set
 # CONFIG_TOUCHSCREEN_W90X900 is not set
 # CONFIG_TOUCHSCREEN_TPS6507X is not set
-# CONFIG_TOUCHSCREEN_P1003 is not set
-# CONFIG_TOUCHSCREEN_MAX11801 is not set
 CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_ATI_REMOTE is not set
@@ -865,7 +879,6 @@ CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_UINPUT is not set
 # CONFIG_INPUT_PCF8574 is not set
 # CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
-# CONFIG_INPUT_ISL29023 is not set
 
 #
 # Hardware I/O ports
@@ -1104,10 +1117,7 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_W83627EHF is not set
 # CONFIG_SENSORS_LIS3_SPI is not set
 # CONFIG_SENSORS_LIS3_I2C is not set
-# CONFIG_SENSORS_MAG3110 is not set
 CONFIG_MXC_MMA7450=m
-CONFIG_MXC_MMA8450=y
-CONFIG_MXC_MMA8451=y
 # CONFIG_THERMAL is not set
 CONFIG_WATCHDOG=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -1155,7 +1165,6 @@ CONFIG_MFD_SUPPORT=y
 # CONFIG_MFD_LTC3589_I2C is not set
 # CONFIG_MFD_PCF50633 is not set
 # CONFIG_MFD_MC13783 is not set
-# CONFIG_PMIC_DA9052 is not set
 # CONFIG_ABX500_CORE is not set
 # CONFIG_EZX_PCAP is not set
 # CONFIG_AB8500_CORE is not set
@@ -1408,6 +1417,7 @@ CONFIG_USB=y
 # CONFIG_USB_DEVICEFS is not set
 CONFIG_USB_DEVICE_CLASS=y
 # CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_OTG is not set
 # CONFIG_USB_OTG_WHITELIST is not set
 # CONFIG_USB_OTG_BLACKLIST_HUB is not set
 CONFIG_USB_MON=y
@@ -1745,13 +1755,15 @@ CONFIG_NFS_FS=y
 CONFIG_NFS_V3=y
 # CONFIG_NFS_V3_ACL is not set
 CONFIG_NFS_V4=y
+# CONFIG_NFS_V4_1 is not set
 CONFIG_ROOT_NFS=y
 # CONFIG_NFSD is not set
 CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
-# CONFIG_RPCSEC_GSS_KRB5 is not set
+CONFIG_SUNRPC_GSS=y
+CONFIG_RPCSEC_GSS_KRB5=y
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
 # CONFIG_CEPH_FS is not set
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.inc b/recipes-kernel/linux/linux-imx.inc
new file mode 100644
index 0000000..6909582
--- /dev/null
+++ b/recipes-kernel/linux/linux-imx.inc
@@ -0,0 +1,64 @@
+# Copyright (C) 2012 O.S. Systems Software LTDA.
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+DESCRIPTION = "Linux kernel for imx platforms"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
+
+INC_PR = "r30"
+
+inherit kernel
+
+# Put a local version until we have a true SRCREV to point to
+LOCALVERSION ?= "+yocto-${DATE}"
+
+SRC_URI = "git://git.freescale.com/imx/linux-2.6-imx.git \
+           file://defconfig \
+"
+
+S = "${WORKDIR}/git"
+
+kernel_conf_variable() {
+        CONF_SED_SCRIPT="$CONF_SED_SCRIPT /CONFIG_$1[ =]/d;"
+        if test "$2" = "n"
+        then
+                echo "# CONFIG_$1 is not set" >> ${S}/.config
+        else
+                echo "CONFIG_$1=$2" >> ${S}/.config
+        fi
+}
+
+do_configure_prepend() {
+        echo "" > ${S}/.config
+        CONF_SED_SCRIPT=""
+
+        kernel_conf_variable LOCALVERSION "\"${LOCALVERSION}\""
+        kernel_conf_variable LOCALVERSION_AUTO n
+
+        sed -e "${CONF_SED_SCRIPT}" < '${WORKDIR}/defconfig' >> '${S}/.config'
+}
+
+# install nedded headers for imx-test compilation
+do_install_append() {
+        # bounds.h may be used by a module and is currently missing
+        if [ -d include/generated ]; then
+                cp include/generated/* $kerneldir/include/generated/
+        fi
+
+        # Host architecture object file
+        rm -f $kerneldir/scripts/kconfig/kxgettext.o
+}
+
+sysroot_stage_all_append() {
+        # denzil does not have KERNEL_SRC_PATH so we default to /kernel
+        destdir=${KERNEL_SRC_PATH}
+        if [ -z "$destdir" ]; then
+                destdir=/kernel
+        fi
+
+        # Copy native binaries need for imx-test build onto sysroot
+        mkdir -p ${SYSROOT_DESTDIR}/usr/src/kernel/scripts/basic \
+                 ${SYSROOT_DESTDIR}/usr/src/kernel/scripts/mod
+        cp ${S}/scripts/basic/fixdep ${SYSROOT_DESTDIR}$destdir/scripts/basic
+        cp ${S}/scripts/mod/modpost ${SYSROOT_DESTDIR}$destdir/scripts/mod
+}
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 b541ee1..c487cbc 100644
--- a/recipes-kernel/linux/linux-imx_2.6.35.3.bb
+++ b/recipes-kernel/linux/linux-imx_2.6.35.3.bb
@@ -1,57 +1,39 @@
 # Copyright (C) 2011-2012 Freescale Semiconductor
 # Released under the MIT license (see COPYING.MIT for the terms)
 
-DESCRIPTION = "Linux kernel for imx platforms"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
-PR = "r30"
+PR = "${INC_PR}.2"
+
+include linux-imx.inc
 
-inherit kernel
 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://NFS-Fix-nfsroot-support.patch \
+            file://NFS-allow-nfs-root-mount-to-use-alternate-rpc-ports.patch \
+            file://no-unaligned-access.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 \
+"
+
+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 = "git://git.freescale.com/imx/linux-2.6-imx.git \
-           file://0002-cgroupfs-create-sys-fs-cgroup-to-mount-cgroupfs-on.patch \
+SRC_URI_append_mx5 = " \
            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 \
-           file://defconfig \
-          "
-
-#EXTRA_OEMAKE += "V=1"
-
-S = "${WORKDIR}/git"
-
-# install nedded headers for imx-test compilation
-do_install_append() {
-        # bounds.h may be used by a module and is currently missing
-        if [ -d include/generated ]; then
-                cp include/generated/* $kerneldir/include/generated/
-        fi
-}
-
-sysroot_stage_all_append() {
-        # denzil does not have KERNEL_SRC_PATH so we default to /kernel
-        destdir=${KERNEL_SRC_PATH}
-        if [ -z "$destdir" ]; then
-                destdir=/kernel
-        fi
-
-        # Copy native binaries need for imx-test build onto sysroot
-        mkdir -p ${SYSROOT_DESTDIR}/usr/src/kernel/scripts/basic \
-                 ${SYSROOT_DESTDIR}/usr/src/kernel/scripts/mod
-        cp ${S}/scripts/basic/fixdep ${SYSROOT_DESTDIR}$destdir/scripts/basic
-        cp ${S}/scripts/mod/modpost ${SYSROOT_DESTDIR}$destdir/scripts/mod
-}
+"
diff --git a/recipes-kernel/linux/linux-imx_3.0.15.bb b/recipes-kernel/linux/linux-imx_3.0.15.bb
index fe62daf..3c14535 100644
--- a/recipes-kernel/linux/linux-imx_3.0.15.bb
+++ b/recipes-kernel/linux/linux-imx_3.0.15.bb
@@ -1,30 +1,12 @@
 # Copyright (C) 2011-2012 Freescale Semiconductor
 # Released under the MIT license (see COPYING.MIT for the terms)
 
-DESCRIPTION = "Linux kernel for imx platforms"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
-PR = "r2"
+include linux-imx.inc
 
-inherit kernel
-COMPATIBLE_MACHINE = "(mx6)"
-
-SRC_URI = "git://git.freescale.com/imx/linux-2.6-imx.git;tag=rel_imx_3.0.15_12.02.01\
-           file://defconfig \
-          "
+PR = "${INC_PR}.1"
 
-S = "${WORKDIR}/git"
+COMPATIBLE_MACHINE = "(mx6)"
 
-# install nedded headers for imx-test compilation
-do_install_append() {
-        # bounds.h may be used by a module and is currently missing
-        if [ -d include/generated ]; then
-                cp include/generated/* $kerneldir/include/generated/
-        fi
-        # scripts/basic/fixdep is used in imx-test
-        mkdir -p $kerneldir/scripts/basic/
-        cp scripts/basic/fixdep $kerneldir/scripts/basic/
-        # scripts/mod/modpost is used in imx-test
-        mkdir -p $kerneldir/scripts/mod
-        cp scripts/mod/modpost $kerneldir/scripts/mod
-}
+# Revision of 12.02.01 tag
+SRCREV = "1e54cdcdb6940a58d5e09174410fe0fe28041fa3"
+LOCALVERSION = "-12.02.01+yocto-${DATE}"