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

Commit 6f984f3b authored by Zhangfei Gao's avatar Zhangfei Gao Committed by Chris Ball
Browse files

mmc: update mmp2 mmc resources in arch/arm 



Update MMP2 platform code to "sdhci-pxav3", following the driver rename.

Signed-off-by: default avatarZhangfei Gao <zhangfei.gao@marvell.com>
Acked-by: default avatarPhilip Rakity <prakity@marvell.com>
Acked-by: default avatarMark F. Brown <mark.brown314@gmail.com>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 9f5d71e4

arch/arm/mach-mmp/brownstone.c

+9 −1
Original line number Diff line number Diff line
@@ -177,9 +177,16 @@ static struct i2c_board_info brownstone_twsi1_info[] = { 
};



static struct sdhci_pxa_platdata mmp2_sdh_platdata_mmc0 = {

	.max_speed	= 25000000,

	.clk_delay_cycles = 0x1f,

};



static struct sdhci_pxa_platdata mmp2_sdh_platdata_mmc2 = {

	.clk_delay_cycles = 0x1f,

	.flags = PXA_FLAG_CARD_PERMANENT

		| PXA_FLAG_SD_8_BIT_CAPABLE_SLOT,

};





static void __init brownstone_init(void)

{

	mfp_config(ARRAY_AND_SIZE(brownstone_pin_config));
@@ -189,6 +196,7 @@ static void __init brownstone_init(void) 
	mmp2_add_uart(3);

	mmp2_add_twsi(1, NULL, ARRAY_AND_SIZE(brownstone_twsi1_info));

	mmp2_add_sdhost(0, &mmp2_sdh_platdata_mmc0); /* SD/MMC */

	mmp2_add_sdhost(2, &mmp2_sdh_platdata_mmc2); /* eMMC */



	/* enable 5v regulator */

	platform_device_register(&brownstone_v_5vp_device);

arch/arm/mach-mmp/jasper.c

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ static struct i2c_board_info jasper_twsi1_info[] = { 
};



static struct sdhci_pxa_platdata mmp2_sdh_platdata_mmc0 = {

	.max_speed	= 25000000,

	.clk_delay_cycles = 0x1f,

};



static void __init jasper_init(void)

arch/arm/mach-mmp/mmp2.c

+8 −8
Original line number Diff line number Diff line
@@ -168,10 +168,10 @@ static struct clk_lookup mmp2_clkregs[] = { 
	INIT_CLKREG(&clk_twsi5, "pxa2xx-i2c.4", NULL),

	INIT_CLKREG(&clk_twsi6, "pxa2xx-i2c.5", NULL),

	INIT_CLKREG(&clk_nand, "pxa3xx-nand", NULL),

	INIT_CLKREG(&clk_sdh0, "sdhci-pxa.0", "PXA-SDHCLK"),

	INIT_CLKREG(&clk_sdh1, "sdhci-pxa.1", "PXA-SDHCLK"),

	INIT_CLKREG(&clk_sdh2, "sdhci-pxa.2", "PXA-SDHCLK"),

	INIT_CLKREG(&clk_sdh3, "sdhci-pxa.3", "PXA-SDHCLK"),

	INIT_CLKREG(&clk_sdh0, "sdhci-pxav3.0", "PXA-SDHCLK"),

	INIT_CLKREG(&clk_sdh1, "sdhci-pxav3.1", "PXA-SDHCLK"),

	INIT_CLKREG(&clk_sdh2, "sdhci-pxav3.2", "PXA-SDHCLK"),

	INIT_CLKREG(&clk_sdh3, "sdhci-pxav3.3", "PXA-SDHCLK"),

};



static int __init mmp2_init(void)
@@ -222,8 +222,8 @@ MMP2_DEVICE(twsi4, "pxa2xx-i2c", 3, TWSI4, 0xd4033000, 0x70); 
MMP2_DEVICE(twsi5, "pxa2xx-i2c", 4, TWSI5, 0xd4033800, 0x70);

MMP2_DEVICE(twsi6, "pxa2xx-i2c", 5, TWSI6, 0xd4034000, 0x70);

MMP2_DEVICE(nand, "pxa3xx-nand", -1, NAND, 0xd4283000, 0x100, 28, 29);

MMP2_DEVICE(sdh0, "sdhci-pxa", 0, MMC, 0xd4280000, 0x120);

MMP2_DEVICE(sdh1, "sdhci-pxa", 1, MMC2, 0xd4280800, 0x120);

MMP2_DEVICE(sdh2, "sdhci-pxa", 2, MMC3, 0xd4281000, 0x120);

MMP2_DEVICE(sdh3, "sdhci-pxa", 3, MMC4, 0xd4281800, 0x120);

MMP2_DEVICE(sdh0, "sdhci-pxav3", 0, MMC, 0xd4280000, 0x120);

MMP2_DEVICE(sdh1, "sdhci-pxav3", 1, MMC2, 0xd4280800, 0x120);

MMP2_DEVICE(sdh2, "sdhci-pxav3", 2, MMC3, 0xd4281000, 0x120);

MMP2_DEVICE(sdh3, "sdhci-pxav3", 3, MMC4, 0xd4281800, 0x120);