Commit c0745129 authored by Eric Bénard's avatar Eric Bénard Committed by Sascha Hauer
Browse files

imx-esdhc: update devices registration 



Tested on i.MX25 and i.MX35 and i.MX51

Signed-off-by: default avatarEric Bénard <eric@eukrea.com>
parent 6a001b88

arch/arm/mach-mx25/devices-imx25.h

+3 −4
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ extern const struct imx_spi_imx_data imx25_spi_imx_data[] __initconst; 
#define imx25_add_spi_imx1(pdata)	imx25_add_spi_imx(1, pdata)

#define imx25_add_spi_imx2(pdata)	imx25_add_spi_imx(2, pdata)



#define imx25_add_esdhc0(pdata)	\

	imx_add_esdhc(0, MX25_ESDHC1_BASE_ADDR, SZ_16K, MX25_INT_MMC_SDHC1, pdata)

#define imx25_add_esdhc1(pdata)	\

	imx_add_esdhc(1, MX25_ESDHC2_BASE_ADDR, SZ_16K, MX25_INT_MMC_SDHC2, pdata)
 
extern const struct imx_esdhc_imx_data imx25_esdhc_data[] __initconst;

#define imx25_add_esdhc(id, pdata)	\

	imx_add_esdhc(&imx25_esdhc_data[id], pdata)

arch/arm/mach-mx25/eukrea_mbimxsd-baseboard.c

+1 −1
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ void __init eukrea_mbimxsd25_baseboard_init(void) 
	imx25_add_imx_ssi(0, &eukrea_mbimxsd_ssi_pdata);



	imx25_add_flexcan1(NULL);

	imx25_add_esdhc0(NULL);

	imx25_add_esdhc(0, NULL);



	gpio_request(GPIO_LED1, "LED1");

	gpio_direction_output(GPIO_LED1, 1);

arch/arm/mach-mx3/devices-imx35.h

+3 −6
Original line number Diff line number Diff line
@@ -46,9 +46,6 @@ extern const struct imx_spi_imx_data imx35_cspi_data[] __initconst; 
#define imx35_add_spi_imx0(pdata)	imx35_add_cspi(0, pdata)

#define imx35_add_spi_imx1(pdata)	imx35_add_cspi(1, pdata)



#define imx35_add_esdhc0(pdata)	\

	imx_add_esdhc(0, MX35_ESDHC1_BASE_ADDR, SZ_16K, MX35_INT_MMC_SDHC1, pdata)

#define imx35_add_esdhc1(pdata)	\

	imx_add_esdhc(1, MX35_ESDHC2_BASE_ADDR, SZ_16K, MX35_INT_MMC_SDHC2, pdata)

#define imx35_add_esdhc2(pdata)	\

	imx_add_esdhc(2, MX35_ESDHC3_BASE_ADDR, SZ_16K, MX35_INT_MMC_SDHC3, pdata)
 
extern const struct imx_esdhc_imx_data imx35_esdhc_data[] __initconst;

#define imx35_add_esdhc(id, pdata)	\

	imx_add_esdhc(&imx35_esdhc_data[id], pdata)

arch/arm/mach-mx3/eukrea_mbimxsd-baseboard.c

+1 −1
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ void __init eukrea_mbimxsd35_baseboard_init(void) 
	imx35_add_imx_ssi(0, &eukrea_mbimxsd_ssi_pdata);



	imx35_add_flexcan1(NULL);

	imx35_add_esdhc0(NULL);

	imx35_add_esdhc(0, NULL);



	gpio_request(GPIO_LED1, "LED1");

	gpio_direction_output(GPIO_LED1, 1);

arch/arm/mach-mx3/mach-pcm043.c

+1 −1
Original line number Diff line number Diff line
@@ -395,7 +395,7 @@ static void __init mxc_board_init(void) 
		mxc_register_device(&mxc_otg_udc_device, &otg_device_pdata);



	imx35_add_flexcan1(NULL);

	imx35_add_esdhc0(NULL);

	imx35_add_esdhc(0, NULL);

}



static void __init pcm043_timer_init(void)