linux-davinci: Update da850-omapl138 to latest staging kernel 2_6_33

* Update to latest staging kernel + use PSP defconfig * Add rebased ts patches + enable configs * Enable MMC unsafe removal (for deep-sleep support when sd/mmc mounted) * Bump PR Signed-off-by: Roger Monk <r-monk@ti.com> Signed-off-by: Koen Kooi <k-kooi@ti.com>
author: Roger Monk <r-monk@ti.com> 2010-02-09 23:04:08 +0000
committer: Koen Kooi <koen@openembedded.org> 2010-04-12 19:43:18 +0200
commit: 3aa2b62bb50f2c6f6790c9dfdcb8924c43250ca4 (patch)
tree: b4871f0ffc8ed877efe34751a2031edeccd872ae
parent: 2e7b6b68e4d4d74b6f83b75cfa967aae5d93b306 (diff)
9 files changed, 430 insertions, 577 deletions
diff --git a/conf/machine/include/davinci.inc b/conf/machine/include/davinci.inc
index 2d744e9897..e5341649fc 100644
--- a/conf/machine/include/davinci.inc
+++ b/conf/machine/include/davinci.inc
@@ -1,7 +1,7 @@
 require conf/machine/include/tune-arm926ejs.inc
 
 # Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r34"
+MACHINE_KERNEL_PR = "r35"
 
 TARGET_ARCH = "arm"
 
diff --git a/recipes/linux/linux-davinci/0001-tps6507x_regulator_refactor.patch b/recipes/linux/linux-davinci/0001-tps6507x_regulator_refactor.patch
index b3050c6dfe..dfa356f682 100644
--- a/recipes/linux/linux-davinci/0001-tps6507x_regulator_refactor.patch
+++ b/recipes/linux/linux-davinci/0001-tps6507x_regulator_refactor.patch
@@ -1,7 +1,7 @@
-Index: git/drivers/regulator/tps6507x-regulator.c
+Index: kernel/drivers/regulator/tps6507x-regulator.c
 ===================================================================
---- git.orig/drivers/regulator/tps6507x-regulator.c	2010-01-11 02:59:57.000000000 -0700
-+++ git/drivers/regulator/tps6507x-regulator.c	2010-01-11 02:59:59.000000000 -0700
+--- kernel.orig/drivers/regulator/tps6507x-regulator.c	2010-01-26 14:28:42.000000000 -0700
++++ kernel/drivers/regulator/tps6507x-regulator.c	2010-01-26 14:32:05.000000000 -0700
 @@ -24,65 +24,7 @@
  #include <linux/regulator/machine.h>
  #include <linux/i2c.h>
@@ -69,11 +69,11 @@ Index: git/drivers/regulator/tps6507x-regulator.c
  
  /* DCDC's */
  #define TPS6507X_DCDC_1				0
-Index: git/drivers/regulator/Kconfig
+Index: kernel/drivers/regulator/Kconfig
 ===================================================================
---- git.orig/drivers/regulator/Kconfig	2010-01-11 02:59:57.000000000 -0700
-+++ git/drivers/regulator/Kconfig	2010-01-11 02:59:59.000000000 -0700
-@@ -152,6 +152,7 @@
+--- kernel.orig/drivers/regulator/Kconfig	2010-01-26 14:28:42.000000000 -0700
++++ kernel/drivers/regulator/Kconfig	2010-01-26 14:32:05.000000000 -0700
+@@ -159,6 +159,7 @@
  config REGULATOR_TPS6507X
  	tristate "TI TPS6507X Power regulators"
  	depends on I2C
@@ -81,10 +81,10 @@ Index: git/drivers/regulator/Kconfig
  	help
  	  This driver supports TPS6507X voltage regulator chips. TPS6507X provides
  	  three step-down converters and two general-purpose LDO voltage regulators.
-Index: git/include/linux/mfd/tps6507x.h
+Index: kernel/include/linux/mfd/tps6507x.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ git/include/linux/mfd/tps6507x.h	2010-01-11 03:00:38.000000000 -0700
++++ kernel/include/linux/mfd/tps6507x.h	2010-01-26 14:32:05.000000000 -0700
 @@ -0,0 +1,134 @@
 +/* linux/mfd/tps6507x.h
 + *
diff --git a/recipes/linux/linux-davinci/0002-tps6507x_regulator_da850_integration.patch b/recipes/linux/linux-davinci/0002-tps6507x_regulator_da850_integration.patch
index 0cf24d3eb4..56d697d54b 100644
--- a/recipes/linux/linux-davinci/0002-tps6507x_regulator_da850_integration.patch
+++ b/recipes/linux/linux-davinci/0002-tps6507x_regulator_da850_integration.patch
@@ -1,16 +1,16 @@
-Index: git/arch/arm/mach-davinci/board-da850-evm.c
+Index: kernel/arch/arm/mach-davinci/board-da850-evm.c
 ===================================================================
---- git.orig/arch/arm/mach-davinci/board-da850-evm.c	2010-01-06 16:23:17.000000000 -0600
-+++ git/arch/arm/mach-davinci/board-da850-evm.c	2010-01-12 08:54:24.921995195 -0600
+--- kernel.orig/arch/arm/mach-davinci/board-da850-evm.c	2010-01-26 14:28:12.000000000 -0700
++++ kernel/arch/arm/mach-davinci/board-da850-evm.c	2010-01-26 14:33:36.000000000 -0700
 @@ -17,6 +17,7 @@
  #include <linux/i2c.h>
  #include <linux/i2c/at24.h>
  #include <linux/i2c/pca953x.h>
 +#include <linux/mfd/tps6507x.h>
  #include <linux/gpio.h>
+ #include <linux/delay.h>
  #include <linux/platform_device.h>
- #include <linux/mtd/mtd.h>
-@@ -643,10 +644,14 @@
+@@ -633,10 +634,14 @@
  	},
  };
  
@@ -26,15 +26,15 @@ Index: git/arch/arm/mach-davinci/board-da850-evm.c
  	},
  };
  
-Index: git/drivers/regulator/tps6507x-regulator.c
+Index: kernel/drivers/regulator/tps6507x-regulator.c
 ===================================================================
---- git.orig/drivers/regulator/tps6507x-regulator.c	2010-01-12 08:43:00.561370246 -0600
-+++ git/drivers/regulator/tps6507x-regulator.c	2010-01-12 08:53:30.261440110 -0600
+--- kernel.orig/drivers/regulator/tps6507x-regulator.c	2010-01-26 14:32:05.000000000 -0700
++++ kernel/drivers/regulator/tps6507x-regulator.c	2010-01-26 14:33:36.000000000 -0700
 @@ -502,6 +502,7 @@
  	struct regulator_init_data *init_data;
  	struct regulator_dev *rdev;
  	struct tps_pmic *tps;
-+        struct tps6507x_board *tps_board;
++	struct tps6507x_board *tps_board;
  	int i;
  
  	if (!i2c_check_functionality(client->adapter,
@@ -46,7 +46,7 @@ Index: git/drivers/regulator/tps6507x-regulator.c
 +	 * coming from the board-evm file.
 +	 */
 +
-+        tps_board = (struct tps6507x_board *)client->dev.platform_data;
++	tps_board = (struct tps6507x_board *)client->dev.platform_data;
 +
 +	if (!tps_board)
 +		return -EIO;
@@ -61,10 +61,10 @@ Index: git/drivers/regulator/tps6507x-regulator.c
  
  	if (!init_data)
  		return -EIO;
-Index: git/include/linux/mfd/tps6507x.h
+Index: kernel/include/linux/mfd/tps6507x.h
 ===================================================================
---- git.orig/include/linux/mfd/tps6507x.h	2010-01-12 08:43:00.561370246 -0600
-+++ git/include/linux/mfd/tps6507x.h	2010-01-12 08:53:59.849433723 -0600
+--- kernel.orig/include/linux/mfd/tps6507x.h	2010-01-26 14:32:05.000000000 -0700
++++ kernel/include/linux/mfd/tps6507x.h	2010-01-26 14:33:36.000000000 -0700
 @@ -131,4 +131,15 @@
  /* VDCDC MASK */
  #define TPS6507X_DEFDCDCX_DCDC_MASK		0X3F
diff --git a/recipes/linux/linux-davinci/0003-tps6507x_mfd_driver.patch b/recipes/linux/linux-davinci/0003-tps6507x_mfd_driver.patch
index 0acbf8a26b..418d867c63 100644
--- a/recipes/linux/linux-davinci/0003-tps6507x_mfd_driver.patch
+++ b/recipes/linux/linux-davinci/0003-tps6507x_mfd_driver.patch
@@ -1,8 +1,8 @@
-Index: git/drivers/mfd/Kconfig
+Index: kernel/drivers/mfd/Kconfig
 ===================================================================
---- git.orig/drivers/mfd/Kconfig	2010-01-06 16:23:19.000000000 -0600
-+++ git/drivers/mfd/Kconfig	2010-01-12 08:43:00.961383768 -0600
-@@ -84,6 +84,17 @@
+--- kernel.orig/drivers/mfd/Kconfig	2010-01-26 14:28:36.000000000 -0700
++++ kernel/drivers/mfd/Kconfig	2010-01-26 14:33:54.000000000 -0700
+@@ -92,6 +92,17 @@
  	  This driver can also be built as a module.  If so, the module
  	  will be called tps65010.
  
@@ -20,23 +20,23 @@ Index: git/drivers/mfd/Kconfig
  config MENELAUS
  	bool "Texas Instruments TWL92330/Menelaus PM chip"
  	depends on I2C=y && ARCH_OMAP24XX
-Index: git/drivers/mfd/Makefile
+Index: kernel/drivers/mfd/Makefile
 ===================================================================
---- git.orig/drivers/mfd/Makefile	2010-01-06 16:23:19.000000000 -0600
-+++ git/drivers/mfd/Makefile	2010-01-12 08:43:00.961383768 -0600
-@@ -22,6 +22,7 @@
+--- kernel.orig/drivers/mfd/Makefile	2010-01-26 14:28:36.000000000 -0700
++++ kernel/drivers/mfd/Makefile	2010-01-26 14:33:54.000000000 -0700
+@@ -24,6 +24,7 @@
  obj-$(CONFIG_MFD_WM8350_I2C)	+= wm8350-i2c.o
  
  obj-$(CONFIG_TPS65010)		+= tps65010.o
 +obj-$(CONFIG_TPS6507x)		+= tps6507x.o
  obj-$(CONFIG_MENELAUS)		+= menelaus.o
  
