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

Commit 9cf24b15 authored by Lee Jones's avatar Lee Jones
Browse files

ARM: ux500: Pass SDI DMA information though AUX_DATA to MMCI 



There are four SDIs on the HREF, as opposed to the original two
enabled on Snowball. To get them working we have to pass their DMA
information in the same was as we need with the other two.

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

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

+2 −2
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ static struct stedma40_chan_cfg sdi1_dma_cfg_tx = { 
};

#endif



static struct mmci_platform_data mop500_sdi1_data = {

struct mmci_platform_data mop500_sdi1_data = {

	.ocr_mask	= MMC_VDD_29_30,

	.f_max		= 50000000,

	.capabilities	= MMC_CAP_4_BIT_DATA,
@@ -189,7 +189,7 @@ static struct stedma40_chan_cfg mop500_sdi2_dma_cfg_tx = { 
};

#endif



static struct mmci_platform_data mop500_sdi2_data = {

struct mmci_platform_data mop500_sdi2_data = {

	.ocr_mask	= MMC_VDD_165_195,

	.f_max		= 50000000,

	.capabilities	= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA |

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

+2 −0
Original line number Diff line number Diff line
@@ -736,6 +736,8 @@ struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = { 
	/* Requires DMA bindings. */

	OF_DEV_AUXDATA("arm,pl022", 0x80002000, "ssp0",  &ssp0_plat),

	OF_DEV_AUXDATA("arm,pl18x", 0x80126000, "sdi0",  &mop500_sdi0_data),

	OF_DEV_AUXDATA("arm,pl18x", 0x80118000, "sdi1",  &mop500_sdi1_data),

	OF_DEV_AUXDATA("arm,pl18x", 0x80005000, "sdi2",  &mop500_sdi2_data),

	OF_DEV_AUXDATA("arm,pl18x", 0x80114000, "sdi4",  &mop500_sdi4_data),

	/* Requires clock name bindings. */

	OF_DEV_AUXDATA("st,nomadik-gpio", 0x8012e000, "gpio.0", NULL),

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

+2 −0
Original line number Diff line number Diff line
@@ -80,6 +80,8 @@ 
struct device;

struct i2c_board_info;

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 arm_pmu_platdata db8500_pmu_platdata;