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

Commit bf9f6c8f authored by Sascha Hauer's avatar Sascha Hauer
Browse files

Merge branch 'imx-board-ifdefs' into imx-for-2.6.39

parents 4404117d 53cdd306

arch/arm/mach-imx/eukrea_mbimx27-baseboard.c

+0 −2
Original line number Diff line number Diff line
@@ -357,13 +357,11 @@ void __init eukrea_mbimx27_baseboard_init(void) 
	ads7846_dev_init();

#endif



#if defined(CONFIG_SPI_IMX) || defined(CONFIG_SPI_IMX_MODULE)

	/* SPI_CS0 init */

	mxc_gpio_mode(GPIO_PORTD | 28 | GPIO_GPIO | GPIO_OUT);

	imx27_add_spi_imx0(&eukrea_mbimx27_spi0_data);

	spi_register_board_info(eukrea_mbimx27_spi_board_info,

			ARRAY_SIZE(eukrea_mbimx27_spi_board_info));

#endif



	/* Leds configuration */

	mxc_gpio_mode(GPIO_PORTF | 16 | GPIO_GPIO | GPIO_OUT);

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

+0 −4
Original line number Diff line number Diff line
@@ -187,7 +187,6 @@ static struct i2c_board_info pca100_i2c_devices[] = { 
	}

};



#if defined(CONFIG_SPI_IMX) || defined(CONFIG_SPI_IMX_MODULE)

static struct spi_eeprom at25320 = {

	.name		= "at25320an",

