Commit b2833a05 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branches 'devel-iommu-mailbox', 'devel-mcbsp', 'devel-board' and... 

Merge branches 'devel-iommu-mailbox', 'devel-mcbsp', 'devel-board' and 'devel-hsmmc' into omap-for-linus

Conflicts:
	arch/arm/mach-omap2/omap_hwmod_44xx_data.c
parents 12d7d4e0 d594f1f3 b176654e 0a0d128d 0005ae73

arch/arm/mach-omap1/mcbsp.c

+259 −68
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
 *

 * Multichannel mode not supported.

 */

#include <linux/ioport.h>

#include <linux/module.h>

#include <linux/init.h>

#include <linux/clk.h>
@@ -78,100 +79,288 @@ static struct omap_mcbsp_ops omap1_mcbsp_ops = { 
};



#if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)

struct resource omap7xx_mcbsp_res[][6] = {

	{

		{

			.start = OMAP7XX_MCBSP1_BASE,

			.end   = OMAP7XX_MCBSP1_BASE + SZ_256,

			.flags = IORESOURCE_MEM,

		},

		{

			.name  = "rx",

			.start = INT_7XX_McBSP1RX,

			.flags = IORESOURCE_IRQ,

		},

		{

			.name  = "tx",

			.start = INT_7XX_McBSP1TX,

			.flags = IORESOURCE_IRQ,

		},

		{

			.name  = "rx",

			.start = OMAP_DMA_MCBSP1_RX,

			.flags = IORESOURCE_DMA,

		},

		{

			.name  = "tx",

			.start = OMAP_DMA_MCBSP1_TX,

			.flags = IORESOURCE_DMA,

		},

	},

	{

		{

			.start = OMAP7XX_MCBSP2_BASE,

			.end   = OMAP7XX_MCBSP2_BASE + SZ_256,

			.flags = IORESOURCE_MEM,

		},

		{

			.name  = "rx",

			.start = INT_7XX_McBSP2RX,

			.flags = IORESOURCE_IRQ,

		},

		{

			.name  = "tx",

			.start = INT_7XX_McBSP2TX,

			.flags = IORESOURCE_IRQ,

		},

		{

			.name  = "rx",

			.start = OMAP_DMA_MCBSP3_RX,

			.flags = IORESOURCE_DMA,

		},

		{

			.name  = "tx",

			.start = OMAP_DMA_MCBSP3_TX,

			.flags = IORESOURCE_DMA,

		},

	},

};



static struct omap_mcbsp_platform_data omap7xx_mcbsp_pdata[] = {

	{

		.phys_base	= OMAP7XX_MCBSP1_BASE,

		.dma_rx_sync	= OMAP_DMA_MCBSP1_RX,

		.dma_tx_sync	= OMAP_DMA_MCBSP1_TX,

		.rx_irq		= INT_7XX_McBSP1RX,

		.tx_irq		= INT_7XX_McBSP1TX,

		.ops		= &omap1_mcbsp_ops,

	},

	{

		.phys_base	= OMAP7XX_MCBSP2_BASE,

		.dma_rx_sync	= OMAP_DMA_MCBSP3_RX,

		.dma_tx_sync	= OMAP_DMA_MCBSP3_TX,

		.rx_irq		= INT_7XX_McBSP2RX,

		.tx_irq		= INT_7XX_McBSP2TX,

		.ops		= &omap1_mcbsp_ops,

	},

};

#define OMAP7XX_MCBSP_PDATA_SZ		ARRAY_SIZE(omap7xx_mcbsp_pdata)

#define OMAP7XX_MCBSP_REG_NUM		(OMAP_MCBSP_REG_XCERH / sizeof(u16) + 1)

#define OMAP7XX_MCBSP_RES_SZ		ARRAY_SIZE(omap7xx_mcbsp_res[1])

#define OMAP7XX_MCBSP_COUNT		ARRAY_SIZE(omap7xx_mcbsp_res)