- obj-$(CONFIG_TWL4030_CORE)	+= twl4030-core.o twl4030-irq.o
-Index: git/drivers/mfd/tps6507x.c
+ obj-$(CONFIG_TWL4030_CORE)	+= twl-core.o twl4030-irq.o twl6030-irq.o
+Index: kernel/drivers/mfd/tps6507x.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ git/drivers/mfd/tps6507x.c	2010-01-12 08:53:53.009504942 -0600
-@@ -0,0 +1,139 @@
++++ kernel/drivers/mfd/tps6507x.c	2010-01-26 14:33:54.000000000 -0700
+@@ -0,0 +1,185 @@
 +/*
 + * tps6507x.c  --  TPS6507x chip family multi-function driver
 + *
@@ -60,6 +60,15 @@ Index: git/drivers/mfd/tps6507x.c
 +#include <linux/platform_device.h>
 +#include <linux/mfd/tps6507x.h>
 +
++struct tps_sub_devices {
++	const char *name;
++	struct platform_device *pdev;
++};
++
++static struct tps_sub_devices tps6507x_sub_devices[] = {
++	{ NULL, NULL }
++};
++
 +static int tps6507x_i2c_read_device(struct tps6507x_dev *tps6507x, char reg,
 +				  int bytes, void *dest)
 +{
@@ -96,11 +105,42 @@ Index: git/drivers/mfd/tps6507x.c
 +	return 0;
 +}
 +
++/*
++ * Register a client device.  This is non-fatal since there is no need to
++ * fail the entire device init due to a single platform device failing.
++ */
++static void tps6507x_client_dev_register(struct tps6507x_dev *tps6507x,
++					 const char *name,
++					 struct platform_device **pdev)
++{
++	int ret;
++
++	*pdev = platform_device_alloc(name, -1);
++	if (*pdev == NULL) {
++		dev_err(tps6507x->dev, "Failed to allocate %s\n", name);
++		return;
++	}
++
++	(*pdev)->dev.parent = tps6507x->dev;
++	platform_set_drvdata(*pdev, tps6507x);
++	ret = platform_device_add(*pdev);
++	if (ret != 0) {
++		dev_err(tps6507x->dev, "Failed to register %s: %d\n", name, ret);
++		platform_device_put(*pdev);
++		*pdev = NULL;
++	}
++}
 +
 +int tps6507x_device_init(struct tps6507x_dev *tps6507x, int irq,
 +		       struct tps6507x_board *pdata)
 +{
 +	int ret = 0;
++	struct tps_sub_devices *d = &tps6507x_sub_devices[0];
++
++	while (d->name) {
++		tps6507x_client_dev_register(tps6507x, d->name, &(d->pdev));
++		d++;
++	}
 +
 +	return ret;
 +}
@@ -138,6 +178,12 @@ Index: git/drivers/mfd/tps6507x.c
 +static int tps6507x_i2c_remove(struct i2c_client *i2c)
 +{
 +	struct tps6507x_dev *tps6507x = i2c_get_clientdata(i2c);
++	struct tps_sub_devices *d = &tps6507x_sub_devices[0];
++
++	while (d->name) {
++		platform_device_unregister(d->pdev);
++		d++;
++	}
 +
 +	kfree(tps6507x);
 +
@@ -176,10 +222,10 @@ Index: git/drivers/mfd/tps6507x.c
 +
 +MODULE_DESCRIPTION("TPS6507x chip family multi-function driver")
 +MODULE_LICENSE("GPL");
-Index: git/include/linux/mfd/tps6507x.h
+Index: kernel/include/linux/mfd/tps6507x.h
 ===================================================================
---- git.orig/include/linux/mfd/tps6507x.h	2010-01-12 08:43:00.797384396 -0600
-+++ git/include/linux/mfd/tps6507x.h	2010-01-12 08:53:28.437624848 -0600
+--- kernel.orig/include/linux/mfd/tps6507x.h	2010-01-26 14:33:36.000000000 -0700
++++ kernel/include/linux/mfd/tps6507x.h	2010-01-26 14:33:54.000000000 -0700
 @@ -131,6 +131,8 @@
  /* VDCDC MASK */
  #define TPS6507X_DEFDCDCX_DCDC_MASK		0X3F
@@ -205,9 +251,9 @@ Index: git/include/linux/mfd/tps6507x.h
 +	struct device *dev;
 +	struct i2c_client *i2c_client;
 +	int (*read_dev)(struct tps6507x_dev *tps6507x, char reg, int size,
-+                        void *dest);
++			void *dest);
 +	int (*write_dev)(struct tps6507x_dev *tps6507x, char reg, int size,
-+                         void *src);
++			 void *src);
 +	struct mutex adc_mutex;
 +};
 +
diff --git a/recipes/linux/linux-davinci/0004-tps6507x_regulator_naming_change.patch b/recipes/linux/linux-davinci/0004-tps6507x_regulator_naming_change.patch
index 2bd9ac174b..dfeb67553a 100644
--- a/recipes/linux/linux-davinci/0004-tps6507x_regulator_naming_change.patch
+++ b/recipes/linux/linux-davinci/0004-tps6507x_regulator_naming_change.patch
@@ -1,7 +1,7 @@
-Index: git/drivers/regulator/tps6507x-regulator.c
+Index: kernel/drivers/regulator/tps6507x-regulator.c
 ===================================================================
---- git.orig/drivers/regulator/tps6507x-regulator.c	2010-01-09 17:30:10.000000000 -0700
-+++ git/drivers/regulator/tps6507x-regulator.c	2010-01-09 17:31:39.000000000 -0700
+--- kernel.orig/drivers/regulator/tps6507x-regulator.c	2010-01-26 14:33:36.000000000 -0700
++++ kernel/drivers/regulator/tps6507x-regulator.c	2010-01-26 14:34:00.000000000 -0700
 @@ -113,23 +113,23 @@
  	struct mutex io_lock;
  };
@@ -154,12 +154,13 @@ Index: git/drivers/regulator/tps6507x-regulator.c
  {
  	struct tps_pmic *tps = rdev_get_drvdata(dev);
  	int dcdc = rdev_get_id(dev);
-@@ -256,10 +256,10 @@
+@@ -256,10 +256,11 @@
  		return -EINVAL;
  
  	shift = TPS6507X_MAX_REG_ID - dcdc;
 -	return tps_6507x_clear_bits(tps, TPS6507X_REG_CON_CTRL1, 1 << shift);
-+	return tps6507x_pmic_clear_bits(tps, TPS6507X_REG_CON_CTRL1, 1 << shift);
++	return tps6507x_pmic_clear_bits(tps, TPS6507X_REG_CON_CTRL1,
++					1 << shift);
  }
  
 -static int tps6507x_ldo_enable(struct regulator_dev *dev)
@@ -167,7 +168,7 @@ Index: git/drivers/regulator/tps6507x-regulator.c
  {
  	struct tps_pmic *tps = rdev_get_drvdata(dev);
  	int ldo = rdev_get_id(dev);
-@@ -269,10 +269,10 @@
+@@ -269,10 +270,10 @@
  		return -EINVAL;
  
  	shift = TPS6507X_MAX_REG_ID - ldo;
@@ -180,12 +181,13 @@ Index: git/drivers/regulator/tps6507x-regulator.c
  {
  	struct tps_pmic *tps = rdev_get_drvdata(dev);
  	int ldo = rdev_get_id(dev);
-@@ -282,10 +282,10 @@
+@@ -282,10 +283,11 @@
  		return -EINVAL;
  
  	shift = TPS6507X_MAX_REG_ID - ldo;
 -	return tps_6507x_clear_bits(tps, TPS6507X_REG_CON_CTRL1, 1 << shift);
-+	return tps6507x_pmic_clear_bits(tps, TPS6507X_REG_CON_CTRL1, 1 << shift);
++	return tps6507x_pmic_clear_bits(tps, TPS6507X_REG_CON_CTRL1,
++					1 << shift);
  }
  
 -static int tps6507x_dcdc_get_voltage(struct regulator_dev *dev)
@@ -193,7 +195,7 @@ Index: git/drivers/regulator/tps6507x-regulator.c
  {
  	struct tps_pmic *tps = rdev_get_drvdata(dev);
  	int data, dcdc = rdev_get_id(dev);
-@@ -311,7 +311,7 @@
+@@ -311,7 +313,7 @@
  		return -EINVAL;
  	}
  
@@ -202,7 +204,7 @@ Index: git/drivers/regulator/tps6507x-regulator.c
  	if (data < 0)
  		return data;
  
-@@ -319,7 +319,7 @@
+@@ -319,7 +321,7 @@
  	return tps->info[dcdc]->table[data] * 1000;
  }
  
@@ -211,7 +213,7 @@ Index: git/drivers/regulator/tps6507x-regulator.c
  				int min_uV, int max_uV)
  {
  	struct tps_pmic *tps = rdev_get_drvdata(dev);
-@@ -366,17 +366,17 @@
+@@ -366,17 +368,17 @@
  	if (vsel == tps->info[dcdc]->table_len)
  		return -EINVAL;
  
@@ -232,7 +234,7 @@ Index: git/drivers/regulator/tps6507x-regulator.c
  {
  	struct tps_pmic *tps = rdev_get_drvdata(dev);
  	int data, ldo = rdev_get_id(dev);
-@@ -392,7 +392,7 @@
+@@ -392,7 +394,7 @@
  				TPS6507X_REG_DEFLDO2_LDO2_MASK);
  	}
  
@@ -241,7 +243,7 @@ Index: git/drivers/regulator/tps6507x-regulator.c
  	if (data < 0)
  		return data;
  
-@@ -400,7 +400,7 @@
+@@ -400,7 +402,7 @@
  	return tps->info[ldo]->table[data] * 1000;
  }
  
@@ -250,7 +252,7 @@ Index: git/drivers/regulator/tps6507x-regulator.c
  				int min_uV, int max_uV)
  {
  	struct tps_pmic *tps = rdev_get_drvdata(dev);
-@@ -434,17 +434,17 @@
+@@ -434,17 +436,17 @@
  	if (vsel == tps->info[ldo]->table_len)
  		return -EINVAL;
  
@@ -271,7 +273,7 @@ Index: git/drivers/regulator/tps6507x-regulator.c
  					unsigned selector)
  {
  	struct tps_pmic *tps = rdev_get_drvdata(dev);
-@@ -459,7 +459,7 @@
+@@ -459,7 +461,7 @@
  		return tps->info[dcdc]->table[selector] * 1000;
  }
  
@@ -280,7 +282,7 @@ Index: git/drivers/regulator/tps6507x-regulator.c
  					unsigned selector)
  {
  	struct tps_pmic *tps = rdev_get_drvdata(dev);
-@@ -475,27 +475,27 @@
+@@ -475,27 +477,28 @@
  }
  
  /* Operations permitted on VDCDCx */
@@ -319,11 +321,12 @@ Index: git/drivers/regulator/tps6507x-regulator.c
  
  static
 -int tps_6507x_probe(struct i2c_client *client, const struct i2c_device_id *id)
