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

Commit 47babe69 authored by Shawn Guo's avatar Shawn Guo Committed by Sascha Hauer
Browse files

ARM: mxs: dynamically allocate mmc device 



Signed-off-by: default avatarShawn Guo <shawn.guo@freescale.com>
[ukleinek: fix naming to include complete device name in functions]
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent 251290a6

arch/arm/mach-mxs/clock-mx23.c

+15 −0
Original line number Diff line number Diff line
@@ -521,6 +521,15 @@ static int clk_misc_init(void) 
	__raw_writel(BM_CLKCTRL_CPU_INTERRUPT_WAIT,

			CLKCTRL_BASE_ADDR + HW_CLKCTRL_CPU_SET);



	/*

	 * 480 MHz seems too high to be ssp clock source directly,

	 * so set frac to get a 288 MHz ref_io.

	 */

	reg = __raw_readl(CLKCTRL_BASE_ADDR + HW_CLKCTRL_FRAC);

	reg &= ~BM_CLKCTRL_FRAC_IOFRAC;

	reg |= 30 << BP_CLKCTRL_FRAC_IOFRAC;

	__raw_writel(reg, CLKCTRL_BASE_ADDR + HW_CLKCTRL_FRAC);



	return 0;

}
@@ -528,6 +537,12 @@ int __init mx23_clocks_init(void) 
{

	clk_misc_init();



	/*

	 * source ssp clock from ref_io than ref_xtal,

	 * as ref_xtal only provides 24 MHz as maximum.

	 */

	clk_set_parent(&ssp_clk, &ref_io_clk);



	clk_enable(&cpu_clk);

	clk_enable(&hbus_clk);

	clk_enable(&xbus_clk);

arch/arm/mach-mxs/clock-mx28.c

+18 −0
Original line number Diff line number Diff line
@@ -618,6 +618,8 @@ static struct clk_lookup lookups[] = { 
	_REGISTER_CLOCK("pll2", NULL, pll2_clk)

	_REGISTER_CLOCK("mxs-dma-apbh", NULL, hbus_clk)

	_REGISTER_CLOCK("mxs-dma-apbx", NULL, xbus_clk)

	_REGISTER_CLOCK("mxs-mmc.0", NULL, ssp0_clk)

	_REGISTER_CLOCK("mxs-mmc.1", NULL, ssp1_clk)

	_REGISTER_CLOCK("flexcan.0", NULL, can0_clk)

	_REGISTER_CLOCK("flexcan.1", NULL, can1_clk)

	_REGISTER_CLOCK(NULL, "usb0", usb0_clk)
@@ -737,6 +739,15 @@ static int clk_misc_init(void) 
	reg |= BM_CLKCTRL_ENET_CLK_OUT_EN;

	__raw_writel(reg, CLKCTRL_BASE_ADDR + HW_CLKCTRL_ENET);



	/*

	 * 480 MHz seems too high to be ssp clock source directly,

	 * so set frac0 to get a 288 MHz ref_io0.

	 */

	reg = __raw_readl(CLKCTRL_BASE_ADDR + HW_CLKCTRL_FRAC0);

	reg &= ~BM_CLKCTRL_FRAC0_IO0FRAC;

	reg |= 30 << BP_CLKCTRL_FRAC0_IO0FRAC;

	__raw_writel(reg, CLKCTRL_BASE_ADDR + HW_CLKCTRL_FRAC0);



	return 0;

}
@@ -744,6 +755,13 @@ int __init mx28_clocks_init(void) 
{

	clk_misc_init();



	/*

	 * source ssp clock from ref_io0 than ref_xtal,

	 * as ref_xtal only provides 24 MHz as maximum.

	 */

	clk_set_parent(&ssp0_clk, &ref_io0_clk);

	clk_set_parent(&ssp1_clk, &ref_io0_clk);



	clk_enable(&cpu_clk);

	clk_enable(&hbus_clk);

	clk_enable(&xbus_clk);

arch/arm/mach-mxs/devices-mx23.h

+4 −0
Original line number Diff line number Diff line
@@ -21,6 +21,10 @@ extern const struct mxs_auart_data mx23_auart_data[] __initconst; 
#define mx23_add_auart0()		mx23_add_auart(0)

#define mx23_add_auart1()		mx23_add_auart(1)



extern const struct mxs_mxs_mmc_data mx23_mxs_mmc_data[] __initconst;

#define mx23_add_mxs_mmc(id, pdata) \

	mxs_add_mxs_mmc(&mx23_mxs_mmc_data[id], pdata)



#define mx23_add_mxs_pwm(id)		mxs_add_mxs_pwm(MX23_PWM_BASE_ADDR, id)



struct platform_device *__init mx23_add_mxsfb(

arch/arm/mach-mxs/devices-mx28.h

+4 −0
Original line number Diff line number Diff line
@@ -37,6 +37,10 @@ extern const struct mxs_flexcan_data mx28_flexcan_data[] __initconst; 
extern const struct mxs_i2c_data mx28_mxs_i2c_data[] __initconst;

#define mx28_add_mxs_i2c(id)		mxs_add_mxs_i2c(&mx28_mxs_i2c_data[id])



extern const struct mxs_mxs_mmc_data mx28_mxs_mmc_data[] __initconst;

#define mx28_add_mxs_mmc(id, pdata) \

	mxs_add_mxs_mmc(&mx28_mxs_mmc_data[id], pdata)



#define mx28_add_mxs_pwm(id)		mxs_add_mxs_pwm(MX28_PWM_BASE_ADDR, id)



struct platform_device *__init mx28_add_mxsfb(

arch/arm/mach-mxs/devices/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -15,6 +15,9 @@ config MXS_HAVE_PLATFORM_FLEXCAN 
config MXS_HAVE_PLATFORM_MXS_I2C

	bool



config MXS_HAVE_PLATFORM_MXS_MMC

	bool



config MXS_HAVE_PLATFORM_MXS_PWM

	bool