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

Commit f6a1f218 authored by Russell King's avatar Russell King
Browse files

Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6

parents b0c4d4ee 46e3f307

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

+0 −6
Original line number Diff line number Diff line
@@ -250,9 +250,6 @@ static const struct imxuart_platform_data uart_pdata __initconst = { 
	.flags = IMXUART_HAVE_RTSCTS,

};



#if defined(CONFIG_TOUCHSCREEN_ADS7846) \

	|| defined(CONFIG_TOUCHSCREEN_ADS7846_MODULE)



#define ADS7846_PENDOWN (GPIO_PORTD | 25)



static void ads7846_dev_init(void)
@@ -273,9 +270,7 @@ static struct ads7846_platform_data ads7846_config __initdata = { 
	.get_pendown_state	= ads7846_get_pendown_state,

	.keep_vref_on		= 1,

};

#endif



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

static struct spi_board_info eukrea_mbimx27_spi_board_info[] __initdata = {

	[0] = {

		.modalias	= "ads7846",
@@ -294,7 +289,6 @@ static const struct spi_imx_master eukrea_mbimx27_spi0_data __initconst = { 
	.chipselect	= eukrea_mbimx27_spi_cs,

	.num_chipselect = ARRAY_SIZE(eukrea_mbimx27_spi_cs),

};

#endif



static struct i2c_board_info eukrea_mbimx27_i2c_devices[] = {

	{

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

+2 −2
Original line number Diff line number Diff line
@@ -42,9 +42,9 @@ extern const struct imx_mxc_nand_data imx25_mxc_nand_data __initconst; 
#define imx25_add_mxc_nand(pdata)	\

	imx_add_mxc_nand(&imx25_mxc_nand_data, pdata)



extern const struct imx_spi_imx_data imx25_spi_imx_data[] __initconst;

extern const struct imx_spi_imx_data imx25_cspi_data[] __initconst;

#define imx25_add_spi_imx(id, pdata)	\

	imx_add_spi_imx(&imx25_spi_imx_data[id], pdata)

	imx_add_spi_imx(&imx25_cspi_data[id], 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_imx2(pdata)	imx25_add_spi_imx(2, pdata)

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

+2 −3
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 


#include <mach/common.h>

#include <mach/iomux-mx3.h>

#include <mach/spi.h>



#include <asm/mach-types.h>
@@ -59,14 +60,12 @@ static struct spi_board_info pcm037_spi_dev[] = { 
};



/* Platform Data for MXC CSPI */

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

static int pcm037_spi1_cs[] = {MXC_SPI_CS(1), IOMUX_TO_GPIO(MX31_PIN_KEY_COL7)};



static const struct spi_imx_master pcm037_spi1_pdata __initconst = {

	.chipselect = pcm037_spi1_cs,

	.num_chipselect = ARRAY_SIZE(pcm037_spi1_cs),

};

#endif



/* GPIO-keys input device */

static struct gpio_keys_button pcm037_gpio_keys[] = {
@@ -171,7 +170,7 @@ static struct platform_device pcm037_gpio_keys_device = { 
	},

};



static int eet_init_devices(void)

static int __init eet_init_devices(void)

{

	if (!machine_is_pcm037() || pcm037_variant() != PCM037_EET)

		return 0;

arch/arm/plat-mxc/devices/platform-imx-dma.c

+0 −8
Original line number Diff line number Diff line
@@ -12,15 +12,7 @@ 


#include <mach/hardware.h>

#include <mach/devices-common.h>

#ifdef SDMA_IS_MERGED

#include <mach/sdma.h>

#else

struct sdma_platform_data {

	int sdma_version;

	char *cpu_name;

	int to_version;

};

#endif



struct imx_imx_sdma_data {

	resource_size_t iobase;

arch/arm/plat-mxc/devices/platform-spi_imx.c

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ const struct imx_spi_imx_data imx21_cspi_data[] __initconst = { 
	imx_spi_imx_data_entry(MX21, CSPI, "imx21-cspi", _id, _hwid, SZ_4K)

	imx21_cspi_data_entry(0, 1),

	imx21_cspi_data_entry(1, 2),

};

#endif



#ifdef CONFIG_ARCH_MX25