#else

#define omap7xx_mcbsp_res		NULL

#define omap7xx_mcbsp_pdata		NULL

#define OMAP7XX_MCBSP_PDATA_SZ		0

#define OMAP7XX_MCBSP_REG_NUM		0

#define OMAP7XX_MCBSP_RES_SZ		0

#define OMAP7XX_MCBSP_COUNT		0

#endif



#ifdef CONFIG_ARCH_OMAP15XX

struct resource omap15xx_mcbsp_res[][6] = {

	{

		{

			.start = OMAP1510_MCBSP1_BASE,

			.end   = OMAP1510_MCBSP1_BASE + SZ_256,

			.flags = IORESOURCE_MEM,

		},

		{

			.name  = "rx",

			.start = INT_McBSP1RX,

			.flags = IORESOURCE_IRQ,

		},

		{

			.name  = "tx",

			.start = INT_McBSP1TX,

			.flags = IORESOURCE_IRQ,

		},

		{

			.name  = "rx",

			.start = OMAP_DMA_MCBSP1_RX,

			.flags = IORESOURCE_DMA,

		},

		{

			.name  = "tx",

			.start = OMAP_DMA_MCBSP1_TX,

			.flags = IORESOURCE_DMA,

		},

	},

	{

		{

			.start = OMAP1510_MCBSP2_BASE,

			.end   = OMAP1510_MCBSP2_BASE + SZ_256,

			.flags = IORESOURCE_MEM,

		},

		{

			.name  = "rx",

			.start = INT_1510_SPI_RX,

			.flags = IORESOURCE_IRQ,

		},

		{

			.name  = "tx",

			.start = INT_1510_SPI_TX,

			.flags = IORESOURCE_IRQ,

		},

		{

			.name  = "rx",

			.start = OMAP_DMA_MCBSP2_RX,

			.flags = IORESOURCE_DMA,

		},

		{

			.name  = "tx",

			.start = OMAP_DMA_MCBSP2_TX,

			.flags = IORESOURCE_DMA,

		},

	},

	{

		{

			.start = OMAP1510_MCBSP3_BASE,

			.end   = OMAP1510_MCBSP3_BASE + SZ_256,

			.flags = IORESOURCE_MEM,

		},

		{

			.name  = "rx",

			.start = INT_McBSP3RX,

			.flags = IORESOURCE_IRQ,

		},

		{

			.name  = "tx",

			.start = INT_McBSP3TX,

			.flags = IORESOURCE_IRQ,

		},

		{

			.name  = "rx",

			.start = OMAP_DMA_MCBSP3_RX,

			.flags = IORESOURCE_DMA,

		},

		{

			.name  = "tx",

			.start = OMAP_DMA_MCBSP3_TX,

			.flags = IORESOURCE_DMA,

		},

	},

};



static struct omap_mcbsp_platform_data omap15xx_mcbsp_pdata[] = {

	{

		.phys_base	= OMAP1510_MCBSP1_BASE,

		.dma_rx_sync	= OMAP_DMA_MCBSP1_RX,

		.dma_tx_sync	= OMAP_DMA_MCBSP1_TX,

		.rx_irq		= INT_McBSP1RX,

		.tx_irq		= INT_McBSP1TX,

		.ops		= &omap1_mcbsp_ops,

	},

	{

		.phys_base	= OMAP1510_MCBSP2_BASE,

		.dma_rx_sync	= OMAP_DMA_MCBSP2_RX,

		.dma_tx_sync	= OMAP_DMA_MCBSP2_TX,

		.rx_irq		= INT_1510_SPI_RX,

		.tx_irq		= INT_1510_SPI_TX,

		.ops		= &omap1_mcbsp_ops,

	},

