Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65846909 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] omap: fix virtual vs physical address space confusions 



mcbsp is confused as to what takes a physical or virtual address.
Fix the two instances where it gets it wrong.

Acked-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 8b540fdc

arch/arm/mach-omap1/mcbsp.c

+8 −0
Original line number Diff line number Diff line
@@ -159,6 +159,7 @@ static struct omap_mcbsp_ops omap1_mcbsp_ops = { 
#ifdef CONFIG_ARCH_OMAP730

static struct omap_mcbsp_platform_data omap730_mcbsp_pdata[] = {

	{

		.phys_base	= OMAP730_MCBSP1_BASE,

		.virt_base	= io_p2v(OMAP730_MCBSP1_BASE),

		.dma_rx_sync	= OMAP_DMA_MCBSP1_RX,

		.dma_tx_sync	= OMAP_DMA_MCBSP1_TX,
@@ -167,6 +168,7 @@ static struct omap_mcbsp_platform_data omap730_mcbsp_pdata[] = { 
		.ops		= &omap1_mcbsp_ops,

	},

	{

		.phys_base	= OMAP730_MCBSP2_BASE,

		.virt_base	= io_p2v(OMAP730_MCBSP2_BASE),

		.dma_rx_sync	= OMAP_DMA_MCBSP3_RX,

		.dma_tx_sync	= OMAP_DMA_MCBSP3_TX,
@@ -184,6 +186,7 @@ static struct omap_mcbsp_platform_data omap730_mcbsp_pdata[] = { 
#ifdef CONFIG_ARCH_OMAP15XX

static struct omap_mcbsp_platform_data omap15xx_mcbsp_pdata[] = {

	{

		.phys_base	= OMAP1510_MCBSP1_BASE,

		.virt_base	= OMAP1510_MCBSP1_BASE,

		.dma_rx_sync	= OMAP_DMA_MCBSP1_RX,

		.dma_tx_sync	= OMAP_DMA_MCBSP1_TX,
@@ -193,6 +196,7 @@ static struct omap_mcbsp_platform_data omap15xx_mcbsp_pdata[] = { 
		.clk_name	= "mcbsp_clk",

		},

	{

		.phys_base	= OMAP1510_MCBSP2_BASE,

		.virt_base	= io_p2v(OMAP1510_MCBSP2_BASE),

		.dma_rx_sync	= OMAP_DMA_MCBSP2_RX,

		.dma_tx_sync	= OMAP_DMA_MCBSP2_TX,
@@ -201,6 +205,7 @@ static struct omap_mcbsp_platform_data omap15xx_mcbsp_pdata[] = { 
		.ops		= &omap1_mcbsp_ops,

	},

	{

		.phys_base	= OMAP1510_MCBSP3_BASE,

		.virt_base	= OMAP1510_MCBSP3_BASE,

		.dma_rx_sync	= OMAP_DMA_MCBSP3_RX,

		.dma_tx_sync	= OMAP_DMA_MCBSP3_TX,
@@ -219,6 +224,7 @@ static struct omap_mcbsp_platform_data omap15xx_mcbsp_pdata[] = { 
#ifdef CONFIG_ARCH_OMAP16XX

static struct omap_mcbsp_platform_data omap16xx_mcbsp_pdata[] = {

	{

		.phys_base	= OMAP1610_MCBSP1_BASE,

		.virt_base	= OMAP1610_MCBSP1_BASE,

		.dma_rx_sync	= OMAP_DMA_MCBSP1_RX,

		.dma_tx_sync	= OMAP_DMA_MCBSP1_TX,
@@ -228,6 +234,7 @@ static struct omap_mcbsp_platform_data omap16xx_mcbsp_pdata[] = { 
		.clk_name	= "mcbsp_clk",

	},

	{

		.phys_base	= OMAP1610_MCBSP2_BASE,

		.virt_base	= io_p2v(OMAP1610_MCBSP2_BASE),

		.dma_rx_sync	= OMAP_DMA_MCBSP2_RX,

		.dma_tx_sync	= OMAP_DMA_MCBSP2_TX,
@@ -236,6 +243,7 @@ static struct omap_mcbsp_platform_data omap16xx_mcbsp_pdata[] = { 
		.ops		= &omap1_mcbsp_ops,

	},

	{

		.phys_base	= OMAP1610_MCBSP3_BASE,

		.virt_base	= OMAP1610_MCBSP3_BASE,

		.dma_rx_sync	= OMAP_DMA_MCBSP3_RX,

		.dma_tx_sync	= OMAP_DMA_MCBSP3_TX,

arch/arm/mach-omap2/mcbsp.c

+4 −0
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ static struct omap_mcbsp_ops omap2_mcbsp_ops = { 
#ifdef CONFIG_ARCH_OMAP24XX

static struct omap_mcbsp_platform_data omap24xx_mcbsp_pdata[] = {

	{

		.phys_base	= OMAP24XX_MCBSP1_BASE,

		.virt_base	= IO_ADDRESS(OMAP24XX_MCBSP1_BASE),

		.dma_rx_sync	= OMAP24XX_DMA_MCBSP1_RX,

		.dma_tx_sync	= OMAP24XX_DMA_MCBSP1_TX,
@@ -143,6 +144,7 @@ static struct omap_mcbsp_platform_data omap24xx_mcbsp_pdata[] = { 
		.clk_name	= "mcbsp_clk",

	},

	{

		.phys_base	= OMAP24XX_MCBSP2_BASE,

		.virt_base	= IO_ADDRESS(OMAP24XX_MCBSP2_BASE),

		.dma_rx_sync	= OMAP24XX_DMA_MCBSP2_RX,

		.dma_tx_sync	= OMAP24XX_DMA_MCBSP2_TX,
@@ -161,6 +163,7 @@ static struct omap_mcbsp_platform_data omap24xx_mcbsp_pdata[] = { 
#ifdef CONFIG_ARCH_OMAP34XX

static struct omap_mcbsp_platform_data omap34xx_mcbsp_pdata[] = {

	{

		.phys_base	= OMAP34XX_MCBSP1_BASE,

		.virt_base	= IO_ADDRESS(OMAP34XX_MCBSP1_BASE),

		.dma_rx_sync	= OMAP24XX_DMA_MCBSP1_RX,

		.dma_tx_sync	= OMAP24XX_DMA_MCBSP1_TX,
@@ -170,6 +173,7 @@ static struct omap_mcbsp_platform_data omap34xx_mcbsp_pdata[] = { 
		.clk_name	= "mcbsp_clk",

	},

	{

		.phys_base	= OMAP34XX_MCBSP2_BASE,

		.virt_base	= IO_ADDRESS(OMAP34XX_MCBSP2_BASE),

		.dma_rx_sync	= OMAP24XX_DMA_MCBSP2_RX,

		.dma_tx_sync	= OMAP24XX_DMA_MCBSP2_TX,

arch/arm/plat-omap/include/mach/mcbsp.h

+2 −0
Original line number Diff line number Diff line
@@ -315,6 +315,7 @@ struct omap_mcbsp_ops { 
};



struct omap_mcbsp_platform_data {

	unsigned long phys_base;

	u32 virt_base;

	u8 dma_rx_sync, dma_tx_sync;

	u16 rx_irq, tx_irq;
@@ -324,6 +325,7 @@ struct omap_mcbsp_platform_data { 


struct omap_mcbsp {

	struct device *dev;

	unsigned long phys_base;

	u32 io_base;

	u8 id;

	u8 free;

arch/arm/plat-omap/mcbsp.c

+3 −2
Original line number Diff line number Diff line
@@ -651,7 +651,7 @@ int omap_mcbsp_xmit_buffer(unsigned int id, dma_addr_t buffer, 
	omap_set_dma_dest_params(mcbsp[id].dma_tx_lch,

				 src_port,

				 OMAP_DMA_AMODE_CONSTANT,

				 mcbsp[id].io_base + OMAP_MCBSP_REG_DXR1,

				 mcbsp[id].phys_base + OMAP_MCBSP_REG_DXR1,

				 0, 0);



	omap_set_dma_src_params(mcbsp[id].dma_tx_lch,
@@ -712,7 +712,7 @@ int omap_mcbsp_recv_buffer(unsigned int id, dma_addr_t buffer, 
	omap_set_dma_src_params(mcbsp[id].dma_rx_lch,

				src_port,

				OMAP_DMA_AMODE_CONSTANT,

				mcbsp[id].io_base + OMAP_MCBSP_REG_DRR1,

				mcbsp[id].phys_base + OMAP_MCBSP_REG_DRR1,

				0, 0);



	omap_set_dma_dest_params(mcbsp[id].dma_rx_lch,
@@ -830,6 +830,7 @@ static int __init omap_mcbsp_probe(struct platform_device *pdev) 
	mcbsp[id].dma_tx_lch = -1;

	mcbsp[id].dma_rx_lch = -1;



	mcbsp[id].phys_base = pdata->phys_base;

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

	/* Default I/O is IRQ based */

	mcbsp[id].io_type = OMAP_MCBSP_IRQ_IO;