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

Commit 7f917a8d authored by Shawn Guo's avatar Shawn Guo
Browse files

mmc: mxcmmc: remove cpu_is_xxx by using platform_device_id 



It changes the driver to use platform_device_id rather than cpu_is_xxx
to determine the controller type, and updates the platform code
accordingly.

As the result, mach/hardware.h inclusion gets removed from the driver.

Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
Acked-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarChris Ball <cjb@laptop.org>
Tested-by: default avatarJavier Martin <javier.martin@vista-silicon.com>
Cc: linux-mmc@vger.kernel.org
parent 27b76486

arch/arm/mach-imx/clk-imx27.c

+6 −6
Original line number Diff line number Diff line
@@ -212,12 +212,12 @@ int __init mx27_clocks_init(unsigned long fref) 
	clk_register_clkdev(clk[gpt6_ipg_gate], "ipg", "imx-gpt.5");

	clk_register_clkdev(clk[per1_gate], "per", "imx-gpt.5");

	clk_register_clkdev(clk[pwm_ipg_gate], NULL, "mxc_pwm.0");

	clk_register_clkdev(clk[per2_gate], "per", "mxc-mmc.0");

	clk_register_clkdev(clk[sdhc1_ipg_gate], "ipg", "mxc-mmc.0");

	clk_register_clkdev(clk[per2_gate], "per", "mxc-mmc.1");

	clk_register_clkdev(clk[sdhc2_ipg_gate], "ipg", "mxc-mmc.1");

	clk_register_clkdev(clk[per2_gate], "per", "mxc-mmc.2");

	clk_register_clkdev(clk[sdhc2_ipg_gate], "ipg", "mxc-mmc.2");

	clk_register_clkdev(clk[per2_gate], "per", "imx21-mmc.0");

	clk_register_clkdev(clk[sdhc1_ipg_gate], "ipg", "imx21-mmc.0");

	clk_register_clkdev(clk[per2_gate], "per", "imx21-mmc.1");

	clk_register_clkdev(clk[sdhc2_ipg_gate], "ipg", "imx21-mmc.1");

	clk_register_clkdev(clk[per2_gate], "per", "imx21-mmc.2");

	clk_register_clkdev(clk[sdhc2_ipg_gate], "ipg", "imx21-mmc.2");

	clk_register_clkdev(clk[cspi1_ipg_gate], NULL, "imx27-cspi.0");

	clk_register_clkdev(clk[cspi2_ipg_gate], NULL, "imx27-cspi.1");

	clk_register_clkdev(clk[cspi3_ipg_gate], NULL, "imx27-cspi.2");

arch/arm/mach-imx/clk-imx31.c

+2 −2
Original line number Diff line number Diff line
@@ -159,8 +159,8 @@ int __init mx31_clocks_init(unsigned long fref) 
	clk_register_clkdev(clk[i2c2_gate], NULL, "imx21-i2c.1");

	clk_register_clkdev(clk[i2c3_gate], NULL, "imx21-i2c.2");

	clk_register_clkdev(clk[owire_gate], NULL, "mxc_w1.0");

	clk_register_clkdev(clk[sdhc1_gate], NULL, "mxc-mmc.0");

	clk_register_clkdev(clk[sdhc2_gate], NULL, "mxc-mmc.1");

	clk_register_clkdev(clk[sdhc1_gate], NULL, "imx31-mmc.0");

	clk_register_clkdev(clk[sdhc2_gate], NULL, "imx31-mmc.1");

	clk_register_clkdev(clk[ssi1_gate], NULL, "imx-ssi.0");

	clk_register_clkdev(clk[ssi2_gate], NULL, "imx-ssi.1");

	clk_register_clkdev(clk[firi_gate], "firi", NULL);

arch/arm/mach-imx/devices/devices-common.h