	{

		.phys_base	= OMAP1510_MCBSP3_BASE,

		.dma_rx_sync	= OMAP_DMA_MCBSP3_RX,

		.dma_tx_sync	= OMAP_DMA_MCBSP3_TX,

		.rx_irq		= INT_McBSP3RX,

		.tx_irq		= INT_McBSP3TX,

		.ops		= &omap1_mcbsp_ops,

	},

};

#define OMAP15XX_MCBSP_PDATA_SZ		ARRAY_SIZE(omap15xx_mcbsp_pdata)

#define OMAP15XX_MCBSP_REG_NUM		(OMAP_MCBSP_REG_XCERH / sizeof(u16) + 1)

#define OMAP15XX_MCBSP_RES_SZ		ARRAY_SIZE(omap15xx_mcbsp_res[1])

#define OMAP15XX_MCBSP_COUNT		ARRAY_SIZE(omap15xx_mcbsp_res)

#else

#define omap15xx_mcbsp_res		NULL

#define omap15xx_mcbsp_pdata		NULL

#define OMAP15XX_MCBSP_PDATA_SZ		0

#define OMAP15XX_MCBSP_REG_NUM		0

#define OMAP15XX_MCBSP_RES_SZ		0

#define OMAP15XX_MCBSP_COUNT		0

#endif



#ifdef CONFIG_ARCH_OMAP16XX

struct resource omap16xx_mcbsp_res[][6] = {

	{

		{

			.start = OMAP1610_MCBSP1_BASE,

			.end   = OMAP1610_MCBSP1_BASE + SZ_256,

			.flags = IORESOURCE_MEM,

		},

		{

			.name  = "rx",

			.start = INT_McBSP1RX,

			.flags = IORESOURCE_IRQ,

		},

		{

			.name  = "tx",

			.start = INT_McBSP1TX,

			.flags = IORESOURCE_IRQ,

		},

		{

			.name  = "rx",

			.start = OMAP_DMA_MCBSP1_RX,

			.flags = IORESOURCE_DMA,

		},

		{

			.name  = "tx",

			.start = OMAP_DMA_MCBSP1_TX,

			.flags = IORESOURCE_DMA,

		},

	},

	{

		{

			.start = OMAP1610_MCBSP2_BASE,

			.end   = OMAP1610_MCBSP2_BASE + SZ_256,

			.flags = IORESOURCE_MEM,

		},

		{

			.name  = "rx",

			.start = INT_1610_McBSP2_RX,

			.flags = IORESOURCE_IRQ,

		},

		{

			.name  = "tx",

			.start = INT_1610_McBSP2_TX,

			.flags = IORESOURCE_IRQ,

		},

		{

			.name  = "rx",

			.start = OMAP_DMA_MCBSP2_RX,

			.flags = IORESOURCE_DMA,

		},

		{

			.name  = "tx",

			.start = OMAP_DMA_MCBSP2_TX,

			.flags = IORESOURCE_DMA,

		},

	},

	{

		{

			.start = OMAP1610_MCBSP3_BASE,

			.end   = OMAP1610_MCBSP3_BASE + SZ_256,

			.flags = IORESOURCE_MEM,

		},

		{

			.name  = "rx",

			.start = INT_McBSP3RX,

			.flags = IORESOURCE_IRQ,

		},

		{

			.name  = "tx",

			.start = INT_McBSP3TX,

			.flags = IORESOURCE_IRQ,

		},

		{

			.name  = "rx",

			.start = OMAP_DMA_MCBSP3_RX,

			.flags = IORESOURCE_DMA,

		},

		{

			.name  = "tx",

			.start = OMAP_DMA_MCBSP3_TX,

			.flags = IORESOURCE_DMA,

		},

	},

};



static struct omap_mcbsp_platform_data omap16xx_mcbsp_pdata[] = {

	{

		.phys_base	= OMAP1610_MCBSP1_BASE,

		.dma_rx_sync	= OMAP_DMA_MCBSP1_RX,

		.dma_tx_sync	= OMAP_DMA_MCBSP1_TX,