	.byte_len	= 4096,
@@ -211,7 +210,6 @@ static const struct spi_imx_master pca100_spi0_data __initconst = { 
	.chipselect	= pca100_spi_cs,

	.num_chipselect = ARRAY_SIZE(pca100_spi_cs),

};

#endif



static void pca100_ac97_warm_reset(struct snd_ac97 *ac97)

{
@@ -389,13 +387,11 @@ static void __init pca100_init(void) 


	imx27_add_imx_i2c(1, &pca100_i2c1_data);



#if defined(CONFIG_SPI_IMX) || defined(CONFIG_SPI_IMX_MODULE)

	mxc_gpio_mode(GPIO_PORTD | 28 | GPIO_GPIO | GPIO_IN);

	mxc_gpio_mode(GPIO_PORTD | 27 | GPIO_GPIO | GPIO_IN);

	spi_register_board_info(pca100_spi_board_info,

				ARRAY_SIZE(pca100_spi_board_info));

	imx27_add_spi_imx0(&pca100_spi0_data);

#endif



	gpio_request(OTG_PHY_CS_GPIO, "usb-otg-cs");

	gpio_direction_output(OTG_PHY_CS_GPIO, 1);

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

+1 −20
Original line number Diff line number Diff line
@@ -73,8 +73,7 @@ 
 * This file contains the board-specific initialization routines.

 */



#if defined(CONFIG_SERIAL_8250) || defined(CONFIG_SERIAL_8250_MODULE)

/*!

/*

 * The serial port definition structure.

 */

static struct plat_serial8250_port serial_platform_data[] = {
@@ -110,14 +109,7 @@ static int __init mxc_init_extuart(void) 
{

	return platform_device_register(&serial_device);

}

#else

static inline int mxc_init_extuart(void)

{

	return 0;

}

#endif



#if defined(CONFIG_SERIAL_IMX) || defined(CONFIG_SERIAL_IMX_MODULE)

static const struct imxuart_platform_data uart_pdata __initconst = {

	.flags = IMXUART_HAVE_RTSCTS,

};
@@ -134,11 +126,6 @@ static inline void mxc_init_imx_uart(void) 
	mxc_iomux_setup_multiple_pins(uart_pins, ARRAY_SIZE(uart_pins), "uart-0");

	imx31_add_imx_uart0(&uart_pdata);

}

#else /* !SERIAL_IMX */

static inline void mxc_init_imx_uart(void)

{

}

#endif /* !SERIAL_IMX */



static void mx31ads_expio_irq_handler(u32 irq, struct irq_desc *desc)

{
@@ -476,7 +463,6 @@ static struct wm8350_platform_data __initdata mx31_wm8350_pdata = { 
};

#endif



#if defined(CONFIG_I2C_IMX) || defined(CONFIG_I2C_IMX_MODULE)

static struct i2c_board_info __initdata mx31ads_i2c1_devices[] = {

#ifdef CONFIG_MACH_MX31ADS_WM1133_EV1

	{
@@ -497,11 +483,6 @@ static void mxc_init_i2c(void) 


	imx31_add_imx_i2c1(NULL);

}

#else

static void mxc_init_i2c(void)

{

}

#endif



static unsigned int ssi_pins[] = {

	MX31_PIN_SFS5__SFS5,

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

+0 −2
Original line number Diff line number Diff line
@@ -180,9 +180,7 @@ static int __init eet_init_devices(void) 


	/* SPI */

	spi_register_board_info(pcm037_spi_dev, ARRAY_SIZE(pcm037_spi_dev));

#if defined(CONFIG_SPI_IMX) || defined(CONFIG_SPI_IMX_MODULE)

	imx31_add_spi_imx0(&pcm037_spi1_pdata);

#endif



	platform_device_register(&pcm037_gpio_keys_device);

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

+3 −7
Original line number Diff line number Diff line
@@ -115,7 +115,6 @@ static const struct imxuart_platform_data uart_pdata __initconst = { 
	.flags = IMXUART_HAVE_RTSCTS,

};



#if defined CONFIG_I2C_IMX || defined CONFIG_I2C_IMX_MODULE

static const struct imxi2c_platform_data pcm043_i2c0_data __initconst = {

	.bitrate = 50000,

};
@@ -134,7 +133,6 @@ static struct i2c_board_info pcm043_i2c_devices[] = { 
		I2C_BOARD_INFO("pcf8563", 0x51),

	}

};

#endif



static struct platform_device *devices[] __initdata = {

	&pcm043_flash,
@@ -312,13 +310,13 @@ static struct mxc_usbh_platform_data otg_pdata __initdata = { 
	.portsc	= MXC_EHCI_MODE_UTMI,

	.flags	= MXC_EHCI_INTERFACE_DIFF_UNI,

};

#endif



static const struct mxc_usbh_platform_data usbh1_pdata __initconst = {

	.portsc	= MXC_EHCI_MODE_SERIAL,

	.flags	= MXC_EHCI_INTERFACE_SINGLE_UNI | MXC_EHCI_INTERNAL_PHY |

		  MXC_EHCI_IPPUE_DOWN,

};

#endif



static const struct fsl_usb2_platform_data otg_device_pdata __initconst = {

	.operating_mode = FSL_USB2_DR_DEVICE,
@@ -369,12 +367,10 @@ static void __init mxc_board_init(void) 


	imx35_add_imx_uart1(&uart_pdata);



#if defined CONFIG_I2C_IMX || defined CONFIG_I2C_IMX_MODULE

	i2c_register_board_info(0, pcm043_i2c_devices,

			ARRAY_SIZE(pcm043_i2c_devices));



	imx35_add_imx_i2c0(&pcm043_i2c0_data);

#endif



	mxc_register_device(&mx3_ipu, &mx3_ipu_data);

	mxc_register_device(&mx3_fb, &mx3fb_pdata);
@@ -386,9 +382,9 @@ static void __init mxc_board_init(void) 


		imx35_add_mxc_ehci_otg(&otg_pdata);

	}



	imx35_add_mxc_ehci_hs(&usbh1_pdata);

#endif

	imx35_add_mxc_ehci_hs(&usbh1_pdata);



	if (!otg_mode_host)

		imx35_add_fsl_usb2_udc(&otg_device_pdata);