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

Commit 8482c81c authored by Thomas Abraham's avatar Thomas Abraham Committed by Kukjin Kim
Browse files

ARM: EXYNOS: use 'exynos4-sdhci' as device name for sdhci controllers 



With the addition of platform specific driver data in the sdhci driver
for EXYNOS4 and EXYNOS5, the device name of sdhci controllers on EXYNOS4
and EXYNOS5 are changed accordingly.

Signed-off-by: default avatarThomas Abraham <thomas.abraham@linaro.org>
[kgene.kim@samsung.com: re-worked on top of v3.4-rc2]
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent e816b57a

arch/arm/mach-exynos/clock-exynos4.c

+12 −12
Original line number Diff line number Diff line
@@ -497,25 +497,25 @@ static struct clk exynos4_init_clocks_off[] = { 
		.ctrlbit	= (1 << 3),

	}, {

		.name		= "hsmmc",

		.devname	= "s3c-sdhci.0",

		.devname	= "exynos4-sdhci.0",

		.parent		= &exynos4_clk_aclk_133.clk,

		.enable		= exynos4_clk_ip_fsys_ctrl,

		.ctrlbit	= (1 << 5),

	}, {

		.name		= "hsmmc",

		.devname	= "s3c-sdhci.1",

		.devname	= "exynos4-sdhci.1",

		.parent		= &exynos4_clk_aclk_133.clk,

		.enable		= exynos4_clk_ip_fsys_ctrl,

		.ctrlbit	= (1 << 6),

	}, {

		.name		= "hsmmc",

		.devname	= "s3c-sdhci.2",

		.devname	= "exynos4-sdhci.2",

		.parent		= &exynos4_clk_aclk_133.clk,

		.enable		= exynos4_clk_ip_fsys_ctrl,

		.ctrlbit	= (1 << 7),

	}, {

		.name		= "hsmmc",

		.devname	= "s3c-sdhci.3",

		.devname	= "exynos4-sdhci.3",

		.parent		= &exynos4_clk_aclk_133.clk,

		.enable		= exynos4_clk_ip_fsys_ctrl,

		.ctrlbit	= (1 << 8),
@@ -1202,7 +1202,7 @@ static struct clksrc_clk exynos4_clk_sclk_uart3 = { 
static struct clksrc_clk exynos4_clk_sclk_mmc0 = {

	.clk	= {

		.name		= "sclk_mmc",

		.devname	= "s3c-sdhci.0",

		.devname	= "exynos4-sdhci.0",

		.parent		= &exynos4_clk_dout_mmc0.clk,

		.enable		= exynos4_clksrc_mask_fsys_ctrl,

		.ctrlbit	= (1 << 0),
@@ -1213,7 +1213,7 @@ static struct clksrc_clk exynos4_clk_sclk_mmc0 = { 
static struct clksrc_clk exynos4_clk_sclk_mmc1 = {

	.clk	= {

		.name		= "sclk_mmc",

		.devname	= "s3c-sdhci.1",

		.devname	= "exynos4-sdhci.1",

		.parent		= &exynos4_clk_dout_mmc1.clk,

		.enable		= exynos4_clksrc_mask_fsys_ctrl,

		.ctrlbit	= (1 << 4),
@@ -1224,7 +1224,7 @@ static struct clksrc_clk exynos4_clk_sclk_mmc1 = { 
static struct clksrc_clk exynos4_clk_sclk_mmc2 = {

	.clk	= {

		.name		= "sclk_mmc",

		.devname	= "s3c-sdhci.2",

		.devname	= "exynos4-sdhci.2",

		.parent		= &exynos4_clk_dout_mmc2.clk,

		.enable		= exynos4_clksrc_mask_fsys_ctrl,

		.ctrlbit	= (1 << 8),
@@ -1235,7 +1235,7 @@ static struct clksrc_clk exynos4_clk_sclk_mmc2 = { 
static struct clksrc_clk exynos4_clk_sclk_mmc3 = {

	.clk	= {

		.name		= "sclk_mmc",

		.devname	= "s3c-sdhci.3",

		.devname	= "exynos4-sdhci.3",

		.parent		= &exynos4_clk_dout_mmc3.clk,

		.enable		= exynos4_clksrc_mask_fsys_ctrl,

		.ctrlbit	= (1 << 12),
@@ -1340,10 +1340,10 @@ static struct clk_lookup exynos4_clk_lookup[] = { 
	CLKDEV_INIT("exynos4210-uart.1", "clk_uart_baud0", &exynos4_clk_sclk_uart1.clk),

	CLKDEV_INIT("exynos4210-uart.2", "clk_uart_baud0", &exynos4_clk_sclk_uart2.clk),

	CLKDEV_INIT("exynos4210-uart.3", "clk_uart_baud0", &exynos4_clk_sclk_uart3.clk),

	CLKDEV_INIT("s3c-sdhci.0", "mmc_busclk.2", &exynos4_clk_sclk_mmc0.clk),

	CLKDEV_INIT("s3c-sdhci.1", "mmc_busclk.2", &exynos4_clk_sclk_mmc1.clk),

	CLKDEV_INIT("s3c-sdhci.2", "mmc_busclk.2", &exynos4_clk_sclk_mmc2.clk),

	CLKDEV_INIT("s3c-sdhci.3", "mmc_busclk.2", &exynos4_clk_sclk_mmc3.clk),

	CLKDEV_INIT("exynos4-sdhci.0", "mmc_busclk.2", &exynos4_clk_sclk_mmc0.clk),

	CLKDEV_INIT("exynos4-sdhci.1", "mmc_busclk.2", &exynos4_clk_sclk_mmc1.clk),

	CLKDEV_INIT("exynos4-sdhci.2", "mmc_busclk.2", &exynos4_clk_sclk_mmc2.clk),

	CLKDEV_INIT("exynos4-sdhci.3", "mmc_busclk.2", &exynos4_clk_sclk_mmc3.clk),

	CLKDEV_INIT("exynos4-fb.0", "lcd", &exynos4_clk_fimd0),

	CLKDEV_INIT("dma-pl330.0", "apb_pclk", &exynos4_clk_pdma0),

	CLKDEV_INIT("dma-pl330.1", "apb_pclk", &exynos4_clk_pdma1),

arch/arm/mach-exynos/clock-exynos5.c

+12 −12
Original line number Diff line number Diff line
@@ -455,25 +455,25 @@ static struct clk exynos5_init_clocks_off[] = { 
		.ctrlbit	= (1 << 20),

	}, {

		.name		= "hsmmc",

		.devname	= "s3c-sdhci.0",

		.devname	= "exynos4-sdhci.0",

		.parent		= &exynos5_clk_aclk_200.clk,

		.enable		= exynos5_clk_ip_fsys_ctrl,

		.ctrlbit	= (1 << 12),

	}, {

		.name		= "hsmmc",

		.devname	= "s3c-sdhci.1",

		.devname	= "exynos4-sdhci.1",

		.parent		= &exynos5_clk_aclk_200.clk,

		.enable		= exynos5_clk_ip_fsys_ctrl,

		.ctrlbit	= (1 << 13),

	}, {

		.name		= "hsmmc",

		.devname	= "s3c-sdhci.2",

		.devname	= "exynos4-sdhci.2",

		.parent		= &exynos5_clk_aclk_200.clk,

		.enable		= exynos5_clk_ip_fsys_ctrl,

		.ctrlbit	= (1 << 14),

	}, {

		.name		= "hsmmc",

		.devname	= "s3c-sdhci.3",

		.devname	= "exynos4-sdhci.3",

		.parent		= &exynos5_clk_aclk_200.clk,

		.enable		= exynos5_clk_ip_fsys_ctrl,

		.ctrlbit	= (1 << 15),
@@ -813,7 +813,7 @@ static struct clksrc_clk exynos5_clk_sclk_uart3 = { 
static struct clksrc_clk exynos5_clk_sclk_mmc0 = {

	.clk	= {

		.name		= "sclk_mmc",

		.devname	= "s3c-sdhci.0",

		.devname	= "exynos4-sdhci.0",

		.parent		= &exynos5_clk_dout_mmc0.clk,

		.enable		= exynos5_clksrc_mask_fsys_ctrl,

		.ctrlbit	= (1 << 0),
@@ -824,7 +824,7 @@ static struct clksrc_clk exynos5_clk_sclk_mmc0 = { 
static struct clksrc_clk exynos5_clk_sclk_mmc1 = {

	.clk	= {

		.name		= "sclk_mmc",

		.devname	= "s3c-sdhci.1",

		.devname	= "exynos4-sdhci.1",

		.parent		= &exynos5_clk_dout_mmc1.clk,

		.enable		= exynos5_clksrc_mask_fsys_ctrl,

		.ctrlbit	= (1 << 4),
@@ -835,7 +835,7 @@ static struct clksrc_clk exynos5_clk_sclk_mmc1 = { 
static struct clksrc_clk exynos5_clk_sclk_mmc2 = {

	.clk	= {

		.name		= "sclk_mmc",

		.devname	= "s3c-sdhci.2",

		.devname	= "exynos4-sdhci.2",

		.parent		= &exynos5_clk_dout_mmc2.clk,

		.enable		= exynos5_clksrc_mask_fsys_ctrl,

		.ctrlbit	= (1 << 8),
@@ -846,7 +846,7 @@ static struct clksrc_clk exynos5_clk_sclk_mmc2 = { 
static struct clksrc_clk exynos5_clk_sclk_mmc3 = {

	.clk	= {

		.name		= "sclk_mmc",

		.devname	= "s3c-sdhci.3",

		.devname	= "exynos4-sdhci.3",

		.parent		= &exynos5_clk_dout_mmc3.clk,

		.enable		= exynos5_clksrc_mask_fsys_ctrl,

		.ctrlbit	= (1 << 12),
@@ -990,10 +990,10 @@ static struct clk_lookup exynos5_clk_lookup[] = { 
	CLKDEV_INIT("exynos4210-uart.1", "clk_uart_baud0", &exynos5_clk_sclk_uart1.clk),

	CLKDEV_INIT("exynos4210-uart.2", "clk_uart_baud0", &exynos5_clk_sclk_uart2.clk),

	CLKDEV_INIT("exynos4210-uart.3", "clk_uart_baud0", &exynos5_clk_sclk_uart3.clk),

	CLKDEV_INIT("s3c-sdhci.0", "mmc_busclk.2", &exynos5_clk_sclk_mmc0.clk),

	CLKDEV_INIT("s3c-sdhci.1", "mmc_busclk.2", &exynos5_clk_sclk_mmc1.clk),

	CLKDEV_INIT("s3c-sdhci.2", "mmc_busclk.2", &exynos5_clk_sclk_mmc2.clk),

	CLKDEV_INIT("s3c-sdhci.3", "mmc_busclk.2", &exynos5_clk_sclk_mmc3.clk),

	CLKDEV_INIT("exynos4-sdhci.0", "mmc_busclk.2", &exynos5_clk_sclk_mmc0.clk),

	CLKDEV_INIT("exynos4-sdhci.1", "mmc_busclk.2", &exynos5_clk_sclk_mmc1.clk),

	CLKDEV_INIT("exynos4-sdhci.2", "mmc_busclk.2", &exynos5_clk_sclk_mmc2.clk),

	CLKDEV_INIT("exynos4-sdhci.3", "mmc_busclk.2", &exynos5_clk_sclk_mmc3.clk),

	CLKDEV_INIT("dma-pl330.0", "apb_pclk", &exynos5_clk_pdma0),

	CLKDEV_INIT("dma-pl330.1", "apb_pclk", &exynos5_clk_pdma1),

	CLKDEV_INIT("dma-pl330.2", "apb_pclk", &exynos5_clk_mdma1),

arch/arm/mach-exynos/common.c

+10 −0
Original line number Diff line number Diff line
@@ -326,6 +326,11 @@ static void __init exynos4_map_io(void) 
	s3c_fimc_setname(2, "exynos4-fimc");

	s3c_fimc_setname(3, "exynos4-fimc");



	s3c_sdhci_setname(0, "exynos4-sdhci");

	s3c_sdhci_setname(1, "exynos4-sdhci");

	s3c_sdhci_setname(2, "exynos4-sdhci");

	s3c_sdhci_setname(3, "exynos4-sdhci");



	/* The I2C bus controllers are directly compatible with s3c2440 */

	s3c_i2c0_setname("s3c2440-i2c");

	s3c_i2c1_setname("s3c2440-i2c");
@@ -344,6 +349,11 @@ static void __init exynos5_map_io(void) 
	s3c_device_i2c0.resource[1].start = EXYNOS5_IRQ_IIC;

	s3c_device_i2c0.resource[1].end   = EXYNOS5_IRQ_IIC;



	s3c_sdhci_setname(0, "exynos4-sdhci");

	s3c_sdhci_setname(1, "exynos4-sdhci");

	s3c_sdhci_setname(2, "exynos4-sdhci");

	s3c_sdhci_setname(3, "exynos4-sdhci");



	/* The I2C bus controllers are directly compatible with s3c2440 */

	s3c_i2c0_setname("s3c2440-i2c");

	s3c_i2c1_setname("s3c2440-i2c");

arch/arm/plat-samsung/include/plat/sdhci.h

+28 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ 
#ifndef __PLAT_S3C_SDHCI_H

#define __PLAT_S3C_SDHCI_H __FILE__



#include <plat/devs.h>



struct platform_device;

struct mmc_host;

struct mmc_card;
@@ -356,4 +358,30 @@ static inline void exynos4_default_sdhci3(void) { } 


#endif /* CONFIG_EXYNOS4_SETUP_SDHCI */



static inline void s3c_sdhci_setname(int id, char *name)

{

	switch (id) {

#ifdef CONFIG_S3C_DEV_HSMMC

	case 0:

		s3c_device_hsmmc0.name = name;

		break;

#endif

#ifdef CONFIG_S3C_DEV_HSMMC1

	case 1:

		s3c_device_hsmmc1.name = name;

		break;

#endif

#ifdef CONFIG_S3C_DEV_HSMMC2

	case 2:

		s3c_device_hsmmc2.name = name;

		break;

#endif

#ifdef CONFIG_S3C_DEV_HSMMC3

	case 3:

		s3c_device_hsmmc3.name = name;

		break;

#endif

	}

}



#endif /* __PLAT_S3C_SDHCI_H */