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

Commit 0508c8e7 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'imx-cleanup' of git://git.pengutronix.de/git/imx/linux-2.6 into next/cleanup 

From Sascha Hauer <s.hauer@pengutronix.de>:

ARM i.MX cleanups for v3.6

* tag 'imx-cleanup' of git://git.pengutronix.de/git/imx/linux-2.6

:
  ARM: imx: remove unused pdata from device macros
  ARM: imx: Kconfig: Remove IMX_HAVE_PLATFORM_IMX_SSI from MACH_MX25_3DS
  ARM: imx27/dt: make dt_compat entry const
  ARM: imx: cleanup otg_mode

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents a26361a7 bec31a85

arch/arm/mach-imx/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -158,7 +158,6 @@ config MACH_MX25_3DS 
	select IMX_HAVE_PLATFORM_IMX2_WDT

	select IMX_HAVE_PLATFORM_IMXDI_RTC

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_SSI

	select IMX_HAVE_PLATFORM_IMX_FB

	select IMX_HAVE_PLATFORM_IMX_KEYPAD

	select IMX_HAVE_PLATFORM_IMX_UART

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

+2 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ extern const struct imx_imx21_hcd_data imx21_imx21_hcd_data; 
	imx_add_imx21_hcd(&imx21_imx21_hcd_data, pdata)



extern const struct imx_imx2_wdt_data imx21_imx2_wdt_data;

#define imx21_add_imx2_wdt(pdata)	\

#define imx21_add_imx2_wdt()	\

	imx_add_imx2_wdt(&imx21_imx2_wdt_data)



extern const struct imx_imx_fb_data imx21_imx_fb_data;
@@ -50,7 +50,7 @@ extern const struct imx_mxc_nand_data imx21_mxc_nand_data; 
	imx_add_mxc_nand(&imx21_mxc_nand_data, pdata)



extern const struct imx_mxc_w1_data imx21_mxc_w1_data;

#define imx21_add_mxc_w1(pdata)	\

#define imx21_add_mxc_w1()	\

	imx_add_mxc_w1(&imx21_mxc_w1_data)



extern const struct imx_spi_imx_data imx21_cspi_data[];

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

+2 −2
Original line number Diff line number Diff line
@@ -24,11 +24,11 @@ extern const struct imx_fsl_usb2_udc_data imx25_fsl_usb2_udc_data; 
	imx_add_fsl_usb2_udc(&imx25_fsl_usb2_udc_data, pdata)



extern struct imx_imxdi_rtc_data imx25_imxdi_rtc_data;

#define imx25_add_imxdi_rtc(pdata)	\

#define imx25_add_imxdi_rtc()	\

	imx_add_imxdi_rtc(&imx25_imxdi_rtc_data)



extern const struct imx_imx2_wdt_data imx25_imx2_wdt_data;

#define imx25_add_imx2_wdt(pdata)	\

#define imx25_add_imx2_wdt()	\

	imx_add_imx2_wdt(&imx25_imx2_wdt_data)



extern const struct imx_imx_fb_data imx25_imx_fb_data;

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

+3 −3
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ extern const struct imx_fsl_usb2_udc_data imx27_fsl_usb2_udc_data; 
	imx_add_fsl_usb2_udc(&imx27_fsl_usb2_udc_data, pdata)



extern const struct imx_imx2_wdt_data imx27_imx2_wdt_data;

#define imx27_add_imx2_wdt(pdata)	\

#define imx27_add_imx2_wdt()	\

	imx_add_imx2_wdt(&imx27_imx2_wdt_data)



extern const struct imx_imx_fb_data imx27_imx_fb_data;
@@ -50,7 +50,7 @@ extern const struct imx_imx_uart_1irq_data imx27_imx_uart_data[]; 
extern const struct imx_mx2_camera_data imx27_mx2_camera_data;

#define imx27_add_mx2_camera(pdata)	\

	imx_add_mx2_camera(&imx27_mx2_camera_data, pdata)

#define imx27_add_mx2_emmaprp(pdata)	\

#define imx27_add_mx2_emmaprp()	\

	imx_add_mx2_emmaprp(&imx27_mx2_camera_data)



extern const struct imx_mxc_ehci_data imx27_mxc_ehci_otg_data;
@@ -69,7 +69,7 @@ extern const struct imx_mxc_nand_data imx27_mxc_nand_data; 
	imx_add_mxc_nand(&imx27_mxc_nand_data, pdata)



extern const struct imx_mxc_w1_data imx27_mxc_w1_data;

#define imx27_add_mxc_w1(pdata)	\

#define imx27_add_mxc_w1()	\

	imx_add_mxc_w1(&imx27_mxc_w1_data)



extern const struct imx_spi_imx_data imx27_cspi_data[];

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

+3 −3
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ extern const struct imx_fsl_usb2_udc_data imx31_fsl_usb2_udc_data; 
	imx_add_fsl_usb2_udc(&imx31_fsl_usb2_udc_data, pdata)



extern const struct imx_imx2_wdt_data imx31_imx2_wdt_data;

#define imx31_add_imx2_wdt(pdata)       \

#define imx31_add_imx2_wdt()       \

	imx_add_imx2_wdt(&imx31_imx2_wdt_data)



extern const struct imx_imx_i2c_data imx31_imx_i2c_data[];
@@ -65,11 +65,11 @@ extern const struct imx_mxc_nand_data imx31_mxc_nand_data; 
	imx_add_mxc_nand(&imx31_mxc_nand_data, pdata)



extern const struct imx_mxc_rtc_data imx31_mxc_rtc_data;

#define imx31_add_mxc_rtc(pdata)	\

#define imx31_add_mxc_rtc()	\

	imx_add_mxc_rtc(&imx31_mxc_rtc_data)



extern const struct imx_mxc_w1_data imx31_mxc_w1_data;

#define imx31_add_mxc_w1(pdata)	\

#define imx31_add_mxc_w1()	\

	imx_add_mxc_w1(&imx31_mxc_w1_data)



extern const struct imx_spi_imx_data imx31_cspi_data[];