merge of '08199c52a592fe71e2675200cf618a439d710884'

     and '3e5f187370604cf4577025ebc49d90ca52a72d4d'

15 files changed, 3051 insertions, 1745 deletions

diff --git a/packages/linux/linux-omap2-git/beagleboard/00001-mcbsp-transform.patch b/packages/linux/linux-omap2-git/beagleboard/00001-mcbsp-transform.patch
deleted file mode 100644
index 452370bf3e..0000000000
--- a/packages/linux/linux-omap2-git/beagleboard/00001-mcbsp-transform.patch
+++ /dev/null
@@ -1,1160 +0,0 @@
-From: Eduardo Valentin <eduardo.valentin@indt.org.br>

-

-This patch transform mcbsp code into a very initial

-implementation of a platform driver.

-

-It also gets ride of ifdefs on mcbsp.c code.

-To do it, a platform data structure was defined.

-

-Platform devices are located in arch/arm/plat-omap/devices.c

-

-Signed-off-by: Eduardo Valentin <eduardo.valentin@indt.org.br>

----

- arch/arm/plat-omap/devices.c      |   45 +++

- arch/arm/plat-omap/mcbsp.c        |  660 ++++++++++++++-----------------------

- include/asm-arm/arch-omap/mcbsp.h |   73 ++++-

- 3 files changed, 367 insertions(+), 411 deletions(-)

-

-diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c

-index 099182b..b3e0147 100644

---- a/arch/arm/plat-omap/devices.c

-+++ b/arch/arm/plat-omap/devices.c

-@@ -27,6 +27,7 @@

- #include <asm/arch/gpio.h>

- #include <asm/arch/menelaus.h>

- #include <asm/arch/dsp_common.h>

-+#include <asm/arch/mcbsp.h>

- 

- #if	defined(CONFIG_OMAP_DSP) || defined(CONFIG_OMAP_DSP_MODULE)

- 

-@@ -150,6 +151,49 @@ static inline void omap_init_kp(void) {}

- #endif

- 

- /*-------------------------------------------------------------------------*/

-+#if defined(CONFIG_OMAP_MCBSP) || defined(CONFIG_OMAP_MCBSP_MODULE)

-+

-+static struct platform_device omap_mcbsp_devices[OMAP_MAX_MCBSP_COUNT];

-+static int mcbsps_configured;

-+

-+void omap_mcbsp_register_board_cfg(struct omap_mcbsp_platform_data *config,

-+					int size)

-+{

-+	int i;

-+

-+	if (size > OMAP_MAX_MCBSP_COUNT) {

-+		printk(KERN_WARNING "Registered too many McBSPs platform_data."

-+			" Using maximum (%d) available.\n",

-+			OMAP_MAX_MCBSP_COUNT);

-+		size = OMAP_MAX_MCBSP_COUNT;

-+	}

-+

-+	for (i = 0; i < size; i++) {

-+		struct platform_device *new_mcbsp = &omap_mcbsp_devices[i];

-+		new_mcbsp->name = "omap-mcbsp";

-+		new_mcbsp->id = i + 1;

-+		new_mcbsp->dev.platform_data = &config[i];

-+	}

-+	mcbsps_configured = size;

-+}

-+

-+static void __init omap_init_mcbsp(void)

-+{

-+	int i;

-+

-+	for (i = 0; i < mcbsps_configured; i++)

-+		platform_device_register(&omap_mcbsp_devices[i]);

-+}

-+#else

-+void omap_mcbsp_register_board_cfg(struct omap_mcbsp_platform_data *config,

-+					int size)

-+{  }

-+

-+static inline void __init omap_init_mcbsp(void)

-+{  }

-+#endif

-+

-+/*-------------------------------------------------------------------------*/

- 

- #if	defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) \

- 	|| defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE)

-@@ -511,6 +555,7 @@ static int __init omap_init_devices(void)

- 	 */

- 	omap_init_dsp();

- 	omap_init_kp();

-+	omap_init_mcbsp();

- 	omap_init_mmc();

- 	omap_init_uwire();

- 	omap_init_wdt();

-diff --git a/arch/arm/plat-omap/mcbsp.c b/arch/arm/plat-omap/mcbsp.c

-index 053de31..5536223 100644

---- a/arch/arm/plat-omap/mcbsp.c

-+++ b/arch/arm/plat-omap/mcbsp.c

-@@ -15,6 +15,7 @@

- #include <linux/module.h>

- #include <linux/init.h>

- #include <linux/device.h>

-+#include <linux/platform_device.h>

- #include <linux/wait.h>

- #include <linux/completion.h>

- #include <linux/interrupt.h>

-@@ -25,83 +26,53 @@

- #include <linux/irq.h>

- 

- #include <asm/arch/dma.h>

--#include <asm/arch/mux.h>

--#include <asm/arch/irqs.h>

--#include <asm/arch/dsp_common.h>

- #include <asm/arch/mcbsp.h>

- 

--#ifdef CONFIG_MCBSP_DEBUG

--#define DBG(x...)	printk(x)

--#else

--#define DBG(x...)			do { } while (0)

--#endif

--

--struct omap_mcbsp {

--	u32                          io_base;

--	u8                           id;

--	u8                           free;

--	omap_mcbsp_word_length       rx_word_length;

--	omap_mcbsp_word_length       tx_word_length;

--

--	omap_mcbsp_io_type_t         io_type; /* IRQ or poll */

--	/* IRQ based TX/RX */

--	int                          rx_irq;

--	int                          tx_irq;

--

--	/* DMA stuff */

--	u8                           dma_rx_sync;

--	short                        dma_rx_lch;

--	u8                           dma_tx_sync;

--	short                        dma_tx_lch;

--

--	/* Completion queues */

--	struct completion            tx_irq_completion;

--	struct completion            rx_irq_completion;

--	struct completion            tx_dma_completion;

--	struct completion            rx_dma_completion;

--

--	/* Protect the field .free, while checking if the mcbsp is in use */

--	spinlock_t                   lock;

--};

--

- static struct omap_mcbsp mcbsp[OMAP_MAX_MCBSP_COUNT];

--#ifdef CONFIG_ARCH_OMAP1

--static struct clk *mcbsp_dsp_ck;

--static struct clk *mcbsp_api_ck;

--static struct clk *mcbsp_dspxor_ck;

--#endif

--#ifdef CONFIG_ARCH_OMAP2

--static struct clk *mcbsp1_ick;

--static struct clk *mcbsp1_fck;

--static struct clk *mcbsp2_ick;

--static struct clk *mcbsp2_fck;

--#endif

-+

-+#define omap_mcbsp_check_valid_id(id)	(mcbsp[id].pdata && \

-+					mcbsp[id].pdata->ops && \

-+					mcbsp[id].pdata->ops->check && \

-+					(mcbsp[id].pdata->ops->check(id) == 0))

- 

- static void omap_mcbsp_dump_reg(u8 id)

