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

Commit ee80285e authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'mxs/gpmi' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/drivers 

* 'mxs/gpmi' of git://git.linaro.org/people/shawnguo/linux-2.6:
  ARM: mxs: add GPMI-NAND support for imx23/imx28
parents dae2efd7 60c15358

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

+1 −0
Original line number Diff line number Diff line
@@ -456,6 +456,7 @@ static struct clk_lookup lookups[] = { 
	_REGISTER_CLOCK("mxs-pwm.3", NULL, pwm_clk)

	_REGISTER_CLOCK("mxs-pwm.4", NULL, pwm_clk)

	_REGISTER_CLOCK("imx23-fb", NULL, lcdif_clk)

	_REGISTER_CLOCK("imx23-gpmi-nand", NULL, gpmi_clk)

};



static int clk_misc_init(void)

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

+1 −0
Original line number Diff line number Diff line
@@ -643,6 +643,7 @@ static struct clk_lookup lookups[] = { 
	_REGISTER_CLOCK("duart", NULL, uart_clk)

	_REGISTER_CLOCK("imx28-fec.0", NULL, fec_clk)

	_REGISTER_CLOCK("imx28-fec.1", NULL, fec_clk)

	_REGISTER_CLOCK("imx28-gpmi-nand", NULL, gpmi_clk)

	_REGISTER_CLOCK("mxs-auart.0", NULL, uart_clk)

	_REGISTER_CLOCK("mxs-auart.1", NULL, uart_clk)

	_REGISTER_CLOCK("mxs-auart.2", NULL, uart_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_gpmi_nand_data mx23_gpmi_nand_data __initconst;

#define mx23_add_gpmi_nand(pdata)	\

	mxs_add_gpmi_nand(pdata, &mx23_gpmi_nand_data)



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)

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

+4 −0
Original line number Diff line number Diff line
@@ -34,6 +34,10 @@ extern const struct mxs_flexcan_data mx28_flexcan_data[] __initconst; 
#define mx28_add_flexcan0(pdata)	mx28_add_flexcan(0, pdata)

#define mx28_add_flexcan1(pdata)	mx28_add_flexcan(1, pdata)



extern const struct mxs_gpmi_nand_data mx28_gpmi_nand_data __initconst;

#define mx28_add_gpmi_nand(pdata)	\

	mxs_add_gpmi_nand(pdata, &mx28_gpmi_nand_data)



extern const struct mxs_mxs_i2c_data mx28_mxs_i2c_data[] __initconst;

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

arch/arm/mach-mxs/devices/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -12,6 +12,9 @@ config MXS_HAVE_PLATFORM_FLEXCAN 
	select HAVE_CAN_FLEXCAN if CAN

	bool



config MXS_HAVE_PLATFORM_GPMI_NAND

	bool



config MXS_HAVE_PLATFORM_MXS_I2C

	bool