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

Commit 124bf94a authored by Uwe Kleine-König's avatar Uwe Kleine-König
Browse files

ARM: imx: fix name for functions adding sdhci-esdhc-imx devices 



and restore alphabetic ordering.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
parent c496fa6b

arch/arm/mach-imx/Kconfig

+2 −2
Original line number Original line Diff line number Diff line
@@ -93,7 +93,6 @@ comment "MX25 platforms:" 
config MACH_MX25_3DS

config MACH_MX25_3DS

	bool "Support MX25PDK (3DS) Platform"

	bool "Support MX25PDK (3DS) Platform"

	select SOC_IMX25

	select SOC_IMX25

	select IMX_HAVE_PLATFORM_ESDHC

	select IMX_HAVE_PLATFORM_IMX2_WDT

	select IMX_HAVE_PLATFORM_IMX2_WDT

	select IMX_HAVE_PLATFORM_IMXDI_RTC

	select IMX_HAVE_PLATFORM_IMXDI_RTC

	select IMX_HAVE_PLATFORM_IMX_FB

	select IMX_HAVE_PLATFORM_IMX_FB
@@ -101,11 +100,11 @@ config MACH_MX25_3DS 
	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_MXC_EHCI

	select IMX_HAVE_PLATFORM_MXC_EHCI

	select IMX_HAVE_PLATFORM_MXC_NAND

	select IMX_HAVE_PLATFORM_MXC_NAND

	select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX





config MACH_EUKREA_CPUIMX25

config MACH_EUKREA_CPUIMX25

	bool "Support Eukrea CPUIMX25 Platform"

	bool "Support Eukrea CPUIMX25 Platform"

	select SOC_IMX25

	select SOC_IMX25

	select IMX_HAVE_PLATFORM_ESDHC

	select IMX_HAVE_PLATFORM_FLEXCAN

	select IMX_HAVE_PLATFORM_FLEXCAN

	select IMX_HAVE_PLATFORM_FSL_USB2_UDC

	select IMX_HAVE_PLATFORM_FSL_USB2_UDC

	select IMX_HAVE_PLATFORM_IMXDI_RTC

	select IMX_HAVE_PLATFORM_IMXDI_RTC
@@ -114,6 +113,7 @@ config MACH_EUKREA_CPUIMX25 
	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_MXC_EHCI

	select IMX_HAVE_PLATFORM_MXC_EHCI

	select IMX_HAVE_PLATFORM_MXC_NAND

	select IMX_HAVE_PLATFORM_MXC_NAND

	select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX

	select MXC_ULPI if USB_ULPI

	select MXC_ULPI if USB_ULPI





choice

choice

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

+5 −4
Original line number Original line Diff line number Diff line
@@ -74,13 +74,14 @@ extern const struct imx_mxc_nand_data imx25_mxc_nand_data __initconst; 
#define imx25_add_mxc_nand(pdata)	\

#define imx25_add_mxc_nand(pdata)	\

	imx_add_mxc_nand(&imx25_mxc_nand_data, pdata)

	imx_add_mxc_nand(&imx25_mxc_nand_data, pdata)





extern const struct imx_sdhci_esdhc_imx_data

imx25_sdhci_esdhc_imx_data[] __initconst;

#define imx25_add_sdhci_esdhc_imx(id, pdata)	\

	imx_add_sdhci_esdhc_imx(&imx25_sdhci_esdhc_imx_data[id], pdata)



extern const struct imx_spi_imx_data imx25_spi_imx_data[] __initconst;

extern const struct imx_spi_imx_data imx25_spi_imx_data[] __initconst;

#define imx25_add_spi_imx(id, pdata)	\

#define imx25_add_spi_imx(id, pdata)	\

	imx_add_spi_imx(&imx25_spi_imx_data[id], pdata)

	imx_add_spi_imx(&imx25_spi_imx_data[id], pdata)

#define imx25_add_spi_imx0(pdata)	imx25_add_spi_imx(0, pdata)

#define imx25_add_spi_imx0(pdata)	imx25_add_spi_imx(0, pdata)

#define imx25_add_spi_imx1(pdata)	imx25_add_spi_imx(1, pdata)