-+int tps6507x_pmic_probe(struct i2c_client *client, const struct i2c_device_id *id)
++int tps6507x_pmic_probe(struct i2c_client *client,
++			const struct i2c_device_id *id)
  {
  	static int desc_id;
  	struct tps_info *info = (void *)id->driver_data;
-@@ -546,7 +546,7 @@
+@@ -546,7 +549,7 @@
  		tps->desc[i].id = desc_id++;
  		tps->desc[i].n_voltages = num_voltages[i];
  		tps->desc[i].ops = (i > TPS6507X_DCDC_3 ?
@@ -332,7 +335,7 @@ Index: git/drivers/regulator/tps6507x-regulator.c
  		tps->desc[i].type = REGULATOR_VOLTAGE;
  		tps->desc[i].owner = THIS_MODULE;
  
-@@ -579,12 +579,12 @@
+@@ -579,12 +582,12 @@
  }
  
  /**
@@ -347,7 +350,7 @@ Index: git/drivers/regulator/tps6507x-regulator.c
  {
  	struct tps_pmic *tps = i2c_get_clientdata(client);
  	int i;
-@@ -601,7 +601,7 @@
+@@ -601,7 +604,7 @@
  	return 0;
  }
  
@@ -356,7 +359,7 @@ Index: git/drivers/regulator/tps6507x-regulator.c
  	{
  		.name = "VDCDC1",
  		.min_uV = 725000,
-@@ -639,44 +639,44 @@
+@@ -639,44 +642,44 @@
  	},
  };
  
diff --git a/recipes/linux/linux-davinci/0005-tps6507x_regulator_mfd_integration.patch b/recipes/linux/linux-davinci/0005-tps6507x_regulator_mfd_integration.patch
index d962e82b6d..f6f3423207 100644
--- a/recipes/linux/linux-davinci/0005-tps6507x_regulator_mfd_integration.patch
+++ b/recipes/linux/linux-davinci/0005-tps6507x_regulator_mfd_integration.patch
@@ -1,60 +1,7 @@
-Index: git/drivers/mfd/tps6507x.c
+Index: kernel/drivers/regulator/tps6507x-regulator.c
 ===================================================================
---- git.orig/drivers/mfd/tps6507x.c	2010-01-12 08:43:00.961383768 -0600
-+++ git/drivers/mfd/tps6507x.c	2010-01-12 08:52:41.725819096 -0600
-@@ -57,12 +57,40 @@
- 	return 0;
- }
- 
-+/*
-+ * Register a client device.  This is non-fatal since there is no need to
-+ * fail the entire device init due to a single platform device failing.
-+ */
-+static void tps6507x_client_dev_register(struct tps6507x_dev *tps6507x,
-+                                         const char *name,
-+                                         struct platform_device **pdev)
-+{
-+	int ret;
-+
-+	*pdev = platform_device_alloc(name, -1);
-+	if (*pdev == NULL) {
-+		dev_err(tps6507x->dev, "Failed to allocate %s\n", name);
-+		return;
-+	}
-+
-+	(*pdev)->dev.parent = tps6507x->dev;
-+	platform_set_drvdata(*pdev, tps6507x);
-+	ret = platform_device_add(*pdev);
-+	if (ret != 0) {
-+		dev_err(tps6507x->dev, "Failed to register %s: %d\n", name, ret);
-+		platform_device_put(*pdev);
-+		*pdev = NULL;
-+	}
-+}
- 
- int tps6507x_device_init(struct tps6507x_dev *tps6507x, int irq,
- 		       struct tps6507x_board *pdata)
- {
- 	int ret = 0;
-+	struct platform_device *pdev;
- 
-+	tps6507x_client_dev_register(tps6507x, "tps6507x-pmic",
-+  				     &pdev);
- 	return ret;
- }
- 
-@@ -71,7 +99,6 @@
- {
- 	struct tps6507x_dev *tps6507x;
- 	int ret = 0;
--
- 	tps6507x = kzalloc(sizeof(struct tps6507x_dev), GFP_KERNEL);
- 	if (tps6507x == NULL) {
- 		kfree(i2c);
-Index: git/drivers/regulator/tps6507x-regulator.c
-===================================================================
---- git.orig/drivers/regulator/tps6507x-regulator.c	2010-01-12 08:43:01.125399079 -0600
-+++ git/drivers/regulator/tps6507x-regulator.c	2010-01-12 08:53:16.586248235 -0600
+--- kernel.orig/drivers/regulator/tps6507x-regulator.c	2010-01-26 14:34:00.000000000 -0700
++++ kernel/drivers/regulator/tps6507x-regulator.c	2010-01-26 14:39:22.000000000 -0700
 @@ -22,7 +22,6 @@
  #include <linux/platform_device.h>
  #include <linux/regulator/driver.h>
@@ -190,24 +137,24 @@ Index: git/drivers/regulator/tps6507x-regulator.c
  
  	mutex_unlock(&tps->io_lock);
  	return err;
-@@ -494,27 +540,24 @@
+@@ -496,29 +542,24 @@
  	.list_voltage = tps6507x_pmic_ldo_list_voltage,
  };
  
 -static
--int tps6507x_pmic_probe(struct i2c_client *client, const struct i2c_device_id *id)
+-int tps6507x_pmic_probe(struct i2c_client *client,
+-			const struct i2c_device_id *id)
 +static __devinit
 +int tps6507x_pmic_probe(struct platform_device *pdev)
  {
 +	struct tps6507x_dev *tps6507x_dev = platform_get_drvdata(pdev);
  	static int desc_id;
 -	struct tps_info *info = (void *)id->driver_data;
-+	struct tps_info *info = &tps6507x_pmic_regs[0];
++	const struct tps_info *info = &tps6507x_pmic_regs[0];
  	struct regulator_init_data *init_data;
  	struct regulator_dev *rdev;
  	struct tps_pmic *tps;
--        struct tps6507x_board *tps_board;
-+	struct tps6507x_board *tps_board;
+ 	struct tps6507x_board *tps_board;
  	int i;
  
 -	if (!i2c_check_functionality(client->adapter,
@@ -220,12 +167,13 @@ Index: git/drivers/regulator/tps6507x-regulator.c
  	 * coming from the board-evm file.
  	 */
  
--        tps_board = (struct tps6507x_board *)client->dev.platform_data;
+-	tps_board = (struct tps6507x_board *)client->dev.platform_data;
+-
 +	tps_board = (struct tps6507x_board *)tps6507x_dev->dev->platform_data;
- 
  	if (!tps_board)
  		return -EIO;
-@@ -536,7 +579,7 @@
+ 
+@@ -539,7 +580,7 @@
  	mutex_init(&tps->io_lock);
  
  	/* common for all regulators */
@@ -234,7 +182,7 @@ Index: git/drivers/regulator/tps6507x-regulator.c
  
  	for (i = 0; i < TPS6507X_NUM_REGULATOR; i++, info++, init_data++) {
  		/* Register the regulators */
-@@ -551,19 +594,16 @@
+@@ -554,19 +595,16 @@
  		tps->desc[i].owner = THIS_MODULE;
  
  		rdev = regulator_register(&tps->desc[i],
@@ -258,7 +206,7 @@ Index: git/drivers/regulator/tps6507x-regulator.c
  
  			kfree(tps);
  			return PTR_ERR(rdev);
-@@ -573,87 +613,34 @@
+@@ -576,87 +614,34 @@
  		tps->rdev[i] = rdev;
  	}
  
@@ -353,7 +301,7 @@ Index: git/drivers/regulator/tps6507x-regulator.c
  };
  
  /**
-@@ -663,7 +650,7 @@
+@@ -666,7 +651,7 @@
   */
  static int __init tps6507x_pmic_init(void)
  {
@@ -362,7 +310,7 @@ Index: git/drivers/regulator/tps6507x-regulator.c
  }
  subsys_initcall(tps6507x_pmic_init);
  
-@@ -674,10 +661,11 @@
+@@ -677,10 +662,11 @@
   */
  static void __exit tps6507x_pmic_cleanup(void)
  {
@@ -375,23 +323,15 @@ Index: git/drivers/regulator/tps6507x-regulator.c
  MODULE_DESCRIPTION("TPS6507x voltage regulator driver");
  MODULE_LICENSE("GPL v2");
 +MODULE_ALIAS("platform:tps6507x-pmic");
-Index: git/include/linux/mfd/tps6507x.h
+Index: kernel/drivers/mfd/tps6507x.c
 ===================================================================
---- git.orig/include/linux/mfd/tps6507x.h	2010-01-12 08:43:00.961383768 -0600
-+++ git/include/linux/mfd/tps6507x.h	2010-01-12 08:52:41.753688570 -0600
-@@ -156,10 +156,13 @@
- 	struct device *dev;
- 	struct i2c_client *i2c_client;
- 	int (*read_dev)(struct tps6507x_dev *tps6507x, char reg, int size,
--                        void *dest);
-+			void *dest);
- 	int (*write_dev)(struct tps6507x_dev *tps6507x, char reg, int size,
--                         void *src);
-+			 void *src);
- 	struct mutex adc_mutex;
-+
-+	/* Client devices */
-+	struct tps6507x_pmic *pmic;
+--- kernel.orig/drivers/mfd/tps6507x.c	2010-01-26 14:33:54.000000000 -0700
++++ kernel/drivers/mfd/tps6507x.c	2010-01-26 14:35:00.000000000 -0700
+@@ -27,6 +27,7 @@
+ };
+ 
+ static struct tps_sub_devices tps6507x_sub_devices[] = {
++	{ "tps6507x-pmic", NULL },
+ 	{ NULL, NULL }
  };
  
- #endif /*  __LINUX_MFD_TPS6507X_H */
diff --git a/recipes/linux/linux-davinci/0006-tps6507x_touchscreen_driver.patch b/recipes/linux/linux-davinci/0006-tps6507x_touchscreen_driver.patch
index adfa7bb24b..cf16787ef4 100644
--- a/recipes/linux/linux-davinci/0006-tps6507x_touchscreen_driver.patch
+++ b/recipes/linux/linux-davinci/0006-tps6507x_touchscreen_driver.patch
@@ -1,8 +1,8 @@
-Index: git/drivers/input/touchscreen/Kconfig
+Index: kernel/drivers/input/touchscreen/Kconfig
 ===================================================================
---- git.orig/drivers/input/touchscreen/Kconfig	2010-01-06 16:23:19.000000000 -0600
-+++ git/drivers/input/touchscreen/Kconfig	2010-01-12 08:46:20.229418722 -0600
-@@ -530,4 +530,17 @@
+--- kernel.orig/drivers/input/touchscreen/Kconfig	2010-01-26 14:28:33.000000000 -0700
++++ kernel/drivers/input/touchscreen/Kconfig	2010-01-26 14:45:26.000000000 -0700
+@@ -577,4 +577,17 @@
  
  	  To compile this driver as a module, choose M here: the
  	  module will be called pcap_ts.
@@ -20,19 +20,19 @@ Index: git/drivers/input/touchscreen/Kconfig
 +	  module will be called tps6507x_ts.
 +
  endif
-Index: git/drivers/input/touchscreen/Makefile
+Index: kernel/drivers/input/touchscreen/Makefile
 ===================================================================
---- git.orig/drivers/input/touchscreen/Makefile	2010-01-06 16:23:19.000000000 -0600
-+++ git/drivers/input/touchscreen/Makefile	2010-01-12 08:46:57.705432438 -0600
-@@ -42,3 +42,4 @@
+--- kernel.orig/drivers/input/touchscreen/Makefile	2010-01-26 14:28:33.000000000 -0700
++++ kernel/drivers/input/touchscreen/Makefile	2010-01-26 14:46:38.000000000 -0700
+@@ -45,3 +45,4 @@
+ obj-$(CONFIG_TOUCHSCREEN_WM97XX_MAINSTONE)	+= mainstone-wm97xx.o
  obj-$(CONFIG_TOUCHSCREEN_WM97XX_ZYLONITE)	+= zylonite-wm97xx.o
  obj-$(CONFIG_TOUCHSCREEN_W90X900)	+= w90p910_ts.o
- obj-$(CONFIG_TOUCHSCREEN_PCAP)		+= pcap_ts.o
 +obj-$(CONFIG_TOUCHSCREEN_TPS6507X)	+= tps6507x-ts.o
-Index: git/drivers/input/touchscreen/tps6507x-ts.c
+Index: kernel/drivers/input/touchscreen/tps6507x-ts.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ git/drivers/input/touchscreen/tps6507x-ts.c	2010-01-12 08:51:49.781765078 -0600
++++ kernel/drivers/input/touchscreen/tps6507x-ts.c	2010-01-26 14:45:26.000000000 -0700
 @@ -0,0 +1,403 @@
 +/*
 + * drivers/input/touchscreen/tps6507x_ts.c
@@ -254,6 +254,7 @@ Index: git/drivers/input/touchscreen/tps6507x-ts.c
 +		poll = 1;
 +	}
 +
++done:
 +	/* always poll if not using interrupts */
 +	poll = 1;
 +
@@ -269,7 +270,6 @@ Index: git/drivers/input/touchscreen/tps6507x-ts.c
 +	} else
 +		tsc->polling = 0;
 +
-+done:
 +	ret = tps6507x_adc_standby(tsc);
 +}
 +
@@ -437,10 +437,10 @@ Index: git/drivers/input/touchscreen/tps6507x-ts.c
 +MODULE_DESCRIPTION("TPS6507x - TouchScreen driver");
 +MODULE_LICENSE("GPL v2");
 +MODULE_ALIAS("platform:tps6507x-tsc");
-Index: git/include/linux/i2c/tps6507x-ts.h
+Index: kernel/include/linux/i2c/tps6507x-ts.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ git/include/linux/i2c/tps6507x-ts.h	2010-01-12 08:46:00.745554017 -0600
++++ kernel/include/linux/i2c/tps6507x-ts.h	2010-01-26 14:45:26.000000000 -0700
 @@ -0,0 +1,24 @@
 +/* linux/i2c/tps6507x-ts.h
 + *
@@ -466,10 +466,10 @@ Index: git/include/linux/i2c/tps6507x-ts.h
 +};
 +
 +#endif /*  __LINUX_I2C_TPS6507X_TS_H */
-Index: git/include/linux/mfd/tps6507x.h
+Index: kernel/include/linux/mfd/tps6507x.h
 ===================================================================
---- git.orig/include/linux/mfd/tps6507x.h	2010-01-12 08:43:01.000000000 -0600
-+++ git/include/linux/mfd/tps6507x.h	2010-01-12 08:46:00.745554017 -0600
+--- kernel.orig/include/linux/mfd/tps6507x.h	2010-01-26 14:33:54.000000000 -0700
++++ kernel/include/linux/mfd/tps6507x.h	2010-01-26 14:45:26.000000000 -0700
 @@ -142,6 +142,7 @@
  
  struct tps6507x_board {
@@ -478,28 +478,30 @@ Index: git/include/linux/mfd/tps6507x.h
  };
  
  /**
-@@ -163,6 +164,7 @@
- 
- 	/* Client devices */
- 	struct tps6507x_pmic *pmic;
+@@ -160,6 +161,9 @@
+ 	int (*write_dev)(struct tps6507x_dev *tps6507x, char reg, int size,
+ 			 void *src);
+ 	struct mutex adc_mutex;
++
++	/* Client devices */
 +	struct tps6507x_ts *ts;
  };
  
  #endif /*  __LINUX_MFD_TPS6507X_H */
