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

Commit 724ebbf4 authored by Lee Jones's avatar Lee Jones
Browse files

ARM: ux500: Pass MSP DMA platform data though AUXDATA 



It isn't currently possible to pass all platform specific configuration
though Device Tree. Thinks like device names used in the clock
infrastructure, call-backs and DMA information have to be passed in via
AUXDATA structures and the MSP is no exception. Here we're passing DMA
settings.

Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent ae6d35b9

arch/arm/mach-ux500/board-mop500-msp.c

+4 −4
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ static struct stedma40_chan_cfg msp0_dma_tx = { 
	/* data_width is set during configuration */

};



static struct msp_i2s_platform_data msp0_platform_data = {

struct msp_i2s_platform_data msp0_platform_data = {

	.id = MSP_I2S_0,

	.msp_i2s_dma_rx = &msp0_dma_rx,

	.msp_i2s_dma_tx = &msp0_dma_tx,
@@ -80,7 +80,7 @@ static struct stedma40_chan_cfg msp1_dma_tx = { 
	/* data_width is set during configuration */

};



static struct msp_i2s_platform_data msp1_platform_data = {

struct msp_i2s_platform_data msp1_platform_data = {

	.id = MSP_I2S_1,

	.msp_i2s_dma_rx = NULL,

	.msp_i2s_dma_tx = &msp1_dma_tx,
@@ -159,13 +159,13 @@ static struct platform_device ux500_pcm = { 
		},

};



static struct msp_i2s_platform_data msp2_platform_data = {

struct msp_i2s_platform_data msp2_platform_data = {

	.id = MSP_I2S_2,

	.msp_i2s_dma_rx = &msp2_dma_rx,

	.msp_i2s_dma_tx = &msp2_dma_tx,

};



static struct msp_i2s_platform_data msp3_platform_data = {

struct msp_i2s_platform_data msp3_platform_data = {

	.id		= MSP_I2S_3,

	.msp_i2s_dma_rx	= &msp1_dma_rx,

	.msp_i2s_dma_tx	= NULL,

arch/arm/mach-ux500/board-mop500.c

+9 −0
Original line number Diff line number Diff line
@@ -755,6 +755,15 @@ struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = { 
	OF_DEV_AUXDATA("st,nomadik-i2c", 0x8012a000, "nmk-i2c.4", NULL),

	/* Requires device name bindings. */

	OF_DEV_AUXDATA("stericsson,nmk_pinctrl", 0, "pinctrl-db8500", NULL),

	/* Requires clock name and DMA bindings. */

	OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80123000,

		"ux500-msp-i2s.0", &msp0_platform_data),

	OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80124000,

		"ux500-msp-i2s.1", &msp1_platform_data),

	OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80117000,

		"ux500-msp-i2s.2", &msp2_platform_data),

	OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80125000,

		"ux500-msp-i2s.3", &msp3_platform_data),

	{},

};

arch/arm/mach-ux500/board-mop500.h

+5 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 


/* For NOMADIK_NR_GPIO */

#include <mach/irqs.h>

#include <mach/msp.h>

#include <linux/amba/mmci.h>



/* Snowball specific GPIO assignments, this board has no GPIO expander */
@@ -83,6 +84,10 @@ extern struct mmci_platform_data mop500_sdi0_data; 
extern struct mmci_platform_data mop500_sdi1_data;

extern struct mmci_platform_data mop500_sdi2_data;

extern struct mmci_platform_data mop500_sdi4_data;

extern struct msp_i2s_platform_data msp0_platform_data;

extern struct msp_i2s_platform_data msp1_platform_data;

extern struct msp_i2s_platform_data msp2_platform_data;

extern struct msp_i2s_platform_data msp3_platform_data;

extern struct arm_pmu_platdata db8500_pmu_platdata;



extern void mop500_sdi_init(struct device *parent);