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

Commit d7ca4c75 authored by Manjunathappa, Prakash's avatar Manjunathappa, Prakash Committed by Sekhar Nori
Browse files

ARM: davinci: mmc: derive version information from device name 



Remove specifying mmc controller IP version information via platform
data, instead specify device name so that driver derives it from
platform_device_id table. Also change the clock node name to match
the changed dev_id.
Tested on da850-evm to make sure driver loads without clk_get failures.

Signed-off-by: default avatarManjunathappa, Prakash <prakash.pm@ti.com>
Reviewed-by: default avatarSekhar Nori <nsekhar@ti.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarChris Ball <cjb@laptop.org>
Signed-off-by: default avatarSekhar Nori <nsekhar@ti.com>
parent bb170e61

arch/arm/mach-davinci/board-da830-evm.c

+0 −1
Original line number Diff line number Diff line
@@ -246,7 +246,6 @@ static struct davinci_mmc_config da830_evm_mmc_config = { 
	.wires			= 8,

	.max_freq		= 50000000,

	.caps			= MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED,

	.version		= MMC_CTLR_VERSION_2,

};



static inline void da830_evm_init_mmc(void)

arch/arm/mach-davinci/board-da850-evm.c

+0 −2
Original line number Diff line number Diff line
@@ -802,7 +802,6 @@ static struct davinci_mmc_config da850_mmc_config = { 
	.wires		= 4,

	.max_freq	= 50000000,

	.caps		= MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED,

	.version	= MMC_CTLR_VERSION_2,

};



static const short da850_evm_mmcsd0_pins[] __initconst = {
@@ -1372,7 +1371,6 @@ static struct davinci_mmc_config da850_wl12xx_mmc_config = { 
	.max_freq	= 25000000,

	.caps		= MMC_CAP_4_BIT_DATA | MMC_CAP_NONREMOVABLE |

			  MMC_CAP_POWER_OFF_CARD,

	.version	= MMC_CTLR_VERSION_2,

};



static const short da850_wl12xx_pins[] __initconst = {

arch/arm/mach-davinci/board-dm355-evm.c

+0 −1
Original line number Diff line number Diff line
@@ -280,7 +280,6 @@ static struct davinci_mmc_config dm355evm_mmc_config = { 
	.wires		= 4,

	.max_freq       = 50000000,

	.caps           = MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED,

	.version	= MMC_CTLR_VERSION_1,

};



/* Don't connect anything to J10 unless you're only using USB host

arch/arm/mach-davinci/board-dm365-evm.c

+0 −1
Original line number Diff line number Diff line
@@ -253,7 +253,6 @@ static struct davinci_mmc_config dm365evm_mmc_config = { 
	.wires		= 4,

	.max_freq	= 50000000,

	.caps		= MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED,

	.version	= MMC_CTLR_VERSION_2,

};



static void dm365evm_emac_configure(void)

arch/arm/mach-davinci/board-dm644x-evm.c

+0 −1
Original line number Diff line number Diff line
@@ -570,7 +570,6 @@ static struct davinci_mmc_config dm6446evm_mmc_config = { 
	.get_cd		= dm6444evm_mmc_get_cd,

	.get_ro		= dm6444evm_mmc_get_ro,

	.wires		= 4,

	.version	= MMC_CTLR_VERSION_1

};



static struct i2c_board_info __initdata i2c_info[] =  {