-Index: git/arch/arm/mach-davinci/board-da850-evm.c
+Index: kernel/arch/arm/mach-davinci/board-da850-evm.c
 ===================================================================
---- git.orig/arch/arm/mach-davinci/board-da850-evm.c	2010-01-12 08:43:00.000000000 -0600
-+++ git/arch/arm/mach-davinci/board-da850-evm.c	2010-01-12 08:47:55.901370217 -0600
+--- kernel.orig/arch/arm/mach-davinci/board-da850-evm.c	2010-01-26 14:33:36.000000000 -0700
++++ kernel/arch/arm/mach-davinci/board-da850-evm.c	2010-01-26 14:45:26.000000000 -0700
 @@ -25,6 +25,8 @@
+ #include <linux/mtd/nand.h>
  #include <linux/mtd/partitions.h>
- #include <linux/mtd/physmap.h>
  #include <linux/regulator/machine.h>
 +#include <linux/mfd/tps6507x.h>
 +#include <linux/i2c/tps6507x-ts.h>
  #include <linux/spi/spi.h>
  #include <linux/spi/flash.h>
- #include <linux/spi/davinci_spi_master.h>
-@@ -644,8 +646,18 @@
+ 
+@@ -634,8 +636,18 @@
  	},
  };
  
@@ -518,24 +520,15 @@ Index: git/arch/arm/mach-davinci/board-da850-evm.c
  };
  
  static struct i2c_board_info __initdata da850evm_tps65070_info[] = {
-Index: git/drivers/mfd/tps6507x.c
+Index: kernel/drivers/mfd/tps6507x.c
 ===================================================================
---- git.orig/drivers/mfd/tps6507x.c	2010-01-12 08:43:01.000000000 -0600
-+++ git/drivers/mfd/tps6507x.c	2010-01-12 08:51:03.997870214 -0600
-@@ -91,6 +91,8 @@
+--- kernel.orig/drivers/mfd/tps6507x.c	2010-01-26 14:35:00.000000000 -0700
++++ kernel/drivers/mfd/tps6507x.c	2010-01-26 14:45:26.000000000 -0700
+@@ -28,6 +28,7 @@
  
- 	tps6507x_client_dev_register(tps6507x, "tps6507x-pmic",
-   				     &pdev);
-+	tps6507x_client_dev_register(tps6507x, "tps6507x-ts",
-+				     &pdev);
- 	return ret;
- }
+ static struct tps_sub_devices tps6507x_sub_devices[] = {
+ 	{ "tps6507x-pmic", NULL },
++	{ "tps6507x-ts", NULL },
+ 	{ NULL, NULL }
+ };
  