		.rx_irq		= INT_McBSP1RX,

		.tx_irq		= INT_McBSP1TX,

		.ops		= &omap1_mcbsp_ops,

	},

	{

		.phys_base	= OMAP1610_MCBSP2_BASE,

		.dma_rx_sync	= OMAP_DMA_MCBSP2_RX,

		.dma_tx_sync	= OMAP_DMA_MCBSP2_TX,

		.rx_irq		= INT_1610_McBSP2_RX,

		.tx_irq		= INT_1610_McBSP2_TX,

		.ops		= &omap1_mcbsp_ops,

	},

	{

		.phys_base	= OMAP1610_MCBSP3_BASE,

		.dma_rx_sync	= OMAP_DMA_MCBSP3_RX,

		.dma_tx_sync	= OMAP_DMA_MCBSP3_TX,

		.rx_irq		= INT_McBSP3RX,

		.tx_irq		= INT_McBSP3TX,

		.ops		= &omap1_mcbsp_ops,

	},

};

#define OMAP16XX_MCBSP_PDATA_SZ		ARRAY_SIZE(omap16xx_mcbsp_pdata)

#define OMAP16XX_MCBSP_REG_NUM		(OMAP_MCBSP_REG_XCERH / sizeof(u16) + 1)

#define OMAP16XX_MCBSP_RES_SZ		ARRAY_SIZE(omap16xx_mcbsp_res[1])

#define OMAP16XX_MCBSP_COUNT		ARRAY_SIZE(omap16xx_mcbsp_res)

#else

#define omap16xx_mcbsp_res		NULL

#define omap16xx_mcbsp_pdata		NULL

#define OMAP16XX_MCBSP_PDATA_SZ		0

#define OMAP16XX_MCBSP_REG_NUM		0

#define OMAP16XX_MCBSP_RES_SZ		0

#define OMAP16XX_MCBSP_COUNT		0

#endif



static int __init omap1_mcbsp_init(void)
@@ -179,16 +368,12 @@ static int __init omap1_mcbsp_init(void) 
	if (!cpu_class_is_omap1())

		return -ENODEV;



	if (cpu_is_omap7xx()) {

		omap_mcbsp_count = OMAP7XX_MCBSP_PDATA_SZ;

		omap_mcbsp_cache_size = OMAP7XX_MCBSP_REG_NUM * sizeof(u16);

	} else if (cpu_is_omap15xx()) {

		omap_mcbsp_count = OMAP15XX_MCBSP_PDATA_SZ;

		omap_mcbsp_cache_size = OMAP15XX_MCBSP_REG_NUM * sizeof(u16);

	} else if (cpu_is_omap16xx()) {

		omap_mcbsp_count = OMAP16XX_MCBSP_PDATA_SZ;

		omap_mcbsp_cache_size = OMAP16XX_MCBSP_REG_NUM * sizeof(u16);

	}

	if (cpu_is_omap7xx())

		omap_mcbsp_count = OMAP7XX_MCBSP_COUNT;

	else if (cpu_is_omap15xx())

		omap_mcbsp_count = OMAP15XX_MCBSP_COUNT;

	else if (cpu_is_omap16xx())

		omap_mcbsp_count = OMAP16XX_MCBSP_COUNT;



	mcbsp_ptr = kzalloc(omap_mcbsp_count * sizeof(struct omap_mcbsp *),

								GFP_KERNEL);