+1 −0
Original line number Diff line number Diff line
@@ -246,6 +246,7 @@ struct platform_device *__init imx_add_mxc_ehci( 


#include <linux/platform_data/mmc-mxcmmc.h>

struct imx_mxc_mmc_data {

	const char *devid;

	int id;

	resource_size_t iobase;

	resource_size_t iosize;

arch/arm/mach-imx/devices/platform-mxc-mmc.c

+8 −7
Original line number Diff line number Diff line
@@ -10,21 +10,22 @@ 
#include <mach/hardware.h>

#include "devices-common.h"



#define imx_mxc_mmc_data_entry_single(soc, _id, _hwid, _size)		\

#define imx_mxc_mmc_data_entry_single(soc, _devid, _id, _hwid, _size)	\

	{								\

		.devid = _devid,					\

		.id = _id,						\

		.iobase = soc ## _SDHC ## _hwid ## _BASE_ADDR,		\

		.iosize = _size,					\

		.irq = soc ## _INT_SDHC ## _hwid,			\

		.dmareq = soc ## _DMA_REQ_SDHC ## _hwid,		\

	}

#define imx_mxc_mmc_data_entry(soc, _id, _hwid, _size)			\

	[_id] = imx_mxc_mmc_data_entry_single(soc, _id, _hwid, _size)

#define imx_mxc_mmc_data_entry(soc, _devid, _id, _hwid, _size)		\

	[_id] = imx_mxc_mmc_data_entry_single(soc, _devid, _id, _hwid, _size)



#ifdef CONFIG_SOC_IMX21

const struct imx_mxc_mmc_data imx21_mxc_mmc_data[] __initconst = {

#define imx21_mxc_mmc_data_entry(_id, _hwid)				\

	imx_mxc_mmc_data_entry(MX21, _id, _hwid, SZ_4K)

	imx_mxc_mmc_data_entry(MX21, "imx21-mmc", _id, _hwid, SZ_4K)

	imx21_mxc_mmc_data_entry(0, 1),

	imx21_mxc_mmc_data_entry(1, 2),

};
@@ -33,7 +34,7 @@ const struct imx_mxc_mmc_data imx21_mxc_mmc_data[] __initconst = { 
#ifdef CONFIG_SOC_IMX27

const struct imx_mxc_mmc_data imx27_mxc_mmc_data[] __initconst = {

#define imx27_mxc_mmc_data_entry(_id, _hwid)				\

	imx_mxc_mmc_data_entry(MX27, _id, _hwid, SZ_4K)

	imx_mxc_mmc_data_entry(MX27, "imx21-mmc", _id, _hwid, SZ_4K)

	imx27_mxc_mmc_data_entry(0, 1),

	imx27_mxc_mmc_data_entry(1, 2),

};
@@ -42,7 +43,7 @@ const struct imx_mxc_mmc_data imx27_mxc_mmc_data[] __initconst = { 
#ifdef CONFIG_SOC_IMX31

const struct imx_mxc_mmc_data imx31_mxc_mmc_data[] __initconst = {

#define imx31_mxc_mmc_data_entry(_id, _hwid)				\

	imx_mxc_mmc_data_entry(MX31, _id, _hwid, SZ_16K)

	imx_mxc_mmc_data_entry(MX31, "imx31-mmc", _id, _hwid, SZ_16K)

	imx31_mxc_mmc_data_entry(0, 1),

	imx31_mxc_mmc_data_entry(1, 2),

};
@@ -67,7 +68,7 @@ struct platform_device *__init imx_add_mxc_mmc( 
			.flags = IORESOURCE_DMA,

		},

	};

	return imx_add_platform_device_dmamask("mxc-mmc", data->id,

	return imx_add_platform_device_dmamask(data->devid, data->id,

			res, ARRAY_SIZE(res),

			pdata, sizeof(*pdata), DMA_BIT_MASK(32));

}

arch/arm/mach-imx/mach-mx31_3ds.c

+1 −1
Original line number Diff line number Diff line
@@ -393,7 +393,7 @@ static struct regulator_init_data gpo_init = { 
};



static struct regulator_consumer_supply vmmc2_consumers[] = {

	REGULATOR_SUPPLY("vmmc", "mxc-mmc.0"),

	REGULATOR_SUPPLY("vmmc", "imx31-mmc.0"),

};



static struct regulator_init_data vmmc2_init = {