#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_spi_imx2(pdata)	imx25_add_spi_imx(2, 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-imx/eukrea_mbimxsd25-baseboard.c

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

	imx25_add_imx_ssi(0, &eukrea_mbimxsd_ssi_pdata);





	imx25_add_flexcan1(NULL);

	imx25_add_flexcan1(NULL);

	imx25_add_esdhc(0, NULL);

	imx25_add_sdhci_esdhc_imx(0, NULL);





	gpio_request(GPIO_LED1, "LED1");

	gpio_request(GPIO_LED1, "LED1");

	gpio_direction_output(GPIO_LED1, 1);

	gpio_direction_output(GPIO_LED1, 1);

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -200,7 +200,7 @@ static void __init mx25pdk_init(void) 
	imx25_add_fec(&mx25_fec_pdata);

	imx25_add_fec(&mx25_fec_pdata);

	imx25_add_imx_keypad(&mx25pdk_keymap_data);

	imx25_add_imx_keypad(&mx25pdk_keymap_data);





	imx25_add_esdhc(0, NULL);

	imx25_add_sdhci_esdhc_imx(0, NULL);

}

}





static void __init mx25pdk_timer_init(void)

static void __init mx25pdk_timer_init(void)

arch/arm/mach-mx3/Kconfig

+6 −6
Original line number Original line Diff line number Diff line
@@ -145,6 +145,7 @@ config MACH_QONG 
config MACH_PCM043

config MACH_PCM043

	bool "Support Phytec pcm043 (i.MX35) platforms"

	bool "Support Phytec pcm043 (i.MX35) platforms"

	select SOC_IMX35

	select SOC_IMX35

	select IMX_HAVE_PLATFORM_FLEXCAN

	select IMX_HAVE_PLATFORM_FSL_USB2_UDC

	select IMX_HAVE_PLATFORM_FSL_USB2_UDC

	select IMX_HAVE_PLATFORM_IMX2_WDT

	select IMX_HAVE_PLATFORM_IMX2_WDT

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_I2C
@@ -152,8 +153,7 @@ config MACH_PCM043 
	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_MXC_EHCI

	select IMX_HAVE_PLATFORM_MXC_EHCI

	select IMX_HAVE_PLATFORM_MXC_NAND

	select IMX_HAVE_PLATFORM_MXC_NAND

	select IMX_HAVE_PLATFORM_FLEXCAN

	select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX

	select IMX_HAVE_PLATFORM_ESDHC

	select MXC_ULPI if USB_ULPI

	select MXC_ULPI if USB_ULPI

	help

	help

	  Include support for Phytec pcm043 platform. This includes

	  Include support for Phytec pcm043 platform. This includes
@@ -176,12 +176,12 @@ config MACH_MX35_3DS 
	bool "Support MX35PDK platform"

	bool "Support MX35PDK platform"

	select SOC_IMX35

	select SOC_IMX35

	select MXC_DEBUG_BOARD

	select MXC_DEBUG_BOARD

	select IMX_HAVE_PLATFORM_ESDHC

	select IMX_HAVE_PLATFORM_FSL_USB2_UDC

	select IMX_HAVE_PLATFORM_FSL_USB2_UDC

	select IMX_HAVE_PLATFORM_IMX2_WDT

	select IMX_HAVE_PLATFORM_IMX2_WDT

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_MXC_EHCI

	select IMX_HAVE_PLATFORM_MXC_EHCI

	select IMX_HAVE_PLATFORM_MXC_NAND

	select IMX_HAVE_PLATFORM_MXC_NAND

	select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX

	help

	help

	  Include support for MX35PDK platform. This includes specific

	  Include support for MX35PDK platform. This includes specific

	  configurations for the board and its peripherals.

	  configurations for the board and its peripherals.
@@ -197,14 +197,14 @@ config MACH_KZM_ARM11_01 
config MACH_EUKREA_CPUIMX35

config MACH_EUKREA_CPUIMX35

	bool "Support Eukrea CPUIMX35 Platform"

	bool "Support Eukrea CPUIMX35 Platform"

	select SOC_IMX35

	select SOC_IMX35

	select IMX_HAVE_PLATFORM_FLEXCAN

	select IMX_HAVE_PLATFORM_FSL_USB2_UDC

	select IMX_HAVE_PLATFORM_FSL_USB2_UDC

	select IMX_HAVE_PLATFORM_IMX2_WDT

	select IMX_HAVE_PLATFORM_IMX2_WDT

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_MXC_EHCI

	select IMX_HAVE_PLATFORM_MXC_EHCI

	select IMX_HAVE_PLATFORM_MXC_NAND

	select IMX_HAVE_PLATFORM_MXC_NAND

	select IMX_HAVE_PLATFORM_FLEXCAN

	select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX

	select IMX_HAVE_PLATFORM_ESDHC

	select MXC_ULPI if USB_ULPI

	select MXC_ULPI if USB_ULPI

	help

	help

	  Include support for Eukrea CPUIMX35 platform. This includes

	  Include support for Eukrea CPUIMX35 platform. This includes