- {

--	DBG("**** MCBSP%d regs ****\n", mcbsp[id].id);

--	DBG("DRR2:  0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, DRR2));

--	DBG("DRR1:  0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, DRR1));

--	DBG("DXR2:  0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, DXR2));

--	DBG("DXR1:  0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, DXR1));

--	DBG("SPCR2: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, SPCR2));

--	DBG("SPCR1: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, SPCR1));

--	DBG("RCR2:  0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, RCR2));

--	DBG("RCR1:  0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, RCR1));

--	DBG("XCR2:  0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, XCR2));

--	DBG("XCR1:  0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, XCR1));

--	DBG("SRGR2: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, SRGR2));

--	DBG("SRGR1: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, SRGR1));

--	DBG("PCR0:  0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, PCR0));

--	DBG("***********************\n");

-+	dev_dbg(mcbsp[id].dev, "**** McBSP%d regs ****\n", mcbsp[id].id);

-+	dev_dbg(mcbsp[id].dev, "DRR2:  0x%04x\n",

-+			OMAP_MCBSP_READ(mcbsp[id].io_base, DRR2));

-+	dev_dbg(mcbsp[id].dev, "DRR1:  0x%04x\n",

-+			OMAP_MCBSP_READ(mcbsp[id].io_base, DRR1));

-+	dev_dbg(mcbsp[id].dev, "DXR2:  0x%04x\n",

-+			OMAP_MCBSP_READ(mcbsp[id].io_base, DXR2));

-+	dev_dbg(mcbsp[id].dev, "DXR1:  0x%04x\n",

-+			OMAP_MCBSP_READ(mcbsp[id].io_base, DXR1));

-+	dev_dbg(mcbsp[id].dev, "SPCR2: 0x%04x\n",

-+			OMAP_MCBSP_READ(mcbsp[id].io_base, SPCR2));

-+	dev_dbg(mcbsp[id].dev, "SPCR1: 0x%04x\n",

-+			OMAP_MCBSP_READ(mcbsp[id].io_base, SPCR1));

-+	dev_dbg(mcbsp[id].dev, "RCR2:  0x%04x\n",

-+			OMAP_MCBSP_READ(mcbsp[id].io_base, RCR2));

-+	dev_dbg(mcbsp[id].dev, "RCR1:  0x%04x\n",

-+			OMAP_MCBSP_READ(mcbsp[id].io_base, RCR1));

-+	dev_dbg(mcbsp[id].dev, "XCR2:  0x%04x\n",

-+			OMAP_MCBSP_READ(mcbsp[id].io_base, XCR2));

-+	dev_dbg(mcbsp[id].dev, "XCR1:  0x%04x\n",

-+			OMAP_MCBSP_READ(mcbsp[id].io_base, XCR1));

-+	dev_dbg(mcbsp[id].dev, "SRGR2: 0x%04x\n",

-+			OMAP_MCBSP_READ(mcbsp[id].io_base, SRGR2));

-+	dev_dbg(mcbsp[id].dev, "SRGR1: 0x%04x\n",

-+			OMAP_MCBSP_READ(mcbsp[id].io_base, SRGR1));

-+	dev_dbg(mcbsp[id].dev, "PCR0:  0x%04x\n",

-+			OMAP_MCBSP_READ(mcbsp[id].io_base, PCR0));

-+	dev_dbg(mcbsp[id].dev, "***********************\n");

- }

- 

- static irqreturn_t omap_mcbsp_tx_irq_handler(int irq, void *dev_id)

- {

- 	struct omap_mcbsp *mcbsp_tx = dev_id;

- 

--	DBG("TX IRQ callback : 0x%x\n",

--	    OMAP_MCBSP_READ(mcbsp_tx->io_base, SPCR2));

-+	dev_dbg(mcbsp_tx->dev, "TX IRQ callback : 0x%x\n",

-+		OMAP_MCBSP_READ(mcbsp_tx->io_base, SPCR2));

- 

- 	complete(&mcbsp_tx->tx_irq_completion);

- 

-@@ -112,8 +83,8 @@ static irqreturn_t omap_mcbsp_rx_irq_handler(int irq, void *dev_id)

- {

- 	struct omap_mcbsp *mcbsp_rx = dev_id;

- 

--	DBG("RX IRQ callback : 0x%x\n",

--	    OMAP_MCBSP_READ(mcbsp_rx->io_base, SPCR2));

-+	dev_dbg(mcbsp_rx->dev, "RX IRQ callback : 0x%x\n",

-+		OMAP_MCBSP_READ(mcbsp_rx->io_base, SPCR2));

- 

- 	complete(&mcbsp_rx->rx_irq_completion);

- 

-@@ -124,8 +95,8 @@ static void omap_mcbsp_tx_dma_callback(int lch, u16 ch_status, void *data)

- {

- 	struct omap_mcbsp *mcbsp_dma_tx = data;

- 

--	DBG("TX DMA callback : 0x%x\n",

--	    OMAP_MCBSP_READ(mcbsp_dma_tx->io_base, SPCR2));

-+	dev_dbg(mcbsp_dma_tx->dev, "TX DMA callback : 0x%x\n",

-+		OMAP_MCBSP_READ(mcbsp_dma_tx->io_base, SPCR2));

- 

- 	/* We can free the channels */

- 	omap_free_dma(mcbsp_dma_tx->dma_tx_lch);

-@@ -138,8 +109,8 @@ static void omap_mcbsp_rx_dma_callback(int lch, u16 ch_status, void *data)

- {

- 	struct omap_mcbsp *mcbsp_dma_rx = data;

- 

--	DBG("RX DMA callback : 0x%x\n",

--	    OMAP_MCBSP_READ(mcbsp_dma_rx->io_base, SPCR2));

-+	dev_dbg(mcbsp_dma_rx->dev, "RX DMA callback : 0x%x\n",

-+		OMAP_MCBSP_READ(mcbsp_dma_rx->io_base, SPCR2));

- 

- 	/* We can free the channels */

- 	omap_free_dma(mcbsp_dma_rx->dma_rx_lch);

-@@ -156,9 +127,16 @@ static void omap_mcbsp_rx_dma_callback(int lch, u16 ch_status, void *data)

-  */

- void omap_mcbsp_config(unsigned int id, const struct omap_mcbsp_reg_cfg *config)

- {

--	u32 io_base = mcbsp[id].io_base;

-+	u32 io_base;

-+

-+	if (!omap_mcbsp_check_valid_id(id)) {

-+		printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1);

-+		return;

-+	}

- 

--	DBG("OMAP-McBSP: McBSP%d  io_base: 0x%8x\n", id + 1, io_base);

-+	io_base = mcbsp[id].io_base;

-+	dev_dbg(mcbsp[id].dev, "Configuring McBSP%d  io_base: 0x%8x\n",

-+			mcbsp[id].id, io_base);

- 

- 	/* We write the given config */

- 	OMAP_MCBSP_WRITE(io_base, SPCR2, config->spcr2);

-@@ -175,97 +153,22 @@ void omap_mcbsp_config(unsigned int id, const struct omap_mcbsp_reg_cfg *config)

- }

- EXPORT_SYMBOL(omap_mcbsp_config);

- 

--static int omap_mcbsp_check(unsigned int id)

--{

--	if (cpu_is_omap730()) {

--		if (id > OMAP_MAX_MCBSP_COUNT - 1) {

--		       printk(KERN_ERR "OMAP-McBSP: McBSP%d doesn't exist\n",

--				id + 1);

--		       return -1;

--		}

--		return 0;

--	}

--

--	if (cpu_is_omap15xx() || cpu_is_omap16xx() || cpu_is_omap24xx()) {

--		if (id > OMAP_MAX_MCBSP_COUNT) {

--			printk(KERN_ERR "OMAP-McBSP: McBSP%d doesn't exist\n",

--				id + 1);

--			return -1;

--		}

--		return 0;

--	}

--

--	return -1;

--}

--

--#ifdef CONFIG_ARCH_OMAP1

--static void omap_mcbsp_dsp_request(void)

--{

--	if (cpu_is_omap15xx() || cpu_is_omap16xx()) {

--		int ret;

--

--		ret = omap_dsp_request_mem();

--		if (ret < 0) {

--			printk(KERN_ERR "Could not get dsp memory: %i\n", ret);

--			return;

--		}

--

--		clk_enable(mcbsp_dsp_ck);

--		clk_enable(mcbsp_api_ck);

--

--		/* enable 12MHz clock to mcbsp 1 & 3 */

--		clk_enable(mcbsp_dspxor_ck);

--

--		/*

--		 * DSP external peripheral reset

--		 * FIXME: This should be moved to dsp code

--		 */

--		__raw_writew(__raw_readw(DSP_RSTCT2) | 1 | 1 << 1,

--			     DSP_RSTCT2);

--	}

--}

--

--static void omap_mcbsp_dsp_free(void)

--{

--	if (cpu_is_omap15xx() || cpu_is_omap16xx()) {

--		omap_dsp_release_mem();

--		clk_disable(mcbsp_dspxor_ck);

--		clk_disable(mcbsp_dsp_ck);

--		clk_disable(mcbsp_api_ck);

--	}

--}

--#endif

--

--#ifdef CONFIG_ARCH_OMAP2

--static void omap2_mcbsp2_mux_setup(void)

--{

--	if (cpu_is_omap2420()) {

--		omap_cfg_reg(Y15_24XX_MCBSP2_CLKX);

--		omap_cfg_reg(R14_24XX_MCBSP2_FSX);

--		omap_cfg_reg(W15_24XX_MCBSP2_DR);

--		omap_cfg_reg(V15_24XX_MCBSP2_DX);

--		omap_cfg_reg(V14_24XX_GPIO117);

--	}

--	/*

--	 * Need to add MUX settings for OMAP 2430 SDP

--	 */

--}

--#endif

--

- /*

-  * We can choose between IRQ based or polled IO.

-  * This needs to be called before omap_mcbsp_request().

-  */

- int omap_mcbsp_set_io_type(unsigned int id, omap_mcbsp_io_type_t io_type)

- {

--	if (omap_mcbsp_check(id) < 0)

--		return -EINVAL;

-+	if (!omap_mcbsp_check_valid_id(id)) {

-+		printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1);

-+		return -ENODEV;

-+	}

- 

- 	spin_lock(&mcbsp[id].lock);

- 

- 	if (!mcbsp[id].free) {

--		printk(KERN_ERR "OMAP-McBSP: McBSP%d is currently in use\n",

--			id + 1);

-+		dev_err(mcbsp[id].dev, "McBSP%d is currently in use\n",

-+			mcbsp[id].id);

- 		spin_unlock(&mcbsp[id].lock);

- 		return -EINVAL;

- 	}

-@@ -282,34 +185,20 @@ int omap_mcbsp_request(unsigned int id)

- {

- 	int err;

- 

--	if (omap_mcbsp_check(id) < 0)

--		return -EINVAL;

--

--#ifdef CONFIG_ARCH_OMAP1

--	/*

--	 * On 1510, 1610 and 1710, McBSP1 and McBSP3

--	 * are DSP public peripherals.

--	 */

--	if (id == OMAP_MCBSP1 || id == OMAP_MCBSP3)

--		omap_mcbsp_dsp_request();

--#endif

--

--#ifdef CONFIG_ARCH_OMAP2

--	if (cpu_is_omap24xx()) {

--		if (id == OMAP_MCBSP1) {

--			clk_enable(mcbsp1_ick);

--			clk_enable(mcbsp1_fck);

--		} else {

--			clk_enable(mcbsp2_ick);

--			clk_enable(mcbsp2_fck);

--		}

-+	if (!omap_mcbsp_check_valid_id(id)) {

-+		printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1);

-+		return -ENODEV;

- 	}

--#endif

-+

-+	if (mcbsp[id].pdata->ops->request)

-+		mcbsp[id].pdata->ops->request(id);

-+

-+	mcbsp_clk_enable(&mcbsp[id]);

- 

- 	spin_lock(&mcbsp[id].lock);

- 	if (!mcbsp[id].free) {

--		printk(KERN_ERR "OMAP-McBSP: McBSP%d is currently in use\n",

--			id + 1);

-+		dev_err(mcbsp[id].dev, "McBSP%d is currently in use\n",

-+			mcbsp[id].id);

- 		spin_unlock(&mcbsp[id].lock);

- 		return -1;

- 	}

-@@ -322,9 +211,9 @@ int omap_mcbsp_request(unsigned int id)

- 		err = request_irq(mcbsp[id].tx_irq, omap_mcbsp_tx_irq_handler,

- 					0, "McBSP", (void *) (&mcbsp[id]));

- 		if (err != 0) {

--			printk(KERN_ERR "OMAP-McBSP: Unable to "

--					"request TX IRQ %d for McBSP%d\n",

--					mcbsp[id].tx_irq, mcbsp[id].id);

-+			dev_err(mcbsp[id].dev, "Unable to request TX IRQ %d "

-+					"for McBSP%d\n", mcbsp[id].tx_irq,

-+					mcbsp[id].id);

- 			return err;

- 		}

- 

-@@ -333,9 +222,9 @@ int omap_mcbsp_request(unsigned int id)

- 		err = request_irq(mcbsp[id].rx_irq, omap_mcbsp_rx_irq_handler,

- 					0, "McBSP", (void *) (&mcbsp[id]));

- 		if (err != 0) {

--			printk(KERN_ERR "OMAP-McBSP: Unable to "

--					"request RX IRQ %d for McBSP%d\n",

--					mcbsp[id].rx_irq, mcbsp[id].id);

-+			dev_err(mcbsp[id].dev, "Unable to request RX IRQ %d "

-+					"for McBSP%d\n", mcbsp[id].rx_irq,

-+					mcbsp[id].id);

- 			free_irq(mcbsp[id].tx_irq, (void *) (&mcbsp[id]));

- 			return err;

- 		}

-@@ -349,32 +238,20 @@ EXPORT_SYMBOL(omap_mcbsp_request);

- 

- void omap_mcbsp_free(unsigned int id)

- {

--	if (omap_mcbsp_check(id) < 0)

-+	if (!omap_mcbsp_check_valid_id(id)) {

-+		printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1);

- 		return;

--

--#ifdef CONFIG_ARCH_OMAP1

--	if (cpu_class_is_omap1()) {

--		if (id == OMAP_MCBSP1 || id == OMAP_MCBSP3)

--			omap_mcbsp_dsp_free();

- 	}

--#endif

--

--#ifdef CONFIG_ARCH_OMAP2

--	if (cpu_is_omap24xx()) {

--		if (id == OMAP_MCBSP1) {

--			clk_disable(mcbsp1_ick);

--			clk_disable(mcbsp1_fck);

--		} else {

--			clk_disable(mcbsp2_ick);

--			clk_disable(mcbsp2_fck);

--		}

--	}

--#endif

-+

-+	if (mcbsp[id].pdata->ops->free)

-+		mcbsp[id].pdata->ops->free(id);

-+

-+	mcbsp_clk_disable(&mcbsp[id]);

- 

- 	spin_lock(&mcbsp[id].lock);

- 	if (mcbsp[id].free) {

--		printk(KERN_ERR "OMAP-McBSP: McBSP%d was not reserved\n",

--			id + 1);

-+		dev_err(mcbsp[id].dev, "McBSP%d was not reserved\n",

-+			mcbsp[id].id);

- 		spin_unlock(&mcbsp[id].lock);

- 		return;

- 	}

-@@ -400,8 +277,10 @@ void omap_mcbsp_start(unsigned int id)

- 	u32 io_base;

- 	u16 w;

- 

--	if (omap_mcbsp_check(id) < 0)

-+	if (!omap_mcbsp_check_valid_id(id)) {

-+		printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1);

- 		return;

-+	}

- 

- 	io_base = mcbsp[id].io_base;

- 

-@@ -435,8 +314,10 @@ void omap_mcbsp_stop(unsigned int id)

- 	u32 io_base;

- 	u16 w;

- 

--	if (omap_mcbsp_check(id) < 0)

-+	if (!omap_mcbsp_check_valid_id(id)) {

-+		printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1);

- 		return;

-+	}

- 

- 	io_base = mcbsp[id].io_base;

- 

-@@ -457,7 +338,14 @@ EXPORT_SYMBOL(omap_mcbsp_stop);

- /* polled mcbsp i/o operations */

- int omap_mcbsp_pollwrite(unsigned int id, u16 buf)

- {

--	u32 base = mcbsp[id].io_base;

-+	u32 base;

-+

-+	if (!omap_mcbsp_check_valid_id(id)) {

-+		printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1);

-+		return -ENODEV;

-+	}

-+

-+	base = mcbsp[id].io_base;

- 	writew(buf, base + OMAP_MCBSP_REG_DXR1);

- 	/* if frame sync error - clear the error */

- 	if (readw(base + OMAP_MCBSP_REG_SPCR2) & XSYNC_ERR) {

-@@ -479,8 +367,8 @@ int omap_mcbsp_pollwrite(unsigned int id, u16 buf)

- 				       (XRST),

- 				       base + OMAP_MCBSP_REG_SPCR2);

- 				udelay(10);

--				printk(KERN_ERR

--				       " Could not write to McBSP Register\n");

-+				dev_err(mcbsp[id].dev, "Could not write to"

-+					" McBSP%d Register\n", mcbsp[id].id);

- 				return -2;

- 			}

- 		}

-@@ -492,7 +380,14 @@ EXPORT_SYMBOL(omap_mcbsp_pollwrite);

- 

- int omap_mcbsp_pollread(unsigned int id, u16 *buf)

- {

--	u32 base = mcbsp[id].io_base;

-+	u32 base;

-+

-+	if (!omap_mcbsp_check_valid_id(id)) {

-+		printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1);

-+		return -ENODEV;

-+	}

-+

-+	base = mcbsp[id].io_base;

- 	/* if frame sync error - clear the error */

- 	if (readw(base + OMAP_MCBSP_REG_SPCR1) & RSYNC_ERR) {

- 		/* clear error */

-@@ -513,8 +408,8 @@ int omap_mcbsp_pollread(unsigned int id, u16 *buf)

- 				       (RRST),

- 				       base + OMAP_MCBSP_REG_SPCR1);

- 				udelay(10);

--				printk(KERN_ERR

--				       " Could not read from McBSP Register\n");

-+				dev_err(mcbsp[id].dev, "Could not read from"

-+					" McBSP%d Register\n", mcbsp[id].id);

- 				return -2;

- 			}

- 		}

-@@ -531,12 +426,15 @@ EXPORT_SYMBOL(omap_mcbsp_pollread);

- void omap_mcbsp_xmit_word(unsigned int id, u32 word)

- {

- 	u32 io_base;

--	omap_mcbsp_word_length word_length = mcbsp[id].tx_word_length;

-+	omap_mcbsp_word_length word_length;

- 

--	if (omap_mcbsp_check(id) < 0)

-+	if (!omap_mcbsp_check_valid_id(id)) {

-+		printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1);

- 		return;

-+	}

- 

- 	io_base = mcbsp[id].io_base;

-+	word_length = mcbsp[id].tx_word_length;

- 

- 	wait_for_completion(&(mcbsp[id].tx_irq_completion));

- 

-@@ -550,11 +448,14 @@ u32 omap_mcbsp_recv_word(unsigned int id)

- {

- 	u32 io_base;

- 	u16 word_lsb, word_msb = 0;

--	omap_mcbsp_word_length word_length = mcbsp[id].rx_word_length;

-+	omap_mcbsp_word_length word_length;

- 

--	if (omap_mcbsp_check(id) < 0)

--		return -EINVAL;

-+	if (!omap_mcbsp_check_valid_id(id)) {

-+		printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1);

-+		return -ENODEV;

-+	}

- 

-+	word_length = mcbsp[id].rx_word_length;

- 	io_base = mcbsp[id].io_base;

- 

- 	wait_for_completion(&(mcbsp[id].rx_irq_completion));

-@@ -569,11 +470,20 @@ EXPORT_SYMBOL(omap_mcbsp_recv_word);

- 

- int omap_mcbsp_spi_master_xmit_word_poll(unsigned int id, u32 word)

- {

--	u32 io_base = mcbsp[id].io_base;

--	omap_mcbsp_word_length tx_word_length = mcbsp[id].tx_word_length;

--	omap_mcbsp_word_length rx_word_length = mcbsp[id].rx_word_length;

-+	u32 io_base;

-+	omap_mcbsp_word_length tx_word_length;

-+	omap_mcbsp_word_length rx_word_length;

- 	u16 spcr2, spcr1, attempts = 0, word_lsb, word_msb = 0;

- 

-+	if (!omap_mcbsp_check_valid_id(id)) {

-+		printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1);

-+		return -ENODEV;

-+	}

-+

-+	io_base = mcbsp[id].io_base;

-+	tx_word_length = mcbsp[id].tx_word_length;

-+	rx_word_length = mcbsp[id].rx_word_length;

-+

- 	if (tx_word_length != rx_word_length)

- 		return -EINVAL;

- 

-@@ -587,7 +497,8 @@ int omap_mcbsp_spi_master_xmit_word_poll(unsigned int id, u32 word)

- 			udelay(10);

- 			OMAP_MCBSP_WRITE(io_base, SPCR2, spcr2 | XRST);

- 			udelay(10);

--			printk(KERN_ERR "McBSP transmitter not ready\n");

-+			dev_err(mcbsp[id].dev, "McBSP%d transmitter not "

-+				"ready\n", mcbsp[id].id);

- 			return -EAGAIN;

- 		}

- 	}

-@@ -607,7 +518,8 @@ int omap_mcbsp_spi_master_xmit_word_poll(unsigned int id, u32 word)

- 			udelay(10);

- 			OMAP_MCBSP_WRITE(io_base, SPCR1, spcr1 | RRST);

- 			udelay(10);

--			printk(KERN_ERR "McBSP receiver not ready\n");

-+			dev_err(mcbsp[id].dev, "McBSP%d receiver not "

-+				"ready\n", mcbsp[id].id);

- 			return -EAGAIN;

- 		}

- 	}

-@@ -623,11 +535,20 @@ EXPORT_SYMBOL(omap_mcbsp_spi_master_xmit_word_poll);

- 

- int omap_mcbsp_spi_master_recv_word_poll(unsigned int id, u32 *word)

- {

--	u32 io_base = mcbsp[id].io_base, clock_word = 0;

--	omap_mcbsp_word_length tx_word_length = mcbsp[id].tx_word_length;

--	omap_mcbsp_word_length rx_word_length = mcbsp[id].rx_word_length;

-+	u32 io_base, clock_word = 0;

-+	omap_mcbsp_word_length tx_word_length;

-+	omap_mcbsp_word_length rx_word_length;

- 	u16 spcr2, spcr1, attempts = 0, word_lsb, word_msb = 0;

- 

-+	if (!omap_mcbsp_check_valid_id(id)) {

-+		printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1);

-+		return -ENODEV;

-+	}

-+

-+	io_base = mcbsp[id].io_base;

-+	tx_word_length = mcbsp[id].tx_word_length;

-+	rx_word_length = mcbsp[id].rx_word_length;

-+

- 	if (tx_word_length != rx_word_length)

- 		return -EINVAL;

- 

-@@ -641,7 +562,8 @@ int omap_mcbsp_spi_master_recv_word_poll(unsigned int id, u32 *word)

- 			udelay(10);

- 			OMAP_MCBSP_WRITE(io_base, SPCR2, spcr2 | XRST);

- 			udelay(10);

--			printk(KERN_ERR "McBSP transmitter not ready\n");

-+			dev_err(mcbsp[id].dev, "McBSP%d transmitter not "

-+				"ready\n", mcbsp[id].id);

- 			return -EAGAIN;

- 		}

- 	}

-@@ -661,7 +583,8 @@ int omap_mcbsp_spi_master_recv_word_poll(unsigned int id, u32 *word)

- 			udelay(10);

- 			OMAP_MCBSP_WRITE(io_base, SPCR1, spcr1 | RRST);

- 			udelay(10);

--			printk(KERN_ERR "McBSP receiver not ready\n");

-+			dev_err(mcbsp[id].dev, "McBSP%d receiver not "

-+				"ready\n", mcbsp[id].id);

- 			return -EAGAIN;

- 		}

- 	}

-@@ -692,20 +615,24 @@ int omap_mcbsp_xmit_buffer(unsigned int id, dma_addr_t buffer,

- 	int dest_port = 0;

- 	int sync_dev = 0;

- 

--	if (omap_mcbsp_check(id) < 0)

--		return -EINVAL;

-+	if (!omap_mcbsp_check_valid_id(id)) {

-+		printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1);

-+		return -ENODEV;

-+	}

- 

- 	if (omap_request_dma(mcbsp[id].dma_tx_sync, "McBSP TX",

- 				omap_mcbsp_tx_dma_callback,

- 				&mcbsp[id],

- 				&dma_tx_ch)) {

--		printk(KERN_ERR "OMAP-McBSP: Unable to request DMA channel for"

--				" McBSP%d TX. Trying IRQ based TX\n", id + 1);

-+		dev_err(mcbsp[id].dev, " Unable to request DMA channel for "

-+				"McBSP%d TX. Trying IRQ based TX\n",

-+				mcbsp[id].id);

- 		return -EAGAIN;

- 	}

- 	mcbsp[id].dma_tx_lch = dma_tx_ch;

- 

--	DBG("TX DMA on channel %d\n", dma_tx_ch);

-+	dev_err(mcbsp[id].dev, "McBSP%d TX DMA on channel %d\n", mcbsp[id].id,

-+		dma_tx_ch);

- 

- 	init_completion(&(mcbsp[id].tx_dma_completion));

- 

-@@ -713,7 +640,7 @@ int omap_mcbsp_xmit_buffer(unsigned int id, dma_addr_t buffer,

- 		src_port = OMAP_DMA_PORT_TIPB;

- 		dest_port = OMAP_DMA_PORT_EMIFF;

- 	}

--	if (cpu_is_omap24xx())

-+	if (cpu_class_is_omap2())

- 		sync_dev = mcbsp[id].dma_tx_sync;

- 

- 	omap_set_dma_transfer_params(mcbsp[id].dma_tx_lch,

-@@ -749,20 +676,24 @@ int omap_mcbsp_recv_buffer(unsigned int id, dma_addr_t buffer,

- 	int dest_port = 0;

- 	int sync_dev = 0;

- 

--	if (omap_mcbsp_check(id) < 0)

--		return -EINVAL;

-+	if (!omap_mcbsp_check_valid_id(id)) {

-+		printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1);

-+		return -ENODEV;

-+	}

- 

- 	if (omap_request_dma(mcbsp[id].dma_rx_sync, "McBSP RX",

- 				omap_mcbsp_rx_dma_callback,

- 				&mcbsp[id],

- 				&dma_rx_ch)) {

--		printk(KERN_ERR "Unable to request DMA channel for McBSP%d RX."

--				" Trying IRQ based RX\n", id + 1);

-+		dev_err(mcbsp[id].dev, "Unable to request DMA channel for "

-+				"McBSP%d RX. Trying IRQ based RX\n",

-+				mcbsp[id].id);

- 		return -EAGAIN;

- 	}

- 	mcbsp[id].dma_rx_lch = dma_rx_ch;

- 

--	DBG("RX DMA on channel %d\n", dma_rx_ch);

-+	dev_err(mcbsp[id].dev, "McBSP%d RX DMA on channel %d\n", mcbsp[id].id,

-+		dma_rx_ch);

- 

- 	init_completion(&(mcbsp[id].rx_dma_completion));

- 

-@@ -770,7 +701,7 @@ int omap_mcbsp_recv_buffer(unsigned int id, dma_addr_t buffer,

- 		src_port = OMAP_DMA_PORT_TIPB;

- 		dest_port = OMAP_DMA_PORT_EMIFF;

- 	}

--	if (cpu_is_omap24xx())

-+	if (cpu_class_is_omap2())

- 		sync_dev = mcbsp[id].dma_rx_sync;

- 

- 	omap_set_dma_transfer_params(mcbsp[id].dma_rx_lch,

-@@ -809,8 +740,10 @@ void omap_mcbsp_set_spi_mode(unsigned int id,

- {

- 	struct omap_mcbsp_reg_cfg mcbsp_cfg;

- 

--	if (omap_mcbsp_check(id) < 0)

-+	if (!omap_mcbsp_check_valid_id(id)) {

-+		printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1);

- 		return;

-+	}

- 

- 	memset(&mcbsp_cfg, 0, sizeof(struct omap_mcbsp_reg_cfg));

- 

-@@ -871,182 +804,91 @@ EXPORT_SYMBOL(omap_mcbsp_set_spi_mode);

-  * McBSP1 and McBSP3 are directly mapped on 1610 and 1510.

-  * 730 has only 2 McBSP, and both of them are MPU peripherals.

-  */

--struct omap_mcbsp_info {

--	u32 virt_base;

--	u8 dma_rx_sync, dma_tx_sync;

--	u16 rx_irq, tx_irq;

--};

-+static int __init omap_mcbsp_probe(struct platform_device *pdev)

-+{

-+	struct omap_mcbsp_platform_data *pdata = pdev->dev.platform_data;

-+	int id = pdev->id - 1;

-+	int ret = 0;

-+	int i;

- 

--#ifdef CONFIG_ARCH_OMAP730

--static const struct omap_mcbsp_info mcbsp_730[] = {

--	[0] = { .virt_base = io_p2v(OMAP730_MCBSP1_BASE),

--		.dma_rx_sync = OMAP_DMA_MCBSP1_RX,

--		.dma_tx_sync = OMAP_DMA_MCBSP1_TX,

--		.rx_irq = INT_730_McBSP1RX,

--		.tx_irq = INT_730_McBSP1TX },

--	[1] = { .virt_base = io_p2v(OMAP730_MCBSP2_BASE),

--		.dma_rx_sync = OMAP_DMA_MCBSP3_RX,

--		.dma_tx_sync = OMAP_DMA_MCBSP3_TX,

--		.rx_irq = INT_730_McBSP2RX,

--		.tx_irq = INT_730_McBSP2TX },

--};

--#endif

--

--#ifdef CONFIG_ARCH_OMAP15XX

--static const struct omap_mcbsp_info mcbsp_1510[] = {

--	[0] = { .virt_base = OMAP1510_MCBSP1_BASE,

--		.dma_rx_sync = OMAP_DMA_MCBSP1_RX,

--		.dma_tx_sync = OMAP_DMA_MCBSP1_TX,

--		.rx_irq = INT_McBSP1RX,

--		.tx_irq = INT_McBSP1TX },

--	[1] = { .virt_base = io_p2v(OMAP1510_MCBSP2_BASE),

--		.dma_rx_sync = OMAP_DMA_MCBSP2_RX,

--		.dma_tx_sync = OMAP_DMA_MCBSP2_TX,

--		.rx_irq = INT_1510_SPI_RX,

--		.tx_irq = INT_1510_SPI_TX },

--	[2] = { .virt_base = OMAP1510_MCBSP3_BASE,

--		.dma_rx_sync = OMAP_DMA_MCBSP3_RX,

--		.dma_tx_sync = OMAP_DMA_MCBSP3_TX,

--		.rx_irq = INT_McBSP3RX,

--		.tx_irq = INT_McBSP3TX },

--};

--#endif

--

--#if defined(CONFIG_ARCH_OMAP16XX)

--static const struct omap_mcbsp_info mcbsp_1610[] = {

--	[0] = { .virt_base = OMAP1610_MCBSP1_BASE,

--		.dma_rx_sync = OMAP_DMA_MCBSP1_RX,

--		.dma_tx_sync = OMAP_DMA_MCBSP1_TX,

--		.rx_irq = INT_McBSP1RX,

--		.tx_irq = INT_McBSP1TX },

--	[1] = { .virt_base = io_p2v(OMAP1610_MCBSP2_BASE),

--		.dma_rx_sync = OMAP_DMA_MCBSP2_RX,

--		.dma_tx_sync = OMAP_DMA_MCBSP2_TX,

--		.rx_irq = INT_1610_McBSP2_RX,

--		.tx_irq = INT_1610_McBSP2_TX },

--	[2] = { .virt_base = OMAP1610_MCBSP3_BASE,

--		.dma_rx_sync = OMAP_DMA_MCBSP3_RX,

--		.dma_tx_sync = OMAP_DMA_MCBSP3_TX,

--		.rx_irq = INT_McBSP3RX,

--		.tx_irq = INT_McBSP3TX },

--};

--#endif

--

--#if defined(CONFIG_ARCH_OMAP24XX)

--static const struct omap_mcbsp_info mcbsp_24xx[] = {

--	[0] = { .virt_base = IO_ADDRESS(OMAP24XX_MCBSP1_BASE),

--		.dma_rx_sync = OMAP24XX_DMA_MCBSP1_RX,

--		.dma_tx_sync = OMAP24XX_DMA_MCBSP1_TX,

--		.rx_irq = INT_24XX_MCBSP1_IRQ_RX,

--		.tx_irq = INT_24XX_MCBSP1_IRQ_TX,

--		},

--	[1] = { .virt_base = IO_ADDRESS(OMAP24XX_MCBSP2_BASE),

--		.dma_rx_sync = OMAP24XX_DMA_MCBSP2_RX,

--		.dma_tx_sync = OMAP24XX_DMA_MCBSP2_TX,

--		.rx_irq = INT_24XX_MCBSP2_IRQ_RX,

--		.tx_irq = INT_24XX_MCBSP2_IRQ_TX,

--		},

--};

--#endif

-+	if (!pdata) {

-+		dev_err(&pdev->dev, "McBSP device initialized without"

-+				"platform data\n");

-+		ret = -EINVAL;

-+		goto exit;

-+	}

- 

--static int __init omap_mcbsp_init(void)

-+	dev_dbg(&pdev->dev, "Initializing OMAP McBSP (%d).\n", pdev->id);

-+

-+	if (id >= OMAP_MAX_MCBSP_COUNT) {

-+		dev_err(&pdev->dev, "Invalid McBSP device id (%d)\n", id);

-+		ret = -EINVAL;

-+		goto exit;

-+	}

-+

-+	spin_lock_init(&mcbsp[id].lock);

-+	mcbsp[id].id = id + 1;

-+	mcbsp[id].free = 1;

-+	mcbsp[id].dma_tx_lch = -1;

-+	mcbsp[id].dma_rx_lch = -1;

-+

-+	mcbsp[id].io_base = pdata->virt_base;

-+	/* Default I/O is IRQ based */

-+	mcbsp[id].io_type = OMAP_MCBSP_IRQ_IO;

-+	mcbsp[id].tx_irq = pdata->tx_irq;

-+	mcbsp[id].rx_irq = pdata->rx_irq;

-+	mcbsp[id].dma_rx_sync = pdata->dma_rx_sync;

-+	mcbsp[id].dma_tx_sync = pdata->dma_tx_sync;

-+

-+	mcbsp[id].nr_clocks = ARRAY_SIZE(pdata->clocks);

-+	for (i = 0; i < ARRAY_SIZE(pdata->clocks); i++)

-+		mcbsp[id].clocks[i] = clk_get(&pdev->dev, pdata->clocks[i]);

-+

-+	mcbsp[id].pdata = pdata;

-+	mcbsp[id].dev = &pdev->dev;

-+	platform_set_drvdata(pdev, &mcbsp[id]);

-+

-+exit:

-+	return ret;

-+}

-+

-+static int omap_mcbsp_remove(struct platform_device *pdev)

- {

--	int mcbsp_count = 0, i;

--	static const struct omap_mcbsp_info *mcbsp_info;

-+	struct omap_mcbsp *mcbsp = platform_get_drvdata(pdev);

- 

--	printk(KERN_INFO "Initializing OMAP McBSP system\n");

-+	platform_set_drvdata(pdev, NULL);

-+	if (mcbsp) {

-+		int i;

- 

--#ifdef CONFIG_ARCH_OMAP1

--	mcbsp_dsp_ck = clk_get(0, "dsp_ck");

--	if (IS_ERR(mcbsp_dsp_ck)) {

--		printk(KERN_ERR "mcbsp: could not acquire dsp_ck handle.\n");

--		return PTR_ERR(mcbsp_dsp_ck);

--	}

--	mcbsp_api_ck = clk_get(0, "api_ck");

--	if (IS_ERR(mcbsp_api_ck)) {

--		printk(KERN_ERR "mcbsp: could not acquire api_ck handle.\n");

--		return PTR_ERR(mcbsp_api_ck);

--	}

--	mcbsp_dspxor_ck = clk_get(0, "dspxor_ck");

--	if (IS_ERR(mcbsp_dspxor_ck)) {

--		printk(KERN_ERR "mcbsp: could not acquire dspxor_ck handle.\n");

--		return PTR_ERR(mcbsp_dspxor_ck);

--	}

--#endif

--#ifdef CONFIG_ARCH_OMAP2

--	mcbsp1_ick = clk_get(0, "mcbsp1_ick");

--	if (IS_ERR(mcbsp1_ick)) {

--		printk(KERN_ERR "mcbsp: could not acquire "

--				"mcbsp1_ick handle.\n");

--		return PTR_ERR(mcbsp1_ick);

--	}

--	mcbsp1_fck = clk_get(0, "mcbsp1_fck");

--	if (IS_ERR(mcbsp1_fck)) {

--		printk(KERN_ERR "mcbsp: could not acquire "

--				"mcbsp1_fck handle.\n");

--		return PTR_ERR(mcbsp1_fck);

--	}

--	mcbsp2_ick = clk_get(0, "mcbsp2_ick");

--	if (IS_ERR(mcbsp2_ick)) {

--		printk(KERN_ERR "mcbsp: could not acquire "

--				"mcbsp2_ick handle.\n");

--		return PTR_ERR(mcbsp2_ick);

--	}

--	mcbsp2_fck = clk_get(0, "mcbsp2_fck");

--	if (IS_ERR(mcbsp2_fck)) {

--		printk(KERN_ERR "mcbsp: could not acquire "

--				"mcbsp2_fck handle.\n");

--		return PTR_ERR(mcbsp2_fck);

--	}

--#endif

-+		if (mcbsp->pdata && mcbsp->pdata->ops &&

-+				mcbsp->pdata->ops->free)

-+			mcbsp->pdata->ops->free(mcbsp->id);

- 

--#ifdef CONFIG_ARCH_OMAP730

--	if (cpu_is_omap730()) {

--		mcbsp_info = mcbsp_730;

--		mcbsp_count = ARRAY_SIZE(mcbsp_730);

--	}

--#endif

--#ifdef CONFIG_ARCH_OMAP15XX

--	if (cpu_is_omap15xx()) {

--		mcbsp_info = mcbsp_1510;

--		mcbsp_count = ARRAY_SIZE(mcbsp_1510);

--	}

--#endif

--#if defined(CONFIG_ARCH_OMAP16XX)

--	if (cpu_is_omap16xx()) {

--		mcbsp_info = mcbsp_1610;

--		mcbsp_count = ARRAY_SIZE(mcbsp_1610);

--	}

--#endif

--#if defined(CONFIG_ARCH_OMAP24XX)

--	if (cpu_is_omap24xx()) {

--		mcbsp_info = mcbsp_24xx;

--		mcbsp_count = ARRAY_SIZE(mcbsp_24xx);

--		omap2_mcbsp2_mux_setup();

--	}

--#endif

--	for (i = 0; i < OMAP_MAX_MCBSP_COUNT ; i++) {

--		if (i >= mcbsp_count) {

--			mcbsp[i].io_base = 0;

--			mcbsp[i].free = 0;

--			continue;

--		}

--		mcbsp[i].id = i + 1;

--		mcbsp[i].free = 1;

--		mcbsp[i].dma_tx_lch = -1;

--		mcbsp[i].dma_rx_lch = -1;

--

--		mcbsp[i].io_base = mcbsp_info[i].virt_base;

--		/* Default I/O is IRQ based */

--		mcbsp[i].io_type = OMAP_MCBSP_IRQ_IO;

--		mcbsp[i].tx_irq = mcbsp_info[i].tx_irq;

--		mcbsp[i].rx_irq = mcbsp_info[i].rx_irq;

--		mcbsp[i].dma_rx_sync = mcbsp_info[i].dma_rx_sync;

--		mcbsp[i].dma_tx_sync = mcbsp_info[i].dma_tx_sync;

--		spin_lock_init(&mcbsp[i].lock);

-+		mcbsp_clk_disable(mcbsp);

-+		mcbsp_clk_put(mcbsp);

-+

-+		for (i = 0; i < mcbsp->nr_clocks; i++)

-+			mcbsp->clocks[i] = NULL;

-+

-+		mcbsp->free = 0;

-+		mcbsp->dev = NULL;

- 	}

- 

- 	return 0;

- }

- 

--arch_initcall(omap_mcbsp_init);

-+static struct platform_driver omap_mcbsp_driver = {

-+	.probe		= omap_mcbsp_probe,

-+	.remove		= omap_mcbsp_remove,

-+	.driver		= {

-+		.name	= "omap-mcbsp",

-+	},

-+};

-+

-+int __init omap_mcbsp_init(void)

-+{

-+	/* Register the McBSP driver */

-+	return platform_driver_register(&omap_mcbsp_driver);

-+}

-+

-+

-diff --git a/include/asm-arm/arch-omap/mcbsp.h b/include/asm-arm/arch-omap/mcbsp.h

-index b53c3b2..aa47421 100644

---- a/include/asm-arm/arch-omap/mcbsp.h

-+++ b/include/asm-arm/arch-omap/mcbsp.h

-@@ -24,7 +24,11 @@

- #ifndef __ASM_ARCH_OMAP_MCBSP_H

- #define __ASM_ARCH_OMAP_MCBSP_H

- 

-+#include <linux/completion.h>

-+#include <linux/spinlock.h>

-+

- #include <asm/hardware.h>

-+#include <asm/arch/clock.h>

- 

- #define OMAP730_MCBSP1_BASE	0xfffb1000

- #define OMAP730_MCBSP2_BASE	0xfffb1800

-@@ -40,6 +44,9 @@

- #define OMAP24XX_MCBSP1_BASE	0x48074000

- #define OMAP24XX_MCBSP2_BASE	0x48076000

- 

-+#define OMAP34XX_MCBSP1_BASE	0x48074000

-+#define OMAP34XX_MCBSP2_BASE	0x49022000

-+

- #if defined(CONFIG_ARCH_OMAP15XX) || defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP730)

- 

- #define OMAP_MCBSP_REG_DRR2	0x00

-@@ -74,7 +81,8 @@

- #define OMAP_MCBSP_REG_XCERG	0x3A

- #define OMAP_MCBSP_REG_XCERH	0x3C

- 

--#define OMAP_MAX_MCBSP_COUNT 3

-+#define OMAP_MAX_MCBSP_COUNT	3

-+#define MAX_MCBSP_CLOCKS	3

- 

- #define AUDIO_MCBSP_DATAWRITE	(OMAP1510_MCBSP1_BASE + OMAP_MCBSP_REG_DXR1)

- #define AUDIO_MCBSP_DATAREAD	(OMAP1510_MCBSP1_BASE + OMAP_MCBSP_REG_DRR1)

-@@ -117,7 +125,8 @@

- #define OMAP_MCBSP_REG_XCERG	0x74

- #define OMAP_MCBSP_REG_XCERH	0x78

- 

--#define OMAP_MAX_MCBSP_COUNT 2

-+#define OMAP_MAX_MCBSP_COUNT	2

-+#define MAX_MCBSP_CLOCKS	2

- 

- #define AUDIO_MCBSP_DATAWRITE	(OMAP24XX_MCBSP2_BASE + OMAP_MCBSP_REG_DXR1)

- #define AUDIO_MCBSP_DATAREAD	(OMAP24XX_MCBSP2_BASE + OMAP_MCBSP_REG_DRR1)

-@@ -298,6 +307,66 @@ struct omap_mcbsp_spi_cfg {

- 	omap_mcbsp_word_length		word_length;

- };

- 

-+/* Platform specific configuration */

-+struct omap_mcbsp_ops {

-+	void (*request)(unsigned int);

-+	void (*free)(unsigned int);

-+	int (*check)(unsigned int);

-+};

-+

-+struct omap_mcbsp_platform_data {

-+	u32 virt_base;

-+	u8 dma_rx_sync, dma_tx_sync;

-+	u16 rx_irq, tx_irq;

-+	struct omap_mcbsp_ops *ops;

-+	char const *clocks[MAX_MCBSP_CLOCKS];

-+};

-+

-+struct omap_mcbsp {

-+	struct device *dev;

-+	u32 io_base;

-+	u8 id;

-+	u8 free;

-+	omap_mcbsp_word_length rx_word_length;

-+	omap_mcbsp_word_length tx_word_length;

-+

-+	omap_mcbsp_io_type_t io_type; /* IRQ or poll */

-+	/* IRQ based TX/RX */

-+	int rx_irq;

-+	int tx_irq;

-+

-+	/* DMA stuff */

-+	u8 dma_rx_sync;

-+	short dma_rx_lch;

-+	u8 dma_tx_sync;

-+	short dma_tx_lch;

-+

-+	/* Completion queues */

-+	struct completion tx_irq_completion;

-+	struct completion rx_irq_completion;

-+	struct completion tx_dma_completion;

-+	struct completion rx_dma_completion;

-+

-+	/* Protect the field .free, while checking if the mcbsp is in use */

-+	spinlock_t lock;

-+	struct omap_mcbsp_platform_data *pdata;

-+	int nr_clocks;

-+	struct clk *clocks[MAX_MCBSP_CLOCKS];

-+};

-+

-+#define __mcbsp_clk_op(mcbsp, op)				\

-+	do {							\

-+		int i;						\

-+		for (i = 0; i < mcbsp->nr_clocks; i++)		\

-+			clk_##op(mcbsp->clocks[i]); 		\

-+	} while (0)

-+#define mcbsp_clk_enable(mcbsp)		__mcbsp_clk_op((mcbsp), enable)

-+#define mcbsp_clk_disable(mcbsp)	__mcbsp_clk_op((mcbsp), disable)

-+#define mcbsp_clk_put(mcbsp)		__mcbsp_clk_op((mcbsp), put)

-+

-+int omap_mcbsp_init(void);

-+void omap_mcbsp_register_board_cfg(struct omap_mcbsp_platform_data *config,

-+					int size);

- void omap_mcbsp_config(unsigned int id, const struct omap_mcbsp_reg_cfg * config);

- int omap_mcbsp_request(unsigned int id);

- void omap_mcbsp_free(unsigned int id);

--- 

-1.5.5.1.67.gbdb8.dirty

-

---

-To unsubscribe from this list: send the line "unsubscribe linux-omap" in

-the body of a message to majordomo@vger.kernel.org

-More majordomo info at  http://vger.kernel.org/majordomo-info.html

-

diff --git a/packages/linux/linux-omap2-git/beagleboard/00002-mcbsp-omap1.patch b/packages/linux/linux-omap2-git/beagleboard/00002-mcbsp-omap1.patch
deleted file mode 100644
index 76246a9fae..0000000000
--- a/packages/linux/linux-omap2-git/beagleboard/00002-mcbsp-omap1.patch
+++ /dev/null
@@ -1,204 +0,0 @@
-From: Eduardo Valentin <eduardo.valentin@indt.org.br>

-

-This patch adds support for mach-omap1 based on current

-mcbsp platform driver.

-

-Signed-off-by: Eduardo Valentin <eduardo.valentin@indt.org.br>

----

- arch/arm/mach-omap1/Makefile |    2 +

- arch/arm/mach-omap1/mcbsp.c  |  165 ++++++++++++++++++++++++++++++++++++++++++

- 2 files changed, 167 insertions(+), 0 deletions(-)

- create mode 100644 arch/arm/mach-omap1/mcbsp.c

-

-diff --git a/arch/arm/mach-omap1/Makefile b/arch/arm/mach-omap1/Makefile

-index 6ebf23b..09246a7 100644

---- a/arch/arm/mach-omap1/Makefile

-+++ b/arch/arm/mach-omap1/Makefile

-@@ -5,6 +5,8 @@

- # Common support

- obj-y := io.o id.o clock.o irq.o mux.o serial.o devices.o

- 

-+obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o

-+

- obj-$(CONFIG_OMAP_MPU_TIMER)	+= time.o

- obj-$(CONFIG_OMAP_32K_TIMER)	+= timer32k.o

- 

-diff --git a/arch/arm/mach-omap1/mcbsp.c b/arch/arm/mach-omap1/mcbsp.c

-new file mode 100644

-index 0000000..f30624a

---- /dev/null

-+++ b/arch/arm/mach-omap1/mcbsp.c

-@@ -0,0 +1,165 @@

-+/*

-+ * linux/arch/arm/mach-omap1/mcbsp.c

-+ *

-+ * Copyright (C) 2008 Instituto Nokia de Tecnologia

-+ * Contact: Eduardo Valentin <eduardo.valentin@indt.org.br>

-+ *

-+ * This program is free software; you can redistribute it and/or modify

-+ * it under the terms of the GNU General Public License version 2 as

-+ * published by the Free Software Foundation.

-+ *

-+ * Multichannel mode not supported.

-+ */

-+#include <linux/module.h>

-+#include <linux/init.h>

-+#include <linux/clk.h>

-+#include <linux/err.h>

-+#include <linux/io.h>

-+

-+#include <asm/arch/dma.h>

-+#include <asm/arch/mux.h>

-+#include <asm/arch/cpu.h>

-+#include <asm/arch/mcbsp.h>

-+#include <asm/arch/dsp_common.h>

-+

-+#define DPS_RSTCT2_PER_EN	(1 << 0)

-+#define DSP_RSTCT2_WD_PER_EN	(1 << 1)

-+

-+static int omap1_mcbsp_check(unsigned int id)

-+{

-+	/* REVISIT: Check correctly for number of registered McBSPs */

-+	if (cpu_is_omap730()) {

-+		if (id > OMAP_MAX_MCBSP_COUNT - 2) {

-+		       printk(KERN_ERR "OMAP-McBSP: McBSP%d doesn't exist\n",

-+				id + 1);

-+		       return -ENODEV;

-+		}

-+		return 0;

-+	}

-+

-+	if (cpu_is_omap15xx() || cpu_is_omap16xx()) {

-+		if (id > OMAP_MAX_MCBSP_COUNT - 1) {

-+			printk(KERN_ERR "OMAP-McBSP: McBSP%d doesn't exist\n",

-+				id + 1);

-+			return -ENODEV;

-+		}

-+		return 0;

-+	}

-+

-+	return -ENODEV;

-+}

-+

-+static void omap1_mcbsp_request(unsigned int id)

-+{

-+	/*

-+	 * On 1510, 1610 and 1710, McBSP1 and McBSP3

-+	 * are DSP public peripherals.

-+	 */

-+	if (id == OMAP_MCBSP1 || id == OMAP_MCBSP3) {

-+		omap_dsp_request_mem();

-+		/*

-+		 * DSP external peripheral reset

-+		 * FIXME: This should be moved to dsp code

-+		 */

-+		__raw_writew(__raw_readw(DSP_RSTCT2) | DPS_RSTCT2_PER_EN |

-+				DSP_RSTCT2_WD_PER_EN, DSP_RSTCT2);

-+	}

-+}

-+

-+static void omap1_mcbsp_free(unsigned int id)

-+{

-+	if (id == OMAP_MCBSP1 || id == OMAP_MCBSP3)

-+		omap_dsp_release_mem();

-+}

-+

-+static struct omap_mcbsp_ops omap1_mcbsp_ops = {

-+	.check		= omap1_mcbsp_check,

-+	.request	= omap1_mcbsp_request,

-+	.free		= omap1_mcbsp_free,

-+};

-+

-+static struct omap_mcbsp_platform_data omap1_mcbsp_pdata[] = {

-+#ifdef CONFIG_ARCH_OMAP730

-+	{

-+		.virt_base	= io_p2v(OMAP730_MCBSP1_BASE),

-+		.dma_rx_sync	= OMAP_DMA_MCBSP1_RX,

-+		.dma_tx_sync	= OMAP_DMA_MCBSP1_TX,

-+		.rx_irq		= INT_730_McBSP1RX,

-+		.tx_irq		= INT_730_McBSP1TX,

-+		.ops		= &omap1_mcbsp_ops,

-+	},

-+	{

-+		.virt_base	= io_p2v(OMAP730_MCBSP2_BASE),

-+		.dma_rx_sync	= OMAP_DMA_MCBSP3_RX,

-+		.dma_tx_sync	= OMAP_DMA_MCBSP3_TX,

-+		.rx_irq		= INT_730_McBSP2RX,

-+		.tx_irq		= INT_730_McBSP2TX

-+		.ops		= &omap1_mcbsp_ops,

-+	},

-+#endif

-+#ifdef CONFIG_ARCH_OMAP15XX

-+	{

-+		.virt_base	= OMAP1510_MCBSP1_BASE,

-+		.dma_rx_sync	= OMAP_DMA_MCBSP1_RX,

-+		.dma_tx_sync	= OMAP_DMA_MCBSP1_TX,

-+		.rx_irq		= INT_McBSP1RX,

-+		.tx_irq		= INT_McBSP1TX,

-+		.ops		= &omap1_mcbsp_ops,

-+		.clocks		= { "dsp_ck", "api_ck", "dspxor_ck" },

-+		},

-+	{

-+		.virt_base	= io_p2v(OMAP1510_MCBSP2_BASE),

-+		.dma_rx_sync	= OMAP_DMA_MCBSP2_RX,

-+		.dma_tx_sync	= OMAP_DMA_MCBSP2_TX,

-+		.rx_irq		= INT_1510_SPI_RX,

-+		.tx_irq		= INT_1510_SPI_TX,

-+		.ops		= &omap1_mcbsp_ops,

-+	},

-+	{

-+		.virt_base	= OMAP1510_MCBSP3_BASE,

-+		.dma_rx_sync	= OMAP_DMA_MCBSP3_RX,

-+		.dma_tx_sync	= OMAP_DMA_MCBSP3_TX,

-+		.rx_irq		= INT_McBSP3RX,

-+		.tx_irq		= INT_McBSP3TX,

-+		.ops		= &omap1_mcbsp_ops,

-+		.clocks		= { "dsp_ck", "api_ck", "dspxor_ck" },

-+	},

-+#endif

-+#ifdef CONFIG_ARCH_OMAP16XX

-+	{

-+		.virt_base	= OMAP1610_MCBSP1_BASE,

-+		.dma_rx_sync	= OMAP_DMA_MCBSP1_RX,

-+		.dma_tx_sync	= OMAP_DMA_MCBSP1_TX,

-+		.rx_irq		= INT_McBSP1RX,

-+		.tx_irq		= INT_McBSP1TX,

-+		.ops		= &omap1_mcbsp_ops,

-+		.clocks		= { "dsp_ck", "api_ck", "dspxor_ck" },

-+	},

-+	{

-+		.virt_base	= io_p2v(OMAP1610_MCBSP2_BASE),

-+		.dma_rx_sync	= OMAP_DMA_MCBSP2_RX,

-+		.dma_tx_sync	= OMAP_DMA_MCBSP2_TX,

-+		.rx_irq		= INT_1610_McBSP2_RX,

-+		.tx_irq		= INT_1610_McBSP2_TX,

-+		.ops		= &omap1_mcbsp_ops,

-+	},

-+	{

-+		.virt_base	= OMAP1610_MCBSP3_BASE,

-+		.dma_rx_sync	= OMAP_DMA_MCBSP3_RX,

-+		.dma_tx_sync	= OMAP_DMA_MCBSP3_TX,

-+		.rx_irq		= INT_McBSP3RX,

-+		.tx_irq		= INT_McBSP3TX,

-+		.ops		= &omap1_mcbsp_ops,

-+		.clocks		= { "dsp_ck", "api_ck", "dspxor_ck" },

-+	},

-+#endif

-+};

-+#define mcbsp_count		ARRAY_SIZE(omap1_mcbsp_pdata)

-+

-+int __init omap1_mcbsp_init(void)

-+{

-+	omap_mcbsp_register_board_cfg(omap1_mcbsp_pdata, mcbsp_count);

-+

-+	return omap_mcbsp_init();

-+}

-+arch_initcall(omap1_mcbsp_init);

--- 

-1.5.5.1.67.gbdb8.dirty

-

---

-To unsubscribe from this list: send the line "unsubscribe linux-omap" in

-the body of a message to majordomo@vger.kernel.org

-More majordomo info at  http://vger.kernel.org/majordomo-info.html

-

diff --git a/packages/linux/linux-omap2-git/beagleboard/00003-mcbsp-omap3-clock.patch b/packages/linux/linux-omap2-git/beagleboard/00003-mcbsp-omap3-clock.patch
deleted file mode 100644
index 6d1e7d3f71..0000000000
--- a/packages/linux/linux-omap2-git/beagleboard/00003-mcbsp-omap3-clock.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-From: Eduardo Valentin <eduardo.valentin@indt.org.br>

-

-This patch fix the clock definition for mcbsps on clock34xx.h.

-Device identification must be done using .id field, not

-only name field.

-

-Signed-off-by: Eduardo Valentin <eduardo.valentin@indt.org.br>

----

- arch/arm/mach-omap2/clock34xx.h |   30 ++++++++++++++++++++----------

- 1 files changed, 20 insertions(+), 10 deletions(-)

-

-diff --git a/arch/arm/mach-omap2/clock34xx.h b/arch/arm/mach-omap2/clock34xx.h

-index 85afe1e..3fea82e 100644

---- a/arch/arm/mach-omap2/clock34xx.h

-+++ b/arch/arm/mach-omap2/clock34xx.h

-@@ -1480,7 +1480,8 @@ static const struct clksel mcbsp_15_clksel[] = {

- };

- 

- static struct clk mcbsp5_fck = {

--	.name		= "mcbsp5_fck",

-+	.name		= "mcbsp_fck",

-+	.id		= 5,

- 	.init		= &omap2_init_clksel_parent,

- 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),

- 	.enable_bit	= OMAP3430_EN_MCBSP5_SHIFT,

-@@ -1493,7 +1494,8 @@ static struct clk mcbsp5_fck = {

- };

- 

- static struct clk mcbsp1_fck = {

--	.name		= "mcbsp1_fck",

-+	.name		= "mcbsp_fck",

-+	.id		= 1,

- 	.init		= &omap2_init_clksel_parent,

- 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),

- 	.enable_bit	= OMAP3430_EN_MCBSP1_SHIFT,

-@@ -1941,7 +1943,8 @@ static struct clk gpt10_ick = {

- };

- 

- static struct clk mcbsp5_ick = {

--	.name		= "mcbsp5_ick",

-+	.name		= "mcbsp_ick",

-+	.id		= 5,

- 	.parent		= &core_l4_ick,

- 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),

- 	.enable_bit	= OMAP3430_EN_MCBSP5_SHIFT,

-@@ -1951,7 +1954,8 @@ static struct clk mcbsp5_ick = {

- };

- 

- static struct clk mcbsp1_ick = {

--	.name		= "mcbsp1_ick",

-+	.name		= "mcbsp_ick",

-+	.id		= 1,

- 	.parent		= &core_l4_ick,

- 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),

- 	.enable_bit	= OMAP3430_EN_MCBSP1_SHIFT,

-@@ -2754,7 +2758,8 @@ static struct clk gpt2_ick = {

- };

- 

- static struct clk mcbsp2_ick = {

--	.name		= "mcbsp2_ick",

-+	.name		= "mcbsp_ick",

-+	.id		= 2,

- 	.parent		= &per_l4_ick,

- 	.enable_reg	= OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_ICLKEN),

- 	.enable_bit	= OMAP3430_EN_MCBSP2_SHIFT,

-@@ -2764,7 +2769,8 @@ static struct clk mcbsp2_ick = {

- };

- 

- static struct clk mcbsp3_ick = {

--	.name		= "mcbsp3_ick",

-+	.name		= "mcbsp_ick",

-+	.id		= 3,

- 	.parent		= &per_l4_ick,

- 	.enable_reg	= OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_ICLKEN),

- 	.enable_bit	= OMAP3430_EN_MCBSP3_SHIFT,

-@@ -2774,7 +2780,8 @@ static struct clk mcbsp3_ick = {

- };

- 

- static struct clk mcbsp4_ick = {

--	.name		= "mcbsp4_ick",

-+	.name		= "mcbsp_ick",

-+	.id		= 4,

- 	.parent		= &per_l4_ick,

- 	.enable_reg	= OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_ICLKEN),

- 	.enable_bit	= OMAP3430_EN_MCBSP4_SHIFT,

-@@ -2790,7 +2797,8 @@ static const struct clksel mcbsp_234_clksel[] = {

- };

- 

- static struct clk mcbsp2_fck = {

--	.name		= "mcbsp2_fck",

-+	.name		= "mcbsp_fck",

-+	.id		= 2,

- 	.init		= &omap2_init_clksel_parent,

- 	.enable_reg	= OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_FCLKEN),

- 	.enable_bit	= OMAP3430_EN_MCBSP2_SHIFT,

-@@ -2803,7 +2811,8 @@ static struct clk mcbsp2_fck = {

- };

- 

- static struct clk mcbsp3_fck = {

--	.name		= "mcbsp3_fck",

-+	.name		= "mcbsp_fck",

-+	.id		= 3,

- 	.init		= &omap2_init_clksel_parent,

- 	.enable_reg	= OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_FCLKEN),

- 	.enable_bit	= OMAP3430_EN_MCBSP3_SHIFT,

-@@ -2816,7 +2825,8 @@ static struct clk mcbsp3_fck = {

- };

- 

- static struct clk mcbsp4_fck = {

--	.name		= "mcbsp4_fck",

-+	.name		= "mcbsp_fck",

-+	.id		= 4,

- 	.init		= &omap2_init_clksel_parent,

- 	.enable_reg	= OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_FCLKEN),

- 	.enable_bit	= OMAP3430_EN_MCBSP4_SHIFT,

--- 

-1.5.5.1.67.gbdb8.dirty

-

---

-To unsubscribe from this list: send the line "unsubscribe linux-omap" in

-the body of a message to majordomo@vger.kernel.org

-More majordomo info at  http://vger.kernel.org/majordomo-info.html

-

diff --git a/packages/linux/linux-omap2-git/beagleboard/00004-omap2-mcbsp.patch b/packages/linux/linux-omap2-git/beagleboard/00004-omap2-mcbsp.patch
deleted file mode 100644
index f31604d658..0000000000
--- a/packages/linux/linux-omap2-git/beagleboard/00004-omap2-mcbsp.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-From: Eduardo Valentin <eduardo.valentin@indt.org.br>

-

-This patch adds support for mach-omap2 based on current

-mcbsp platform driver.

-

-Signed-off-by: Eduardo Valentin <eduardo.valentin@indt.org.br>

----

- arch/arm/mach-omap2/Makefile |    2 +

- arch/arm/mach-omap2/mcbsp.c  |  105 ++++++++++++++++++++++++++++++++++++++++++

- 2 files changed, 107 insertions(+), 0 deletions(-)

- create mode 100644 arch/arm/mach-omap2/mcbsp.c

-

-diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile

-index 552664c..84fa698 100644

---- a/arch/arm/mach-omap2/Makefile

-+++ b/arch/arm/mach-omap2/Makefile

-@@ -7,6 +7,8 @@ obj-y := irq.o id.o io.o memory.o control.o prcm.o clock.o mux.o \

- 		devices.o serial.o gpmc.o timer-gp.o powerdomain.o \

- 		clockdomain.o

- 

-+obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o

-+

- # Functions loaded to SRAM

- obj-$(CONFIG_ARCH_OMAP2)		+= sram24xx.o

- 

-diff --git a/arch/arm/mach-omap2/mcbsp.c b/arch/arm/mach-omap2/mcbsp.c

-new file mode 100644

-index 0000000..e2ee8f7

---- /dev/null

-+++ b/arch/arm/mach-omap2/mcbsp.c

-@@ -0,0 +1,105 @@

-+/*

-+ * linux/arch/arm/mach-omap2/mcbsp.c

-+ *

-+ * Copyright (C) 2008 Instituto Nokia de Tecnologia

-+ * Contact: Eduardo Valentin <eduardo.valentin@indt.org.br>

-+ *

-+ * This program is free software; you can redistribute it and/or modify

-+ * it under the terms of the GNU General Public License version 2 as

-+ * published by the Free Software Foundation.

-+ *

-+ * Multichannel mode not supported.

-+ */

-+#include <linux/module.h>

-+#include <linux/init.h>

-+#include <linux/clk.h>

-+#include <linux/err.h>

-+

-+#include <asm/arch/dma.h>

-+#include <asm/arch/mux.h>

-+#include <asm/arch/cpu.h>

-+#include <asm/arch/mcbsp.h>

-+

-+static void omap2_mcbsp2_mux_setup(void)

-+{

-+	omap_cfg_reg(Y15_24XX_MCBSP2_CLKX);

-+	omap_cfg_reg(R14_24XX_MCBSP2_FSX);

-+	omap_cfg_reg(W15_24XX_MCBSP2_DR);

-+	omap_cfg_reg(V15_24XX_MCBSP2_DX);

-+	omap_cfg_reg(V14_24XX_GPIO117);

-+	/*

-+	 * TODO: Need to add MUX settings for OMAP 2430 SDP

-+	 */

-+}

-+

-+static void omap2_mcbsp_request(unsigned int id)

-+{

-+	if (cpu_is_omap2420() && (id == OMAP_MCBSP2))

-+		omap2_mcbsp2_mux_setup();

-+}

-+

-+static int omap2_mcbsp_check(unsigned int id)

-+{

-+	if (id > OMAP_MAX_MCBSP_COUNT - 1) {

-+		printk(KERN_ERR "OMAP-McBSP: McBSP%d doesn't exist\n", id + 1);

-+		return -ENODEV;

-+	}

-+	return 0;

-+}

-+

-+static struct omap_mcbsp_ops omap2_mcbsp_ops = {

-+	.request	= omap2_mcbsp_request,

-+	.check		= omap2_mcbsp_check,

-+};

-+

-+static struct omap_mcbsp_platform_data omap2_mcbsp_pdata[] = {

-+#ifdef CONFIG_ARCH_OMAP24XX

-+	{

-+		.virt_base	= IO_ADDRESS(OMAP24XX_MCBSP1_BASE),

-+		.dma_rx_sync	= OMAP24XX_DMA_MCBSP1_RX,

-+		.dma_tx_sync	= OMAP24XX_DMA_MCBSP1_TX,

-+		.rx_irq		= INT_24XX_MCBSP1_IRQ_RX,

-+		.tx_irq		= INT_24XX_MCBSP1_IRQ_TX,

-+		.ops		= &omap2_mcbsp_ops,

-+		.clocks		= { "mcbsp_ick", "mcbsp_fck" },

-+	},

-+	{

-+		.virt_base	= IO_ADDRESS(OMAP24XX_MCBSP2_BASE),

-+		.dma_rx_sync	= OMAP24XX_DMA_MCBSP2_RX,

-+		.dma_tx_sync	= OMAP24XX_DMA_MCBSP2_TX,

-+		.rx_irq		= INT_24XX_MCBSP2_IRQ_RX,

-+		.tx_irq		= INT_24XX_MCBSP2_IRQ_TX,

-+		.ops		= &omap2_mcbsp_ops,

-+		.clocks		= { "mcbsp_ick", "mcbsp_fck" },

-+	},

-+#endif

-+#ifdef CONFIG_ARCH_OMAP34XX

-+	{

-+		.virt_base	= IO_ADDRESS(OMAP34XX_MCBSP1_BASE),

-+		.dma_rx_sync	= OMAP24XX_DMA_MCBSP1_RX,

-+		.dma_tx_sync	= OMAP24XX_DMA_MCBSP1_TX,

-+		.rx_irq		= INT_24XX_MCBSP1_IRQ_RX,

-+		.tx_irq		= INT_24XX_MCBSP1_IRQ_TX,

-+		.ops		= &omap2_mcbsp_ops,

-+		.clocks		= { "mcbsp_ick", "mcbsp_fck" },

-+	},

-+	{

-+		.virt_base	= IO_ADDRESS(OMAP34XX_MCBSP2_BASE),

-+		.dma_rx_sync	= OMAP24XX_DMA_MCBSP2_RX,

-+		.dma_tx_sync	= OMAP24XX_DMA_MCBSP2_TX,

-+		.rx_irq		= INT_24XX_MCBSP2_IRQ_RX,

-+		.tx_irq		= INT_24XX_MCBSP2_IRQ_TX,

-+		.ops		= &omap2_mcbsp_ops,

-+		.clocks		= { "mcbsp_ick", "mcbsp_fck" },

-+	},

-+#endif

-+};

-+#define mcbsp_count		ARRAY_SIZE(omap2_mcbsp_pdata)

-+

-+int __init omap2_mcbsp_init(void)

-+{

-+	omap_mcbsp_register_board_cfg(omap2_mcbsp_pdata, mcbsp_count);

-+

-+	return omap_mcbsp_init();

-+}

-+arch_initcall(omap2_mcbsp_init);

--- 

-1.5.5.1.67.gbdb8.dirty

-

---

-To unsubscribe from this list: send the line "unsubscribe linux-omap" in

-the body of a message to majordomo@vger.kernel.org

-More majordomo info at  http://vger.kernel.org/majordomo-info.html

-

diff --git a/packages/linux/linux-omap2-git/beagleboard/0001-omap3-cpuidle.patch b/packages/linux/linux-omap2-git/beagleboard/0001-omap3-cpuidle.patch
new file mode 100644
index 0000000000..28b1ef2214
--- /dev/null
+++ b/packages/linux/linux-omap2-git/beagleboard/0001-omap3-cpuidle.patch
@@ -0,0 +1,450 @@
+From: "Rajendra Nayak" <rnayak@ti.com>

+To: <linux-omap@vger.kernel.org>

+Subject: [PATCH 01/02] OMAP3 CPUidle driver

+Date: 	Tue, 10 Jun 2008 12:39:00 +0530

+

+This patch adds the OMAP3 cpuidle driver. Irq enable/disable is done in the core cpuidle driver

+before it queries the governor for the next state.

+

+Signed-off-by: Rajendra Nayak <rnayak@ti.com>   

+

+---

+ arch/arm/mach-omap2/Makefile      |    2 

+ arch/arm/mach-omap2/cpuidle34xx.c |  293 ++++++++++++++++++++++++++++++++++++++

+ arch/arm/mach-omap2/cpuidle34xx.h |   51 ++++++

+ arch/arm/mach-omap2/pm34xx.c      |    5 

+ drivers/cpuidle/cpuidle.c         |   10 +

+ 5 files changed, 359 insertions(+), 2 deletions(-)

+

+Index: linux-omap-2.6/arch/arm/mach-omap2/Makefile

+===================================================================

+--- linux-omap-2.6.orig/arch/arm/mach-omap2/Makefile	2008-06-09 20:15:33.855303920 +0530

++++ linux-omap-2.6/arch/arm/mach-omap2/Makefile	2008-06-09 20:15:39.569121361 +0530

+@@ -20,7 +20,7 @@ obj-y					+= pm.o

+ obj-$(CONFIG_ARCH_OMAP2)		+= pm24xx.o

+ obj-$(CONFIG_ARCH_OMAP2420)		+= sleep242x.o

+ obj-$(CONFIG_ARCH_OMAP2430)		+= sleep243x.o

+-obj-$(CONFIG_ARCH_OMAP3)		+= pm34xx.o sleep34xx.o

++obj-$(CONFIG_ARCH_OMAP3)		+= pm34xx.o sleep34xx.o cpuidle34xx.o

+ obj-$(CONFIG_PM_DEBUG)			+= pm-debug.o

+ endif

+ 

+Index: linux-omap-2.6/arch/arm/mach-omap2/cpuidle34xx.c

+===================================================================

+--- /dev/null	1970-01-01 00:00:00.000000000 +0000

++++ linux-omap-2.6/arch/arm/mach-omap2/cpuidle34xx.c	2008-06-10 11:41:27.644820323 +0530

+@@ -0,0 +1,293 @@

++/*

++ * linux/arch/arm/mach-omap2/cpuidle34xx.c

++ *

++ * OMAP3 CPU IDLE Routines

++ *

++ * Copyright (C) 2007-2008 Texas Instruments, Inc.

++ * Rajendra Nayak <rnayak@ti.com>

++ *

++ * Copyright (C) 2007 Texas Instruments, Inc.

++ * Karthik Dasu <karthik-dp@ti.com>

++ *

++ * Copyright (C) 2006 Nokia Corporation

++ * Tony Lindgren <tony@atomide.com>

++ *

++ * Copyright (C) 2005 Texas Instruments, Inc.

++ * Richard Woodruff <r-woodruff2@ti.com>

++ *

++ * This program is free software; you can redistribute it and/or modify

++ * it under the terms of the GNU General Public License version 2 as

++ * published by the Free Software Foundation.

++ */

++

++#include <linux/cpuidle.h>

++#include <asm/arch/pm.h>

++#include <asm/arch/prcm.h>

++#include <asm/arch/powerdomain.h>

++#include <asm/arch/clockdomain.h>

++#include <asm/arch/irqs.h>

++#include "cpuidle34xx.h"

++

++#ifdef CONFIG_CPU_IDLE

++

++struct omap3_processor_cx omap3_power_states[OMAP3_MAX_STATES];

++struct omap3_processor_cx current_cx_state;

++

++static int omap3_idle_bm_check(void)

++{

++	/* Check for omap3_fclks_active() here once available */

++	return 0;

++}

++

++/* omap3_enter_idle - Programs OMAP3 to enter the specified state.

++ * returns the total time during which the system was idle.

++ */

++static int omap3_enter_idle(struct cpuidle_device *dev,

++			struct cpuidle_state *state)

++{

++	struct omap3_processor_cx *cx = cpuidle_get_statedata(state);

++	struct timespec ts_preidle, ts_postidle, ts_idle;

++	struct powerdomain *mpu_pd, *core_pd, *per_pd, *neon_pd;

++	int neon_pwrst;

++

++	current_cx_state = *cx;

++

++	if (cx->type == OMAP3_STATE_C0) {

++		/* Do nothing for C0, not even a wfi */

++		return 0;

++	}

++

++	/* Used to keep track of the total time in idle */

++	getnstimeofday(&ts_preidle);

++

++	mpu_pd = pwrdm_lookup("mpu_pwrdm");

++	core_pd = pwrdm_lookup("core_pwrdm");

++	per_pd = pwrdm_lookup("per_pwrdm");

++	neon_pd = pwrdm_lookup("neon_pwrdm");

++

++	/* Reset previous power state registers */

++	pwrdm_clear_all_prev_pwrst(mpu_pd);

++	pwrdm_clear_all_prev_pwrst(neon_pd);

++	pwrdm_clear_all_prev_pwrst(core_pd);

++	pwrdm_clear_all_prev_pwrst(per_pd);

++

++	if (omap_irq_pending())

++		return 0;

++

++	neon_pwrst = pwrdm_read_pwrst(neon_pd);

++

++	/* Program MPU/NEON to target state */

++	if (cx->mpu_state < PWRDM_POWER_ON) {

++		if (neon_pwrst == PWRDM_POWER_ON) {

++                        if (cx->mpu_state == PWRDM_POWER_RET)

++                                pwrdm_set_next_pwrst(neon_pd, PWRDM_POWER_RET);

++                        else if (cx->mpu_state == PWRDM_POWER_OFF)

++                                pwrdm_set_next_pwrst(neon_pd, PWRDM_POWER_OFF);

++		}

++		pwrdm_set_next_pwrst(mpu_pd, cx->mpu_state);

++	}

++

++	/* Program CORE to target state */

++	if (cx->core_state < PWRDM_POWER_ON)

++		pwrdm_set_next_pwrst(core_pd, cx->core_state);

++

++	/* Execute ARM wfi */

++	omap_sram_idle();

++

++	/* Program MPU/NEON to ON */

++	if (cx->mpu_state < PWRDM_POWER_ON) {

++		if (neon_pwrst == PWRDM_POWER_ON)

++			pwrdm_set_next_pwrst(neon_pd, PWRDM_POWER_ON);

++		pwrdm_set_next_pwrst(mpu_pd, PWRDM_POWER_ON);

++	}

++

++	if (cx->core_state < PWRDM_POWER_ON)

++		pwrdm_set_next_pwrst(core_pd, PWRDM_POWER_ON);

++

++	getnstimeofday(&ts_postidle);

++	ts_idle = timespec_sub(ts_postidle, ts_preidle);

++	return timespec_to_ns(&ts_idle);

++}

++

++/*

++ * omap3_enter_idle_bm - enter function for states with CPUIDLE_FLAG_CHECK_BM

++ *

++ * This function checks for all the pre-requisites needed for OMAP3 to enter

++ * CORE RET/OFF state. It then calls omap3_enter_idle to program the desired

++ * C state.

++ */

++static int omap3_enter_idle_bm(struct cpuidle_device *dev,

++			       struct cpuidle_state *state)

++{

++	struct cpuidle_state *new_state = NULL;

++	int i, j;

++

++	if ((state->flags & CPUIDLE_FLAG_CHECK_BM) && omap3_idle_bm_check()) {

++

++		/* Find current state in list */

++		for (i = 0; i < OMAP3_MAX_STATES; i++)

++			if (state == &dev->states[i])

++				break;

++		BUG_ON(i == OMAP3_MAX_STATES);

++

++		/* Back up to non 'CHECK_BM' state */

++		for (j = i - 1;  j > 0; j--) {

++			struct cpuidle_state *s = &dev->states[j];

++

++			if (!(s->flags & CPUIDLE_FLAG_CHECK_BM)) {

++				new_state = s;

++				break;

++			}

++		}

++

++		pr_debug("%s: Bus activity: Entering %s (instead of %s)\n",

++			__FUNCTION__, new_state->name, state->name);

++	}

++

++	return omap3_enter_idle(dev, new_state ? : state);

++}

++

++DEFINE_PER_CPU(struct cpuidle_device, omap3_idle_dev);

++

++/* omap3_init_power_states - Initialises the OMAP3 specific C states.

++ * Below is the desciption of each C state.

++ *

++	C0 . System executing code

++	C1 . MPU WFI + Core active

++	C2 . MPU CSWR + Core active

++	C3 . MPU OFF + Core active

++	C4 . MPU CSWR + Core CSWR

++	C5 . MPU OFF + Core CSWR

++	C6 . MPU OFF + Core OFF

++ */

++void omap_init_power_states(void)

++{

++	/* C0 . System executing code */

++	omap3_power_states[0].valid = 1;

++	omap3_power_states[0].type = OMAP3_STATE_C0;

++	omap3_power_states[0].sleep_latency = 0;

++	omap3_power_states[0].wakeup_latency = 0;

++	omap3_power_states[0].threshold = 0;

++	omap3_power_states[0].mpu_state = PWRDM_POWER_ON;

++	omap3_power_states[0].core_state = PWRDM_POWER_ON;

++	omap3_power_states[0].flags = CPUIDLE_FLAG_TIME_VALID |

++				CPUIDLE_FLAG_SHALLOW;

++

++	/* C1 . MPU WFI + Core active */

++	omap3_power_states[1].valid = 1;

++	omap3_power_states[1].type = OMAP3_STATE_C1;

++	omap3_power_states[1].sleep_latency = 10;

++	omap3_power_states[1].wakeup_latency = 10;

++	omap3_power_states[1].threshold = 30;

++	omap3_power_states[1].mpu_state = PWRDM_POWER_ON;

++	omap3_power_states[1].core_state = PWRDM_POWER_ON;

++	omap3_power_states[1].flags = CPUIDLE_FLAG_TIME_VALID |

++				CPUIDLE_FLAG_SHALLOW;

++

++	/* C2 . MPU CSWR + Core active */

++	omap3_power_states[2].valid = 1;

++	omap3_power_states[2].type = OMAP3_STATE_C2;

++	omap3_power_states[2].sleep_latency = 50;

++	omap3_power_states[2].wakeup_latency = 50;

++	omap3_power_states[2].threshold = 300;

++	omap3_power_states[2].mpu_state = PWRDM_POWER_RET;

++	omap3_power_states[2].core_state = PWRDM_POWER_ON;

++	omap3_power_states[2].flags = CPUIDLE_FLAG_TIME_VALID |

++				CPUIDLE_FLAG_BALANCED;

++

++	/* C3 . MPU OFF + Core active */

++	omap3_power_states[3].valid = 0;

++	omap3_power_states[3].type = OMAP3_STATE_C3;

++	omap3_power_states[3].sleep_latency = 1500;

++	omap3_power_states[3].wakeup_latency = 1800;

++	omap3_power_states[3].threshold = 4000;

++	omap3_power_states[3].mpu_state = PWRDM_POWER_OFF;

++	omap3_power_states[3].core_state = PWRDM_POWER_RET;

++	omap3_power_states[3].flags = CPUIDLE_FLAG_TIME_VALID |

++				CPUIDLE_FLAG_BALANCED;

++

++	/* C4 . MPU CSWR + Core CSWR*/

++	omap3_power_states[4].valid = 1;

++	omap3_power_states[4].type = OMAP3_STATE_C4;

++	omap3_power_states[4].sleep_latency = 2500;

++	omap3_power_states[4].wakeup_latency = 7500;

++	omap3_power_states[4].threshold = 12000;

++	omap3_power_states[4].mpu_state = PWRDM_POWER_RET;

++	omap3_power_states[4].core_state = PWRDM_POWER_RET;

++	omap3_power_states[4].flags = CPUIDLE_FLAG_TIME_VALID |

++			CPUIDLE_FLAG_BALANCED | CPUIDLE_FLAG_CHECK_BM;

++

++	/* C5 . MPU OFF + Core CSWR */

++	omap3_power_states[5].valid = 0;

++	omap3_power_states[5].type = OMAP3_STATE_C5;

++	omap3_power_states[5].sleep_latency = 3000;

++	omap3_power_states[5].wakeup_latency = 8500;

++	omap3_power_states[5].threshold = 15000;

++	omap3_power_states[5].mpu_state = PWRDM_POWER_OFF;

++	omap3_power_states[5].core_state = PWRDM_POWER_RET;

++	omap3_power_states[5].flags = CPUIDLE_FLAG_TIME_VALID |

++			CPUIDLE_FLAG_BALANCED | CPUIDLE_FLAG_CHECK_BM;

++

++	/* C6 . MPU OFF + Core OFF */

++	omap3_power_states[6].valid = 0;

++	omap3_power_states[6].type = OMAP3_STATE_C6;

++	omap3_power_states[6].sleep_latency = 10000;

++	omap3_power_states[6].wakeup_latency = 30000;

++	omap3_power_states[6].threshold = 300000;

++	omap3_power_states[6].mpu_state = PWRDM_POWER_OFF;

++	omap3_power_states[6].core_state = PWRDM_POWER_OFF;

++	omap3_power_states[6].flags = CPUIDLE_FLAG_TIME_VALID |

++			CPUIDLE_FLAG_DEEP | CPUIDLE_FLAG_CHECK_BM;

++}

++

++struct cpuidle_driver omap3_idle_driver = {

++	.name = 	"omap3_idle",

++	.owner = 	THIS_MODULE,

++};

++/*

++ * omap3_idle_init - Init routine for OMAP3 idle.

++ * Registers the OMAP3 specific cpuidle driver with the cpuidle f/w

++ * with the valid set of states.

++ */

++int omap3_idle_init(void)

++{

++	int i, count = 0;

++	struct omap3_processor_cx *cx;

++	struct cpuidle_state *state;

++	struct cpuidle_device *dev;

++

++	omap_init_power_states();

++	cpuidle_register_driver(&omap3_idle_driver);

++

++	dev = &per_cpu(omap3_idle_dev, smp_processor_id());

++

++	for (i = 0; i < OMAP3_MAX_STATES; i++) {

++		cx = &omap3_power_states[i];

++		state = &dev->states[count];

++

++		if (!cx->valid)

++			continue;

++		cpuidle_set_statedata(state, cx);

++		state->exit_latency = cx->sleep_latency + cx->wakeup_latency;

++		state->target_residency = cx->threshold;

++		state->flags = cx->flags;

++		state->enter = (state->flags & CPUIDLE_FLAG_CHECK_BM) ?

++			omap3_enter_idle_bm : omap3_enter_idle;

++		sprintf(state->name, "C%d", count+1);

++		count++;

++	}

++

++	if (!count)

++		return -EINVAL;

++	dev->state_count = count;

++

++	if (cpuidle_register_device(dev)) {

++		printk(KERN_ERR "%s: CPUidle register device failed\n",

++		       __FUNCTION__);

++		return -EIO;

++	}

++

++	return 0;

++}

++__initcall(omap3_idle_init);

++#endif /* CONFIG_CPU_IDLE */

+Index: linux-omap-2.6/arch/arm/mach-omap2/cpuidle34xx.h

+===================================================================

+--- /dev/null	1970-01-01 00:00:00.000000000 +0000

++++ linux-omap-2.6/arch/arm/mach-omap2/cpuidle34xx.h	2008-06-09 20:15:39.569121361 +0530

+@@ -0,0 +1,51 @@

++/*

++ * linux/arch/arm/mach-omap2/cpuidle34xx.h

++ *

++ * OMAP3 cpuidle structure definitions

++ *

++ * Copyright (C) 2007-2008 Texas Instruments, Inc.

++ * Written by Rajendra Nayak <rnayak@ti.com>

++ *

++ * This program is free software; you can redistribute it and/or modify

++ * it under the terms of the GNU General Public License version 2 as

++ * published by the Free Software Foundation.

++ *

++ * THIS PACKAGE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR

++ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED

++ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.

++ *

++ * History:

++ *

++ */

++

++#ifndef ARCH_ARM_MACH_OMAP2_CPUIDLE_34XX

++#define ARCH_ARM_MACH_OMAP2_CPUIDLE_34XX

++

++#define OMAP3_MAX_STATES 7

++#define OMAP3_STATE_C0 0 /* C0 - System executing code */

++#define OMAP3_STATE_C1 1 /* C1 - MPU WFI + Core active */

++#define OMAP3_STATE_C2 2 /* C2 - MPU CSWR + Core active */

++#define OMAP3_STATE_C3 3 /* C3 - MPU OFF + Core active */

++#define OMAP3_STATE_C4 4 /* C4 - MPU RET + Core RET */

++#define OMAP3_STATE_C5 5 /* C5 - MPU OFF + Core RET */

++#define OMAP3_STATE_C6 6 /* C6 - MPU OFF + Core OFF */

++

++extern void omap_sram_idle(void);

++extern int omap3_irq_pending(void);

++

++struct omap3_processor_cx {

++	u8 valid;

++	u8 type;

++	u32 sleep_latency;

++	u32 wakeup_latency;

++	u32 mpu_state;

++	u32 core_state;

++	u32 threshold;

++	u32 flags;

++};

++

++void omap_init_power_states(void);

++int omap3_idle_init(void);

++

++#endif /* ARCH_ARM_MACH_OMAP2_CPUIDLE_34XX */

++

+Index: linux-omap-2.6/arch/arm/mach-omap2/pm34xx.c

+===================================================================

+--- linux-omap-2.6.orig/arch/arm/mach-omap2/pm34xx.c	2008-06-09 20:15:33.855303920 +0530

++++ linux-omap-2.6/arch/arm/mach-omap2/pm34xx.c	2008-06-09 20:16:20.976798343 +0530

+@@ -141,7 +141,7 @@ static irqreturn_t prcm_interrupt_handle

+ 	return IRQ_HANDLED;

+ }

+ 

+-static void omap_sram_idle(void)

++void omap_sram_idle(void)

+ {

+ 	/* Variable to tell what needs to be saved and restored

+ 	 * in omap_sram_idle*/

+@@ -156,6 +156,7 @@ static void omap_sram_idle(void)

+ 

+ 	mpu_next_state = pwrdm_read_next_pwrst(mpu_pwrdm);

+ 	switch (mpu_next_state) {

++	case PWRDM_POWER_ON:

+ 	case PWRDM_POWER_RET:

+ 		/* No need to save context */

+ 		save_state = 0;

+@@ -386,7 +387,9 @@ int __init omap3_pm_init(void)

+ 

+ 	prcm_setup_regs();

+ 

++#ifndef CONFIG_CPU_IDLE

+ 	pm_idle = omap3_pm_idle;

++#endif

+ 

+ err1:

+ 	return ret;

+Index: linux-omap-2.6/drivers/cpuidle/cpuidle.c

+===================================================================

+--- linux-omap-2.6.orig/drivers/cpuidle/cpuidle.c	2008-06-09 20:15:33.856303888 +0530

++++ linux-omap-2.6/drivers/cpuidle/cpuidle.c	2008-06-09 20:15:39.570121329 +0530

+@@ -58,6 +58,11 @@ static void cpuidle_idle_call(void)

+ 		return;

+ 	}

+ 

++#ifdef CONFIG_ARCH_OMAP3

++	local_irq_disable();

++	local_fiq_disable();

++#endif

++

+ 	/* ask the governor for the next state */

+ 	next_state = cpuidle_curr_governor->select(dev);

+ 	if (need_resched())

+@@ -70,6 +75,11 @@ static void cpuidle_idle_call(void)

+ 	target_state->time += (unsigned long long)dev->last_residency;

+ 	target_state->usage++;

+ 

++#ifdef CONFIG_ARCH_OMAP3

++	local_irq_enable();

++	local_fiq_enable();

++#endif

++

+ 	/* give the governor an opportunity to reflect on the outcome */

+ 	if (cpuidle_curr_governor->reflect)

+ 		cpuidle_curr_governor->reflect(dev);

+

+--

+To unsubscribe from this list: send the line "unsubscribe linux-omap" in

+the body of a message to majordomo@vger.kernel.org

+More majordomo info at  http://vger.kernel.org/majordomo-info.html

+

diff --git a/packages/linux/linux-omap2-git/beagleboard/0001-omap3beagle-add-a-platform-device-to-hook-up-the-GP.patch b/packages/linux/linux-omap2-git/beagleboard/0001-omap3beagle-add-a-platform-device-to-hook-up-the-GP.patch
new file mode 100644
index 0000000000..17329be29b
--- /dev/null
+++ b/packages/linux/linux-omap2-git/beagleboard/0001-omap3beagle-add-a-platform-device-to-hook-up-the-GP.patch
@@ -0,0 +1,69 @@
+From 7a444ee080c5f1a62ac5042f1e7926622b3e1ce7 Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@openembedded.org>
+Date: Fri, 30 May 2008 13:43:36 +0200
+Subject: [PATCH] ARM: OMAP: omap3beagle: add a platform device to hook up the GPIO leds to the leds-gpio driver
+
+omap3beagle: add a platform device to hook up the GPIO leds to the leds-gpio driver
+ * on revision A5 and earlier board the two leds can't be controlled seperately, should be fixed in rev. B and C boards.
+
+Signed-off-by: Koen Kooi <koen@openembedded.org>
+---
+ arch/arm/mach-omap2/board-omap3beagle.c |   28 ++++++++++++++++++++++++++++
+ 1 files changed, 28 insertions(+), 0 deletions(-)
+
+diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
+index c992cc7..83891fc 100644
+--- a/arch/arm/mach-omap2/board-omap3beagle.c
++++ b/arch/arm/mach-omap2/board-omap3beagle.c
+@@ -19,6 +19,7 @@
+ #include <linux/err.h>
+ #include <linux/clk.h>
+ #include <linux/io.h>
++#include <linux/leds.h>
+ 
+ #include <asm/hardware.h>
+ #include <asm/mach-types.h>
+@@ -72,6 +73,32 @@ static struct omap_lcd_config omap3_beagle_lcd_config __initdata = {
+ 	.ctrl_name	= "internal",
+ };
+ 
++struct gpio_led gpio_leds[] = {
++	{
++		.name = "beagleboard::led0",
++		.default_trigger = "none",
++		.gpio = 149,
++	},
++	{
++		.name = "beagleboard::led1",
++		.default_trigger = "none",
++		.gpio = 150,
++	},
++};
++
++static struct gpio_led_platform_data gpio_led_info = {
++	.leds = gpio_leds,
++	.num_leds = ARRAY_SIZE(gpio_leds),
++};
++
++static struct platform_device leds_gpio = {
++	.name = "leds-gpio",
++	.id   = -1,
++	.dev  = {
++		.platform_data = &gpio_led_info,
++	},
++};
++
+ static struct omap_board_config_kernel omap3_beagle_config[] __initdata = {
+ 	{ OMAP_TAG_UART,	&omap3_beagle_uart_config },
+ 	{ OMAP_TAG_MMC,		&omap3beagle_mmc_config },
+@@ -83,6 +110,7 @@ static struct platform_device *omap3_beagle_devices[] __initdata = {
+ #ifdef CONFIG_RTC_DRV_TWL4030
+ 	&omap3_beagle_twl4030rtc_device,
+ #endif
++	&leds_gpio,
+ };
+ 
+ static void __init omap3_beagle_init(void)
+-- 
+1.5.4.3
+
diff --git a/packages/linux/linux-omap2-git/beagleboard/0002-omap3-cpuidle.patch b/packages/linux/linux-omap2-git/beagleboard/0002-omap3-cpuidle.patch
new file mode 100644
index 0000000000..c17c690fe1
--- /dev/null
+++ b/packages/linux/linux-omap2-git/beagleboard/0002-omap3-cpuidle.patch
@@ -0,0 +1,88 @@
+From: "Rajendra Nayak" <rnayak@ti.com>

+To: <linux-omap@vger.kernel.org>

+Subject: [PATCH 02/02] Kconfig changes

+Date: 	Tue, 10 Jun 2008 12:39:02 +0530

+

+Updates the CPUidle Kconfig

+

+Signed-off-by: Rajendra Nayak <rnayak@ti.com>   

+

+---

+ arch/arm/Kconfig        |   10 ++++++++++

+ drivers/cpuidle/Kconfig |   28 ++++++++++++++++++++++------

+ 2 files changed, 32 insertions(+), 6 deletions(-)

+

+Index: linux-omap-2.6/arch/arm/Kconfig

+===================================================================

+--- linux-omap-2.6.orig/arch/arm/Kconfig	2008-06-10 11:43:10.790502713 +0530

++++ linux-omap-2.6/arch/arm/Kconfig	2008-06-10 11:43:38.701604549 +0530

+@@ -954,6 +954,16 @@ config ATAGS_PROC

+ 

+ endmenu

+ 

++if (ARCH_OMAP)

++

++menu "CPUIdle"

++

++source "drivers/cpuidle/Kconfig"

++

++endmenu

++

++endif

++

+ if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP || ARCH_IMX || ARCH_PXA)

+ 

+ menu "CPU Frequency scaling"

+Index: linux-omap-2.6/drivers/cpuidle/Kconfig

+===================================================================

+--- linux-omap-2.6.orig/drivers/cpuidle/Kconfig	2008-06-10 11:43:10.790502713 +0530

++++ linux-omap-2.6/drivers/cpuidle/Kconfig	2008-06-10 12:06:36.139332151 +0530

+@@ -1,20 +1,36 @@

++menu "CPU idle PM support"

+ 

+ config CPU_IDLE

+ 	bool "CPU idle PM support"

+-	default ACPI

++	default n

+ 	help

+ 	  CPU idle is a generic framework for supporting software-controlled

+ 	  idle processor power management.  It includes modular cross-platform

+ 	  governors that can be swapped during runtime.

+ 

+-	  If you're using an ACPI-enabled platform, you should say Y here.

++	  If you're using a mobile platform that supports CPU idle PM (e.g.

++	  an ACPI-capable notebook), you should say Y here.

++

++if CPU_IDLE

++

++comment "Governors"

+ 

+ config CPU_IDLE_GOV_LADDER

+-	bool

++	bool "ladder"

+ 	depends on CPU_IDLE

+-	default y

++	default n

+ 

+ config CPU_IDLE_GOV_MENU

+-	bool

++	bool "menu"

+ 	depends on CPU_IDLE && NO_HZ

+-	default y

++	default n

++        help

++	  This cpuidle governor evaluates all available states and chooses the

++	  deepest state that meets all of the following constraints: BM activity,

++	  expected time until next timer interrupt, and last break event time

++	  delta.  It is designed to minimize power consumption.  Currently

++	  dynticks is required.

++

++endif   # CPU_IDLE

++

++endmenu

+

+--

+To unsubscribe from this list: send the line "unsubscribe linux-omap" in

+the body of a message to majordomo@vger.kernel.org

+More majordomo info at  http://vger.kernel.org/majordomo-info.html

+

diff --git a/packages/linux/linux-omap2-git/beagleboard/16bpp.patch b/packages/linux/linux-omap2-git/beagleboard/16bpp.patch
new file mode 100644
index 0000000000..f1e2181c82
--- /dev/null
+++ b/packages/linux/linux-omap2-git/beagleboard/16bpp.patch
@@ -0,0 +1,13 @@
+diff --git a/drivers/video/omap/lcd_omap3beagle.c b/drivers/video/omap/lcd_omap3beagle.c
+index 69d4e06..c1c4f4c 100644
+--- a/drivers/video/omap/lcd_omap3beagle.c
++++ b/drivers/video/omap/lcd_omap3beagle.c
+@@ -66,7 +66,7 @@ struct lcd_panel omap3beagle_panel = {
+ 	.name		= "omap3beagle",
+ 	.config		= OMAP_LCDC_PANEL_TFT,
+ 
+-	.bpp		= 24,
++	.bpp		= 16,
+ 	.data_lines	= 24,
+ 	.x_res		= LCD_XRES,
+ 	.y_res		= LCD_YRES,
diff --git a/packages/linux/linux-omap2-git/beagleboard/defconfig b/packages/linux/linux-omap2-git/beagleboard/defconfig
index 3d3562d9f5..d4c1e9300a 100644
--- a/packages/linux/linux-omap2-git/beagleboard/defconfig
+++ b/packages/linux/linux-omap2-git/beagleboard/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.26-rc3-omap1
-# Tue May 20 19:38:20 2008
+# Linux kernel version: 2.6.26-rc7-omap1
+# Tue Jun 24 20:16:52 2008
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -31,6 +31,7 @@ CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
+CONFIG_LOCK_KERNEL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
@@ -79,8 +80,9 @@ CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLAB=y
-# CONFIG_SLUB is not set
+CONFIG_SLUB_DEBUG=y
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 # CONFIG_PROFILING is not set
 # CONFIG_MARKERS is not set
@@ -171,17 +173,16 @@ CONFIG_ARCH_OMAP3=y
 #
 # OMAP Feature Selections
 #
-CONFIG_OMAP_DEBUG_SRAM_PATCH=y
 # CONFIG_OMAP_DEBUG_POWERDOMAIN is not set
 # CONFIG_OMAP_DEBUG_CLOCKDOMAIN is not set
-# CONFIG_OMAP_RESET_CLOCKS is not set
+CONFIG_OMAP_SMARTREFLEX=y
+# CONFIG_OMAP_SMARTREFLEX_TESTING is not set
+CONFIG_OMAP_RESET_CLOCKS=y
 CONFIG_OMAP_BOOT_TAG=y
 CONFIG_OMAP_BOOT_REASON=y
 # CONFIG_OMAP_COMPONENT_VERSION is not set
 # CONFIG_OMAP_GPIO_SWITCH is not set
-CONFIG_OMAP_MUX=n
-# CONFIG_OMAP_MUX_DEBUG is not set
-CONFIG_OMAP_MUX_WARNINGS=n
+# CONFIG_OMAP_MUX is not set
 CONFIG_OMAP_MCBSP=y
 # CONFIG_OMAP_MMU_FWK is not set
 # CONFIG_OMAP_MBOX_FWK is not set
@@ -192,7 +193,6 @@ CONFIG_OMAP_DM_TIMER=y
 # CONFIG_OMAP_LL_DEBUG_UART1 is not set
 # CONFIG_OMAP_LL_DEBUG_UART2 is not set
 CONFIG_OMAP_LL_DEBUG_UART3=y
-CONFIG_OMAP_SERIAL_WAKE=y
 CONFIG_ARCH_OMAP34XX=y
 CONFIG_ARCH_OMAP3430=y
 
@@ -233,7 +233,7 @@ CONFIG_CPU_CP15_MMU=y
 # Processor Features
 #
 CONFIG_ARM_THUMB=y
-# CONFIG_ARM_THUMBEE is not set
+CONFIG_ARM_THUMBEE=y
 # CONFIG_CPU_ICACHE_DISABLE is not set
 # CONFIG_CPU_DCACHE_DISABLE is not set
 # CONFIG_CPU_BPREDICT_DISABLE is not set
@@ -254,7 +254,7 @@ CONFIG_TICK_ONESHOT=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-# CONFIG_PREEMPT is not set
+CONFIG_PREEMPT=y
 CONFIG_HZ=128
 CONFIG_AEABI=y
 # CONFIG_OABI_COMPAT is not set
@@ -273,7 +273,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_ZONE_DMA_FLAG=1
 CONFIG_BOUNCE=y
 CONFIG_VIRT_TO_BUS=y
-# CONFIG_LEDS is not set
+CONFIG_LEDS=y
 CONFIG_ALIGNMENT_TRAP=y
 
 #
@@ -287,6 +287,21 @@ CONFIG_KEXEC=y
 CONFIG_ATAGS_PROC=y
 
 #
+# CPUIdle
+#
+
+#
+# CPU idle PM support
+#
+CONFIG_CPU_IDLE=y
+
+#
+# Governors
+#
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_IDLE_GOV_MENU=y
+
+#
 # CPU Frequency scaling
 #
 CONFIG_CPU_FREQ=y
@@ -473,7 +488,7 @@ CONFIG_MAC80211_RC_DEFAULT_PID=y
 CONFIG_MAC80211_RC_DEFAULT="pid"
 CONFIG_MAC80211_RC_PID=y
 # CONFIG_MAC80211_MESH is not set
-# CONFIG_MAC80211_LEDS is not set
+CONFIG_MAC80211_LEDS=y
 # CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set
 # CONFIG_MAC80211_DEBUG is not set
 CONFIG_IEEE80211=y
@@ -514,7 +529,7 @@ CONFIG_MTD_PARTITIONS=y
 CONFIG_MTD_CHAR=y
 CONFIG_MTD_BLKDEVS=y
 CONFIG_MTD_BLOCK=y
-CONFIG_FTL=y
+# CONFIG_FTL is not set
 # CONFIG_NFTL is not set
 # CONFIG_INFTL is not set
 # CONFIG_RFD_FTL is not set
@@ -566,6 +581,7 @@ 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_OMAP2=y
 CONFIG_MTD_NAND_IDS=y
 # CONFIG_MTD_NAND_DISKONCHIP is not set
 # CONFIG_MTD_NAND_NANDSIM is not set
@@ -853,22 +869,23 @@ CONFIG_I2C_OMAP=y
 # Miscellaneous I2C Chip support
 #
 # CONFIG_DS1682 is not set
-# CONFIG_SENSORS_EEPROM is not set
+CONFIG_SENSORS_EEPROM=y
 # CONFIG_SENSORS_PCF8574 is not set
 # CONFIG_PCF8575 is not set
 # CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_ISP1301_OMAP is not set
 # CONFIG_TPS65010 is not set
-CONFIG_SENSORS_TLV320AIC23=y
+# CONFIG_SENSORS_TLV320AIC23 is not set
 CONFIG_TWL4030_CORE=y
 CONFIG_TWL4030_GPIO=y
-# CONFIG_TWL4030_MADC is not set
+CONFIG_TWL4030_MADC=m
 CONFIG_TWL4030_USB=y
 CONFIG_TWL4030_USB_HS_ULPI=y
 CONFIG_TWL4030_PWRBUTTON=y
-# CONFIG_TWL4030_POWEROFF is not set
+CONFIG_TWL4030_POWEROFF=y
 # CONFIG_SENSORS_MAX6875 is not set
 # CONFIG_SENSORS_TSL2550 is not set
+# CONFIG_SENSORS_TSL2563 is not set
 # CONFIG_LP5521 is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
@@ -912,8 +929,65 @@ CONFIG_HAVE_GPIO_LIB=y
 #
 # CONFIG_GPIO_MCP23S08 is not set
 # CONFIG_W1 is not set
-# CONFIG_POWER_SUPPLY is not set
-# CONFIG_HWMON is not set
+CONFIG_POWER_SUPPLY=m
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+# CONFIG_PDA_POWER is not set
+# CONFIG_APM_POWER is not set
+# CONFIG_BATTERY_DS2760 is not set
+# CONFIG_BATTERY_BQ27x00 is not set
+CONFIG_HWMON=y
+# CONFIG_HWMON_VID is not set
+# CONFIG_SENSORS_AD7418 is not set
+# CONFIG_SENSORS_ADM1021 is not set
+# CONFIG_SENSORS_ADM1025 is not set
+# CONFIG_SENSORS_ADM1026 is not set
+# CONFIG_SENSORS_ADM1029 is not set
+# CONFIG_SENSORS_ADM1031 is not set
+# CONFIG_SENSORS_ADM9240 is not set
+# CONFIG_SENSORS_ADT7470 is not set
+# CONFIG_SENSORS_ADT7473 is not set
+# CONFIG_SENSORS_ATXP1 is not set
+# CONFIG_SENSORS_DS1621 is not set
+# CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_F71882FG is not set
+# CONFIG_SENSORS_F75375S is not set
+# CONFIG_SENSORS_GL518SM is not set
+# CONFIG_SENSORS_GL520SM is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_LM63 is not set
+# CONFIG_SENSORS_LM70 is not set
+# CONFIG_SENSORS_LM75 is not set
+# CONFIG_SENSORS_LM77 is not set
+# CONFIG_SENSORS_LM78 is not set
+# CONFIG_SENSORS_LM80 is not set
+# CONFIG_SENSORS_LM83 is not set
+# CONFIG_SENSORS_LM85 is not set
+# CONFIG_SENSORS_LM87 is not set
+# CONFIG_SENSORS_LM90 is not set
+# CONFIG_SENSORS_LM92 is not set
+# CONFIG_SENSORS_LM93 is not set
+# CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_MAX6650 is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_DME1737 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47M192 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_ADS7828 is not set
+# CONFIG_SENSORS_THMC50 is not set
+# CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_W83781D is not set
+# CONFIG_SENSORS_W83791D is not set
+# CONFIG_SENSORS_W83792D is not set
+# CONFIG_SENSORS_W83793 is not set
+# CONFIG_SENSORS_W83L785TS is not set
+# CONFIG_SENSORS_W83L786NG is not set
+# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
+# CONFIG_SENSORS_TSC210X is not set
+CONFIG_SENSORS_OMAP34XX=y
+# CONFIG_HWMON_DEBUG_CHIP is not set
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_NOWAYOUT=y
 
@@ -949,102 +1023,178 @@ CONFIG_SSB_POSSIBLE=y
 #
 # Multimedia core support
 #
-CONFIG_VIDEO_DEV=y
-CONFIG_VIDEO_V4L2_COMMON=y
-# CONFIG_VIDEO_ALLOW_V4L1 is not set
-# CONFIG_VIDEO_V4L1_COMPAT is not set
-# CONFIG_DVB_CORE is not set
-CONFIG_VIDEO_MEDIA=y
+CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_V4L2_COMMON=m
+CONFIG_VIDEO_ALLOW_V4L1=y
+CONFIG_VIDEO_V4L1_COMPAT=y
+CONFIG_DVB_CORE=m
+CONFIG_VIDEO_MEDIA=m
 
 #
 # Multimedia drivers
 #
 CONFIG_MEDIA_ATTACH=y
-CONFIG_MEDIA_TUNER=y
+CONFIG_MEDIA_TUNER=m
 # CONFIG_MEDIA_TUNER_CUSTOMIZE 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_VIDEO_V4L2=y
-CONFIG_VIDEO_TVEEPROM=m
-CONFIG_VIDEO_TUNER=m
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA8290=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_QT1010=m
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_VIDEO_V4L2=m
+CONFIG_VIDEO_V4L1=m
 CONFIG_VIDEO_CAPTURE_DRIVERS=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
+CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
+# CONFIG_VIDEO_VIVI 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_TUNER_3036 is not set
+# CONFIG_VIDEO_AU0828 is not set
+CONFIG_V4L_USB_DRIVERS=y
+# CONFIG_VIDEO_PVRUSB2 is not set
+# CONFIG_VIDEO_EM28XX 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_W9968CF 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_ZR364XX is not set
+# CONFIG_USB_STKWEBCAM is not set
+# CONFIG_SOC_CAMERA is not set
+CONFIG_RADIO_ADAPTERS=y
+# CONFIG_RADIO_TEA5761 is not set
+# CONFIG_USB_DSBR is not set
+# CONFIG_USB_SI470X is not set
+CONFIG_DVB_CAPTURE_DRIVERS=y
+# CONFIG_TTPCI_EEPROM is not set
 
 #
-# Encoders/decoders and other helper chips
+# 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_TTUSB_BUDGET=m
+CONFIG_DVB_TTUSB_DEC=m
+CONFIG_DVB_CINERGYT2=m
+# CONFIG_DVB_CINERGYT2_TUNING is not set
 
 #
-# Audio decoders
+# Supported FlexCopII (B2C2) Adapters
 #
-# 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=m
-# CONFIG_VIDEO_CS5345 is not set
-CONFIG_VIDEO_CS53L32A=m
-# CONFIG_VIDEO_M52790 is not set
-# CONFIG_VIDEO_TLV320AIC23B is not set
-CONFIG_VIDEO_WM8775=m
-# CONFIG_VIDEO_WM8739 is not set
-# CONFIG_VIDEO_VP27SMPX is not set
+# CONFIG_DVB_B2C2_FLEXCOP is not set
 
 #
-# Video decoders
+# Supported DVB Frontends
 #
-# CONFIG_VIDEO_OV7670 is not set
-# CONFIG_VIDEO_TCM825X is not set
-# CONFIG_VIDEO_OV9640 is not set
-CONFIG_VIDEO_SAA711X=m
-# CONFIG_VIDEO_SAA717X is not set
-# CONFIG_VIDEO_TVP5150 is not set
 
 #
-# Video and audio decoders
+# Customise DVB Frontends
 #
-CONFIG_VIDEO_CX25840=m
+# CONFIG_DVB_FE_CUSTOMISE is not set
 
 #
-# MPEG video encoders
+# DVB-S (satellite) frontends
 #
-CONFIG_VIDEO_CX2341X=m
+CONFIG_DVB_CX24110=m
+CONFIG_DVB_CX24123=m
+CONFIG_DVB_MT312=m
+CONFIG_DVB_S5H1420=m
+CONFIG_DVB_STV0299=m
+CONFIG_DVB_TDA8083=m
+CONFIG_DVB_TDA10086=m
+CONFIG_DVB_VES1X93=m
+CONFIG_DVB_TUNER_ITD1000=m
+CONFIG_DVB_TDA826X=m
+CONFIG_DVB_TUA6100=m
 
 #
-# Video encoders
+# DVB-T (terrestrial) frontends
 #
-# CONFIG_VIDEO_SAA7127 is not set
+CONFIG_DVB_SP8870=m
+CONFIG_DVB_SP887X=m
+CONFIG_DVB_CX22700=m
+CONFIG_DVB_CX22702=m
+CONFIG_DVB_L64781=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
 
 #
-# Video improvement chips
+# DVB-C (cable) frontends
 #
-# CONFIG_VIDEO_UPD64031A is not set
-# CONFIG_VIDEO_UPD64083 is not set
-# CONFIG_VIDEO_VIVI is not set
-# CONFIG_VIDEO_SAA5246A is not set
-# CONFIG_VIDEO_SAA5249 is not set
-CONFIG_V4L_USB_DRIVERS=y
-CONFIG_VIDEO_PVRUSB2=m
-CONFIG_VIDEO_PVRUSB2_SYSFS=y
-# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
-# CONFIG_VIDEO_EM28XX is not set
-# CONFIG_VIDEO_USBVISION is not set
-# CONFIG_USB_ET61X251 is not set
-CONFIG_USB_SN9C102=m
-# CONFIG_USB_ZC0301 is not set
-# CONFIG_USB_ZR364XX is not set
-# CONFIG_USB_STKWEBCAM is not set
-# CONFIG_SOC_CAMERA is not set
-# CONFIG_RADIO_ADAPTERS is not set
+CONFIG_DVB_VES1820=m
+CONFIG_DVB_TDA10021=m
+CONFIG_DVB_TDA10023=m
+CONFIG_DVB_STV0297=m
+
+#
+# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
+#
+CONFIG_DVB_NXT200X=m
+# CONFIG_DVB_OR51211 is not set
+# CONFIG_DVB_OR51132 is not set
+CONFIG_DVB_BCM3510=m
+CONFIG_DVB_LGDT330X=m
+CONFIG_DVB_S5H1409=m
+CONFIG_DVB_AU8522=m
+CONFIG_DVB_S5H1411=m
+
+#
+# Digital terrestrial only tuners/PLL
+#
+CONFIG_DVB_PLL=m
+CONFIG_DVB_TUNER_DIB0070=m
+
+#
+# SEC control devices for DVB-S
+#
+CONFIG_DVB_LNBP21=m
+# CONFIG_DVB_ISL6405 is not set
+CONFIG_DVB_ISL6421=m
 # CONFIG_DAB is not set
 
 #
@@ -1053,7 +1203,7 @@ CONFIG_USB_SN9C102=m
 # CONFIG_VGASTATE is not set
 # CONFIG_VIDEO_OUTPUT_CONTROL is not set
 CONFIG_FB=y
-CONFIG_FIRMWARE_EDID=y
+# CONFIG_FIRMWARE_EDID is not set
 # CONFIG_FB_DDC is not set
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
@@ -1101,7 +1251,10 @@ CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 # CONFIG_FONTS is not set
 CONFIG_FONT_8x8=y
 CONFIG_FONT_8x16=y
-# CONFIG_LOGO is not set
+CONFIG_LOGO=y
+CONFIG_LOGO_LINUX_MONO=y
+CONFIG_LOGO_LINUX_VGA16=y
+CONFIG_LOGO_LINUX_CLUT224=y
 
 #
 # Sound
@@ -1114,15 +1267,15 @@ CONFIG_SOUND=y
 CONFIG_SND=y
 CONFIG_SND_TIMER=y
 CONFIG_SND_PCM=y
-CONFIG_SND_HWDEP=m
-CONFIG_SND_RAWMIDI=m
+CONFIG_SND_HWDEP=y
+CONFIG_SND_RAWMIDI=y
 CONFIG_SND_SEQUENCER=m
 # CONFIG_SND_SEQ_DUMMY is not set
 CONFIG_SND_OSSEMUL=y
 CONFIG_SND_MIXER_OSS=y
 CONFIG_SND_PCM_OSS=y
 CONFIG_SND_PCM_OSS_PLUGINS=y
-# CONFIG_SND_SEQUENCER_OSS is not set
+CONFIG_SND_SEQUENCER_OSS=y
 # CONFIG_SND_DYNAMIC_MINORS is not set
 CONFIG_SND_SUPPORT_OLD_API=y
 CONFIG_SND_VERBOSE_PROCFS=y
@@ -1154,9 +1307,9 @@ CONFIG_SND_VERBOSE_PROCFS=y
 #
 # USB devices
 #
-CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_AUDIO=y
 CONFIG_SND_USB_CAIAQ=m
-# CONFIG_SND_USB_CAIAQ_INPUT is not set
+CONFIG_SND_USB_CAIAQ_INPUT=y
 
 #
 # System on Chip audio support
@@ -1171,6 +1324,9 @@ CONFIG_SND_SOC=y
 # SoC Audio for the Texas Instruments OMAP
 #
 CONFIG_SND_OMAP_SOC=y
+CONFIG_SND_OMAP_SOC_MCBSP=y
+CONFIG_SND_OMAP_SOC_OMAP3BEAGLE=y
+CONFIG_SND_SOC_TWL4030=y
 
 #
 # Open Sound System
@@ -1203,7 +1359,7 @@ CONFIG_USB_DEVICEFS=y
 CONFIG_USB_DEVICE_CLASS=y
 # CONFIG_USB_DYNAMIC_MINORS is not set
 CONFIG_USB_SUSPEND=y
-# CONFIG_USB_OTG is not set
+CONFIG_USB_OTG=y
 # CONFIG_USB_OTG_WHITELIST is not set
 # CONFIG_USB_OTG_BLACKLIST_HUB is not set
 
@@ -1228,9 +1384,10 @@ CONFIG_USB_MUSB_SOC=y
 # OMAP 343x high speed USB support
 #
 # CONFIG_USB_MUSB_HOST is not set
-CONFIG_USB_MUSB_PERIPHERAL=y
-# CONFIG_USB_MUSB_OTG is not set
+# CONFIG_USB_MUSB_PERIPHERAL is not set
+CONFIG_USB_MUSB_OTG=y
 CONFIG_USB_GADGET_MUSB_HDRC=y
+CONFIG_USB_MUSB_HDRC_HCD=y
 # CONFIG_MUSB_PIO_ONLY is not set
 CONFIG_USB_INVENTRA_DMA=y
 # CONFIG_USB_TI_CPPI_DMA is not set
@@ -1241,6 +1398,7 @@ CONFIG_USB_MUSB_LOGLEVEL=0
 #
 CONFIG_USB_ACM=m
 CONFIG_USB_PRINTER=m
+CONFIG_USB_WDM=m
 
 #
 # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -1344,6 +1502,7 @@ CONFIG_USB_SISUSBVGA_CON=y
 # 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_GADGET=y
 # CONFIG_USB_GADGET_DEBUG is not set
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
@@ -1380,6 +1539,7 @@ CONFIG_MMC_UNSAFE_RESUME=y
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_BLOCK_BOUNCE=y
 CONFIG_SDIO_UART=y
+# CONFIG_MMC_TEST is not set
 
 #
 # MMC/SD Host Controller Drivers
@@ -1395,14 +1555,14 @@ CONFIG_LEDS_CLASS=y
 # CONFIG_LEDS_OMAP_DEBUG is not set
 # CONFIG_LEDS_OMAP is not set
 # CONFIG_LEDS_OMAP_PWM is not set
-CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_GPIO=y
 
 #
 # LED Triggers
 #
 CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
 # CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set
 CONFIG_RTC_LIB=y
 CONFIG_RTC_CLASS=y
@@ -1434,6 +1594,7 @@ CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_DRV_M41T80 is not set
 CONFIG_RTC_DRV_TWL4030=y
 # CONFIG_RTC_DRV_S35390A is not set
+# CONFIG_RTC_DRV_FM3130 is not set
 
 #
 # SPI RTC drivers
@@ -1476,8 +1637,12 @@ CONFIG_EXT3_FS=y
 CONFIG_JBD=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
-# CONFIG_FS_POSIX_ACL is not set
-# CONFIG_XFS_FS is not set
+CONFIG_FS_POSIX_ACL=y
+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_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
 CONFIG_DNOTIFY=y
@@ -1491,13 +1656,16 @@ CONFIG_QFMT_V2=y
 CONFIG_QUOTACTL=y
 # CONFIG_AUTOFS_FS is not set
 # CONFIG_AUTOFS4_FS is not set
-# CONFIG_FUSE_FS is not set
+CONFIG_FUSE_FS=m
 
 #
 # CD-ROM/DVD Filesystems
 #
-# CONFIG_ISO9660_FS is not set
-# CONFIG_UDF_FS is not set
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+CONFIG_UDF_NLS=y
 
 #
 # DOS/FAT/NT Filesystems
@@ -1530,7 +1698,23 @@ CONFIG_TMPFS=y
 # CONFIG_BEFS_FS is not set
 # CONFIG_BFS_FS is not set
 # CONFIG_EFS_FS is not set
-# CONFIG_JFFS2_FS is not set
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+CONFIG_JFFS2_SUMMARY=y
+CONFIG_JFFS2_FS_XATTR=y
+CONFIG_JFFS2_FS_POSIX_ACL=y
+CONFIG_JFFS2_FS_SECURITY=y
+CONFIG_JFFS2_COMPRESSION_OPTIONS=y
+CONFIG_JFFS2_ZLIB=y
+CONFIG_JFFS2_LZO=y
+CONFIG_JFFS2_RTIME=y
+CONFIG_JFFS2_RUBIN=y
+# CONFIG_JFFS2_CMODE_NONE is not set
+CONFIG_JFFS2_CMODE_PRIORITY=y
+# CONFIG_JFFS2_CMODE_SIZE is not set
+# CONFIG_JFFS2_CMODE_FAVOURLZO is not set
 # CONFIG_CRAMFS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_MINIX_FS is not set
@@ -1641,7 +1825,9 @@ CONFIG_SCHED_DEBUG=y
 CONFIG_SCHEDSTATS=y
 CONFIG_TIMER_STATS=y
 # CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_DEBUG_SLAB is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
+CONFIG_DEBUG_PREEMPT=y
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
@@ -1652,7 +1838,7 @@ CONFIG_DEBUG_MUTEXES=y
 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_DEBUG_KOBJECT is not set
-CONFIG_DEBUG_BUGVERBOSE=y
+# CONFIG_DEBUG_BUGVERBOSE is not set
 # CONFIG_DEBUG_INFO is not set
 # CONFIG_DEBUG_VM is not set
 # CONFIG_DEBUG_WRITECOUNT is not set
@@ -1665,10 +1851,9 @@ CONFIG_FRAME_POINTER=y
 # CONFIG_FAULT_INJECTION is not set
 # CONFIG_SAMPLES is not set
 # CONFIG_DEBUG_USER is not set
-CONFIG_DEBUG_ERRORS=y
+# CONFIG_DEBUG_ERRORS is not set
 # CONFIG_DEBUG_STACK_USAGE is not set
-CONFIG_DEBUG_LL=y
-# CONFIG_DEBUG_ICEDCC is not set
+# CONFIG_DEBUG_LL is not set
 
 #
 # Security options
@@ -1772,8 +1957,10 @@ CONFIG_CRC_ITU_T=y
 CONFIG_CRC32=y
 CONFIG_CRC7=y
 CONFIG_LIBCRC32C=y
-CONFIG_ZLIB_INFLATE=m
-CONFIG_ZLIB_DEFLATE=m
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
 CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
diff --git a/packages/linux/linux-omap2-git/beagleboard/fix-dispc-clocks.patch b/packages/linux/linux-omap2-git/beagleboard/fix-dispc-clocks.patch
new file mode 100644
index 0000000000..aade27fd8a
--- /dev/null
+++ b/packages/linux/linux-omap2-git/beagleboard/fix-dispc-clocks.patch
@@ -0,0 +1,147 @@
+From linux-omap-owner@vger.kernel.org Sun Jun 22 10:11:39 2008

+Received: from localhost

+	([127.0.0.1] helo=dominion ident=koen)

+	by dominion.dominion.void with esmtp (Exim 4.63)

+	(envelope-from <linux-omap-owner@vger.kernel.org>)

+	id 1KAKfj-0008Qc-FC

+	for koen@localhost; Sun, 22 Jun 2008 10:11:39 +0200

+Received: from xs.service.utwente.nl [130.89.5.250]

+	by dominion with POP3 (fetchmail-6.3.6)

+	for <koen@localhost> (single-drop); Sun, 22 Jun 2008 10:11:39 +0200 (CEST)

+Received: from mail.service.utwente.nl ([130.89.5.253]) by exchange.service.utwente.nl with Microsoft SMTPSVC(6.0.3790.3959);

+	 Sat, 21 Jun 2008 19:06:02 +0200

+Received: from smtp.utwente.nl ([130.89.2.9]) by mail.service.utwente.nl with Microsoft SMTPSVC(6.0.3790.3959);

+	 Sat, 21 Jun 2008 19:06:01 +0200

+Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])

+          by smtp.utwente.nl (8.12.10/SuSE Linux 0.7) with ESMTP id m5LH5TSm026212

+          for <k.kooi@student.utwente.nl>; Sat, 21 Jun 2008 19:05:30 +0200

+Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand

+	id S1753396AbYFURFN (ORCPT <rfc822;k.kooi@student.utwente.nl>);

+	Sat, 21 Jun 2008 13:05:13 -0400

+Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753305AbYFURFN

+	(ORCPT <rfc822;linux-omap-outgoing>);

+	Sat, 21 Jun 2008 13:05:13 -0400

+Received: from utopia.booyaka.com ([72.9.107.138]:41675 "EHLO

+	utopia.booyaka.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org

+	with ESMTP id S1753145AbYFURFL (ORCPT

+	<rfc822;linux-omap@vger.kernel.org>); Sat, 21 Jun 2008 13:05:11 -0400

+Received: (qmail 20532 invoked by uid 526); 21 Jun 2008 17:05:10 -0000

+Date: 	Sat, 21 Jun 2008 11:05:10 -0600 (MDT)

+From: Paul Walmsley <paul@pwsan.com>

+To: "Gadiyar, Anand" <gadiyar@ti.com>,

+        "linux-omap@vger.kernel.org" <linux-omap@vger.kernel.org>

+cc: Dirk Behme <dirk.behme@googlemail.com>,

+        "jouni.hogander@nokia.com" <jouni.hogander@nokia.com>

+Subject: [PATCH] OMAP3 clock: fix omap2_clk_wait_ready for OMAP3430ES2 DSS

+In-Reply-To: <5A47E75E594F054BAF48C5E4FC4B92AB022BB66209@dbde02.ent.ti.com>

+Message-ID: <alpine.DEB.1.00.0806211054100.19765@utopia.booyaka.com>

+References: <5A47E75E594F054BAF48C5E4FC4B92AB022BE46296@dbde02.ent.ti.com>,<485CA347.909@googlemail.com> <5A47E75E594F054BAF48C5E4FC4B92AB022BB66209@dbde02.ent.ti.com>

+User-Agent: Alpine 1.00 (DEB 882 2007-12-20)

+MIME-Version: 1.0

+Content-Type: TEXT/PLAIN; charset=US-ASCII

+Sender: linux-omap-owner@vger.kernel.org

+Precedence: bulk

+List-ID: <linux-omap.vger.kernel.org>

+X-Mailing-List: 	linux-omap@vger.kernel.org

+X-UTwente-MailScanner-Information: Scanned by MailScanner. Contact servicedesk@icts.utwente.nl for more information.

+X-UTwente-MailScanner: Found to be clean

+X-UTwente-MailScanner-From: linux-omap-owner@vger.kernel.org

+X-Spam-Status: No

+X-OriginalArrivalTime: 21 Jun 2008 17:06:02.0187 (UTC) FILETIME=[157001B0:01C8D3C1]

+

+

+On OMAP3430ES2, DSS has both an initiator standby CM_IDLEST bit, and a

+target idle CM_IDLEST bit.  This is a departure from previous silicon,

+which only had an initiator standby bit.

+

+This means we need to test the target idle bit after enabling

+dss1_alwon_fclk.  Previous clock code has done the wrong thing since ES2

+came out: it's either tested the wrong bit, causing intermittent

+

+    Clock dss1_alwon_fck didn't enable in 100000 tries

+

+messages; or not tested anything at all, causing intermittent crashes 

+during DISPC initialization with:

+

+    Unhandled fault: external abort on non-linefetch (0x1028)

+

+This patch modifies omap2_clk_wait_ready() to wait for the DSS to become

+accessible after dss1_alwon_fclk is enabled.

+

+Thanks to Anand Gadiyar <gadiyar@ti.com> for identifying one of the

+problem patches.

+

+Signed-off-by: Paul Walmsley <paul@pwsan.com>

+---

+

+ arch/arm/mach-omap2/clock.c           |   30 ++++++++++++++++++++++++------

+ arch/arm/mach-omap2/cm-regbits-34xx.h |    4 +++-

+ 2 files changed, 27 insertions(+), 7 deletions(-)

+

+diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c

+index ed15868..1820f75 100644

+--- a/arch/arm/mach-omap2/clock.c

++++ b/arch/arm/mach-omap2/clock.c

+@@ -244,18 +244,36 @@ static void omap2_clk_wait_ready(struct clk *clk)

+ 	}

+ 

+ 	/* REVISIT: What are the appropriate exclusions for 34XX? */

+-	/* OMAP3: ignore DSS-mod clocks */

+-	if (cpu_is_omap34xx() &&

+-	    ((reg & ~0xff) == (__force u32)OMAP34XX_CM_REGADDR(OMAP3430_DSS_MOD, 0) ||

+-	     (((reg & ~0xff) == (__force u32)OMAP34XX_CM_REGADDR(CORE_MOD, 0)) &&

+-	      clk->enable_bit == OMAP3430_EN_SSI_SHIFT)))

+-		return;

++	if (cpu_is_omap34xx()) {

++

++		/* 3430ES1 DSS and SSI have no target idlest bits */

++		if (is_sil_rev_equal_to(OMAP3430_REV_ES1_0) &&

++		    ((reg & ~0xff) == (__force u32)OMAP34XX_CM_REGADDR(OMAP3430_DSS_MOD, 0) ||

++		     ((reg & ~0xff) == (__force u32)OMAP34XX_CM_REGADDR(CORE_MOD, 0) &&

++		      clk->enable_bit == OMAP3430_EN_SSI_SHIFT)))

++			return;

++

++		/* Even for 3430ES2 DSS, only wait for dss1_alwon_fclk */

++		if (is_sil_rev_greater_than(OMAP3430_REV_ES1_0) &&

++		    (reg & ~0xff) == (__force u32)OMAP34XX_CM_REGADDR(OMAP3430_DSS_MOD, 0) &&

++		    clk->enable_bit != OMAP3430_EN_DSS1_SHIFT)

++			return;

++

++	}

+ 

+ 	/* Check if both functional and interface clocks

+ 	 * are running. */

+ 	bit = 1 << clk->enable_bit;

+ 	if (!(__raw_readl((__force void __iomem *)other_reg) & bit))

+ 		return;

++

++	/* OMAP3430ES2 DSS is an unusual case */

++	if (cpu_is_omap34xx() &&

++	    (reg & ~0xff) == (__force u32)OMAP34XX_CM_REGADDR(OMAP3430_DSS_MOD, 0) &&

++	    clk->enable_bit == OMAP3430_EN_DSS1_SHIFT) {

++		bit = OMAP3430ES2_ST_DSS_IDLE;

++	}

++

+ 	st_reg = ((other_reg & ~0xf0) | 0x20); /* CM_IDLEST* */

+ 

+ 	omap2_wait_clock_ready((__force void __iomem *)st_reg, bit, clk->name);

+diff --git a/arch/arm/mach-omap2/cm-regbits-34xx.h b/arch/arm/mach-omap2/cm-regbits-34xx.h

+index 6ec66f4..946c552 100644

+--- a/arch/arm/mach-omap2/cm-regbits-34xx.h

++++ b/arch/arm/mach-omap2/cm-regbits-34xx.h

+@@ -500,7 +500,9 @@

+ #define OMAP3430_CM_ICLKEN_DSS_EN_DSS_SHIFT		0

+ 

+ /* CM_IDLEST_DSS */

+-#define OMAP3430_ST_DSS					(1 << 0)

++#define OMAP3430ES2_ST_DSS_IDLE				(1 << 1)

++#define OMAP3430ES2_ST_DSS_STDBY			(1 << 0)

++#define OMAP3430ES1_ST_DSS				(1 << 0)

+ 

+ /* CM_AUTOIDLE_DSS */

+ #define OMAP3430_AUTO_DSS				(1 << 0)

+--

+To unsubscribe from this list: send the line "unsubscribe linux-omap" in

+the body of a message to majordomo@vger.kernel.org

+More majordomo info at  http://vger.kernel.org/majordomo-info.html

+

diff --git a/packages/linux/linux-omap2-git/beagleboard/flash.patch b/packages/linux/linux-omap2-git/beagleboard/flash.patch
new file mode 100644
index 0000000000..4c76cd97bd
--- /dev/null
+++ b/packages/linux/linux-omap2-git/beagleboard/flash.patch
@@ -0,0 +1,558 @@
+diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
+index 13d0043..d582b8f 100644
+--- a/arch/arm/mach-omap2/Makefile
++++ b/arch/arm/mach-omap2/Makefile
+@@ -44,7 +44,8 @@ obj-$(CONFIG_MACH_OMAP3EVM)		+= board-omap3evm.o \
+ 					   board-omap3evm-flash.o
+ obj-$(CONFIG_MACH_OMAP3_BEAGLE)		+= board-omap3beagle.o \
+ 					   usb-musb.o usb-ehci.o \
+-					   hsmmc.o
++					   hsmmc.o \
++					   board-omap3beagle-flash.o
+ obj-$(CONFIG_MACH_OMAP_LDP)		+= board-ldp.o \
+ 					   hsmmc.o \
+ 					   usb-musb.o
+diff --git a/arch/arm/mach-omap2/board-omap3beagle-flash.c b/arch/arm/mach-omap2/board-omap3beagle-flash.c
+new file mode 100644
+index 0000000..5346df0
+--- /dev/null
++++ b/arch/arm/mach-omap2/board-omap3beagle-flash.c
+@@ -0,0 +1,119 @@
++/*
++ * board-omap3beagle-flash.c
++ * 
++ * Copyright (c) 2008 Texas Instruments
++ *
++ * Modified from board-omap3evm-flash.c
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ */
++
++#include <linux/kernel.h>
++#include <linux/platform_device.h>
++#include <linux/mtd/mtd.h>
++#include <linux/mtd/partitions.h>
++#include <linux/mtd/nand.h>
++#include <linux/types.h>
++#include <linux/io.h>
++
++#include <asm/mach/flash.h>
++#include <asm/arch/board.h>
++#include <asm/arch/gpmc.h>
++#include <asm/arch/nand.h>
++
++#define GPMC_CS0_BASE  0x60
++#define GPMC_CS_SIZE   0x30
++
++static struct mtd_partition omap3beagle_nand_partitions[] = {
++	/* All the partition sizes are listed in terms of NAND block size */
++	{
++		.name		= "X-Loader",
++		.offset		= 0,
++		.size		= 4*(64 * 2048),	
++		.mask_flags	= MTD_WRITEABLE,	/* force read-only */
++	},
++	{
++		.name		= "U-Boot",
++		.offset		= MTDPART_OFS_APPEND,	/* Offset = 0x80000 */
++		.size		= 15*(64 * 2048),
++		.mask_flags	= MTD_WRITEABLE,	/* force read-only */
++	},
++	{
++		.name		= "U-Boot Env",
++		.offset		= MTDPART_OFS_APPEND,	/* Offset = 0x260000 */
++		.size		= 1*(64 * 2048),
++	},
++	{
++		.name		= "Kernel",
++		.offset		= MTDPART_OFS_APPEND,	/* Offset = 0x280000 */
++		.size		= 32*(64 * 2048),
++	},
++	{
++		.name		= "File System",
++		.offset		= MTDPART_OFS_APPEND,	/* Offset = 0x680000 */
++		.size		= MTDPART_SIZ_FULL,
++	},
++};
++
++static struct omap_nand_platform_data omap3beagle_nand_data = {
++	.parts		= omap3beagle_nand_partitions,
++	.nr_parts	= ARRAY_SIZE(omap3beagle_nand_partitions),
++	.dma_channel	= -1,		/* disable DMA in OMAP NAND driver */
++	.nand_setup	= NULL,
++	.dev_ready	= NULL,
++};
++
++static struct resource omap3beagle_nand_resource = {
++	.flags		= IORESOURCE_MEM,
++};
++
++static struct platform_device omap3beagle_nand_device = {
++	.name		= "omap2-nand",
++	.id		= -1,
++	.dev		= {
++		.platform_data	= &omap3beagle_nand_data,
++	},
++	.num_resources	= 1,
++	.resource	= &omap3beagle_nand_resource,
++};
++
++
++void __init omap3beagle_flash_init(void)
++{
++	u8 cs = 0;
++	u8 nandcs = GPMC_CS_NUM + 1;
++
++	u32 gpmc_base_add = OMAP34XX_GPMC_VIRT;
++
++	/* find out the chip-select on which NAND exists */
++	while (cs < GPMC_CS_NUM) {
++		u32 ret = 0;
++		ret = gpmc_cs_read_reg(cs, GPMC_CS_CONFIG1);
++
++		if ((ret & 0xC00) == 0x800) {
++			printk(KERN_INFO "Found NAND on CS%d\n", cs);
++			if (nandcs > GPMC_CS_NUM)
++				nandcs = cs;
++		}
++		cs++;
++	}
++
++	if (nandcs > GPMC_CS_NUM) {
++		printk(KERN_INFO "NAND: Unable to find configuration "
++				 "in GPMC\n ");
++		return;
++	}
++
++	if (nandcs < GPMC_CS_NUM) {
++		omap3beagle_nand_data.cs = nandcs;
++		omap3beagle_nand_data.gpmc_cs_baseaddr = (void *)(gpmc_base_add +
++			GPMC_CS0_BASE + nandcs * GPMC_CS_SIZE);
++		omap3beagle_nand_data.gpmc_baseaddr = (void *) (gpmc_base_add);
++
++		printk(KERN_INFO "Registering NAND on CS%d\n", nandcs);
++		if (platform_device_register(&omap3beagle_nand_device) < 0)
++			printk(KERN_ERR "Unable to register NAND device\n");
++	}
++}
+diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
+index c992cc7..99e042e 100644
+--- a/arch/arm/mach-omap2/board-omap3beagle.c
++++ b/arch/arm/mach-omap2/board-omap3beagle.c
+@@ -94,6 +94,7 @@ static void __init omap3_beagle_init(void)
+ 	hsmmc_init();
+ 	usb_musb_init();
+ 	usb_ehci_init();
++	omap3beagle_flash_init();
+ }
+ 
+ arch_initcall(omap3_beagle_i2c_init);
+diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
+index 3d5e432..02b9ced 100644
+--- a/drivers/mtd/nand/Kconfig
++++ b/drivers/mtd/nand/Kconfig
+@@ -71,7 +71,7 @@ config MTD_NAND_AMS_DELTA
+ 
+ config MTD_NAND_OMAP2
+ 	tristate "NAND Flash device on OMAP 2420H4/2430SDP boards"
+-	depends on (ARM && ARCH_OMAP2 && MTD_NAND)
++	depends on ARM && MTD_NAND && (ARCH_OMAP2 || ARCH_OMAP3)
+ 	help
+           Support for NAND flash on Texas Instruments 2430SDP/2420H4 platforms.
+ 
+diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c
+index 3b7307c..3aac1d2 100644
+--- a/drivers/mtd/nand/omap2.c
++++ b/drivers/mtd/nand/omap2.c
+@@ -111,15 +111,6 @@
+ static const char *part_probes[] = { "cmdlinepart", NULL };
+ #endif
+ 
+-static int hw_ecc = 1;
+-
+-/* new oob placement block for use with hardware ecc generation */
+-static struct nand_ecclayout omap_hw_eccoob = {
+-	.eccbytes = 12,
+-	.eccpos = {2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13},
+-	.oobfree = {{16, 32}, {33, 63} },
+-};
+-
+ struct omap_nand_info {
+ 	struct nand_hw_control		controller;
+ 	struct omap_nand_platform_data	*pdata;
+@@ -133,6 +124,13 @@ struct omap_nand_info {
+ 	void __iomem			*gpmc_cs_baseaddr;
+ 	void __iomem			*gpmc_baseaddr;
+ };
++
++/*
++ * omap_nand_wp - This function enable or disable the Write Protect feature on
++ * NAND device
++ * @mtd: MTD device structure
++ * @mode: WP ON/OFF
++ */
+ static void omap_nand_wp(struct mtd_info *mtd, int mode)
+ {
+ 	struct omap_nand_info *info = container_of(mtd,
+@@ -189,11 +187,11 @@ static void omap_hwcontrol(struct mtd_info *mtd, int cmd, unsigned int ctrl)
+ }
+ 
+ /*
+-* omap_read_buf - read data from NAND controller into buffer
+-* @mtd: MTD device structure
+-* @buf: buffer to store date
+-* @len: number of bytes to read
+-*/
++ * omap_read_buf - read data from NAND controller into buffer
++ * @mtd: MTD device structure
++ * @buf: buffer to store date
++ * @len: number of bytes to read
++ */
+ static void omap_read_buf(struct mtd_info *mtd, u_char *buf, int len)
+ {
+ 	struct omap_nand_info *info = container_of(mtd,
+@@ -207,11 +205,11 @@ static void omap_read_buf(struct mtd_info *mtd, u_char *buf, int len)
+ }
+ 
+ /*
+-* omap_write_buf - write buffer to NAND controller
+-* @mtd: MTD device structure
+-* @buf: data buffer
+-* @len: number of bytes to write
+-*/
++ * omap_write_buf - write buffer to NAND controller
++ * @mtd: MTD device structure
++ * @buf: data buffer
++ * @len: number of bytes to write
++ */
+ static void omap_write_buf(struct mtd_info *mtd, const u_char * buf, int len)
+ {
+ 	struct omap_nand_info *info = container_of(mtd,
+@@ -250,10 +248,16 @@ static int omap_verify_buf(struct mtd_info *mtd, const u_char * buf, int len)
+ 	return 0;
+ }
+ 
++#ifdef CONFIG_MTD_NAND_OMAP_HWECC
++/*
++ * omap_hwecc_init-Initialize the Hardware ECC for NAND flash in GPMC controller
++ * @mtd: MTD device structure
++ */
+ static void omap_hwecc_init(struct mtd_info *mtd)
+ {
+ 	struct omap_nand_info *info = container_of(mtd, struct omap_nand_info,
+ 							mtd);
++	register struct nand_chip *chip = mtd->priv;
+ 	unsigned long val = 0x0;
+ 
+ 	/* Read from ECC Control Register */
+@@ -264,16 +268,15 @@ static void omap_hwecc_init(struct mtd_info *mtd)
+ 
+ 	/* Read from ECC Size Config Register */
+ 	val = __raw_readl(info->gpmc_baseaddr + GPMC_ECC_SIZE_CONFIG);
+-	/* ECCSIZE1=512 | ECCSIZE0=8bytes | Select eccResultsize[0123] */
+-	val = ((0x000000FF<<22) | (0x00000003<<12) | (0x0000000F));
++	/* ECCSIZE1=512 | Select eccResultsize[0-3] */
++	val = ((((chip->ecc.size >> 1) - 1) << 22) | (0x0000000F));
+ 	__raw_writel(val, info->gpmc_baseaddr + GPMC_ECC_SIZE_CONFIG);
+-
+-
+ }
+ 
+ /*
+- * This function will generate true ECC value, which can be used
++ * gen_true_ecc - This function will generate true ECC value, which can be used
+  * when correcting data read from NAND flash memory core
++ * @ecc_buf: buffer to store ecc code
+  */
+ static void gen_true_ecc(u8 *ecc_buf)
+ {
+@@ -289,8 +292,12 @@ static void gen_true_ecc(u8 *ecc_buf)
+ }
+ 
+ /*
+- * This function compares two ECC's and indicates if there is an error.
+- * If the error can be corrected it will be corrected to the buffer
++ * omap_compare_ecc - This function compares two ECC's and indicates if there
++ * is an error. If the error can be corrected it will be corrected to the
++ * buffer
++ * @ecc_data1:  ecc code from nand spare area
++ * @ecc_data2:  ecc code from hardware register obtained from hardware ecc
++ * @page_data:  page data
+  */
+ static int omap_compare_ecc(u8 *ecc_data1,	/* read from NAND memory */
+ 			    u8 *ecc_data2,	/* read from register */
+@@ -409,6 +416,14 @@ static int omap_compare_ecc(u8 *ecc_data1,	/* read from NAND memory */
+ 	}
+ }
+ 
++/*
++ * omap_correct_data - Compares the ecc read from nand spare area with ECC
++ * registers values and corrects one bit error if it has occured
++ * @mtd: MTD device structure
++ * @dat: page data
++ * @read_ecc: ecc read from nand flash
++ * @calc_ecc: ecc read from ECC registers
++ */
+ static int omap_correct_data(struct mtd_info *mtd, u_char * dat,
+ 				u_char * read_ecc, u_char * calc_ecc)
+ {
+@@ -436,65 +451,64 @@ static int omap_correct_data(struct mtd_info *mtd, u_char * dat,
+ }
+ 
+ /*
+-** Generate non-inverted ECC bytes.
+-**
+-** Using noninverted ECC can be considered ugly since writing a blank
+-** page ie. padding will clear the ECC bytes. This is no problem as long
+-** nobody is trying to write data on the seemingly unused page.
+-**
+-** Reading an erased page will produce an ECC mismatch between
+-** generated and read ECC bytes that has to be dealt with separately.
+-*/
++ * omap_calcuate_ecc - Generate non-inverted ECC bytes.
++ * Using noninverted ECC can be considered ugly since writing a blank
++ * page ie. padding will clear the ECC bytes. This is no problem as long
++ * nobody is trying to write data on the seemingly unused page. Reading
++ * an erased page will produce an ECC mismatch between generated and read
++ * ECC bytes that has to be dealt with separately.
++ * @mtd: MTD device structure
++ * @dat: The pointer to data on which ecc is computed
++ * @ecc_code: The ecc_code buffer
++ */
+ static int omap_calculate_ecc(struct mtd_info *mtd, const u_char *dat,
+ 				u_char *ecc_code)
+ {
+ 	struct omap_nand_info *info = container_of(mtd, struct omap_nand_info,
+ 							mtd);
+ 	unsigned long val = 0x0;
+-	unsigned long reg, n;
+-
+-	/* Ex NAND_ECC_HW12_2048 */
+-	if ((info->nand.ecc.mode == NAND_ECC_HW) &&
+-		(info->nand.ecc.size  == 2048))
+-		n = 4;
+-	else
+-		n = 1;
++	unsigned long reg;
+ 
+ 	/* Start Reading from HW ECC1_Result = 0x200 */
+ 	reg = (unsigned long)(info->gpmc_baseaddr + GPMC_ECC1_RESULT);
+-	while (n--) {
+-		val = __raw_readl(reg);
+-		*ecc_code++ = val;		/* P128e, ..., P1e */
+-		*ecc_code++ = val >> 16;	/* P128o, ..., P1o */
+-		/* P2048o, P1024o, P512o, P256o, P2048e, P1024e, P512e, P256e */
+-		*ecc_code++ = ((val >> 8) & 0x0f) | ((val >> 20) & 0xf0);
+-		reg += 4;
+-	}
++	val = __raw_readl(reg);
++	*ecc_code++ = val;          /* P128e, ..., P1e */
++	*ecc_code++ = val >> 16;    /* P128o, ..., P1o */
++	/* P2048o, P1024o, P512o, P256o, P2048e, P1024e, P512e, P256e */
++	*ecc_code++ = ((val >> 8) & 0x0f) | ((val >> 20) & 0xf0);
++	reg += 4;
+ 
+ 	return 0;
+-} /* omap_calculate_ecc */
++}
+ 
++/*
++ * omap_enable_hwecc - This function enables the hardware ecc functionality
++ * @mtd: MTD device structure
++ * @mode: Read/Write mode
++ */
+ static void omap_enable_hwecc(struct mtd_info *mtd, int mode)
+ {
+ 	struct omap_nand_info *info = container_of(mtd, struct omap_nand_info,
+ 							mtd);
++	register struct nand_chip *chip = mtd->priv;
++	unsigned int dev_width = (chip->options & NAND_BUSWIDTH_16) ? 1 : 0;
+ 	unsigned long val = __raw_readl(info->gpmc_baseaddr + GPMC_ECC_CONFIG);
+ 
+ 	switch (mode) {
+ 	case NAND_ECC_READ    :
+ 		__raw_writel(0x101, info->gpmc_baseaddr + GPMC_ECC_CONTROL);
+-		/* ECC 16 bit col) | ( CS 0 )  | ECC Enable */
+-		val = (1 << 7) | (0x0) | (0x1) ;
++		/* (ECC 16 or 8 bit col) | ( CS  )  | ECC Enable */
++		val = (dev_width << 7) | (info->gpmc_cs << 1) | (0x1);
+ 		break;
+ 	case NAND_ECC_READSYN :
+-		__raw_writel(0x100, info->gpmc_baseaddr + GPMC_ECC_CONTROL);
+-		/* ECC 16 bit col) | ( CS 0 )  | ECC Enable */
+-		val = (1 << 7) | (0x0) | (0x1) ;
++		 __raw_writel(0x100, info->gpmc_baseaddr + GPMC_ECC_CONTROL);
++		/* (ECC 16 or 8 bit col) | ( CS  )  | ECC Enable */
++		val = (dev_width << 7) | (info->gpmc_cs << 1) | (0x1);
+ 		break;
+ 	case NAND_ECC_WRITE   :
+ 		__raw_writel(0x101, info->gpmc_baseaddr + GPMC_ECC_CONTROL);
+-		/* ECC 16 bit col) | ( CS 0 )  | ECC Enable */
+-		val = (1 << 7) | (0x0) | (0x1) ;
++		/* (ECC 16 or 8 bit col) | ( CS  )  | ECC Enable */
++		val = (dev_width << 7) | (info->gpmc_cs << 1) | (0x1);
+ 		break;
+ 	default:
+ 		DEBUG(MTD_DEBUG_LEVEL0, "Error: Unrecognized Mode[%d]!\n",
+@@ -504,7 +518,38 @@ static void omap_enable_hwecc(struct mtd_info *mtd, int mode)
+ 
+ 	__raw_writel(val, info->gpmc_baseaddr + GPMC_ECC_CONFIG);
+ }
++#endif
+ 
++/*
++ * omap_wait - Wait function is called during Program and erase
++ * operations and the way it is called from MTD layer, we should wait
++ * till the NAND chip is ready after the programming/erase operation
++ * has completed.
++ * @mtd: MTD device structure
++ * @chip: NAND Chip structure
++ */
++static int omap_wait(struct mtd_info *mtd, struct nand_chip *chip)
++{
++	register struct nand_chip *this = mtd->priv;
++	struct omap_nand_info *info = container_of(mtd, struct omap_nand_info,
++							mtd);
++	int status = 0;
++
++	this->IO_ADDR_W = (void *) info->gpmc_cs_baseaddr +
++						GPMC_CS_NAND_COMMAND;
++	this->IO_ADDR_R = (void *) info->gpmc_cs_baseaddr + GPMC_CS_NAND_DATA;
++
++	while (!(status & 0x40)) {
++		 __raw_writeb(NAND_CMD_STATUS & 0xFF, this->IO_ADDR_W);
++		status = __raw_readb(this->IO_ADDR_R);
++	}
++	return status;
++}
++
++/*
++ * omap_dev_ready - calls the platform specific dev_ready function
++ * @mtd: MTD device structure
++ */
+ static int omap_dev_ready(struct mtd_info *mtd)
+ {
+ 	struct omap_nand_info *info = container_of(mtd, struct omap_nand_info,
+@@ -534,7 +579,7 @@ static int __devinit omap_nand_probe(struct platform_device *pdev)
+ 	struct omap_nand_info		*info;
+ 	struct omap_nand_platform_data	*pdata;
+ 	int				err;
+-	unsigned long val;
++	unsigned long 			val;
+ 
+ 
+ 	pdata = pdev->dev.platform_data;
+@@ -568,15 +613,20 @@ static int __devinit omap_nand_probe(struct platform_device *pdev)
+ 	}
+ 
+ 	/* Enable RD PIN Monitoring Reg */
+-	val  = gpmc_cs_read_reg(info->gpmc_cs, GPMC_CS_CONFIG1);
+-	val |= WR_RD_PIN_MONITORING;
+-	gpmc_cs_write_reg(info->gpmc_cs, GPMC_CS_CONFIG1, val);
++	if (pdata->dev_ready) {
++		val  = gpmc_cs_read_reg(info->gpmc_cs, GPMC_CS_CONFIG1);
++		val |= WR_RD_PIN_MONITORING;
++		gpmc_cs_write_reg(info->gpmc_cs, GPMC_CS_CONFIG1, val);
++	}
+ 
+ 	val  = gpmc_cs_read_reg(info->gpmc_cs, GPMC_CS_CONFIG7);
+ 	val &= ~(0xf << 8);
+ 	val |=  (0xc & 0xf) << 8;
+ 	gpmc_cs_write_reg(info->gpmc_cs, GPMC_CS_CONFIG7, val);
+ 
++	/* NAND write protect off */
++	omap_nand_wp(&info->mtd, NAND_WP_OFF);
++
+ 	if (!request_mem_region(info->phys_base, NAND_IO_SIZE,
+ 				pdev->dev.driver->name)) {
+ 		err = -EBUSY;
+@@ -597,29 +647,39 @@ static int __devinit omap_nand_probe(struct platform_device *pdev)
+ 	info->nand.write_buf  = omap_write_buf;
+ 	info->nand.verify_buf = omap_verify_buf;
+ 
+-	info->nand.dev_ready  = omap_dev_ready;
+-	info->nand.chip_delay = 0;
+-
+-	/* Options */
+-	info->nand.options   = NAND_BUSWIDTH_16;
+-	info->nand.options  |= NAND_SKIP_BBTSCAN;
+-
+-	if (hw_ecc) {
+-		/* init HW ECC */
+-		omap_hwecc_init(&info->mtd);
+-
+-		info->nand.ecc.calculate = omap_calculate_ecc;
+-		info->nand.ecc.hwctl     = omap_enable_hwecc;
+-		info->nand.ecc.correct   = omap_correct_data;
+-		info->nand.ecc.mode      = NAND_ECC_HW;
+-		info->nand.ecc.bytes     = 12;
+-		info->nand.ecc.size      = 2048;
+-		info->nand.ecc.layout    = &omap_hw_eccoob;
+-
++	/*
++	* If RDY/BSY line is connected to OMAP then use the omap ready funcrtion
++	* and the generic nand_wait function which reads the status register
++	* after monitoring the RDY/BSY line.Otherwise use a standard chip delay
++	* which is slightly more than tR (AC Timing) of the NAND device and read
++	* status register until you get a failure or success
++	*/
++	if (pdata->dev_ready) {
++		info->nand.dev_ready = omap_dev_ready;
++		info->nand.chip_delay = 0;
+ 	} else {
+-		info->nand.ecc.mode = NAND_ECC_SOFT;
++		info->nand.waitfunc = omap_wait;
++		info->nand.chip_delay = 50;
+ 	}
+ 
++	info->nand.options  |= NAND_SKIP_BBTSCAN;
++	if ((gpmc_cs_read_reg(info->gpmc_cs, GPMC_CS_CONFIG1) & 0x3000)
++								== 0x1000)
++		info->nand.options  |= NAND_BUSWIDTH_16;
++
++#ifdef CONFIG_MTD_NAND_OMAP_HWECC
++	info->nand.ecc.bytes		= 3;
++	info->nand.ecc.size		= 512;
++	info->nand.ecc.calculate	= omap_calculate_ecc;
++	info->nand.ecc.hwctl		= omap_enable_hwecc;
++	info->nand.ecc.correct		= omap_correct_data;
++	info->nand.ecc.mode		= NAND_ECC_HW;
++
++	/* init HW ECC */
++	omap_hwecc_init(&info->mtd);
++#else
++	info->nand.ecc.mode = NAND_ECC_SOFT;
++#endif
+ 
+ 	/* DIP switches on some boards change between 8 and 16 bit
+ 	 * bus widths for flash.  Try the other width if the first try fails.
+@@ -636,14 +696,12 @@ static int __devinit omap_nand_probe(struct platform_device *pdev)
+ 	err = parse_mtd_partitions(&info->mtd, part_probes, &info->parts, 0);
+ 	if (err > 0)
+ 		add_mtd_partitions(&info->mtd, info->parts, err);
+-	else if (err < 0 && pdata->parts)
++	else if (err <= 0 && pdata->parts)
+ 		add_mtd_partitions(&info->mtd, pdata->parts, pdata->nr_parts);
+ 	else
+ #endif
+ 		add_mtd_device(&info->mtd);
+ 
+-	omap_nand_wp(&info->mtd, NAND_WP_OFF);
+-
+ 	platform_set_drvdata(pdev, &info->mtd);
+ 
+ 	return 0;
+diff --git a/include/asm-arm/arch-omap/board-omap3beagle.h b/include/asm-arm/arch-omap/board-omap3beagle.h
+index 46dff31..26ecfb8 100644
+--- a/include/asm-arm/arch-omap/board-omap3beagle.h
++++ b/include/asm-arm/arch-omap/board-omap3beagle.h
+@@ -29,5 +29,7 @@
+ #ifndef __ASM_ARCH_OMAP3_BEAGLE_H
+ #define __ASM_ARCH_OMAP3_BEAGLE_H
+ 
++extern void omap3beagle_flash_init(void);
++
+ #endif /* __ASM_ARCH_OMAP3_BEAGLE_H */
+ 
diff --git a/packages/linux/linux-omap2-git/beagleboard/omap3-dppl-divider.patch b/packages/linux/linux-omap2-git/beagleboard/omap3-dppl-divider.patch
new file mode 100644
index 0000000000..25e5aad9c9
--- /dev/null
+++ b/packages/linux/linux-omap2-git/beagleboard/omap3-dppl-divider.patch
@@ -0,0 +1,114 @@
+From linux-omap-owner@vger.kernel.org Tue Jun 24 09:24:30 2008
+Received: from localhost
+	([127.0.0.1] helo=dominion ident=koen)
+	by dominion.dominion.void with esmtp (Exim 4.63)
+	(envelope-from <linux-omap-owner@vger.kernel.org>)
+	id 1KB2tB-0005XT-FQ
+	for koen@localhost; Tue, 24 Jun 2008 09:24:30 +0200
+Received: from xs.service.utwente.nl [130.89.5.250]
+	by dominion with POP3 (fetchmail-6.3.6)
+	for <koen@localhost> (single-drop); Tue, 24 Jun 2008 09:24:29 +0200 (CEST)
+Received: from mail.service.utwente.nl ([130.89.5.254]) by exchange.service.utwente.nl with Microsoft SMTPSVC(6.0.3790.3959);
+	 Tue, 24 Jun 2008 09:13:04 +0200
+Received: from mx.utwente.nl ([130.89.2.13]) by mail.service.utwente.nl with Microsoft SMTPSVC(6.0.3790.3959);
+	 Tue, 24 Jun 2008 09:13:03 +0200
+Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
+          by mx.utwente.nl (8.12.10/SuSE Linux 0.7) with ESMTP id m5O7CcD7008917
+          for <k.kooi@student.utwente.nl>; Tue, 24 Jun 2008 09:12:38 +0200
+Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
+	id S1751623AbYFXHMh (ORCPT <rfc822;k.kooi@student.utwente.nl>);
+	Tue, 24 Jun 2008 03:12:37 -0400
+Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751670AbYFXHMh
+	(ORCPT <rfc822;linux-omap-outgoing>);
+	Tue, 24 Jun 2008 03:12:37 -0400
+Received: from utopia.booyaka.com ([72.9.107.138]:47392 "EHLO
+	utopia.booyaka.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
+	with ESMTP id S1751623AbYFXHMg (ORCPT
+	<rfc822;linux-omap@vger.kernel.org>); Tue, 24 Jun 2008 03:12:36 -0400
+Received: (qmail 1797 invoked by uid 526); 24 Jun 2008 07:12:35 -0000
+Date: 	Tue, 24 Jun 2008 01:12:35 -0600 (MDT)
+From: Paul Walmsley <paul@pwsan.com>
+To: linux-omap@vger.kernel.org
+Subject: [PATCH] OMAP3 clock: DPLL{1,2}_FCLK clksel can divide by 4
+Message-ID: <alpine.DEB.1.00.0806240111320.9741@utopia.booyaka.com>
+User-Agent: Alpine 1.00 (DEB 882 2007-12-20)
+MIME-Version: 1.0
+Content-Type: TEXT/PLAIN; charset=US-ASCII
+Sender: linux-omap-owner@vger.kernel.org
+Precedence: bulk
+List-ID: <linux-omap.vger.kernel.org>
+X-Mailing-List: 	linux-omap@vger.kernel.org
+X-UTwente-MailScanner-Information: Scanned by MailScanner. Contact servicedesk@icts.utwente.nl for more information.
+X-UTwente-MailScanner: Found to be clean
+X-UTwente-MailScanner-From: linux-omap-owner@vger.kernel.org
+X-Spam-Status: No
+X-OriginalArrivalTime: 24 Jun 2008 07:13:04.0264 (UTC) FILETIME=[BE950880:01C8D5C9]
+
+
+OMAP34xx ES2 TRM Delta G to H states that the divider for DPLL1_FCLK and 
+DPLL2_FCLK can divide by 4 in addition to dividing by 1 and 2. Encode this 
+into the OMAP3 clock framework.
+
+Signed-off-by: Paul Walmsley <paul@pwsan.com>
+---
+
+ arch/arm/mach-omap2/clock34xx.h |   20 ++++++++++++++++----
+ 1 files changed, 16 insertions(+), 4 deletions(-)
+
+diff --git a/arch/arm/mach-omap2/clock34xx.h b/arch/arm/mach-omap2/clock34xx.h
+index b4dceea..9605744 100644
+--- a/arch/arm/mach-omap2/clock34xx.h
++++ b/arch/arm/mach-omap2/clock34xx.h
+@@ -1029,8 +1029,15 @@ static struct clk corex2_fck = {
+ 
+ /* DPLL power domain clock controls */
+ 
+-static const struct clksel div2_core_clksel[] = {
+-	{ .parent = &core_ck, .rates = div2_rates },
++static const struct clksel_rate div4_rates[] = {
++	{ .div = 1, .val = 1, .flags = RATE_IN_343X | DEFAULT_RATE },
++	{ .div = 2, .val = 2, .flags = RATE_IN_343X },
++	{ .div = 4, .val = 4, .flags = RATE_IN_343X },
++	{ .div = 0 }
++};
++
++static const struct clksel div4_core_clksel[] = {
++	{ .parent = &core_ck, .rates = div4_rates },
+ 	{ .parent = NULL }
+ };
+ 
+@@ -1044,7 +1051,7 @@ static struct clk dpll1_fck = {
+ 	.init		= &omap2_init_clksel_parent,
+ 	.clksel_reg	= _OMAP34XX_CM_REGADDR(MPU_MOD, OMAP3430_CM_CLKSEL1_PLL),
+ 	.clksel_mask	= OMAP3430_MPU_CLK_SRC_MASK,
+-	.clksel		= div2_core_clksel,
++	.clksel		= div4_core_clksel,
+ 	.flags		= CLOCK_IN_OMAP343X | RATE_PROPAGATES |
+ 				PARENT_CONTROLS_CLOCK,
+ 	.recalc		= &omap2_clksel_recalc,
+@@ -1119,7 +1126,7 @@ static struct clk dpll2_fck = {
+ 	.init		= &omap2_init_clksel_parent,
+ 	.clksel_reg	= _OMAP34XX_CM_REGADDR(OMAP3430_IVA2_MOD, OMAP3430_CM_CLKSEL1_PLL),
+ 	.clksel_mask	= OMAP3430_IVA2_CLK_SRC_MASK,
+-	.clksel		= div2_core_clksel,
++	.clksel		= div4_core_clksel,
+ 	.flags		= CLOCK_IN_OMAP343X | RATE_PROPAGATES |
+ 				PARENT_CONTROLS_CLOCK,
+ 	.recalc		= &omap2_clksel_recalc,
+@@ -1155,6 +1162,11 @@ static struct clk iva2_ck = {
+ 
+ /* Common interface clocks */
+ 
++static const struct clksel div2_core_clksel[] = {
++	{ .parent = &core_ck, .rates = div2_rates },
++	{ .parent = NULL }
++};
++
+ static struct clk l3_ick = {
+ 	.name		= "l3_ick",
+ 	.parent		= &core_ck,
+--
+To unsubscribe from this list: send the line "unsubscribe linux-omap" in
+the body of a message to majordomo@vger.kernel.org
+More majordomo info at  http://vger.kernel.org/majordomo-info.html
+
diff --git a/packages/linux/linux-omap2-git/beagleboard/omap3-jitter.patch b/packages/linux/linux-omap2-git/beagleboard/omap3-jitter.patch
new file mode 100644
index 0000000000..2e0dfd9f13
--- /dev/null
+++ b/packages/linux/linux-omap2-git/beagleboard/omap3-jitter.patch
@@ -0,0 +1,95 @@
+From linux-omap-owner@vger.kernel.org Tue Jun 24 09:24:30 2008
+Received: from localhost
+	([127.0.0.1] helo=dominion ident=koen)
+	by dominion.dominion.void with esmtp (Exim 4.63)
+	(envelope-from <linux-omap-owner@vger.kernel.org>)
+	id 1KB2tC-0005XT-Mj
+	for koen@localhost; Tue, 24 Jun 2008 09:24:30 +0200
+Received: from xs.service.utwente.nl [130.89.5.250]
+	by dominion with POP3 (fetchmail-6.3.6)
+	for <koen@localhost> (single-drop); Tue, 24 Jun 2008 09:24:30 +0200 (CEST)
+Received: from mail.service.utwente.nl ([130.89.5.253]) by exchange.service.utwente.nl with Microsoft SMTPSVC(6.0.3790.3959);
+	 Tue, 24 Jun 2008 09:20:48 +0200
+Received: from smtp.utwente.nl ([130.89.2.8]) by mail.service.utwente.nl with Microsoft SMTPSVC(6.0.3790.3959);
+	 Tue, 24 Jun 2008 09:20:47 +0200
+Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
+          by smtp.utwente.nl (8.12.10/SuSE Linux 0.7) with ESMTP id m5O7BPWU031214
+          for <k.kooi@student.utwente.nl>; Tue, 24 Jun 2008 09:11:25 +0200
+Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
+	id S1751128AbYFXHLY (ORCPT <rfc822;k.kooi@student.utwente.nl>);
+	Tue, 24 Jun 2008 03:11:24 -0400
+Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751405AbYFXHLX
+	(ORCPT <rfc822;linux-omap-outgoing>);
+	Tue, 24 Jun 2008 03:11:23 -0400
+Received: from utopia.booyaka.com ([72.9.107.138]:44580 "EHLO
+	utopia.booyaka.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
+	with ESMTP id S1751128AbYFXHLX (ORCPT
+	<rfc822;linux-omap@vger.kernel.org>); Tue, 24 Jun 2008 03:11:23 -0400
+Received: (qmail 1744 invoked by uid 526); 24 Jun 2008 07:11:21 -0000
+Date: 	Tue, 24 Jun 2008 01:11:21 -0600 (MDT)
+From: Paul Walmsley <paul@pwsan.com>
+To: linux-omap@vger.kernel.org
+Subject: [PATCH] OMAP3 clock: fix DPLL jitter correction and rate
+ programming
+Message-ID: <alpine.DEB.1.00.0806240109440.9741@utopia.booyaka.com>
+User-Agent: Alpine 1.00 (DEB 882 2007-12-20)
+MIME-Version: 1.0
+Content-Type: TEXT/PLAIN; charset=US-ASCII
+Sender: linux-omap-owner@vger.kernel.org
+Precedence: bulk
+List-ID: <linux-omap.vger.kernel.org>
+X-Mailing-List: 	linux-omap@vger.kernel.org
+X-UTwente-MailScanner-Information: Scanned by MailScanner. Contact servicedesk@icts.utwente.nl for more information.
+X-UTwente-MailScanner: Found to be clean
+X-UTwente-MailScanner-From: linux-omap-owner@vger.kernel.org
+X-Spam-Status: No
+X-OriginalArrivalTime: 24 Jun 2008 07:20:48.0265 (UTC) FILETIME=[D325F790:01C8D5CA]
+
+
+Fix DPLL jitter correction programming.  Previously, 
+omap3_noncore_dpll_program() stored the FREQSEL jitter correction 
+parameter to the wrong register.  This caused jitter correction to be set 
+incorrectly and also caused the DPLL divider to be programmed incorrectly.
+
+Also, fix DPLL divider programming.  An off-by-one error existed in 
+omap3_noncore_dpll_program(), causing DPLLs to be programmed with a higher 
+divider than intended.
+
+Signed-off-by: Paul Walmsley <paul@pwsan.com>
+---
+
+ arch/arm/mach-omap2/clock34xx.c |   13 ++++++++-----
+ 1 files changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/arch/arm/mach-omap2/clock34xx.c b/arch/arm/mach-omap2/clock34xx.c
+index 408b51a..8fdf8f3 100644
+--- a/arch/arm/mach-omap2/clock34xx.c
++++ b/arch/arm/mach-omap2/clock34xx.c
+@@ -346,14 +346,17 @@ static int omap3_noncore_dpll_program(struct clk *clk, u16 m, u8 n, u16 freqsel)
+ 	/* 3430 ES2 TRM: 4.7.6.9 DPLL Programming Sequence */
+ 	_omap3_noncore_dpll_bypass(clk);
+ 
++	/* Set jitter correction */
++	v = __raw_readl(dd->control_reg);
++	v &= ~dd->freqsel_mask;
++	v |= freqsel << __ffs(dd->freqsel_mask);
++	__raw_writel(v, dd->control_reg);
++
++	/* Set DPLL multiplier, divider */
+ 	v = __raw_readl(dd->mult_div1_reg);
+ 	v &= ~(dd->mult_mask | dd->div1_mask);
+-
+-	/* Set mult (M), div1 (N), freqsel */
+ 	v |= m << __ffs(dd->mult_mask);
+-	v |= n << __ffs(dd->div1_mask);
+-	v |= freqsel << __ffs(dd->freqsel_mask);
+-
++	v |= (n - 1) << __ffs(dd->div1_mask);
+ 	__raw_writel(v, dd->mult_div1_reg);
+ 
+ 	/* We let the clock framework set the other output dividers later */
+--
+To unsubscribe from this list: send the line "unsubscribe linux-omap" in
+the body of a message to majordomo@vger.kernel.org
+More majordomo info at  http://vger.kernel.org/majordomo-info.html
+
diff --git a/packages/linux/linux-omap2-git/beagleboard/soc.patch b/packages/linux/linux-omap2-git/beagleboard/soc.patch
new file mode 100644
index 0000000000..bb97403f29
--- /dev/null
+++ b/packages/linux/linux-omap2-git/beagleboard/soc.patch
@@ -0,0 +1,1173 @@
+diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
+index 3903ab7..468536d 100644
+--- a/sound/soc/codecs/Kconfig
++++ b/sound/soc/codecs/Kconfig
+@@ -44,3 +44,7 @@ config SND_SOC_CS4270_VD33_ERRATA
+ config SND_SOC_TLV320AIC3X
+ 	tristate
+ 	depends on SND_SOC && I2C
++
++config SND_SOC_TWL4030
++	tristate
++	depends on SND_SOC && I2C
+diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
+index 4e1314c..d2c0b12 100644
+--- a/sound/soc/codecs/Makefile
++++ b/sound/soc/codecs/Makefile
+@@ -6,6 +6,7 @@ snd-soc-wm9712-objs := wm9712.o
+ snd-soc-wm9713-objs := wm9713.o
+ snd-soc-cs4270-objs := cs4270.o
+ snd-soc-tlv320aic3x-objs := tlv320aic3x.o
++snd-soc-twl4030-objs := twl4030.o
+ 
+ obj-$(CONFIG_SND_SOC_AC97_CODEC)	+= snd-soc-ac97.o
+ obj-$(CONFIG_SND_SOC_WM8731)	+= snd-soc-wm8731.o
+@@ -15,3 +16,4 @@ obj-$(CONFIG_SND_SOC_WM9712)	+= snd-soc-wm9712.o
+ obj-$(CONFIG_SND_SOC_WM9713)	+= snd-soc-wm9713.o
+ obj-$(CONFIG_SND_SOC_CS4270)	+= snd-soc-cs4270.o
+ obj-$(CONFIG_SND_SOC_TLV320AIC3X)	+= snd-soc-tlv320aic3x.o
++obj-$(CONFIG_SND_SOC_TWL4030)	+= snd-soc-twl4030.o
+diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c
+new file mode 100644
+index 0000000..c9eee19
+--- /dev/null
++++ b/sound/soc/codecs/twl4030.c
+@@ -0,0 +1,595 @@
++/*
++ * ALSA SoC TWL4030 codec driver
++ *
++ * Author:      Steve Sakoman, <steve@sakoman.com>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ */
++
++#include <linux/module.h>
++#include <linux/moduleparam.h>
++#include <linux/init.h>
++#include <linux/delay.h>
++#include <linux/pm.h>
++#include <linux/i2c.h>
++#include <linux/platform_device.h>
++#include <linux/i2c/twl4030.h>
++#include <sound/core.h>
++#include <sound/pcm.h>
++#include <sound/pcm_params.h>
++#include <sound/soc.h>
++#include <sound/soc-dapm.h>
++#include <sound/initval.h>
++
++#include "twl4030.h"
++
++/*
++ * twl4030 register cache & default register settings
++ */
++static const u8 twl4030_reg[TWL4030_CACHEREGNUM] = {
++	0x00, // this register not used
++	0x93, // REG_CODEC_MODE		(0x1)
++	0xc3, // REG_OPTION		(0x2)
++	0x00, // REG_UNKNOWN		(0x3)
++	0x00, // REG_MICBIAS_CTL	(0x4)
++	0x34, // REG_ANAMICL		(0x5)
++	0x14, // REG_ANAMICR		(0x6)
++	0x0a, // REG_AVADC_CTL		(0x7)
++	0x00, // REG_ADCMICSEL		(0x8)
++	0x00, // REG_DIGMIXING		(0x9)
++	0x0c, // REG_ATXL1PGA		(0xA)
++	0x0c, // REG_ATXR1PGA		(0xB)
++	0x00, // REG_AVTXL2PGA		(0xC)
++	0x00, // REG_AVTXR2PGA		(0xD)
++	0x01, // REG_AUDIO_IF		(0xE)
++	0x00, // REG_VOICE_IF		(0xF)
++	0x00, // REG_ARXR1PGA		(0x10)
++	0x00, // REG_ARXL1PGA		(0x11)
++	0x6c, // REG_ARXR2PGA		(0x12)
++	0x6c, // REG_ARXL2PGA		(0x13)
++	0x00, // REG_VRXPGA		(0x14)
++	0x00, // REG_VSTPGA		(0x15)
++	0x00, // REG_VRX2ARXPGA		(0x16)
++	0x0c, // REG_AVDAC_CTL		(0x17)
++	0x00, // REG_ARX2VTXPGA		(0x18)
++	0x00, // REG_ARXL1_APGA_CTL	(0x19)
++	0x00, // REG_ARXR1_APGA_CTL	(0x1A)
++	0x4b, // REG_ARXL2_APGA_CTL	(0x1B)
++	0x4b, // REG_ARXR2_APGA_CTL	(0x1C)
++	0x00, // REG_ATX2ARXPGA		(0x1D)
++	0x00, // REG_BT_IF		(0x1E)
++	0x00, // REG_BTPGA		(0x1F)
++	0x00, // REG_BTSTPGA		(0x20)
++	0x00, // REG_EAR_CTL		(0x21)
++	0x24, // REG_HS_SEL		(0x22)
++	0x0a, // REG_HS_GAIN_SET	(0x23)
++	0x00, // REG_HS_POPN_SET	(0x24)
++	0x00, // REG_PREDL_CTL		(0x25)
++	0x00, // REG_PREDR_CTL		(0x26)
++	0x00, // REG_PRECKL_CTL		(0x27)
++	0x00, // REG_PRECKR_CTL		(0x28)
++	0x00, // REG_HFL_CTL		(0x29)
++	0x00, // REG_HFR_CTL		(0x2A)
++	0x00, // REG_ALC_CTL		(0x2B)
++	0x00, // REG_ALC_SET1		(0x2C)
++	0x00, // REG_ALC_SET2		(0x2D)
++	0x00, // REG_BOOST_CTL		(0x2E)
++	0x01, // REG_SOFTVOL_CTL	(0x2F)
++	0x00, // REG_DTMF_FREQSEL	(0x30)
++	0x00, // REG_DTMF_TONEXT1H	(0x31)
++	0x00, // REG_DTMF_TONEXT1L	(0x32)
++	0x00, // REG_DTMF_TONEXT2H	(0x33)
++	0x00, // REG_DTMF_TONEXT2L	(0x34)
++	0x00, // REG_DTMF_TONOFF	(0x35)
++	0x00, // REG_DTMF_WANONOFF	(0x36)
++	0x00, // REG_I2S_RX_SCRAMBLE_H	(0x37)
++	0x00, // REG_I2S_RX_SCRAMBLE_M	(0x38)
++	0x00, // REG_I2S_RX_SCRAMBLE_L	(0x39)
++	0x16, // REG_APLL_CTL		(0x3A)
++	0x00, // REG_DTMF_CTL		(0x3B)
++	0x00, // REG_DTMF_PGA_CTL2	(0x3C)
++	0x00, // REG_DTMF_PGA_CTL1	(0x3D)
++	0x00, // REG_MISC_SET_1		(0x3E)
++	0x00, // REG_PCMBTMUX		(0x3F)
++	0x00, // REG_RX_PATH_SEL	(0x43)
++	0x00, // REG_VDL_APGA_CTL	(0x44)
++	0x00, // REG_VIBRA_CTL		(0x45)
++	0x00, // REG_VIBRA_SET		(0x46)
++	0x00, // REG_VIBRA_PWM_SET	(0x47)
++	0x00, // REG_ANAMIC_GAIN	(0x48)
++	0x00, // REG_MISC_SET_2		(0x49)
++};
++
++static void twl4030_dump_registers(void)
++{
++	int i = 0;
++	u8 data;
++
++	printk(KERN_INFO "TWL 4030 Register dump for Audio Module\n");
++
++	for (i = REG_CODEC_MODE; i <= REG_MISC_SET_2; i++) {
++		twl4030_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE, &data, i);
++		printk(KERN_INFO "Register[0x%02x]=0x%02x\n", i, data);
++	}
++}
++
++struct twl4030_priv {
++	unsigned int dummy;
++};
++
++/*
++ * read twl4030 register cache
++ */
++static inline unsigned int twl4030_read_reg_cache(struct snd_soc_codec *codec,
++	unsigned int reg)
++{
++	u8 *cache = codec->reg_cache;
++
++	return cache[reg];
++}
++
++/*
++ * write twl4030 register cache
++ */
++static inline void twl4030_write_reg_cache(struct snd_soc_codec *codec,
++						u8 reg, u8 value)
++{
++	u8 *cache = codec->reg_cache;
++
++	if (reg >= TWL4030_CACHEREGNUM)
++		return;
++	cache[reg] = value;
++}
++
++/*
++ * write to the twl4030 register space
++ */
++static int twl4030_write(struct snd_soc_codec *codec,
++			unsigned int reg, unsigned int value)
++{
++	twl4030_write_reg_cache(codec, reg, value);
++	return twl4030_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE, value, reg);
++}
++
++static void twl4030_init_chip(void)
++{
++	unsigned char byte;
++	int i;
++
++	twl4030_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE,
++		twl4030_reg[REG_CODEC_MODE] & 0xfd, REG_CODEC_MODE);
++
++	udelay(10); /* 10 ms delay for power settling */
++
++	for (i = REG_OPTION; i <= REG_MISC_SET_2; i++) {
++		twl4030_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE, twl4030_reg[i], i);
++	}
++
++	twl4030_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE,
++		twl4030_reg[REG_CODEC_MODE], REG_CODEC_MODE);
++
++	udelay(10); /* 10 ms delay for power settling */
++
++	/* initiate offset cancellation */
++	twl4030_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE,
++		twl4030_reg[REG_ANAMICL] | 0x80, REG_ANAMICL);
++
++	/* wait for offset cancellation to complete */
++	twl4030_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE, &byte, REG_ANAMICL);
++	while ((byte & 0x80) == 0x80)
++		twl4030_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE, &byte, REG_ANAMICL);
++
++	twl4030_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE,
++		twl4030_reg[REG_MISC_SET_1] | 0x02, REG_MISC_SET_1);
++
++	twl4030_dump_registers();
++}
++
++static const struct snd_kcontrol_new twl4030_snd_controls[] = {
++	SOC_DOUBLE_R("Master Playback Volume",
++		 REG_ARXL2PGA, REG_ARXR2PGA,
++		0, 127, 0),
++	SOC_DOUBLE_R("Capture Volume",
++		 REG_ATXL1PGA, REG_ATXR1PGA,
++		0, 127, 0),
++};
++
++/* add non dapm controls */
++static int twl4030_add_controls(struct snd_soc_codec *codec)
++{
++	int err, i;
++
++	for (i = 0; i < ARRAY_SIZE(twl4030_snd_controls); i++) {
++		err = snd_ctl_add(codec->card,
++				  snd_soc_cnew(&twl4030_snd_controls[i],
++						codec, NULL));
++		if (err < 0)
++			return err;
++	}
++
++	return 0;
++}
++
++#define TWL4030_PWR 0
++
++static const struct snd_soc_dapm_widget twl4030_dapm_widgets[] = {
++	SND_SOC_DAPM_INPUT("INL"),
++	SND_SOC_DAPM_INPUT("INR"),
++
++	SND_SOC_DAPM_OUTPUT("OUTL"),
++	SND_SOC_DAPM_OUTPUT("OUTR"),
++
++	SND_SOC_DAPM_DAC("DACL", "Left Playback", SND_SOC_NOPM, 0, 0),
++	SND_SOC_DAPM_DAC("DACR", "Right Playback", SND_SOC_NOPM, 0, 0),
++
++	SND_SOC_DAPM_ADC("ADCL", "Left Capture", SND_SOC_NOPM, 0, 0),
++	SND_SOC_DAPM_ADC("ADCR", "Right Capture", SND_SOC_NOPM, 0, 0),
++};
++
++static const char *intercon[][3] = {
++	/* outputs */
++	{"OUTL", NULL, "DACL"},
++	{"OUTR", NULL, "DACR"},
++
++	/* inputs */
++	{"ADCL", NULL, "INL"},
++	{"ADCR", NULL, "INR"},
++
++	/* terminator */
++	{NULL, NULL, NULL},
++};
++
++static int twl4030_add_widgets(struct snd_soc_codec *codec)
++{
++	int i;
++
++	for (i = 0; i < ARRAY_SIZE(twl4030_dapm_widgets); i++)
++		snd_soc_dapm_new_control(codec, &twl4030_dapm_widgets[i]);
++
++	/* set up audio path interconnects */
++	for (i = 0; intercon[i][0] != NULL; i++)
++		snd_soc_dapm_connect_input(codec, intercon[i][0],
++			intercon[i][1], intercon[i][2]);
++
++	snd_soc_dapm_new_widgets(codec);
++	return 0;
++}
++
++static int twl4030_dapm_event(struct snd_soc_codec *codec, int event)
++{
++
++	printk(KERN_INFO "TWL4030 Audio Codec dapm event\n");
++	switch (event) {
++	case SNDRV_CTL_POWER_D0: /* full On */
++		break;
++	case SNDRV_CTL_POWER_D1: /* partial On */
++	case SNDRV_CTL_POWER_D2: /* partial On */
++		break;
++	case SNDRV_CTL_POWER_D3hot: /* off, with power */
++		break;
++	case SNDRV_CTL_POWER_D3cold: /* off, without power */
++		break;
++	}
++	codec->dapm_state = event;
++
++	return 0;
++}
++
++static void twl4030_power_up (struct snd_soc_codec *codec, u8 mode)
++{
++	twl4030_write(codec, REG_CODEC_MODE, mode & ~CODECPDZ);
++	twl4030_write(codec, REG_CODEC_MODE, mode | CODECPDZ);
++	udelay(10);
++
++	u8 popn = twl4030_read_reg_cache(codec, REG_HS_POPN_SET) | (0x40);
++	twl4030_write(codec, REG_HS_POPN_SET, popn);
++
++	u8 hsgain = twl4030_read_reg_cache(codec, REG_HS_GAIN_SET) | (0x0a);
++	twl4030_write(codec, REG_HS_GAIN_SET, hsgain);
++
++	popn = twl4030_read_reg_cache(codec, REG_HS_POPN_SET) | (0x02);
++	twl4030_write(codec, REG_HS_POPN_SET, popn);
++}
++
++static void twl4030_power_down (struct snd_soc_codec *codec)
++{
++	u8 popn = twl4030_read_reg_cache(codec, REG_HS_POPN_SET) & ~(0x02);
++	twl4030_write(codec, REG_HS_POPN_SET, popn);
++
++	u8 hsgain = twl4030_read_reg_cache(codec, REG_HS_GAIN_SET) & ~(0x0f);
++	twl4030_write(codec, REG_HS_GAIN_SET, hsgain);
++
++	popn = twl4030_read_reg_cache(codec, REG_HS_POPN_SET) & ~(0x40);
++	twl4030_write(codec, REG_HS_POPN_SET, popn);
++
++	u8 mode = twl4030_read_reg_cache(codec, REG_CODEC_MODE) & ~CODECPDZ;
++	twl4030_write(codec, REG_CODEC_MODE, mode);
++	udelay(10);
++}
++
++
++static int twl4030_hw_params(struct snd_pcm_substream *substream,
++			   struct snd_pcm_hw_params *params)
++{
++	struct snd_soc_pcm_runtime *rtd = substream->private_data;
++	struct snd_soc_device *socdev = rtd->socdev;
++	struct snd_soc_codec *codec = socdev->codec;
++	struct twl4030_priv *twl4030 = codec->private_data;
++
++	twl4030_power_down(codec);
++
++	u8 mode = twl4030_read_reg_cache(codec, REG_CODEC_MODE) & ~CODECPDZ;
++
++	mode &= ~APLL_RATE;
++	switch (params_rate(params)) {
++	case 44100:
++		printk(KERN_INFO "TWL4030 hw params: set rate to 44.1khz\n");
++		mode |= APLL_RATE_44100;
++		break;
++	case 48000:
++		printk(KERN_INFO "TWL4030 hw params: set rate to 48khz\n");
++		mode |= APLL_RATE_48000;
++		break;
++	default:
++		printk(KERN_INFO "TWL4030 hw params: unknown rate %d\n", params_rate(params));
++		return -EINVAL;
++	}
++
++	/* bit size */
++	switch (params_format(params)) {
++	case SNDRV_PCM_FORMAT_S16_LE:
++		printk(KERN_INFO "TWL4030 hw params: set format to S16_LE\n");
++		break;
++	case SNDRV_PCM_FORMAT_S24_LE:
++		printk(KERN_INFO "TWL4030 hw params: set format to S24_LE\n");
++		break;
++	default:
++		printk(KERN_INFO "TWL4030 hw params: unknown format %d\n", params_format(params));
++		return -EINVAL;
++	}
++
++	/* change rate and turn codec back on */
++	twl4030_power_up(codec, mode);
++
++	return 0;
++}
++
++static int twl4030_mute(struct snd_soc_codec_dai *dai, int mute)
++{
++	struct snd_soc_codec *codec = dai->codec;
++
++	u8 ldac_reg = twl4030_read_reg_cache(codec, REG_ARXL2PGA);
++	u8 rdac_reg = twl4030_read_reg_cache(codec, REG_ARXR2PGA);
++
++	if (mute) {
++		printk(KERN_INFO "TWL4030 Audio Codec mute\n");
++		twl4030_write(codec, REG_ARXL2PGA, 0x00);
++		twl4030_write(codec, REG_ARXR2PGA, 0x00);
++		twl4030_write_reg_cache(codec, REG_ARXL2PGA, ldac_reg);
++		twl4030_write_reg_cache(codec, REG_ARXR2PGA, rdac_reg);
++	}
++	else {
++		printk(KERN_INFO "TWL4030 Audio Codec unmute: %02x/%02x\n", ldac_reg, rdac_reg);
++		twl4030_write(codec, REG_ARXL2PGA, ldac_reg);
++		twl4030_write(codec, REG_ARXR2PGA, rdac_reg);
++	}
++
++	return 0;
++}
++
++static int twl4030_set_dai_fmt(struct snd_soc_codec_dai *codec_dai,
++			     unsigned int fmt)
++{
++	struct snd_soc_codec *codec = codec_dai->codec;
++	struct twl4030_priv *twl4030 = codec->private_data;
++
++	/* get current format */
++	u8 format = twl4030_read_reg_cache(codec, REG_AUDIO_IF);
++
++	/* set master/slave audio interface */
++	switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
++	case SND_SOC_DAIFMT_CBM_CFM:
++		printk(KERN_INFO "TWL4030 set dai fmt: master\n");
++		format &= ~(AIF_SLAVE_EN);
++		format |= CLK256FS_EN;
++		break;
++	case SND_SOC_DAIFMT_CBS_CFS:
++		printk(KERN_INFO "TWL4030 set dai fmt: slave\n");
++		format &= ~(CLK256FS_EN);
++ 		format |= AIF_SLAVE_EN;
++		break;
++	default:
++		return -EINVAL;
++	}
++
++	/* interface format */
++	format &= ~AIF_FORMAT;
++	switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
++	case SND_SOC_DAIFMT_I2S:
++		printk(KERN_INFO "TWL4030 set dai fmt: i2s\n");
++		format |= AIF_FORMAT_CODEC;
++		break;
++	default:
++		return -EINVAL;
++	}
++
++	/* turn off codec before changing format */
++	twl4030_power_down(codec);
++
++	/* change format */
++	twl4030_write(codec, REG_AUDIO_IF, format);
++
++	u8 mode = twl4030_read_reg_cache(codec, REG_CODEC_MODE);
++	twl4030_power_up(codec, mode);
++
++	return 0;
++}
++
++#define TWL4030_RATES	 SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000
++#define TWL4030_FORMATS	 SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FORMAT_S24_LE
++
++struct snd_soc_codec_dai twl4030_dai = {
++	.name = "twl4030",
++	.playback = {
++		.stream_name = "Playback",
++		.channels_min = 2,
++		.channels_max = 2,
++		.rates = TWL4030_RATES,
++		.formats = TWL4030_FORMATS,},
++	.capture = {
++		.stream_name = "Capture",
++		.channels_min = 2,
++		.channels_max = 2,
++		.rates = TWL4030_RATES,
++		.formats = TWL4030_FORMATS,},
++	.ops = {
++		.hw_params = twl4030_hw_params,
++	},
++	.dai_ops = {
++		.digital_mute = twl4030_mute,
++		.set_fmt = twl4030_set_dai_fmt,
++	}
++};
++
++EXPORT_SYMBOL_GPL(twl4030_dai);
++
++static int twl4030_suspend(struct platform_device *pdev, pm_message_t state)
++{
++	struct snd_soc_device *socdev = platform_get_drvdata(pdev);
++	struct snd_soc_codec *codec = socdev->codec;
++
++	printk(KERN_INFO "TWL4030 Audio Codec suspend\n");
++	twl4030_dapm_event(codec, SNDRV_CTL_POWER_D3cold);
++
++	return 0;
++}
++
++static int twl4030_resume(struct platform_device *pdev)
++{
++	struct snd_soc_device *socdev = platform_get_drvdata(pdev);
++	struct snd_soc_codec *codec = socdev->codec;
++	int i;
++	u16 *cache = codec->reg_cache;
++
++	printk(KERN_INFO "TWL4030 Audio Codec resume\n");
++	/* Sync reg_cache with the hardware */
++	for (i = REG_CODEC_MODE; i <= REG_MISC_SET_2; i++) {
++		twl4030_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE, cache[i], i);
++	}
++	twl4030_dapm_event(codec, SNDRV_CTL_POWER_D3hot);
++	twl4030_dapm_event(codec, codec->suspend_dapm_state);
++	return 0;
++}
++
++/*
++ * initialize the driver
++ * register the mixer and dsp interfaces with the kernel
++ */
++
++static int twl4030_init(struct snd_soc_device *socdev)
++{
++	struct snd_soc_codec *codec = socdev->codec;
++	int ret = 0;
++
++	printk(KERN_INFO "TWL4030 Audio Codec init \n");
++
++	twl4030_init_chip();
++
++	codec->name = "twl4030";
++	codec->owner = THIS_MODULE;
++	codec->read = twl4030_read_reg_cache;
++	codec->write = twl4030_write;
++	codec->dapm_event = twl4030_dapm_event;
++	codec->dai = &twl4030_dai;
++	codec->num_dai = 1;
++	codec->reg_cache_size = sizeof(twl4030_reg);
++	codec->reg_cache = kmemdup(twl4030_reg, sizeof(twl4030_reg), GFP_KERNEL);
++	if (codec->reg_cache == NULL)
++		return -ENOMEM;
++
++	/* register pcms */
++	ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1);
++	if (ret < 0) {
++		printk(KERN_ERR "twl4030: failed to create pcms\n");
++		goto pcm_err;
++	}
++
++	twl4030_add_controls(codec);
++	twl4030_add_widgets(codec);
++
++	ret = snd_soc_register_card(socdev);
++	if (ret < 0) {
++		printk(KERN_ERR "twl4030: failed to register card\n");
++		goto card_err;
++	}
++
++	return ret;
++
++card_err:
++	printk(KERN_INFO "TWL4030 Audio Codec init card error\n");
++	snd_soc_free_pcms(socdev);
++	snd_soc_dapm_free(socdev);
++pcm_err:
++	printk(KERN_INFO "TWL4030 Audio Codec init pcm error\n");
++	kfree(codec->reg_cache);
++	return ret;
++}
++
++static struct snd_soc_device *twl4030_socdev;
++
++static int twl4030_probe(struct platform_device *pdev)
++{
++	struct snd_soc_device *socdev = platform_get_drvdata(pdev);
++	struct snd_soc_codec *codec;
++	struct twl4030_priv *twl4030;
++
++	printk(KERN_INFO "TWL4030 Audio Codec probe\n");
++
++	codec = kzalloc(sizeof(struct snd_soc_codec), GFP_KERNEL);
++	if (codec == NULL)
++		return -ENOMEM;
++
++	twl4030 = kzalloc(sizeof(struct twl4030_priv), GFP_KERNEL);
++	if (twl4030 == NULL) {
++		kfree(codec);
++		return -ENOMEM;
++	}
++
++	codec->private_data = twl4030;
++	socdev->codec = codec;
++	mutex_init(&codec->mutex);
++	INIT_LIST_HEAD(&codec->dapm_widgets);
++	INIT_LIST_HEAD(&codec->dapm_paths);
++
++	twl4030_socdev = socdev;
++	twl4030_init(socdev);
++
++	printk(KERN_INFO "TWL4030 Audio Codec probe exit\n");
++	return 0;
++}
++
++static int twl4030_remove(struct platform_device *pdev)
++{
++	struct snd_soc_device *socdev = platform_get_drvdata(pdev);
++	struct snd_soc_codec *codec = socdev->codec;
++
++	printk(KERN_INFO "TWL4030 Audio Codec remove\n");
++	kfree(codec->private_data);
++	kfree(codec);
++
++	return 0;
++}
++
++struct snd_soc_codec_device soc_codec_dev_twl4030 = {
++	.probe = twl4030_probe,
++	.remove = twl4030_remove,
++	.suspend = twl4030_suspend,
++	.resume = twl4030_resume,
++};
++EXPORT_SYMBOL_GPL(soc_codec_dev_twl4030);
++
++MODULE_DESCRIPTION("ASoC TWL4030 codec driver");
++MODULE_AUTHOR("Steve Sakoman");
++MODULE_LICENSE("GPL");
+diff --git a/sound/soc/codecs/twl4030.h b/sound/soc/codecs/twl4030.h
+new file mode 100644
+index 0000000..af8eb43
+--- /dev/null
++++ b/sound/soc/codecs/twl4030.h
+@@ -0,0 +1,125 @@
++/*
++ * ALSA SoC TWL4030 codec driver
++ *
++ * Author:      Steve Sakoman, <steve@sakoman.com>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ */
++
++#ifndef __TWL4030_AUDIO_H__
++#define __TWL4030_AUDIO_H__
++
++#define REG_CODEC_MODE		0x1
++#define REG_OPTION		0x2
++#define REG_UNKNOWN		0x3
++#define REG_MICBIAS_CTL		0x4
++#define REG_ANAMICL		0x5
++#define REG_ANAMICR		0x6
++#define REG_AVADC_CTL		0x7
++#define REG_ADCMICSEL		0x8
++#define REG_DIGMIXING		0x9
++#define REG_ATXL1PGA		0xA
++#define REG_ATXR1PGA		0xB
++#define REG_AVTXL2PGA		0xC
++#define REG_AVTXR2PGA		0xD
++#define REG_AUDIO_IF		0xE
++#define REG_VOICE_IF		0xF
++#define REG_ARXR1PGA		0x10
++#define REG_ARXL1PGA		0x11
++#define REG_ARXR2PGA		0x12
++#define REG_ARXL2PGA		0x13
++#define REG_VRXPGA		0x14
++#define REG_VSTPGA		0x15
++#define REG_VRX2ARXPGA		0x16
++#define REG_AVDAC_CTL		0x17
++#define REG_ARX2VTXPGA		0x18
++#define REG_ARXL1_APGA_CTL	0x19
++#define REG_ARXR1_APGA_CTL	0x1A
++#define REG_ARXL2_APGA_CTL	0x1B
++#define REG_ARXR2_APGA_CTL	0x1C
++#define REG_ATX2ARXPGA		0x1D
++#define REG_BT_IF		0x1E
++#define REG_BTPGA		0x1F
++#define REG_BTSTPGA		0x20
++#define REG_EAR_CTL		0x21
++#define REG_HS_SEL		0x22
++#define REG_HS_GAIN_SET		0x23
++#define REG_HS_POPN_SET		0x24
++#define REG_PREDL_CTL		0x25
++#define REG_PREDR_CTL		0x26
++#define REG_PRECKL_CTL		0x27
++#define REG_PRECKR_CTL		0x28
++#define REG_HFL_CTL		0x29
++#define REG_HFR_CTL		0x2A
++#define REG_ALC_CTL		0x2B
++#define REG_ALC_SET1		0x2C
++#define REG_ALC_SET2		0x2D
++#define REG_BOOST_CTL		0x2E
++#define REG_SOFTVOL_CTL		0x2F
++#define REG_DTMF_FREQSEL	0x30
++#define REG_DTMF_TONEXT1H	0x31
++#define REG_DTMF_TONEXT1L	0x32
++#define REG_DTMF_TONEXT2H	0x33
++#define REG_DTMF_TONEXT2L	0x34
++#define REG_DTMF_TONOFF		0x35
++#define REG_DTMF_WANONOFF	0x36
++#define REG_I2S_RX_SCRAMBLE_H	0x37
++#define REG_I2S_RX_SCRAMBLE_M	0x38
++#define REG_I2S_RX_SCRAMBLE_L	0x39
++#define REG_APLL_CTL		0x3A
++#define REG_DTMF_CTL		0x3B
++#define REG_DTMF_PGA_CTL2	0x3C
++#define REG_DTMF_PGA_CTL1	0x3D
++#define REG_MISC_SET_1		0x3E
++#define REG_PCMBTMUX		0x3F
++#define REG_RX_PATH_SEL		0x43
++#define REG_VDL_APGA_CTL	0x44
++#define REG_VIBRA_CTL		0x45
++#define REG_VIBRA_SET		0x46
++#define REG_VIBRA_PWM_SET	0x47
++#define REG_ANAMIC_GAIN		0x48
++#define REG_MISC_SET_2		0x49
++
++#define TWL4030_CACHEREGNUM	REG_MISC_SET_2 + 1
++
++/* Bitfield Definitions */
++
++/* CODEC_MODE Fields */
++
++#define APLL_RATE		0xF0
++#define APLL_RATE_8000		0x00
++#define APLL_RATE_11025		0x10
++#define APLL_RATE_12000		0x20
++#define APLL_RATE_16000		0x40
++#define APLL_RATE_22050		0x50
++#define APLL_RATE_24000		0x60
++#define APLL_RATE_32000		0x80
++#define APLL_RATE_44100		0x90
++#define APLL_RATE_48000		0xa0
++#define SEL_16K			0x04
++#define CODECPDZ		0x02
++#define OPT_MODE		0x01
++
++/* AUDIO_IF Fields */
++
++#define AIF_SLAVE_EN		0x80
++#define DATA_WIDTH		0x60
++#define DATA_WIDTH_16S_16W	0x00
++#define DATA_WIDTH_32S_16W	0x40
++#define DATA_WIDTH_32S_24W	0x60
++#define AIF_FORMAT		0x18
++#define AIF_FORMAT_CODEC	0x00
++#define AIF_FORMAT_LEFT		0x08
++#define AIF_FORMAT_RIGHT	0x10
++#define AIF_FORMAT_TDM		0x18
++#define AIF_TRI_EN		0x04
++#define CLK256FS_EN		0x02
++#define AIF_EN			0x01
++
++
++extern struct snd_soc_codec_dai twl4030_dai;
++extern struct snd_soc_codec_device soc_codec_dev_twl4030;
++
++#endif	/* End of __TWL4030_AUDIO_H__ */
+diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig
+index 0230d83..8703cea 100644
+--- a/sound/soc/omap/Kconfig
++++ b/sound/soc/omap/Kconfig
+@@ -16,4 +16,20 @@ config SND_OMAP_SOC_N810
+ 	help
+ 	  Say Y if you want to add support for SoC audio on Nokia N810.
+ 
++config SND_OMAP_SOC_OMAP3EVM
++	tristate "SoC Audio support for OMAP3 EVM"
++	depends on SND_OMAP_SOC && MACH_OMAP3EVM
++	select SND_OMAP_SOC_MCBSP
++	select SND_SOC_TWL4030
++	help
++	  Say Y if you want to add support for SoC audio on the OMAP3 EVM.
++
++config SND_OMAP_SOC_OMAP3BEAGLE
++	tristate "SoC Audio support for OMAP3 Beagle"
++	depends on SND_OMAP_SOC && MACH_OMAP3_BEAGLE
++	select SND_OMAP_SOC_MCBSP
++	select SND_SOC_TWL4030
++	help
++	  Say Y if you want to add support for SoC audio on the OMAP3 Beagle.
++
+ endmenu
+diff --git a/sound/soc/omap/Makefile b/sound/soc/omap/Makefile
+index d8d8d58..638a240 100644
+--- a/sound/soc/omap/Makefile
++++ b/sound/soc/omap/Makefile
+@@ -7,5 +7,10 @@ obj-$(CONFIG_SND_OMAP_SOC_MCBSP) += snd-soc-omap-mcbsp.o
+ 
+ # OMAP Machine Support
+ snd-soc-n810-objs := n810.o
++snd-soc-omap3evm-objs := omap3evm.o
++snd-soc-omap3beagle-objs := omap3beagle.o
+ 
+ obj-$(CONFIG_SND_OMAP_SOC_N810) += snd-soc-n810.o
++obj-$(CONFIG_SND_OMAP_SOC_OMAP3EVM) += snd-soc-omap3evm.o
++obj-$(CONFIG_SND_OMAP_SOC_OMAP3BEAGLE) += snd-soc-omap3beagle.o
++
+diff --git a/sound/soc/omap/omap3beagle.c b/sound/soc/omap/omap3beagle.c
+new file mode 100644
+index 0000000..fb79938
+--- /dev/null
++++ b/sound/soc/omap/omap3beagle.c
+@@ -0,0 +1,180 @@
++/*
++ * omap3beagle.c  --  SoC audio for OMAP3 Beagle
++ *
++ * Author: Steve Sakoman <steve@sakoman.com>
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * version 2 as published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301 USA
++ *
++ */
++
++#include <linux/clk.h>
++#include <linux/platform_device.h>
++#include <sound/core.h>
++#include <sound/pcm.h>
++#include <sound/soc.h>
++#include <sound/soc-dapm.h>
++
++#include <asm/mach-types.h>
++#include <asm/arch/hardware.h>
++#include <asm/arch/gpio.h>
++#include <asm/arch/mcbsp.h>
++
++#include "omap-mcbsp.h"
++#include "omap-pcm.h"
++#include "../codecs/twl4030.h"
++
++static int omap3beagle_hw_params(struct snd_pcm_substream *substream,
++	struct snd_pcm_hw_params *params)
++{
++	struct snd_soc_pcm_runtime *rtd = substream->private_data;
++	struct snd_soc_codec_dai *codec_dai = rtd->dai->codec_dai;
++	struct snd_soc_cpu_dai *cpu_dai = rtd->dai->cpu_dai;
++	int ret;
++
++	/* Set codec DAI configuration */
++	ret = codec_dai->dai_ops.set_fmt(codec_dai,
++					 SND_SOC_DAIFMT_I2S |
++					 SND_SOC_DAIFMT_NB_NF |
++					 SND_SOC_DAIFMT_CBM_CFM);
++	if (ret < 0) {
++	printk(KERN_INFO "can't set codec DAI configuration\n");
++		return ret;
++	}
++
++	/* Set cpu DAI configuration */
++	ret = cpu_dai->dai_ops.set_fmt(cpu_dai,
++				       SND_SOC_DAIFMT_I2S |
++				       SND_SOC_DAIFMT_NB_NF |
++				       SND_SOC_DAIFMT_CBM_CFM);
++	if (ret < 0) {
++	printk(KERN_INFO "can't set cpu DAI configuration\n");
++		return ret;
++	}
++
++	return 0;
++}
++
++static struct snd_soc_ops omap3beagle_ops = {
++	.hw_params = omap3beagle_hw_params,
++};
++
++static const struct snd_soc_dapm_widget twl4030_dapm_widgets[] = {
++	SND_SOC_DAPM_HP("Headphone Jack", NULL),
++	SND_SOC_DAPM_LINE("Line In", NULL),
++};
++
++static const char *audio_map[][3] = {
++	{"Headphone Jack", NULL, "HPLOUT"},
++	{"Headphone Jack", NULL, "HPROUT"},
++
++	{"Line In", NULL, "Line In"},
++	{"Line In", NULL, "Line In"},
++};
++
++static int omap3beagle_twl4030_init(struct snd_soc_codec *codec)
++{
++	int i;
++
++	printk(KERN_INFO "OMAP3 Beagle TWL4030 SoC init\n");
++
++	/* Add omap3beagle specific widgets */
++	for (i = 0; i < ARRAY_SIZE(twl4030_dapm_widgets); i++)
++		snd_soc_dapm_new_control(codec, &twl4030_dapm_widgets[i]);
++
++	/* Set up omap3beagle specific audio path audio_map */
++	for (i = 0; i < ARRAY_SIZE(audio_map); i++)
++		snd_soc_dapm_connect_input(codec, audio_map[i][0],
++			audio_map[i][1], audio_map[i][2]);
++
++	/* always connected */
++	snd_soc_dapm_set_endpoint(codec, "Headphone Jack", 1);
++	snd_soc_dapm_set_endpoint(codec, "Line In", 1);
++
++	snd_soc_dapm_sync_endpoints(codec);
++
++	return 0;
++}
++
++/* Digital audio interface glue - connects codec <--> CPU */
++static struct snd_soc_dai_link omap3beagle_dai = {
++	.name = "TWL4030",
++	.stream_name = "TWL4030",
++	.cpu_dai = &omap_mcbsp_dai[0],
++	.codec_dai = &twl4030_dai,
++	.init = omap3beagle_twl4030_init,
++	.ops = &omap3beagle_ops,
++};
++
++/* Audio machine driver */
++static struct snd_soc_machine snd_soc_machine_omap3beagle = {
++	.name = "omap3beagle",
++	.dai_link = &omap3beagle_dai,
++	.num_links = 1,
++};
++
++/* Audio subsystem */
++static struct snd_soc_device omap3beagle_snd_devdata = {
++	.machine = &snd_soc_machine_omap3beagle,
++	.platform = &omap_soc_platform,
++	.codec_dev = &soc_codec_dev_twl4030,
++};
++
++static struct platform_device *omap3beagle_snd_device;
++
++static int __init omap3beagle_soc_init(void)
++{
++	int ret;
++
++	printk(KERN_INFO "OMAP3 Beagle SoC init\n");
++	if (!machine_is_omap3_beagle()) {
++		printk(KERN_INFO "Not OMAP3 Beagle!\n");
++		return -ENODEV;
++	}
++
++	omap3beagle_snd_device = platform_device_alloc("soc-audio", -1);
++	if (!omap3beagle_snd_device) {
++		printk(KERN_INFO "Platform device allocation failed\n");	
++		return -ENOMEM;
++	}
++
++	platform_set_drvdata(omap3beagle_snd_device, &omap3beagle_snd_devdata);
++	omap3beagle_snd_devdata.dev = &omap3beagle_snd_device->dev;
++	*(unsigned int *)omap3beagle_dai.cpu_dai->private_data = 1; /* McBSP2 */
++
++	ret = platform_device_add(omap3beagle_snd_device);
++	if (ret)
++		goto err1;
++
++	return 0;
++
++err1:
++	printk(KERN_INFO "Unable to add platform device\n");		
++	platform_device_put(omap3beagle_snd_device);
++
++	return ret;
++}
++
++static void __exit omap3beagle_soc_exit(void)
++{
++	printk(KERN_INFO "OMAP3 Beagle SoC exit\n");
++	platform_device_unregister(omap3beagle_snd_device);
++}
++
++module_init(omap3beagle_soc_init);
++module_exit(omap3beagle_soc_exit);
++
++MODULE_AUTHOR("Steve Sakoman <steve@sakoman.com>");
++MODULE_DESCRIPTION("ALSA SoC OMAP3 Beagle");
++MODULE_LICENSE("GPL");
+diff --git a/sound/soc/omap/omap3evm.c b/sound/soc/omap/omap3evm.c
+new file mode 100644
+index 0000000..32d4f5d
+--- /dev/null
++++ b/sound/soc/omap/omap3evm.c
+@@ -0,0 +1,180 @@
++/*
++ * omap3evm.c  --  SoC audio for OMAP3 EVM
++ *
++ * Author: Steve Sakoman <steve@sakoman.com>
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * version 2 as published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301 USA
++ *
++ */
++
++#include <linux/clk.h>
++#include <linux/platform_device.h>
++#include <sound/core.h>
++#include <sound/pcm.h>
++#include <sound/soc.h>
++#include <sound/soc-dapm.h>
++
++#include <asm/mach-types.h>
++#include <asm/arch/hardware.h>
++#include <asm/arch/gpio.h>
++#include <asm/arch/mcbsp.h>
++
++#include "omap-mcbsp.h"
++#include "omap-pcm.h"
++#include "../codecs/twl4030.h"
++
++static int omap3evm_hw_params(struct snd_pcm_substream *substream,
++	struct snd_pcm_hw_params *params)
++{
++	struct snd_soc_pcm_runtime *rtd = substream->private_data;
++	struct snd_soc_codec_dai *codec_dai = rtd->dai->codec_dai;
++	struct snd_soc_cpu_dai *cpu_dai = rtd->dai->cpu_dai;
++	int ret;
++
++	/* Set codec DAI configuration */
++	ret = codec_dai->dai_ops.set_fmt(codec_dai,
++					 SND_SOC_DAIFMT_I2S |
++					 SND_SOC_DAIFMT_NB_NF |
++					 SND_SOC_DAIFMT_CBM_CFM);
++	if (ret < 0) {
++	printk(KERN_INFO "can't set codec DAI configuration\n");
++		return ret;
++	}
++
++	/* Set cpu DAI configuration */
++	ret = cpu_dai->dai_ops.set_fmt(cpu_dai,
++				       SND_SOC_DAIFMT_I2S |
++				       SND_SOC_DAIFMT_NB_NF |
++				       SND_SOC_DAIFMT_CBM_CFM);
++	if (ret < 0) {
++	printk(KERN_INFO "can't set cpu DAI configuration\n");
++		return ret;
++	}
++
++	return 0;
++}
++
++static struct snd_soc_ops omap3evm_ops = {
++	.hw_params = omap3evm_hw_params,
++};
++
++static const struct snd_soc_dapm_widget twl4030_dapm_widgets[] = {
++	SND_SOC_DAPM_HP("Headphone Jack", NULL),
++	SND_SOC_DAPM_LINE("Line In", NULL),
++};
++
++static const char *audio_map[][3] = {
++	{"Headphone Jack", NULL, "HPLOUT"},
++	{"Headphone Jack", NULL, "HPROUT"},
++
++	{"Line In", NULL, "Line In"},
++	{"Line In", NULL, "Line In"},
++};
++
++static int omap3evm_twl4030_init(struct snd_soc_codec *codec)
++{
++	int i;
++
++	printk(KERN_INFO "OMAP3 EVM TWL4030 SoC init\n");
++
++	/* Add omap3evm specific widgets */
++	for (i = 0; i < ARRAY_SIZE(twl4030_dapm_widgets); i++)
++		snd_soc_dapm_new_control(codec, &twl4030_dapm_widgets[i]);
++
++	/* Set up omap3evm specific audio path audio_map */
++	for (i = 0; i < ARRAY_SIZE(audio_map); i++)
++		snd_soc_dapm_connect_input(codec, audio_map[i][0],
++			audio_map[i][1], audio_map[i][2]);
++
++	/* always connected */
++	snd_soc_dapm_set_endpoint(codec, "Headphone Jack", 1);
++	snd_soc_dapm_set_endpoint(codec, "Line In", 1);
++
++	snd_soc_dapm_sync_endpoints(codec);
++
++	return 0;
++}
++
++/* Digital audio interface glue - connects codec <--> CPU */
++static struct snd_soc_dai_link omap3evm_dai = {
++	.name = "TWL4030",
++	.stream_name = "TWL4030",
++	.cpu_dai = &omap_mcbsp_dai[0],
++	.codec_dai = &twl4030_dai,
++	.init = omap3evm_twl4030_init,
++	.ops = &omap3evm_ops,
++};
++
++/* Audio machine driver */
++static struct snd_soc_machine snd_soc_machine_omap3evm = {
++	.name = "omap3evm",
++	.dai_link = &omap3evm_dai,
++	.num_links = 1,
++};
++
++/* Audio subsystem */
++static struct snd_soc_device omap3evm_snd_devdata = {
++	.machine = &snd_soc_machine_omap3evm,
++	.platform = &omap_soc_platform,
++	.codec_dev = &soc_codec_dev_twl4030,
++};
++
++static struct platform_device *omap3evm_snd_device;
++
++static int __init omap3evm_soc_init(void)
++{
++	int ret;
++
++	printk(KERN_INFO "OMAP3 EVM SoC init\n");
++	if (!machine_is_omap3evm()) {
++		printk(KERN_INFO "Not OMAP3 EVM!\n");
++		return -ENODEV;
++	}
++
++	omap3evm_snd_device = platform_device_alloc("soc-audio", -1);
++	if (!omap3evm_snd_device) {
++		printk(KERN_INFO "Platform device allocation failed\n");	
++		return -ENOMEM;
++	}
++
++	platform_set_drvdata(omap3evm_snd_device, &omap3evm_snd_devdata);
++	omap3evm_snd_devdata.dev = &omap3evm_snd_device->dev;
++	*(unsigned int *)omap3evm_dai.cpu_dai->private_data = 1; /* McBSP2 */
++
++	ret = platform_device_add(omap3evm_snd_device);
++	if (ret)
++		goto err1;
++
++	return 0;
++
++err1:
++	printk(KERN_INFO "Unable to add platform device\n");		
++	platform_device_put(omap3evm_snd_device);
++
++	return ret;
++}
++
++static void __exit omap3evm_soc_exit(void)
++{
++	printk(KERN_INFO "OMAP3 EVM SoC exit\n");
++	platform_device_unregister(omap3evm_snd_device);
++}
++
++module_init(omap3evm_soc_init);
++module_exit(omap3evm_soc_exit);
++
++MODULE_AUTHOR("Steve Sakoman <steve@sakoman.com>");
++MODULE_DESCRIPTION("ALSA SoC OMAP3 EVM");
++MODULE_LICENSE("GPL");
diff --git a/packages/linux/linux-omap2-git/beagleboard/timer-suppression.patch b/packages/linux/linux-omap2-git/beagleboard/timer-suppression.patch
new file mode 100644
index 0000000000..04362c96e3
--- /dev/null
+++ b/packages/linux/linux-omap2-git/beagleboard/timer-suppression.patch
@@ -0,0 +1,43 @@
+diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c
+index b854a89..26f5569 100644
+--- a/kernel/time/tick-sched.c
++++ b/kernel/time/tick-sched.c
+@@ -253,6 +253,16 @@ void tick_nohz_stop_sched_tick(void)
+ 
+ 	/* Schedule the tick, if we are at least one jiffie off */
+ 	if ((long)delta_jiffies >= 1) {
++		/*
++		 * calculate the expiry time for the next timer wheel
++		 * timer
++		 */
++		expires = ktime_add_ns(last_update, tick_period.tv64 *
++					delta_jiffies);
++
++		/* Skip reprogram of event if its not changed */
++		if(ts->tick_stopped && ktime_equal(expires, dev->next_event))
++		goto out2;
+ 
+ 		if (delta_jiffies > 1)
+ 			cpu_set(cpu, nohz_cpu_mask);
+@@ -304,12 +314,7 @@ void tick_nohz_stop_sched_tick(void)
+ 			goto out;
+ 		}
+ 
+-		/*
+-		 * calculate the expiry time for the next timer wheel
+-		 * timer
+-		 */
+-		expires = ktime_add_ns(last_update, tick_period.tv64 *
+-				       delta_jiffies);
++		/* Mark expiries */
+ 		ts->idle_expires = expires;
+ 
+ 		if (ts->nohz_mode == NOHZ_MODE_HIGHRES) {
+@@ -328,6 +333,7 @@ void tick_nohz_stop_sched_tick(void)
+ 		tick_do_update_jiffies64(ktime_get());
+ 		cpu_clear(cpu, nohz_cpu_mask);
+ 	}
++out2:	
+ 	raise_softirq_irqoff(TIMER_SOFTIRQ);
+ out:
+ 	ts->next_jiffies = next_jiffies;