Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev

Conflicts:
	recipes/linux/linux-kirkwood_2.6.33-rc1.bb

46 files changed, 80614 insertions, 265 deletions

diff --git a/recipes/linux/linux-2.6.32+2.6.33-rc3/0001-pxafb-fix-regression-from-d2a34c13e7ccec5d06eafd60e6.patch b/recipes/linux/linux-2.6.32+2.6.33-rc3/0001-pxafb-fix-regression-from-d2a34c13e7ccec5d06eafd60e6.patch
deleted file mode 100644
index 3d79409233..0000000000
--- a/recipes/linux/linux-2.6.32+2.6.33-rc3/0001-pxafb-fix-regression-from-d2a34c13e7ccec5d06eafd60e6.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From b448a4e11127012a96bae8689e019879fbb8470f Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Mon, 28 Dec 2009 16:45:33 +0100
-Subject: [PATCH] pxafb: fix regression from d2a34c13e7ccec5d06eafd60e6f80ea531b34668
-
-fbi->dev->platform_data is void * and gcc does not allow to access
-!fbi->dev->platform_data->smart_update without cast platform_data to
-(struct pxafb_mach_info) or assignment as used in this patch.
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- drivers/video/pxafb.c |    7 ++++++-
- 1 files changed, 6 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
-index 415858b..241468c 100644
---- a/drivers/video/pxafb.c
-+++ b/drivers/video/pxafb.c
-@@ -1223,12 +1223,17 @@ static int pxafb_smart_thread(void *arg)
- 	struct pxafb_info *fbi = arg;
- 	struct pxafb_mach_info *inf;
- 
--	if (!fbi || !fbi->dev->platform_data->smart_update) {
-+	if (!fbi) {
- 		pr_err("%s: not properly initialized, thread terminated\n",
- 				__func__);
- 		return -EINVAL;
- 	}
- 	inf = fbi->dev->platform_data;
-+	if (!inf || !inf->smart_update) {
-+		pr_err("%s: not properly initialized, thread terminated\n",
-+				__func__);
-+		return -EINVAL;
-+	}
- 
- 	pr_debug("%s(): task starting\n", __func__);
- 
--- 
-1.6.6
-
diff --git a/recipes/linux/linux-2.6.32+2.6.33-rc3/spitz/defconfig b/recipes/linux/linux-2.6.32+2.6.33-rc4/spitz/defconfig
index 7aefa71a2d..1aedc1219f 100644
--- a/recipes/linux/linux-2.6.32+2.6.33-rc3/spitz/defconfig
+++ b/recipes/linux/linux-2.6.32+2.6.33-rc4/spitz/defconfig
@@ -765,7 +765,7 @@ CONFIG_MTD_ROM=y
 # Mapping drivers for chip access
 #
 CONFIG_MTD_COMPLEX_MAPPINGS=y
-# CONFIG_MTD_PHYSMAP is not set
+CONFIG_MTD_PHYSMAP=y
 # CONFIG_MTD_GPIO_ADDR is not set
 # CONFIG_MTD_PLATRAM is not set
 
diff --git a/recipes/linux/linux-davinci/0001-CheckRegisterForDCDC.patch b/recipes/linux/linux-davinci/0001-CheckRegisterForDCDC.patch
new file mode 100644
index 0000000000..656a09e8c4
--- /dev/null
+++ b/recipes/linux/linux-davinci/0001-CheckRegisterForDCDC.patch
@@ -0,0 +1,93 @@
+From: Anuj Aggarwal <anuj.aggarwal@ti.com>
+Date: Fri, 18 Dec 2009 11:18:43 +0000 (+0530)
+Subject: Regulator: Check which register needs to be read for DCDC2/3
+X-Git-Url: http://arago-project.org/git/people/?p=sekhar%2Flinux-omapl1.git;a=commitdiff_plain;h=9f8ddc15520a7d5bb27bb660215d3a153ea39c00
+
+Regulator: Check which register needs to be read for DCDC2/3
+
+In TPS6507x, for DCDC2/3, either DEFDCDC2_LOW or DEFDCDC2_HIGH
+can be read depending on the status of DEFDCDC2 pin. Since this
+pin cannot be read through register, this information is passed
+through board-evm file and the driver appropriately checks it
+before reading the LOW / HIGH register.
+
+Signed-off-by: Anuj Aggarwal <anuj.aggarwal@ti.com>
+Signed-off-by: Sekhar Nori <nsekhar@ti.com>
+---
+
+diff --git a/drivers/regulator/tps6507x-regulator.c b/drivers/regulator/tps6507x-regulator.c
+index f8a6dfb..602a194 100644
+--- a/drivers/regulator/tps6507x-regulator.c
++++ b/drivers/regulator/tps6507x-regulator.c
+@@ -159,13 +159,15 @@ struct tps_info {
+ 	unsigned max_uV;
+ 	u8 table_len;
+ 	const u16 *table;
++	/* HIGH register is used to control the output voltage for DCDC2/3 */
++	unsigned reg_high:1;
+ };
+ 
+ struct tps_pmic {
+ 	struct regulator_desc desc[TPS6507X_NUM_REGULATOR];
+ 	struct i2c_client *client;
+ 	struct regulator_dev *rdev[TPS6507X_NUM_REGULATOR];
+-	const struct tps_info *info[TPS6507X_NUM_REGULATOR];
++	struct tps_info *info[TPS6507X_NUM_REGULATOR];
+ 	struct mutex io_lock;
+ };
+ 
+@@ -352,10 +354,16 @@ static int tps6507x_dcdc_get_voltage(struct regulator_dev *dev)
+ 		reg = TPS6507X_REG_DEFDCDC1;
+ 		break;
+ 	case TPS6507X_DCDC_2:
+-		reg = TPS6507X_REG_DEFDCDC2_LOW;
++		if (tps->info[dcdc]->reg_high)
++			reg = TPS6507X_REG_DEFDCDC2_HIGH;
++		else
++			reg = TPS6507X_REG_DEFDCDC2_LOW;
+ 		break;
+ 	case TPS6507X_DCDC_3:
+-		reg = TPS6507X_REG_DEFDCDC3_LOW;
++		if (tps->info[dcdc]->reg_high)
++			reg = TPS6507X_REG_DEFDCDC3_HIGH;
++		else
++			reg = TPS6507X_REG_DEFDCDC3_LOW;
+ 		break;
+ 	default:
+ 		return -EINVAL;
+@@ -381,10 +389,16 @@ static int tps6507x_dcdc_set_voltage(struct regulator_dev *dev,
+ 		reg = TPS6507X_REG_DEFDCDC1;
+ 		break;
+ 	case TPS6507X_DCDC_2:
+-		reg = TPS6507X_REG_DEFDCDC2_LOW;
++		if (tps->info[dcdc]->reg_high)
++			reg = TPS6507X_REG_DEFDCDC2_HIGH;
++		else
++			reg = TPS6507X_REG_DEFDCDC2_LOW;
+ 		break;
+ 	case TPS6507X_DCDC_3:
+-		reg = TPS6507X_REG_DEFDCDC3_LOW;
++		if (tps->info[dcdc]->reg_high)
++			reg = TPS6507X_REG_DEFDCDC3_HIGH;
++		else
++			reg = TPS6507X_REG_DEFDCDC3_LOW;
+ 		break;
+ 	default:
+ 		return -EINVAL;
+@@ -542,7 +556,7 @@ static
+ int tps_6507x_probe(struct i2c_client *client, const struct i2c_device_id *id)
+ {
+ 	static int desc_id;
+-	const struct tps_info *info = (void *)id->driver_data;
++	struct tps_info *info = (void *)id->driver_data;
+ 	struct regulator_init_data *init_data;
+ 	struct regulator_dev *rdev;
+ 	struct tps_pmic *tps;
+@@ -573,6 +587,7 @@ int tps_6507x_probe(struct i2c_client *client, const struct i2c_device_id *id)
+ 	for (i = 0; i < TPS6507X_NUM_REGULATOR; i++, info++, init_data++) {
+ 		/* Register the regulators */
+ 		tps->info[i] = info;
++		tps->info[i]->reg_high = (unsigned) init_data->driver_data;
+ 		tps->desc[i].name = info->name;
+ 		tps->desc[i].id = desc_id++;
+ 		tps->desc[i].n_voltages = num_voltages[i];
diff --git a/recipes/linux/linux-davinci/0002-DefDcDcTiedhigh.patch b/recipes/linux/linux-davinci/0002-DefDcDcTiedhigh.patch
new file mode 100644
index 0000000000..ff60c41fff
--- /dev/null
+++ b/recipes/linux/linux-davinci/0002-DefDcDcTiedhigh.patch
@@ -0,0 +1,40 @@
+From: Sekhar Nori <nsekhar@ti.com>
+Date: Mon, 21 Dec 2009 09:13:49 +0000 (+0530)
+Subject: davinci: da850/omap-l138 evm: account for defdcdc{2,3} being tied high
+X-Git-Url: http://arago-project.org/git/people/?p=sekhar%2Flinux-omapl1.git;a=commitdiff_plain;h=2aa1058a4db0681929ba09f50da89f4fe283e0bd
+
+davinci: da850/omap-l138 evm: account for defdcdc{2,3} being tied high
+
+Per the da850/omap-l138 Beta EVM SOM schematic, the defdcdc2 and
+defdcdc3 lines are tied high by default. This leads to a 3.3V IO
+and 1.2V CVDD voltage.
+
+For the TPS6507x driver, it means that the DEFDCDC_HIGH registers
+need to be read/written instead of DEFDCDC_LOW register. The tps6507x
+driver added this functionality recently. This patch passes the right
+platform data to the TPS6507x which tells it that the HIGH register
+needs to be read instead of the LOW register.
+
+Signed-off-by: Sekhar Nori <nsekhar@ti.com>
+---
+
+diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
+index 607dd2d..9ed07d6 100755
+--- a/arch/arm/mach-davinci/board-da850-evm.c
++++ b/arch/arm/mach-davinci/board-da850-evm.c
+@@ -599,6 +599,7 @@ struct regulator_init_data tps65070_regulator_data[] = {
+ 		},
+ 		.num_consumer_supplies = ARRAY_SIZE(tps65070_dcdc2_consumers),
+ 		.consumer_supplies = tps65070_dcdc2_consumers,
++		.driver_data = (void *) 1,
+ 	},
+ 
+ 	/* dcdc3 */
+@@ -612,6 +613,7 @@ struct regulator_init_data tps65070_regulator_data[] = {
+ 		},
+ 		.num_consumer_supplies = ARRAY_SIZE(tps65070_dcdc3_consumers),
+ 		.consumer_supplies = tps65070_dcdc3_consumers,
++		.driver_data = (void *) 1,
+ 	},
+ 
+ 	/* ldo1 */
diff --git a/recipes/linux/linux-davinci/da850_omapl138_opp408mhz.patch b/recipes/linux/linux-davinci/da850_omapl138_opp408mhz.patch
new file mode 100644
index 0000000000..2a80f644f5
--- /dev/null
+++ b/recipes/linux/linux-davinci/da850_omapl138_opp408mhz.patch
@@ -0,0 +1,26 @@
+--- old/arch/arm/mach-davinci/da850.c	2010-01-11 15:02:02.000000000 +0000
++++ new/arch/arm/mach-davinci/da850.c	2010-01-11 15:00:28.000000000 +0000
+@@ -974,6 +974,15 @@
+ 	.cvdd_max       = 1375000,
+ };
+ 
++static const struct da850_opp da850_opp_408 = {
++	.freq           = 408000,
++	.prediv         = 1,
++	.mult           = 17,
++	.postdiv        = 1,
++	.cvdd_min       = 1300000,
++	.cvdd_max       = 1325000,
++};
++
+ static const struct da850_opp da850_opp_300 = {
+ 	.freq		= 300000,
+ 	.prediv		= 1,
+@@ -1009,6 +1018,7 @@
+ 
+ static struct cpufreq_frequency_table da850_freq_table[] = {
+ 	OPP(456),
++	OPP(408),
+ 	OPP(300),
+ 	OPP(200),
+ 	OPP(96),
diff --git a/recipes/linux/linux-davinci/da850_omapl138_opp456mhz_increaseDcDc3.patch b/recipes/linux/linux-davinci/da850_omapl138_opp456mhz_increaseDcDc3.patch
new file mode 100644
index 0000000000..113eeb0847
--- /dev/null
+++ b/recipes/linux/linux-davinci/da850_omapl138_opp456mhz_increaseDcDc3.patch
@@ -0,0 +1,11 @@
+--- old/arch/arm/mach-davinci/board-da850-evm.c		2010-01-11 14:49:21.000000000 +0000
++++ new/arch/arm/mach-davinci/board-da850-evm.c		2010-01-11 14:47:44.000000000 +0000
+@@ -606,7 +606,7 @@
+ 	{
+ 		.constraints = {
+ 			.min_uV = 950000,
+-			.max_uV = 1320000,
++			.max_uV = 1400000,
+ 			.valid_ops_mask = (REGULATOR_CHANGE_VOLTAGE |
+ 				REGULATOR_CHANGE_STATUS),
+ 			.boot_on = 1,
diff --git a/recipes/linux/linux-davinci_git.bb b/recipes/linux/linux-davinci_git.bb
index 276b623a56..9c8d4ab67e 100644
--- a/recipes/linux/linux-davinci_git.bb
+++ b/recipes/linux/linux-davinci_git.bb
@@ -66,7 +66,11 @@ SRC_URI_append_da850-omapl138-evm = ${ARAGO_L1_URI}
 SRC_URI_append_hawkboard          = ${ARAGO_L1_URI}
 
 SRC_URI_append_da850-omapl138-evm = "file://logo_linux_clut224.ppm \
-                                     file://da850_omapl138_opp456mhz.patch;patch=1"
+                                     file://0001-CheckRegisterForDCDC.patch;patch=1 \
+                                     file://0002-DefDcDcTiedhigh.patch;patch=1 \
+                                     file://da850_omapl138_opp456mhz.patch;patch=1 \
+                                     file://da850_omapl138_opp408mhz.patch;patch=1 \
+                                     file://da850_omapl138_opp456mhz_increaseDcDc3.patch;patch=1"
 SRC_URI_append_hawkboard          = "file://logo_linux_clut224.ppm \
                                      file://da850_omapl138_opp456mhz.patch;patch=1 \
                                      file://patch_hawk.diff;patch=1"
diff --git a/recipes/linux/linux-jlime-jornada6xx_2.6.32.bb b/recipes/linux/linux-jlime-jornada6xx_2.6.32.bb
new file mode 100644
index 0000000000..d3d1625070
--- /dev/null
+++ b/recipes/linux/linux-jlime-jornada6xx_2.6.32.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "Linux 2.6.32 kernel for the SuperH-based Jornada 6xx"
+SECTION = "kernel"
+LICENSE = "GPL"
+
+SRCREV = "${AUTOREV}"
+
+COMPATIBLE_MACHINE = "jornada6xx"
+
+SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kristoffer/linux-hpc.git;protocol=git;branch=v2.6.32-hpc"
+
+S = "${WORKDIR}/git"
+
+inherit kernel
+
+ARCH = "sh"
+FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}*"
+
+do_configure_prepend() {
+	install -m 0644 ${S}/config-hp6xx ${S}/.config
+}
\ No newline at end of file
diff --git a/recipes/linux/linux-jlime-jornada7xx_2.6.19rc6.bb b/recipes/linux/linux-jlime-jornada7xx_2.6.19rc6.bb
index f756d4f259..a80f4c91a1 100644
--- a/recipes/linux/linux-jlime-jornada7xx_2.6.19rc6.bb
+++ b/recipes/linux/linux-jlime-jornada7xx_2.6.19rc6.bb
@@ -7,7 +7,7 @@ COMPATIBLE_HOST = "arm.*-linux"
 COMPATIBLE_MACHINE = "jornada7xx"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.gz \
-           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-2.6.19-rc6.bz2;patch=1 \
+           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/v2.6.19/patch-2.6.19-rc6.bz2;patch=1 \
 	   file://jornada7xx.patch;patch=0 \
            file://defconf_jlime "
 
@@ -23,5 +23,6 @@ ARCH = "arm"
 FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}*"
 
 do_configure_prepend() {
+	sed -i 's:\(#include "modpost.h"\):\1\n#include <limits.h>:' ${S}/scripts/mod/sumversion.c
 	install -m 0644 ${WORKDIR}/defconf_jlime ${S}/.config
 }
diff --git a/recipes/linux/linux-kirkwood_2.6.33-rc1.bb b/recipes/linux/linux-kirkwood_2.6.33-rc1.bb
index 1c1f340682..c138351ba7 100644
--- a/recipes/linux/linux-kirkwood_2.6.33-rc1.bb
+++ b/recipes/linux/linux-kirkwood_2.6.33-rc1.bb
@@ -7,7 +7,7 @@ COMPATIBLE_MACHINE = "openrd-base|openrd-client|sheevaplug"
 require linux.inc
 
 # Change MACHINE_KERNEL_PR in conf/machine/include/kirkwood.inc
-PV = "2.6.33-rc1"
+PV = "2.6.32+2.6.33-rc1"
 
 SRCREV = "58c19e3ea75a629c3d38a4490f96a65cf2f36a11"
 
@@ -19,8 +19,8 @@ SRC_URI_append_openrd-base += \
 	 file://0004-ARM-Kirkwood-OpenRD-SD-UART1-selection.patch;patch=1 \
 	"
 
-SRC_URI_append_openrd-client += \
-	"file://0001-OpenRD-Client-PCIe-Initialize-PCI-express-and-i2c.patch;patch=1 \
+SRC_URI_append_openrd-client += " \
+	 file://0001-OpenRD-Client-PCIe-Initialize-PCI-express-and-i2c.patch;patch=1 \
 	 file://0002-OpenRD-Client-Volari-Z11-driver-added.patch;patch=1 \
 	 file://0003-ARM-Kirkwood-Sound-Sound-driver-added.patch;patch=1 \
 	 file://0004-ARM-Kirkwood-OpenRD-SD-UART1-selection.patch;patch=1 \
diff --git a/recipes/linux/linux-omap-2.6.28/overo/defconfig b/recipes/linux/linux-omap-2.6.28/overo/defconfig
index d462085be7..533e457984 100644
--- a/recipes/linux/linux-omap-2.6.28/overo/defconfig
+++ b/recipes/linux/linux-omap-2.6.28/overo/defconfig
@@ -1571,7 +1571,7 @@ CONFIG_USB_SERIAL=m
 # CONFIG_USB_SERIAL_CH341 is not set
 # CONFIG_USB_SERIAL_WHITEHEAT is not set
 # CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
-# CONFIG_USB_SERIAL_CP2101 is not set
+CONFIG_USB_SERIAL_CP2101=m
 # CONFIG_USB_SERIAL_CYPRESS_M8 is not set
 # CONFIG_USB_SERIAL_EMPEG is not set
 # CONFIG_USB_SERIAL_FTDI_SIO is not set
diff --git a/recipes/linux/linux-omap-2.6.29/overo/defconfig b/recipes/linux/linux-omap-2.6.29/overo/defconfig
index a4894e2283..06812f0ee9 100644
--- a/recipes/linux/linux-omap-2.6.29/overo/defconfig
+++ b/recipes/linux/linux-omap-2.6.29/overo/defconfig
@@ -1662,7 +1662,7 @@ CONFIG_USB_SERIAL_GENERIC=y
 # CONFIG_USB_SERIAL_CH341 is not set
 # CONFIG_USB_SERIAL_WHITEHEAT is not set
 # CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
-# CONFIG_USB_SERIAL_CP2101 is not set
+CONFIG_USB_SERIAL_CP2101=m
 # CONFIG_USB_SERIAL_CYPRESS_M8 is not set
 # CONFIG_USB_SERIAL_EMPEG is not set
 CONFIG_USB_SERIAL_FTDI_SIO=m
diff --git a/recipes/linux/linux-omap-2.6.32/cm-t35/0001-omap3-cm-t35-add-mux-initialization.patch b/recipes/linux/linux-omap-2.6.32/cm-t35/0001-omap3-cm-t35-add-mux-initialization.patch
index 07f901c9a6..e69de29bb2 100644
--- a/recipes/linux/linux-omap-2.6.32/cm-t35/0001-omap3-cm-t35-add-mux-initialization.patch
+++ b/recipes/linux/linux-omap-2.6.32/cm-t35/0001-omap3-cm-t35-add-mux-initialization.patch
@@ -1,153 +0,0 @@
-Date: Wed, 09 Dec 2009 15:22:20 +0200
-From: Mike Rapoport <mike@compulab.co.il>
-To: Koen Kooi <koen@dominion.thruhere.net>
-Subject: Re: linux-omap 2.6.32 updates
-
-
-Mike Rapoport wrote:
->> The tdo24m patch is indeed in the linux-omap tree and the mux patch should be
->> different for the updated linux-omap (at least with
->> SRCREV = "6833f1a8cdcb65a370f898bde6b6af63f81962df").
->>
->> Attached the actual patch needed to initialize cm-t35 mux and updated recipe
->> diff that uses this patch.
->>
->> I don't know yet if Tony is going to merge my latest patches before the merge
->> window closes. If you're going to bump SRCREV once again in the next few days,
->> it's possible that cm-t35 patches won't be needed at all.
-
--- 
-Sincerely yours,
-Mike.
-
-
-diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
-index 16c0c13..66de47b 100644
---- a/arch/arm/mach-omap2/Kconfig
-+++ b/arch/arm/mach-omap2/Kconfig
-@@ -136,6 +136,7 @@ config MACH_CM_T35
- 	bool "CompuLab CM-T35 module"
- 	depends on ARCH_OMAP3 && ARCH_OMAP34XX
- 	select OMAP_PACKAGE_CUS
-+	select OMAP_MUX
- 
- config MACH_IGEP0020
- 	bool "IGEP0020"
-diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c
-index 507c922..1591aae 100644
---- a/arch/arm/mach-omap2/board-cm-t35.c
-+++ b/arch/arm/mach-omap2/board-cm-t35.c
-@@ -482,13 +482,98 @@ static void __init cm_t35_map_io(void)
- 	omap2_map_common_io();
- }
- 
--#ifdef CONFIG_OMAP_MUX
- static struct omap_board_mux board_mux[] __initdata = {
-+	/* nCS and IRQ for CM-T35 ethernet */
-+	OMAP3_MUX(GPMC_NCS5, OMAP_MUX_MODE0),
-+	OMAP3_MUX(UART3_CTS_RCTX, OMAP_MUX_MODE4 | OMAP_PIN_INPUT_PULLUP),
-+
-+	/* nCS and IRQ for SB-T35 ethernet */
-+	OMAP3_MUX(GPMC_NCS4, OMAP_MUX_MODE0),
-+	OMAP3_MUX(GPMC_WAIT3, OMAP_MUX_MODE4 | OMAP_PIN_INPUT_PULLUP),
-+
-+	/* PENDOWN GPIO */
-+	OMAP3_MUX(GPMC_NCS6, OMAP_MUX_MODE4 | OMAP_PIN_INPUT),
-+
-+	/* mUSB */
-+	OMAP3_MUX(HSUSB0_CLK, OMAP_MUX_MODE0 | OMAP_PIN_INPUT),
-+	OMAP3_MUX(HSUSB0_STP, OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT),
-+	OMAP3_MUX(HSUSB0_DIR, OMAP_MUX_MODE0 | OMAP_PIN_INPUT),
-+	OMAP3_MUX(HSUSB0_NXT, OMAP_MUX_MODE0 | OMAP_PIN_INPUT),
-+	OMAP3_MUX(HSUSB0_DATA0, OMAP_MUX_MODE0 | OMAP_PIN_INPUT),
-+	OMAP3_MUX(HSUSB0_DATA1, OMAP_MUX_MODE0 | OMAP_PIN_INPUT),
-+	OMAP3_MUX(HSUSB0_DATA2, OMAP_MUX_MODE0 | OMAP_PIN_INPUT),
-+	OMAP3_MUX(HSUSB0_DATA3, OMAP_MUX_MODE0 | OMAP_PIN_INPUT),
-+	OMAP3_MUX(HSUSB0_DATA4, OMAP_MUX_MODE0 | OMAP_PIN_INPUT),
-+	OMAP3_MUX(HSUSB0_DATA5, OMAP_MUX_MODE0 | OMAP_PIN_INPUT),
-+	OMAP3_MUX(HSUSB0_DATA6, OMAP_MUX_MODE0 | OMAP_PIN_INPUT),
-+	OMAP3_MUX(HSUSB0_DATA7, OMAP_MUX_MODE0 | OMAP_PIN_INPUT),
-+
-+	/* MMC 2 */
-+	OMAP3_MUX(SDMMC2_DAT4, OMAP_MUX_MODE1 | OMAP_PIN_OUTPUT),
-+	OMAP3_MUX(SDMMC2_DAT5, OMAP_MUX_MODE1 | OMAP_PIN_OUTPUT),
-+	OMAP3_MUX(SDMMC2_DAT6, OMAP_MUX_MODE1 | OMAP_PIN_OUTPUT),
-+	OMAP3_MUX(SDMMC2_DAT7, OMAP_MUX_MODE1 | OMAP_PIN_INPUT),
-+
-+	/* McSPI 1 */
-+	OMAP3_MUX(MCSPI1_CLK, OMAP_MUX_MODE0 | OMAP_PIN_INPUT),
-+	OMAP3_MUX(MCSPI1_SIMO, OMAP_MUX_MODE0 | OMAP_PIN_INPUT),
-+	OMAP3_MUX(MCSPI1_SOMI, OMAP_MUX_MODE0 | OMAP_PIN_INPUT),
-+	OMAP3_MUX(MCSPI1_CS0, OMAP_MUX_MODE0 | OMAP_PIN_INPUT_PULLDOWN),
-+
-+	/* McSPI 4 */
-+	OMAP3_MUX(MCBSP1_CLKR, OMAP_MUX_MODE1 | OMAP_PIN_INPUT),
-+	OMAP3_MUX(MCBSP1_DX, OMAP_MUX_MODE1 | OMAP_PIN_INPUT),
-+	OMAP3_MUX(MCBSP1_DR, OMAP_MUX_MODE1 | OMAP_PIN_INPUT),
-+	OMAP3_MUX(MCBSP1_FSX, OMAP_MUX_MODE1 | OMAP_PIN_INPUT_PULLUP),
-+
-+	/* McBSP 2 */
-+	OMAP3_MUX(MCBSP2_FSX, OMAP_MUX_MODE0 | OMAP_PIN_INPUT),
-+	OMAP3_MUX(MCBSP2_CLKX, OMAP_MUX_MODE0 | OMAP_PIN_INPUT),
-+	OMAP3_MUX(MCBSP2_DR, OMAP_MUX_MODE0 | OMAP_PIN_INPUT),
-+	OMAP3_MUX(MCBSP2_DX, OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT),
-+
-+	/* serial ports */
-+	OMAP3_MUX(MCBSP3_CLKX, OMAP_MUX_MODE1 | OMAP_PIN_OUTPUT),
-+	OMAP3_MUX(MCBSP3_FSX, OMAP_MUX_MODE1 | OMAP_PIN_INPUT),
-+	OMAP3_MUX(UART1_TX, OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT),
-+	OMAP3_MUX(UART1_RX, OMAP_MUX_MODE0 | OMAP_PIN_INPUT),
-+
-+	/* DSS */
-+	OMAP3_MUX(DSS_PCLK, OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT),
-+	OMAP3_MUX(DSS_HSYNC, OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT),
-+	OMAP3_MUX(DSS_VSYNC, OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT),
-+	OMAP3_MUX(DSS_ACBIAS, OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT),
-+	OMAP3_MUX(DSS_DATA0, OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT),
-+	OMAP3_MUX(DSS_DATA1, OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT),
-+	OMAP3_MUX(DSS_DATA2, OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT),
-+	OMAP3_MUX(DSS_DATA3, OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT),
-+	OMAP3_MUX(DSS_DATA4, OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT),
-+	OMAP3_MUX(DSS_DATA5, OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT),
-+	OMAP3_MUX(DSS_DATA6, OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT),
-+	OMAP3_MUX(DSS_DATA7, OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT),
-+	OMAP3_MUX(DSS_DATA8, OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT),
-+	OMAP3_MUX(DSS_DATA9, OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT),
-+	OMAP3_MUX(DSS_DATA10, OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT),
-+	OMAP3_MUX(DSS_DATA11, OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT),
-+	OMAP3_MUX(DSS_DATA12, OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT),
-+	OMAP3_MUX(DSS_DATA13, OMAP_MUX_MODE0 |