-@@ -99,6 +101,7 @@
- {
- 	struct tps6507x_dev *tps6507x;
- 	int ret = 0;
-+
- 	tps6507x = kzalloc(sizeof(struct tps6507x_dev), GFP_KERNEL);
- 	if (tps6507x == NULL) {
- 		kfree(i2c);
diff --git a/recipes/linux/linux-davinci/da850-omapl138-evm/defconfig b/recipes/linux/linux-davinci/da850-omapl138-evm/defconfig
index 3532e2c7a5..bd232e25e4 100644
--- a/recipes/linux/linux-davinci/da850-omapl138-evm/defconfig
+++ b/recipes/linux/linux-davinci/da850-omapl138-evm/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.32-rc6
-# Tue Jan 26 14:03:33 2010
+# Linux kernel version: 2.6.33-rc4
+# Tue Feb  9 19:24:00 2010
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -34,6 +34,12 @@ CONFIG_LOCK_KERNEL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_LZO=y
+CONFIG_KERNEL_GZIP=y
+# CONFIG_KERNEL_BZIP2 is not set
+# CONFIG_KERNEL_LZMA is not set
+# CONFIG_KERNEL_LZO is not set
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
@@ -48,6 +54,7 @@ CONFIG_POSIX_MQUEUE_SYSCTL=y
 #
 CONFIG_TREE_RCU=y
 # CONFIG_TREE_PREEMPT_RCU is not set
+# CONFIG_TINY_RCU is not set
 # CONFIG_RCU_TRACE is not set
 CONFIG_RCU_FANOUT=32
 # CONFIG_RCU_FANOUT_EXACT is not set
@@ -69,6 +76,7 @@ CONFIG_INITRAMFS_SOURCE=""
 CONFIG_RD_GZIP=y
 # CONFIG_RD_BZIP2 is not set
 # CONFIG_RD_LZMA is not set
+# CONFIG_RD_LZO is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
 CONFIG_ANON_INODES=y
@@ -129,15 +137,42 @@ CONFIG_LBDAF=y
 # IO Schedulers
 #
 CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
 # CONFIG_IOSCHED_DEADLINE is not set
 # CONFIG_IOSCHED_CFQ is not set
-CONFIG_DEFAULT_AS=y
 # CONFIG_DEFAULT_DEADLINE is not set
 # CONFIG_DEFAULT_CFQ is not set
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="anticipatory"
-# CONFIG_FREEZER is not set
+CONFIG_DEFAULT_NOOP=y
+CONFIG_DEFAULT_IOSCHED="noop"
+# CONFIG_INLINE_SPIN_TRYLOCK is not set
+# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK is not set
+# CONFIG_INLINE_SPIN_LOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
+# CONFIG_INLINE_SPIN_UNLOCK is not set
+# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
+# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
+# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_READ_TRYLOCK is not set
+# CONFIG_INLINE_READ_LOCK is not set
+# CONFIG_INLINE_READ_LOCK_BH is not set
+# CONFIG_INLINE_READ_LOCK_IRQ is not set
+# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
+# CONFIG_INLINE_READ_UNLOCK is not set
+# CONFIG_INLINE_READ_UNLOCK_BH is not set
+# CONFIG_INLINE_READ_UNLOCK_IRQ is not set
+# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_WRITE_TRYLOCK is not set
+# CONFIG_INLINE_WRITE_LOCK is not set
+# CONFIG_INLINE_WRITE_LOCK_BH is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
+# CONFIG_INLINE_WRITE_UNLOCK is not set
+# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
+# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
+# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
+# CONFIG_MUTEX_SPIN_ON_OWNER is not set
+CONFIG_FREEZER=y
 
 #
 # System Type
@@ -165,6 +200,7 @@ CONFIG_MMU=y
 # CONFIG_ARCH_IXP2000 is not set
 # CONFIG_ARCH_IXP4XX is not set
 # CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_DOVE is not set
 # CONFIG_ARCH_KIRKWOOD is not set
 # CONFIG_ARCH_LOKI is not set
 # CONFIG_ARCH_MV78XX0 is not set
@@ -187,6 +223,7 @@ CONFIG_MMU=y
 CONFIG_ARCH_DAVINCI=y
 # CONFIG_ARCH_OMAP is not set
 # CONFIG_ARCH_BCMRING is not set
+# CONFIG_ARCH_U8500 is not set
 CONFIG_CP_INTC=y
 
 #
@@ -201,9 +238,12 @@ CONFIG_CP_INTC=y
 # CONFIG_ARCH_DAVINCI_DM646x is not set
 # CONFIG_ARCH_DAVINCI_DA830 is not set
 CONFIG_ARCH_DAVINCI_DA850=y
+# CONFIG_DA8XX_MAX_SPEED_300 is not set
+# CONFIG_DA8XX_MAX_SPEED_372 is not set
+# CONFIG_DA8XX_MAX_SPEED_408 is not set
+CONFIG_DA8XX_MAX_SPEED_456=y
 CONFIG_ARCH_DAVINCI_DA8XX=y
 # CONFIG_ARCH_DAVINCI_DM365 is not set
-CONFIG_CPPI41=y
 
 #
 # DaVinci Board Type
@@ -212,6 +252,7 @@ CONFIG_MACH_DAVINCI_DA850_EVM=y
 CONFIG_DA850_UI_NONE=y
 # CONFIG_DA850_UI_RMII is not set
 # CONFIG_DA850_UI_CLCD is not set
+# CONFIG_DA850_UI_VIDEO_PORT is not set
 CONFIG_DAVINCI_MUX=y
 # CONFIG_DAVINCI_MUX_DEBUG is not set
 # CONFIG_DAVINCI_MUX_WARNINGS is not set
@@ -223,7 +264,6 @@ CONFIG_DAVINCI_MCBSP1=y
 #
 # Processor Type
 #
-CONFIG_CPU_32=y
 CONFIG_CPU_ARM926T=y
 CONFIG_CPU_32v5=y
 CONFIG_CPU_ABRT_EV5TJ=y
@@ -280,13 +320,11 @@ CONFIG_FLATMEM_MANUAL=y
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_SPLIT_PTLOCK_CPUS=4096
+CONFIG_SPLIT_PTLOCK_CPUS=999999
 # CONFIG_PHYS_ADDR_T_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=1
 CONFIG_BOUNCE=y
 CONFIG_VIRT_TO_BUS=y
-CONFIG_HAVE_MLOCK=y
-CONFIG_HAVE_MLOCKED_PAGE_BIT=y
 # CONFIG_KSM is not set
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 CONFIG_LEDS=y
@@ -299,7 +337,7 @@ CONFIG_ALIGNMENT_TRAP=y
 #
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE=" debug "
+CONFIG_CMDLINE=""
 # CONFIG_XIP_KERNEL is not set
 # CONFIG_KEXEC is not set
 
@@ -313,8 +351,8 @@ 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_USERSPACE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=y
@@ -346,7 +384,13 @@ CONFIG_HAVE_AOUT=y
 #
 # Power management options
 #
-# CONFIG_PM is not set
+CONFIG_PM=y
+# CONFIG_PM_DEBUG is not set
+CONFIG_PM_SLEEP=y
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
+# CONFIG_APM_EMULATION is not set
+# CONFIG_PM_RUNTIME is not set
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_NET=y
 
@@ -404,6 +448,7 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m
 CONFIG_INET6_XFRM_MODE_BEET=m
 # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
 CONFIG_IPV6_SIT=m
+# CONFIG_IPV6_SIT_6RD is not set
 CONFIG_IPV6_NDISC_NODETYPE=y
 # CONFIG_IPV6_TUNNEL is not set
 # CONFIG_IPV6_MULTIPLE_TABLES is not set
@@ -465,7 +510,13 @@ CONFIG_NETFILTER_ADVANCED=y
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
 # CONFIG_AF_RXRPC is not set
-# CONFIG_WIRELESS is not set
+CONFIG_WIRELESS=y
+# CONFIG_CFG80211 is not set
+# CONFIG_LIB80211 is not set
+
+#
+# CFG80211 needs to be enabled for MAC80211
+#
 # CONFIG_WIMAX is not set
 # CONFIG_RFKILL is not set
 # CONFIG_NET_9P is not set
@@ -510,10 +561,8 @@ CONFIG_MTD_BLOCK=y
 #
 # RAM/ROM/Flash chip drivers
 #
-CONFIG_MTD_CFI=y
+# CONFIG_MTD_CFI is not set
 # CONFIG_MTD_JEDECPROBE is not set
-CONFIG_MTD_GEN_PROBE=y
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
 CONFIG_MTD_MAP_BANK_WIDTH_1=y
 CONFIG_MTD_MAP_BANK_WIDTH_2=y
 CONFIG_MTD_MAP_BANK_WIDTH_4=y
@@ -524,10 +573,6 @@ CONFIG_MTD_CFI_I1=y
 CONFIG_MTD_CFI_I2=y
 # CONFIG_MTD_CFI_I4 is not set
 # CONFIG_MTD_CFI_I8 is not set
-CONFIG_MTD_CFI_INTELEXT=y
-# CONFIG_MTD_CFI_AMDSTD is not set
-# CONFIG_MTD_CFI_STAA is not set
-CONFIG_MTD_CFI_UTIL=y
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_ABSENT is not set
@@ -536,9 +581,6 @@ CONFIG_MTD_CFI_UTIL=y
 # Mapping drivers for chip access
 #
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
-CONFIG_MTD_PHYSMAP=y
-# CONFIG_MTD_PHYSMAP_COMPAT is not set
-# CONFIG_MTD_ARM_INTEGRATOR is not set
 # CONFIG_MTD_PLATRAM is not set
 
 #
@@ -559,17 +601,7 @@ CONFIG_M25PXX_USE_FAST_READ=y
 # CONFIG_MTD_DOC2000 is not set
 # CONFIG_MTD_DOC2001 is not set
 # CONFIG_MTD_DOC2001PLUS is not set
-CONFIG_MTD_NAND=y
-# CONFIG_MTD_NAND_VERIFY_WRITE is not set
-# CONFIG_MTD_NAND_ECC_SMC is not set
-# CONFIG_MTD_NAND_MUSEUM_IDS is not set
-# CONFIG_MTD_NAND_GPIO is not set
-CONFIG_MTD_NAND_IDS=y
-# CONFIG_MTD_NAND_DISKONCHIP is not set
-# CONFIG_MTD_NAND_NANDSIM is not set
-# CONFIG_MTD_NAND_PLATFORM is not set
-# CONFIG_MTD_ALAUDA is not set
-CONFIG_MTD_NAND_DAVINCI=y
+# CONFIG_MTD_NAND is not set
 # CONFIG_MTD_ONENAND is not set
 
 #
@@ -586,6 +618,10 @@ CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=m
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
+
+#
+# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
+#
 # CONFIG_BLK_DEV_NBD is not set
 # CONFIG_BLK_DEV_UB is not set
 CONFIG_BLK_DEV_RAM=y
@@ -596,9 +632,12 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
 # CONFIG_ATA_OVER_ETH is not set
 # CONFIG_MG_DISK is not set
 CONFIG_MISC_DEVICES=y
+# CONFIG_AD525X_DPOT is not set
 # CONFIG_ICS932S401 is not set
 # CONFIG_ENCLOSURE_SERVICES is not set
 # CONFIG_ISL29003 is not set
+# CONFIG_DS1682 is not set
+# CONFIG_TI_DAC7512 is not set
 # CONFIG_C2PORT is not set
 
 #
@@ -609,6 +648,7 @@ CONFIG_EEPROM_AT24=y
 # CONFIG_EEPROM_LEGACY is not set
 # CONFIG_EEPROM_MAX6875 is not set
 # CONFIG_EEPROM_93CX6 is not set
+# CONFIG_IWMC3200TOP is not set
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
 
@@ -629,7 +669,7 @@ CONFIG_BLK_DEV_SD=y
 # CONFIG_CHR_DEV_ST is not set
 # CONFIG_CHR_DEV_OSST is not set
 # CONFIG_BLK_DEV_SR is not set
-# CONFIG_CHR_DEV_SG is not set
+CONFIG_CHR_DEV_SG=y
 # CONFIG_CHR_DEV_SCH is not set
 # CONFIG_SCSI_MULTI_LUN is not set
 # CONFIG_SCSI_CONSTANTS is not set
@@ -652,19 +692,14 @@ CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_SCSI_DEBUG is not set
 # CONFIG_SCSI_DH is not set
 # CONFIG_SCSI_OSD_INITIATOR is not set
-CONFIG_ATA=y
-# CONFIG_ATA_NONSTANDARD is not set
-CONFIG_ATA_VERBOSE_ERROR=y
-# CONFIG_SATA_PMP is not set
-CONFIG_SATA_AHCI=y
-# CONFIG_ATA_SFF is not set
+# CONFIG_ATA is not set
 # CONFIG_MD is not set
 CONFIG_NETDEVICES=y
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
 # CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
-CONFIG_TUN=m
+# CONFIG_TUN is not set
 # CONFIG_VETH is not set
 CONFIG_PHYLIB=y
 
@@ -677,7 +712,7 @@ CONFIG_PHYLIB=y
 CONFIG_LXT_PHY=y
 # CONFIG_CICADA_PHY is not set
 # CONFIG_VITESSE_PHY is not set
-# CONFIG_SMSC_PHY is not set
+CONFIG_SMSC_PHY=y
 # CONFIG_BROADCOM_PHY is not set
 # CONFIG_ICPLUS_PHY is not set
 # CONFIG_REALTEK_PHY is not set
@@ -711,8 +746,8 @@ CONFIG_TI_DAVINCI_EMAC=y
 # CONFIG_NETDEV_1000 is not set
 # CONFIG_NETDEV_10000 is not set
 CONFIG_WLAN=y
-# CONFIG_WLAN_PRE80211 is not set
-# CONFIG_WLAN_80211 is not set
+# CONFIG_USB_ZD1201 is not set
+# CONFIG_HOSTAP is not set
 
 #
 # Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -743,6 +778,7 @@ CONFIG_NET_POLL_CONTROLLER=y
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
 # CONFIG_INPUT_POLLDEV is not set
+# CONFIG_INPUT_SPARSEKMAP is not set
 
 #
 # Userland interfaces
@@ -780,6 +816,7 @@ CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_AD7879_I2C is not set
 # CONFIG_TOUCHSCREEN_AD7879_SPI is not set
 # CONFIG_TOUCHSCREEN_AD7879 is not set
+# CONFIG_TOUCHSCREEN_DYNAPRO is not set
 # CONFIG_TOUCHSCREEN_EETI is not set
 # CONFIG_TOUCHSCREEN_FUJITSU is not set
 # CONFIG_TOUCHSCREEN_GUNZE is not set
@@ -806,6 +843,7 @@ CONFIG_SERIO=y
 CONFIG_SERIO_SERPORT=y
 CONFIG_SERIO_LIBPS2=y
 # CONFIG_SERIO_RAW is not set
+# CONFIG_SERIO_ALTERA_PS2 is not set
 # CONFIG_GAMEPORT is not set
 
 #
@@ -849,6 +887,7 @@ CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_COMPAT=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_HELPER_AUTO=y
+CONFIG_I2C_ALGOBIT=y
 
 #
 # I2C Hardware Bus support
@@ -859,7 +898,7 @@ CONFIG_I2C_HELPER_AUTO=y
 #
 CONFIG_I2C_DAVINCI=y
 # CONFIG_I2C_DESIGNWARE is not set
-# CONFIG_I2C_GPIO is not set
+CONFIG_I2C_GPIO=y
 # CONFIG_I2C_OCORES is not set
 # CONFIG_I2C_SIMTEC is not set
 
@@ -879,7 +918,6 @@ CONFIG_I2C_DAVINCI=y
 #
 # Miscellaneous I2C Chip support
 #
-# CONFIG_DS1682 is not set
 # CONFIG_SENSORS_TSL2550 is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
@@ -892,9 +930,10 @@ CONFIG_SPI_MASTER=y
 # SPI Master Controller Drivers
 #
 CONFIG_SPI_DAVINCI=y
-CONFIG_SPI_DAVINCI_DMA=y
 CONFIG_SPI_BITBANG=y
 # CONFIG_SPI_GPIO is not set
+# CONFIG_SPI_XILINX is not set
+# CONFIG_SPI_DESIGNWARE is not set
 
 #
 # SPI Protocol Masters
@@ -920,6 +959,7 @@ CONFIG_GPIOLIB=y
 # CONFIG_GPIO_MAX732X is not set
 CONFIG_GPIO_PCA953X=y
 CONFIG_GPIO_PCF857X=y
+# CONFIG_GPIO_ADP5588 is not set
 
 #
 # PCI GPIO expanders:
@@ -975,6 +1015,7 @@ CONFIG_TPS6507x=y
 # CONFIG_MFD_TC6387XB is not set
 # CONFIG_MFD_TC6393XB is not set
 # CONFIG_PMIC_DA903X is not set
+# CONFIG_PMIC_ADP5520 is not set
 # CONFIG_MFD_WM8400 is not set
 # CONFIG_MFD_WM831X is not set
 # CONFIG_MFD_WM8350_I2C is not set
@@ -982,6 +1023,8 @@ CONFIG_TPS6507x=y
 # CONFIG_MFD_MC13783 is not set
 # CONFIG_AB3100_CORE is not set
 # CONFIG_EZX_PCAP is not set
+# CONFIG_MFD_88PM8607 is not set
+# CONFIG_AB4500_CORE is not set
 CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_DEBUG is not set
 # CONFIG_REGULATOR_FIXED_VOLTAGE is not set
@@ -989,244 +1032,155 @@ CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
 # CONFIG_REGULATOR_BQ24022 is not set
 # CONFIG_REGULATOR_MAX1586 is not set
+# CONFIG_REGULATOR_MAX8660 is not set
 # CONFIG_REGULATOR_LP3971 is not set
 # CONFIG_REGULATOR_TPS65023 is not set
 CONFIG_REGULATOR_TPS6507X=y
-CONFIG_MEDIA_SUPPORT=m
+CONFIG_MEDIA_SUPPORT=y
 
 #
 # Multimedia core support
 #
-CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_V4L2_COMMON=m
+CONFIG_VIDEO_DEV=y
+CONFIG_VIDEO_V4L2_COMMON=y
 CONFIG_VIDEO_ALLOW_V4L1=y
 CONFIG_VIDEO_V4L1_COMPAT=y
-CONFIG_DVB_CORE=m
-CONFIG_VIDEO_MEDIA=m
+# CONFIG_DVB_CORE is not set
+CONFIG_VIDEO_MEDIA=y
 
 #
 # Multimedia drivers
 #
+CONFIG_IR_CORE=y
+CONFIG_VIDEO_IR=y
 # CONFIG_MEDIA_ATTACH is not set
-CONFIG_MEDIA_TUNER=m
-CONFIG_MEDIA_TUNER_CUSTOMISE=y
-CONFIG_MEDIA_TUNER_SIMPLE=m
-CONFIG_MEDIA_TUNER_TDA8290=m
-CONFIG_MEDIA_TUNER_TDA827X=m
-CONFIG_MEDIA_TUNER_TDA18271=m
-CONFIG_MEDIA_TUNER_TDA9887=m
-CONFIG_MEDIA_TUNER_TEA5761=m
-CONFIG_MEDIA_TUNER_TEA5767=m
-CONFIG_MEDIA_TUNER_MT20XX=m
-CONFIG_MEDIA_TUNER_MT2060=m
-CONFIG_MEDIA_TUNER_MT2266=m
-CONFIG_MEDIA_TUNER_MT2131=m
-CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=m
-CONFIG_MEDIA_TUNER_XC5000=m
-CONFIG_MEDIA_TUNER_MXL5005S=m
-CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=m
-CONFIG_VIDEO_V4L2=m
-CONFIG_VIDEO_V4L1=m
-CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_VMALLOC=m
-CONFIG_VIDEOBUF_DMA_CONTIG=m
-CONFIG_VIDEOBUF_DVB=m
-CONFIG_VIDEO_IR=m
-CONFIG_VIDEO_TVEEPROM=m
-CONFIG_VIDEO_TUNER=m
+CONFIG_MEDIA_TUNER=y
+# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
+CONFIG_MEDIA_TUNER_SIMPLE=y
+CONFIG_MEDIA_TUNER_TDA8290=y
+CONFIG_MEDIA_TUNER_TDA9887=y
+CONFIG_MEDIA_TUNER_TEA5761=y
+CONFIG_MEDIA_TUNER_TEA5767=y
+CONFIG_MEDIA_TUNER_MT20XX=y
+CONFIG_MEDIA_TUNER_XC2028=y
+CONFIG_MEDIA_TUNER_XC5000=y
+CONFIG_MEDIA_TUNER_MC44S803=y
+CONFIG_VIDEO_V4L2=y
+CONFIG_VIDEO_V4L1=y
 CONFIG_VIDEO_CAPTURE_DRIVERS=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
-CONFIG_VIDEO_IR_I2C=m
-CONFIG_VIDEO_MSP3400=m
-CONFIG_VIDEO_CS53L32A=m
-CONFIG_VIDEO_WM8775=m
-CONFIG_VIDEO_MT9V011=m
-CONFIG_VIDEO_SAA711X=m
-CONFIG_VIDEO_TVP5150=m
-CONFIG_VIDEO_CX25840=m
-CONFIG_VIDEO_CX2341X=m
-CONFIG_VIDEO_VIVI=m
-CONFIG_VIDEO_VPSS_SYSTEM=m
-CONFIG_VIDEO_VPFE_CAPTURE=m
+# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
+# CONFIG_VIDEO_IR_I2C is not set
+
+#
+# Encoders/decoders and other helper chips
+#
+
+#
+# Audio decoders
+#
+# CONFIG_VIDEO_TVAUDIO is not set
+# CONFIG_VIDEO_TDA7432 is not set
+# CONFIG_VIDEO_TDA9840 is not set
+# CONFIG_VIDEO_TDA9875 is not set
+# CONFIG_VIDEO_TEA6415C is not set
+# CONFIG_VIDEO_TEA6420 is not set
+# CONFIG_VIDEO_MSP3400 is not set
+# CONFIG_VIDEO_CS5345 is not set
+# CONFIG_VIDEO_CS53L32A is not set
+# CONFIG_VIDEO_M52790 is not set
+# CONFIG_VIDEO_TLV320AIC23B is not set
+# CONFIG_VIDEO_WM8775 is not set
+# CONFIG_VIDEO_WM8739 is not set
+# CONFIG_VIDEO_VP27SMPX is not set
+
+#
+# RDS decoders
+#
+# CONFIG_VIDEO_SAA6588 is not set
+
+#
+# Video decoders
+#
+# CONFIG_VIDEO_ADV7180 is not set
+# CONFIG_VIDEO_BT819 is not set
+# CONFIG_VIDEO_BT856 is not set
+# CONFIG_VIDEO_BT866 is not set
+# CONFIG_VIDEO_KS0127 is not set
+# CONFIG_VIDEO_OV7670 is not set
+# CONFIG_VIDEO_MT9V011 is not set
+# CONFIG_VIDEO_TCM825X is not set
+# CONFIG_VIDEO_SAA7110 is not set
+# CONFIG_VIDEO_SAA711X is not set
+# CONFIG_VIDEO_SAA717X is not set
+# CONFIG_VIDEO_SAA7191 is not set
+# CONFIG_VIDEO_TVP514X is not set
+# CONFIG_VIDEO_TVP5150 is not set
+# CONFIG_VIDEO_VPX3220 is not set
+
+#
+# Video and audio decoders
+#
+# CONFIG_VIDEO_CX25840 is not set
+
+#
+# MPEG video encoders
+#
+# CONFIG_VIDEO_CX2341X is not set
+
+#
+# Video encoders
+#
+# CONFIG_VIDEO_SAA7127 is not set
+# CONFIG_VIDEO_SAA7185 is not set
+# CONFIG_VIDEO_ADV7170 is not set
+# CONFIG_VIDEO_ADV7175 is not set
+# CONFIG_VIDEO_THS7303 is not set
+# CONFIG_VIDEO_ADV7343 is not set
+
+#
+# Video improvement chips
+#
+# CONFIG_VIDEO_UPD64031A is not set
+# CONFIG_VIDEO_UPD64083 is not set
+# CONFIG_VIDEO_DAVINCI_VPIF_DISPLAY is not set
+# CONFIG_VIDEO_DAVINCI_VPIF_CAPTURE is not set
+# CONFIG_VIDEO_VIVI is not set
+# CONFIG_VIDEO_VPSS_SYSTEM is not set
+# CONFIG_VIDEO_VPFE_CAPTURE is not set
 # CONFIG_VIDEO_CPIA is not set
 # CONFIG_VIDEO_CPIA2 is not set
 # CONFIG_VIDEO_SAA5246A is not set
 # CONFIG_VIDEO_SAA5249 is not set
-# CONFIG_VIDEO_AU0828 is not set
 # CONFIG_SOC_CAMERA is not set
 CONFIG_V4L_USB_DRIVERS=y
-CONFIG_USB_VIDEO_CLASS=m
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
-CONFIG_USB_GSPCA=m
-# CONFIG_USB_M5602 is not set
-# CONFIG_USB_STV06XX is not set
-# CONFIG_USB_GL860 is not set
-# CONFIG_USB_GSPCA_CONEX is not set
-# CONFIG_USB_GSPCA_ETOMS is not set
-# CONFIG_USB_GSPCA_FINEPIX is not set
-# CONFIG_USB_GSPCA_JEILINJ is not set
-# CONFIG_USB_GSPCA_MARS is not set
-# CONFIG_USB_GSPCA_MR97310A is not set
-# CONFIG_USB_GSPCA_OV519 is not set
-# CONFIG_USB_GSPCA_OV534 is not set
-# CONFIG_USB_GSPCA_PAC207 is not set
-# CONFIG_USB_GSPCA_PAC7311 is not set
-# CONFIG_USB_GSPCA_SN9C20X is not set
-# CONFIG_USB_GSPCA_SONIXB is not set
-# CONFIG_USB_GSPCA_SONIXJ is not set
-# CONFIG_USB_GSPCA_SPCA500 is not set
-# CONFIG_USB_GSPCA_SPCA501 is not set
-# CONFIG_USB_GSPCA_SPCA505 is not set
-# CONFIG_USB_GSPCA_SPCA506 is not set
-# CONFIG_USB_GSPCA_SPCA508 is not set
-# CONFIG_USB_GSPCA_SPCA561 is not set
-# CONFIG_USB_GSPCA_SQ905 is not set
-# CONFIG_USB_GSPCA_SQ905C is not set
-# CONFIG_USB_GSPCA_STK014 is not set
-# CONFIG_USB_GSPCA_SUNPLUS is not set
-# CONFIG_USB_GSPCA_T613 is not set
-# CONFIG_USB_GSPCA_TV8532 is not set
-# CONFIG_USB_GSPCA_VC032X is not set
-# CONFIG_USB_GSPCA_ZC3XX is not set
-CONFIG_VIDEO_PVRUSB2=m
-CONFIG_VIDEO_PVRUSB2_SYSFS=y
-CONFIG_VIDEO_PVRUSB2_DVB=y
-# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
-CONFIG_VIDEO_HDPVR=m
-CONFIG_VIDEO_EM28XX=m
-CONFIG_VIDEO_EM28XX_ALSA=m
-CONFIG_VIDEO_EM28XX_DVB=m
-CONFIG_VIDEO_CX231XX=m
-CONFIG_VIDEO_CX231XX_ALSA=m
-CONFIG_VIDEO_CX231XX_DVB=m
-CONFIG_VIDEO_USBVISION=m
-CONFIG_VIDEO_USBVIDEO=m
-CONFIG_USB_VICAM=m
-CONFIG_USB_IBMCAM=m
-CONFIG_USB_KONICAWC=m
-CONFIG_USB_QUICKCAM_MESSENGER=m
-CONFIG_USB_ET61X251=m
-CONFIG_VIDEO_OVCAMCHIP=m
-CONFIG_USB_W9968CF=m
-CONFIG_USB_OV511=m
-CONFIG_USB_SE401=m
-CONFIG_USB_SN9C102=m
-CONFIG_USB_STV680=m
-CONFIG_USB_ZC0301=m
-CONFIG_USB_PWC=m
-# CONFIG_USB_PWC_DEBUG is not set
-CONFIG_USB_PWC_INPUT_EVDEV=y
-CONFIG_USB_ZR364XX=m
-CONFIG_USB_STKWEBCAM=m
-CONFIG_USB_S2255=m
-CONFIG_RADIO_ADAPTERS=y
-# CONFIG_I2C_SI4713 is not set
-# CONFIG_RADIO_SI4713 is not set
-# CONFIG_USB_DSBR is not set
-# CONFIG_RADIO_SI470X is not set
-# CONFIG_USB_MR800 is not set
-# CONFIG_RADIO_TEA5764 is not set
-CONFIG_DVB_MAX_ADAPTERS=8
-# CONFIG_DVB_DYNAMIC_MINORS is not set
-CONFIG_DVB_CAPTURE_DRIVERS=y
-# CONFIG_TTPCI_EEPROM is not set
-
-#
-# Supported USB Adapters
-#
-CONFIG_DVB_USB=m
-# CONFIG_DVB_USB_DEBUG is not set
-CONFIG_DVB_USB_A800=m
-CONFIG_DVB_USB_DIBUSB_MB=m
-# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
-CONFIG_DVB_USB_DIBUSB_MC=m
-CONFIG_DVB_USB_DIB0700=m
-CONFIG_DVB_USB_UMT_010=m
-CONFIG_DVB_USB_CXUSB=m
-CONFIG_DVB_USB_M920X=m
-CONFIG_DVB_USB_GL861=m
-CONFIG_DVB_USB_AU6610=m
-CONFIG_DVB_USB_DIGITV=m
-CONFIG_DVB_USB_VP7045=m
-CONFIG_DVB_USB_VP702X=m
-CONFIG_DVB_USB_GP8PSK=m
-CONFIG_DVB_USB_NOVA_T_USB2=m
-CONFIG_DVB_USB_TTUSB2=m
-CONFIG_DVB_USB_DTT200U=m
-CONFIG_DVB_USB_OPERA1=m
-CONFIG_DVB_USB_AF9005=m
-CONFIG_DVB_USB_AF9005_REMOTE=m
-CONFIG_DVB_USB_DW2102=m
-CONFIG_DVB_USB_CINERGY_T2=m
-CONFIG_DVB_USB_ANYSEE=m
-CONFIG_DVB_USB_DTV5100=m
-CONFIG_DVB_USB_AF9015=m
-CONFIG_DVB_USB_CE6230=m
-CONFIG_DVB_USB_FRIIO=m
-CONFIG_SMS_SIANO_MDTV=m
-
-#
-# Siano module components
-#
-CONFIG_SMS_USB_DRV=m
-CONFIG_SMS_SDIO_DRV=m
-
-#
-# Supported FlexCopII (B2C2) Adapters
-#
-CONFIG_DVB_B2C2_FLEXCOP=m
-CONFIG_DVB_B2C2_FLEXCOP_USB=m
-# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set
-
-#
-# Supported DVB Frontends
-#
-# CONFIG_DVB_FE_CUSTOMISE is not set
-CONFIG_DVB_CX24123=m
-CONFIG_DVB_MT312=m
-CONFIG_DVB_ZL10039=m
-CONFIG_DVB_S5H1420=m
-CONFIG_DVB_STV0288=m
-CONFIG_DVB_STB6000=m
-CONFIG_DVB_STV0299=m
-CONFIG_DVB_TDA10086=m
-CONFIG_DVB_TUNER_ITD1000=m
-CONFIG_DVB_TUNER_CX24113=m
-CONFIG_DVB_TDA826X=m
-CONFIG_DVB_CX24116=m
-CONFIG_DVB_SI21XX=m
-CONFIG_DVB_CX22702=m
-CONFIG_DVB_TDA1004X=m
-CONFIG_DVB_NXT6000=m
-CONFIG_DVB_MT352=m
-CONFIG_DVB_ZL10353=m
-CONFIG_DVB_DIB3000MB=m
-CONFIG_DVB_DIB3000MC=m
-CONFIG_DVB_DIB7000M=m
-CONFIG_DVB_DIB7000P=m
-CONFIG_DVB_TDA10048=m
-CONFIG_DVB_AF9013=m
-CONFIG_DVB_TDA10021=m
-CONFIG_DVB_TDA10023=m
-CONFIG_DVB_STV0297=m
-CONFIG_DVB_NXT200X=m
-CONFIG_DVB_BCM3510=m
-CONFIG_DVB_LGDT330X=m
-CONFIG_DVB_LGDT3305=m
-CONFIG_DVB_S5H1409=m
-CONFIG_DVB_S5H1411=m
-CONFIG_DVB_DIB8000=m
-CONFIG_DVB_PLL=m
-CONFIG_DVB_TUNER_DIB0070=m
-CONFIG_DVB_LNBP21=m
-CONFIG_DVB_ISL6421=m
-CONFIG_DVB_LGS8GL5=m
-CONFIG_DAB=y
-CONFIG_USB_DABUSB=m
+CONFIG_USB_VIDEO_CLASS=y
+# CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV is not set
+# CONFIG_USB_GSPCA is not set
+# CONFIG_VIDEO_PVRUSB2 is not set
+# CONFIG_VIDEO_HDPVR is not set
+# CONFIG_VIDEO_EM28XX is not set
+# CONFIG_VIDEO_CX231XX is not set
+# CONFIG_VIDEO_USBVISION is not set
+# CONFIG_USB_VICAM is not set
+# CONFIG_USB_IBMCAM is not set
+# CONFIG_USB_KONICAWC is not set
+# CONFIG_USB_QUICKCAM_MESSENGER is not set
+# CONFIG_USB_ET61X251 is not set
+# CONFIG_VIDEO_OVCAMCHIP is not set
+# CONFIG_USB_OV511 is not set
+# CONFIG_USB_SE401 is not set
+# CONFIG_USB_SN9C102 is not set
+# CONFIG_USB_STV680 is not set
+# CONFIG_USB_ZC0301 is not set
+# CONFIG_USB_PWC is not set
+# CONFIG_USB_PWC_INPUT_EVDEV is not set
+# CONFIG_USB_ZR364XX is not set
+# CONFIG_USB_STKWEBCAM is not set
+# CONFIG_USB_S2255 is not set
+# CONFIG_RADIO_ADAPTERS is not set
+# CONFIG_DAB is not set
 
 #
 # Graphics support
@@ -1289,7 +1243,8 @@ CONFIG_SOUND=y
 CONFIG_SND=y
 CONFIG_SND_TIMER=y
 CONFIG_SND_PCM=y
-CONFIG_SND_RAWMIDI=m
+CONFIG_SND_HWDEP=y
+CONFIG_SND_RAWMIDI=y
 CONFIG_SND_JACK=y
 # CONFIG_SND_SEQUENCER is not set
 # CONFIG_SND_MIXER_OSS is not set
@@ -1313,7 +1268,7 @@ CONFIG_SND_DRIVERS=y
 CONFIG_SND_ARM=y
 CONFIG_SND_SPI=y
 CONFIG_SND_USB=y
-# CONFIG_SND_USB_AUDIO is not set
+CONFIG_SND_USB_AUDIO=y
 # CONFIG_SND_USB_CAIAQ is not set
 CONFIG_SND_SOC=y
 CONFIG_SND_DAVINCI_SOC=y
@@ -1377,10 +1332,11 @@ CONFIG_USB=y
 # CONFIG_USB_DEVICEFS is not set
 # CONFIG_USB_DEVICE_CLASS is not set
 # CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_SUSPEND 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=m
+# CONFIG_USB_MON is not set
 # CONFIG_USB_WUSB is not set
 # CONFIG_USB_WUSB_CBAF is not set
 
@@ -1392,20 +1348,15 @@ CONFIG_USB_MON=m
 # CONFIG_USB_ISP116X_HCD is not set
 # CONFIG_USB_ISP1760_HCD is not set
 # CONFIG_USB_ISP1362_HCD is not set
-CONFIG_USB_OHCI_HCD=y
-# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+# CONFIG_USB_OHCI_HCD is not set
 # CONFIG_USB_SL811_HCD is not set
 # CONFIG_USB_R8A66597_HCD is not set
 # CONFIG_USB_HWA_HCD is not set
 CONFIG_USB_MUSB_HDRC=y
 CONFIG_USB_MUSB_SOC=y
-# CONFIG_USB_MUSB_HOST is not set
+CONFIG_USB_MUSB_HOST=y
 # CONFIG_USB_MUSB_PERIPHERAL is not set
-CONFIG_USB_MUSB_DUAL_ROLE=y
 # CONFIG_USB_MUSB_OTG is not set
-CONFIG_USB_GADGET_MUSB_HDRC=y
 CONFIG_USB_MUSB_HDRC_HCD=y
 # CONFIG_MUSB_PIO_ONLY is not set
 # CONFIG_USB_INVENTRA_DMA is not set
@@ -1416,10 +1367,10 @@ CONFIG_USB_MUSB_DEBUG=y
 #
 # USB Device Class drivers
 #
-CONFIG_USB_ACM=m
-CONFIG_USB_PRINTER=m
-CONFIG_USB_WDM=m
-CONFIG_USB_TMC=m
+# CONFIG_USB_ACM is not set
+# CONFIG_USB_PRINTER is not set
+# CONFIG_USB_WDM is not set
+# CONFIG_USB_TMC is not set
 
 #
 # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
@@ -1452,54 +1403,7 @@ CONFIG_USB_STORAGE=y
 #
 # USB port drivers
 #
-CONFIG_USB_SERIAL=m
-CONFIG_USB_EZUSB=y
-# CONFIG_USB_SERIAL_GENERIC is not set
-CONFIG_USB_SERIAL_AIRCABLE=m
-CONFIG_USB_SERIAL_ARK3116=m
-CONFIG_USB_SERIAL_BELKIN=m
-CONFIG_USB_SERIAL_CH341=m
-CONFIG_USB_SERIAL_WHITEHEAT=m
-CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-CONFIG_USB_SERIAL_CP210X=m
-CONFIG_USB_SERIAL_CYPRESS_M8=m
-CONFIG_USB_SERIAL_EMPEG=m
-CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_FUNSOFT=m
-CONFIG_USB_SERIAL_VISOR=m
-CONFIG_USB_SERIAL_IPAQ=m
-CONFIG_USB_SERIAL_IR=m
-CONFIG_USB_SERIAL_EDGEPORT=m
-CONFIG_USB_SERIAL_EDGEPORT_TI=m
-CONFIG_USB_SERIAL_GARMIN=m
-CONFIG_USB_SERIAL_IPW=m
-CONFIG_USB_SERIAL_IUU=m
-CONFIG_USB_SERIAL_KEYSPAN_PDA=m
-CONFIG_USB_SERIAL_KEYSPAN=m
-CONFIG_USB_SERIAL_KLSI=m
-CONFIG_USB_SERIAL_KOBIL_SCT=m
-CONFIG_USB_SERIAL_MCT_U232=m
-CONFIG_USB_SERIAL_MOS7720=m
-CONFIG_USB_SERIAL_MOS7840=m
-CONFIG_USB_SERIAL_MOTOROLA=m
-CONFIG_USB_SERIAL_NAVMAN=m
-CONFIG_USB_SERIAL_PL2303=m
-CONFIG_USB_SERIAL_OTI6858=m
-CONFIG_USB_SERIAL_QUALCOMM=m
-CONFIG_USB_SERIAL_SPCP8X5=m
-CONFIG_USB_SERIAL_HP4X=m
-CONFIG_USB_SERIAL_SAFE=m
-# CONFIG_USB_SERIAL_SAFE_PADDED is not set
-CONFIG_USB_SERIAL_SIEMENS_MPI=m
-CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-CONFIG_USB_SERIAL_SYMBOL=m
-CONFIG_USB_SERIAL_TI=m
-CONFIG_USB_SERIAL_CYBERJACK=m
-CONFIG_USB_SERIAL_XIRCOM=m
-CONFIG_USB_SERIAL_OPTION=m
-CONFIG_USB_SERIAL_OMNINET=m
-CONFIG_USB_SERIAL_OPTICON=m
-CONFIG_USB_SERIAL_DEBUG=m
+# CONFIG_USB_SERIAL is not set
 
 #
 # USB Miscellaneous drivers
@@ -1509,7 +1413,7 @@ CONFIG_USB_SERIAL_DEBUG=m
 # CONFIG_USB_ADUTUX is not set
 # CONFIG_USB_SEVSEG is not set
 # CONFIG_USB_RIO500 is not set
-CONFIG_USB_LEGOTOWER=m
+# CONFIG_USB_LEGOTOWER is not set
 # CONFIG_USB_LCD is not set
 # CONFIG_USB_BERRY_CHARGE is not set
 # CONFIG_USB_LED is not set
@@ -1518,60 +1422,25 @@ CONFIG_USB_LEGOTOWER=m
 # CONFIG_USB_IDMOUSE is not set
 # CONFIG_USB_FTDI_ELAN is not set
 # CONFIG_USB_APPLEDISPLAY is not set
-CONFIG_USB_SISUSBVGA=m
-CONFIG_USB_SISUSBVGA_CON=y
+# CONFIG_USB_SISUSBVGA is not set
 # CONFIG_USB_LD is not set
 # CONFIG_USB_TRANCEVIBRATOR is not set
 # CONFIG_USB_IOWARRIOR is not set
 # CONFIG_USB_TEST is not set
 # CONFIG_USB_ISIGHTFW is not set
 # CONFIG_USB_VST is not set
-CONFIG_USB_GADGET=y
-# CONFIG_USB_GADGET_DEBUG_FILES is not set
-CONFIG_USB_GADGET_VBUS_DRAW=2
-CONFIG_USB_GADGET_SELECTED=y
-# CONFIG_USB_GADGET_AT91 is not set
-# CONFIG_USB_GADGET_ATMEL_USBA is not set
-# CONFIG_USB_GADGET_FSL_USB2 is not set
-# CONFIG_USB_GADGET_LH7A40X is not set
-# CONFIG_USB_GADGET_OMAP is not set
-# CONFIG_USB_GADGET_PXA25X is not set
-# CONFIG_USB_GADGET_R8A66597 is not set
-# CONFIG_USB_GADGET_PXA27X is not set
-# CONFIG_USB_GADGET_S3C_HSOTG is not set
-# CONFIG_USB_GADGET_IMX is not set
-# CONFIG_USB_GADGET_S3C2410 is not set
-# CONFIG_USB_GADGET_M66592 is not set
-# CONFIG_USB_GADGET_AMD5536UDC is not set
-# CONFIG_USB_GADGET_FSL_QE is not set
-# CONFIG_USB_GADGET_CI13XXX is not set
-# CONFIG_USB_GADGET_NET2280 is not set
-# CONFIG_USB_GADGET_GOKU is not set
-# CONFIG_USB_GADGET_LANGWELL is not set
-# CONFIG_USB_GADGET_DUMMY_HCD is not set
-CONFIG_USB_GADGET_DUALSPEED=y
-CONFIG_USB_ZERO=m
-CONFIG_USB_AUDIO=m
-CONFIG_USB_ETH=m
-CONFIG_USB_ETH_RNDIS=y
-# CONFIG_USB_ETH_EEM is not set
-CONFIG_USB_GADGETFS=m
-CONFIG_USB_FILE_STORAGE=m
-CONFIG_USB_FILE_STORAGE_TEST=y
-CONFIG_USB_G_SERIAL=m
-CONFIG_USB_MIDI_GADGET=m
-CONFIG_USB_G_PRINTER=m
-CONFIG_USB_CDC_COMPOSITE=m
+# CONFIG_USB_GADGET is not set
 
 #
 # OTG and related infrastructure
 #
 CONFIG_USB_OTG_UTILS=y
 # CONFIG_USB_GPIO_VBUS is not set
+# CONFIG_USB_ULPI is not set
 CONFIG_NOP_USB_XCEIV=y
 CONFIG_MMC=y
 # CONFIG_MMC_DEBUG is not set
-# CONFIG_MMC_UNSAFE_RESUME is not set
+CONFIG_MMC_UNSAFE_RESUME=y
 
 #
 # MMC/SD/SDIO Card Drivers
@@ -1620,6 +1489,7 @@ CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_DRV_PCF8563 is not set
 # CONFIG_RTC_DRV_PCF8583 is not set
 # CONFIG_RTC_DRV_M41T80 is not set
+# CONFIG_RTC_DRV_BQ32K is not set
 # CONFIG_RTC_DRV_S35390A is not set
 # CONFIG_RTC_DRV_FM3130 is not set
 # CONFIG_RTC_DRV_RX8581 is not set
@@ -1649,7 +1519,9 @@ CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_DRV_M48T86 is not set
 # CONFIG_RTC_DRV_M48T35 is not set
 # CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_MSM6242 is not set
 # CONFIG_RTC_DRV_BQ4802 is not set
+# CONFIG_RTC_DRV_RP5C01 is not set
 # CONFIG_RTC_DRV_V3020 is not set
 
 #
@@ -1682,11 +1554,7 @@ CONFIG_FS_MBCACHE=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 # CONFIG_FS_POSIX_ACL is not set
-CONFIG_XFS_FS=m
-# CONFIG_XFS_QUOTA is not set
-# CONFIG_XFS_POSIX_ACL is not set
-# CONFIG_XFS_RT is not set
-# CONFIG_XFS_DEBUG is not set
+# CONFIG_XFS_FS is not set
 # CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
 # CONFIG_BTRFS_FS is not set
@@ -1864,7 +1732,7 @@ CONFIG_FRAME_WARN=1024
 # CONFIG_DEBUG_KERNEL is not set
 # CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_SLUB_STATS is not set
-# CONFIG_DEBUG_BUGVERBOSE is not set
+CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_MEMORY_INIT is not set
 CONFIG_FRAME_POINTER=y
 # CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -1877,6 +1745,7 @@ CONFIG_TRACING_SUPPORT=y
 CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_ARM_UNWIND is not set
 # CONFIG_DEBUG_USER is not set
+# CONFIG_OC_ETM is not set
 
 #
 # Security options
@@ -1884,7 +1753,11 @@ CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
 # CONFIG_SECURITYFS is not set
-# CONFIG_SECURITY_FILE_CAPABILITIES is not set
+# CONFIG_DEFAULT_SECURITY_SELINUX is not set
+# CONFIG_DEFAULT_SECURITY_SMACK is not set
+# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_DEFAULT_SECURITY=""
 CONFIG_CRYPTO=y
 
 #
diff --git a/recipes/linux/linux-davinci_git.bb b/recipes/linux/linux-davinci_git.bb
index 67bc423b45..11df83415e 100644
--- a/recipes/linux/linux-davinci_git.bb
+++ b/recipes/linux/linux-davinci_git.bb
@@ -46,7 +46,10 @@ SRC_URI_append_dm6467-evm  = ${ARAGO_DM_URI}
 SRC_URI_append_dm6467t-evm = ${ARAGO_DM_URI}
 
 # OMAPL1 DA8xx/L1xx
-# da830-omapl137-evm/da850-omapl138-evm/hawkboard OMAPL1 PSP 03.20.00.08 (Beta)
+# da830-omapl137-evm/hawkboard OMAPL1 PSP 03.20.00.08 (Beta)
+# da850-omapl138-evm using 'master' branch
+#  - defconfig is psp defconfig + MMC unsafe (for deep-sleep) + tps/mfd/touchscreen configs 
+
 # The main PR is now using MACHINE_KERNEL_PR, for davinci see conf/machine/include/davinci.inc
 
 ARAGO_L1_REV = "e3939e092ce59a6906bf8869a3c7d40314c02eef"
@@ -55,15 +58,15 @@ ARAGO_L1_PV  = "2.6.31+2.6.32-rc6-${PR}+gitr${SRCREV}"
 ARAGO_L1_URI = "git://arago-project.org/git/people/sekhar/linux-omapl1.git;protocol=git;branch=${BRANCH} "
 
 SRCREV_da830-omapl137-evm         = ${ARAGO_L1_REV}
-SRCREV_da850-omapl138-evm         = ${ARAGO_L1_REV}
+SRCREV_da850-omapl138-evm         = "c4c048fa6de7ca7f1b971d013b806ab809259697"
 SRCREV_hawkboard                  = ${ARAGO_L1_REV}
 
 PV_da830-omapl137-evm             = ${ARAGO_L1_PV}
-PV_da850-omapl138-evm             = ${ARAGO_L1_PV}
+PV_da850-omapl138-evm             = "2.6.32+2.6.33-rc4-${PR}+gitr${SRCREV}"
 PV_hawkboard                      = ${ARAGO_L1_PV}
 
 BRANCH_da830-omapl137-evm         = ${ARAGO_L1_BR}
-BRANCH_da850-omapl138-evm         = ${ARAGO_L1_BR}
+BRANCH_da850-omapl138-evm         = "master"
 BRANCH_hawkboard                  = ${ARAGO_L1_BR}
 
 SRC_URI_append_da830-omapl137-evm = ${ARAGO_L1_URI}
@@ -71,17 +74,12 @@ 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://0001-CheckRegisterForDCDC.patch;patch=1 \
-                                     file://0002-DefDcDcTiedhigh.patch;patch=1 \
                                      file://0001-tps6507x_regulator_refactor.patch;patch=1 \
                                      file://0002-tps6507x_regulator_da850_integration.patch;patch=1 \
                                      file://0003-tps6507x_mfd_driver.patch;patch=1 \
                                      file://0004-tps6507x_regulator_naming_change.patch;patch=1 \
                                      file://0005-tps6507x_regulator_mfd_integration.patch;patch=1 \
-                                     file://0006-tps6507x_touchscreen_driver.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"
+                                     file://0006-tps6507x_touchscreen_driver.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"
author	Roger Monk <r-monk@ti.com>	2010-02-09 23:04:08 +0000
committer	Koen Kooi <koen@openembedded.org>	2010-04-12 19:43:18 +0200
commit	3aa2b62bb50f2c6f6790c9dfdcb8924c43250ca4 (patch)
tree	b4871f0ffc8ed877efe34751a2031edeccd872ae
parent	2e7b6b68e4d4d74b6f83b75cfa967aae5d93b306 (diff)