@@ -196,16 +381,22 @@ static int __init omap1_mcbsp_init(void) 
		return -ENOMEM;



	if (cpu_is_omap7xx())

		omap_mcbsp_register_board_cfg(omap7xx_mcbsp_pdata,

						OMAP7XX_MCBSP_PDATA_SZ);

		omap_mcbsp_register_board_cfg(omap7xx_mcbsp_res[0],

					OMAP7XX_MCBSP_RES_SZ,

					omap7xx_mcbsp_pdata,

					OMAP7XX_MCBSP_COUNT);



	if (cpu_is_omap15xx())

		omap_mcbsp_register_board_cfg(omap15xx_mcbsp_pdata,

						OMAP15XX_MCBSP_PDATA_SZ);

		omap_mcbsp_register_board_cfg(omap15xx_mcbsp_res[0],

					OMAP15XX_MCBSP_RES_SZ,

					omap15xx_mcbsp_pdata,

					OMAP15XX_MCBSP_COUNT);



	if (cpu_is_omap16xx())

		omap_mcbsp_register_board_cfg(omap16xx_mcbsp_pdata,

						OMAP16XX_MCBSP_PDATA_SZ);

		omap_mcbsp_register_board_cfg(omap16xx_mcbsp_res[0],

					OMAP16XX_MCBSP_RES_SZ,

					omap16xx_mcbsp_pdata,

					OMAP16XX_MCBSP_COUNT);



	return omap_mcbsp_init();

}

arch/arm/mach-omap2/board-2430sdp.c

+4 −3
Original line number Diff line number Diff line
@@ -142,14 +142,12 @@ static struct omap_board_config_kernel sdp2430_config[] __initdata = { 


static void __init omap_2430sdp_init_early(void)

{

	omap_board_config = sdp2430_config;

	omap_board_config_size = ARRAY_SIZE(sdp2430_config);

	omap2_init_common_infrastructure();

	omap2_init_common_devices(NULL, NULL);

}



static struct regulator_consumer_supply sdp2430_vmmc1_supplies[] = {

	REGULATOR_SUPPLY("vmmc", "mmci-omap-hs.0"),

	REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"),

};



/* VMMC1 for OMAP VDD_MMC1 (i/o) and MMC1 card */
@@ -246,6 +244,9 @@ static void __init omap_2430sdp_init(void) 


	omap2430_mux_init(board_mux, OMAP_PACKAGE_ZAC);



	omap_board_config = sdp2430_config;

	omap_board_config_size = ARRAY_SIZE(sdp2430_config);



	omap2430_i2c_init();



	platform_add_devices(sdp2430_devices, ARRAY_SIZE(sdp2430_devices));

arch/arm/mach-omap2/board-3430sdp.c

+7 −9
Original line number Diff line number Diff line
@@ -315,9 +315,6 @@ static struct omap_board_config_kernel sdp3430_config[] __initdata = { 


static void __init omap_3430sdp_init_early(void)

{

	omap_board_config = sdp3430_config;

	omap_board_config_size = ARRAY_SIZE(sdp3430_config);

	omap3_pm_init_cpuidle(omap3_cpuidle_params_table);

	omap2_init_common_infrastructure();

	omap2_init_common_devices(hyb18m512160af6_sdrc_params, NULL);

}
@@ -410,15 +407,15 @@ static struct regulator_consumer_supply sdp3430_vpll2_supplies[] = { 
};



static struct regulator_consumer_supply sdp3430_vmmc1_supplies[] = {

	REGULATOR_SUPPLY("vmmc", "mmci-omap-hs.0"),

	REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"),

};



static struct regulator_consumer_supply sdp3430_vsim_supplies[] = {

	REGULATOR_SUPPLY("vmmc_aux", "mmci-omap-hs.0"),

	REGULATOR_SUPPLY("vmmc_aux", "omap_hsmmc.0"),

};



static struct regulator_consumer_supply sdp3430_vmmc2_supplies[] = {

	REGULATOR_SUPPLY("vmmc", "mmci-omap-hs.1"),

	REGULATOR_SUPPLY("vmmc", "omap_hsmmc.1"),

};



/*
@@ -555,9 +552,7 @@ static struct regulator_init_data sdp3430_vpll2 = { 
	.consumer_supplies	= sdp3430_vpll2_supplies,

};



static struct twl4030_codec_audio_data sdp3430_audio = {

	.audio_mclk = 26000000,

};

static struct twl4030_codec_audio_data sdp3430_audio;



static struct twl4030_codec_data sdp3430_codec = {

	.audio_mclk = 26000000,
@@ -788,6 +783,9 @@ static struct omap_musb_board_data musb_board_data = { 
static void __init omap_3430sdp_init(void)

{

	omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);

	omap_board_config = sdp3430_config;

	omap_board_config_size = ARRAY_SIZE(sdp3430_config);

	omap3_pm_init_cpuidle(omap3_cpuidle_params_table);

	omap3430_i2c_init();

	omap_display_init(&sdp3430_dss_data);

	if (omap_rev() > OMAP3430_REV_ES1_0)

arch/arm/mach-omap2/board-3630sdp.c

+2 −2
Original line number Diff line number Diff line
@@ -72,8 +72,6 @@ static struct omap_board_config_kernel sdp_config[] __initdata = { 


static void __init omap_sdp_init_early(void)

{

	omap_board_config = sdp_config;

	omap_board_config_size = ARRAY_SIZE(sdp_config);

	omap2_init_common_infrastructure();

	omap2_init_common_devices(h8mbx00u0mer0em_sdrc_params,

				  h8mbx00u0mer0em_sdrc_params);
@@ -206,6 +204,8 @@ static struct flash_partitions sdp_flash_partitions[] = { 
static void __init omap_sdp_init(void)

{

	omap3_mux_init(board_mux, OMAP_PACKAGE_CBP);

	omap_board_config = sdp_config;

	omap_board_config_size = ARRAY_SIZE(sdp_config);

	zoom_peripherals_init();

	zoom_display_init();

	board_smc91x_init();

arch/arm/mach-omap2/board-4430sdp.c

+10 −9
Original line number Diff line number Diff line
@@ -325,8 +325,6 @@ static struct omap_board_config_kernel sdp4430_config[] __initdata = { 


static void __init omap_4430sdp_init_early(void)

{

	omap_board_config = sdp4430_config;

	omap_board_config_size = ARRAY_SIZE(sdp4430_config);

	omap2_init_common_infrastructure();

	omap2_init_common_devices(NULL, NULL);

#ifdef CONFIG_OMAP_32K_TIMER
@@ -348,11 +346,6 @@ static struct twl4030_usb_data omap4_usbphy_data = { 
};



static struct omap2_hsmmc_info mmc[] = {

	{

		.mmc		= 1,

		.caps		= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA,

		.gpio_wp	= -EINVAL,

	},

	{

		.mmc		= 2,

		.caps		=  MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA,
@@ -361,19 +354,24 @@ static struct omap2_hsmmc_info mmc[] = { 
		.nonremovable   = true,

		.ocr_mask	= MMC_VDD_29_30,

	},

	{

		.mmc		= 1,

		.caps		= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA,

		.gpio_wp	= -EINVAL,

	},

	{}	/* Terminator */

};



static struct regulator_consumer_supply sdp4430_vaux_supply[] = {

	{

		.supply = "vmmc",

		.dev_name = "mmci-omap-hs.1",

		.dev_name = "omap_hsmmc.1",

	},

};

static struct regulator_consumer_supply sdp4430_vmmc_supply[] = {

	{

		.supply = "vmmc",

		.dev_name = "mmci-omap-hs.0",

		.dev_name = "omap_hsmmc.0",

	},

};
@@ -640,6 +638,9 @@ static void __init omap_4430sdp_init(void) 
		package = OMAP_PACKAGE_CBL;

	omap4_mux_init(board_mux, package);



	omap_board_config = sdp4430_config;

	omap_board_config_size = ARRAY_SIZE(sdp4430_config);



	omap4_i2c_init();

	omap_sfh7741prox_init();

	platform_add_devices(sdp4430_devices, ARRAY_SIZE(sdp4430_devices));