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

Commit c2fda222 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'fixes-part-2' of... 

Merge branch 'fixes-part-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into omap/fixes
parents fdcc205f e4609747

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -852,6 +852,7 @@ config ARCH_OMAP 
	select HAVE_CLK

	select ARCH_REQUIRE_GPIOLIB

	select ARCH_HAS_CPUFREQ

	select CLKSRC_MMIO

	select GENERIC_CLOCKEVENTS

	select HAVE_SCHED_CLOCK

	select ARCH_HAS_HOLES_MEMORYMODEL

arch/arm/mach-omap1/mcbsp.c

+2 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ static void omap1_mcbsp_request(unsigned int id) 
	 * On 1510, 1610 and 1710, McBSP1 and McBSP3

	 * are DSP public peripherals.

	 */

	if (id == OMAP_MCBSP1 || id == OMAP_MCBSP3) {

	if (id == 0 || id == 2) {

		if (dsp_use++ == 0) {

			api_clk = clk_get(NULL, "api_ck");

			dsp_clk = clk_get(NULL, "dsp_ck");
@@ -59,7 +59,7 @@ static void omap1_mcbsp_request(unsigned int id) 


static void omap1_mcbsp_free(unsigned int id)

{

	if (id == OMAP_MCBSP1 || id == OMAP_MCBSP3) {

	if (id == 0 || id == 2) {

		if (--dsp_use == 0) {

			if (!IS_ERR(api_clk)) {

				clk_disable(api_clk);

arch/arm/mach-omap2/Makefile

+14 −4
Original line number Diff line number Diff line
@@ -145,9 +145,19 @@ obj-$(CONFIG_SOC_OMAP2420) += opp2420_data.o 
obj-$(CONFIG_SOC_OMAP2430)		+= opp2430_data.o



# hwmod data

obj-$(CONFIG_SOC_OMAP2420)		+= omap_hwmod_2420_data.o

obj-$(CONFIG_SOC_OMAP2430)		+= omap_hwmod_2430_data.o

obj-$(CONFIG_ARCH_OMAP3)		+= omap_hwmod_3xxx_data.o

obj-$(CONFIG_SOC_OMAP2420)		+= omap_hwmod_2xxx_ipblock_data.o \

					   omap_hwmod_2xxx_3xxx_ipblock_data.o \

					   omap_hwmod_2xxx_interconnect_data.o \

					   omap_hwmod_2xxx_3xxx_interconnect_data.o \

					   omap_hwmod_2420_data.o

obj-$(CONFIG_SOC_OMAP2430)		+= omap_hwmod_2xxx_ipblock_data.o \

					   omap_hwmod_2xxx_3xxx_ipblock_data.o \

					   omap_hwmod_2xxx_interconnect_data.o \

					   omap_hwmod_2xxx_3xxx_interconnect_data.o \

					   omap_hwmod_2430_data.o

obj-$(CONFIG_ARCH_OMAP3)		+= omap_hwmod_2xxx_3xxx_ipblock_data.o \

					   omap_hwmod_2xxx_3xxx_interconnect_data.o \

					   omap_hwmod_3xxx_data.o

obj-$(CONFIG_ARCH_OMAP4)		+= omap_hwmod_44xx_data.o



# EMU peripherals
@@ -269,4 +279,4 @@ obj-$(CONFIG_ARCH_OMAP4) += hwspinlock.o 
disp-$(CONFIG_OMAP2_DSS)		:= display.o

obj-y					+= $(disp-m) $(disp-y)



obj-y					+= common-board-devices.o
 
obj-y					+= common-board-devices.o twl-common.o

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

+9 −80
Original line number Diff line number Diff line
@@ -231,22 +231,6 @@ static void __init omap_3430sdp_init_early(void) 
	omap2_init_common_devices(hyb18m512160af6_sdrc_params, NULL);

}



static int sdp3430_batt_table[] = {

/* 0 C*/

30800, 29500, 28300, 27100,

26000, 24900, 23900, 22900, 22000, 21100, 20300, 19400, 18700, 17900,

17200, 16500, 15900, 15300, 14700, 14100, 13600, 13100, 12600, 12100,

11600, 11200, 10800, 10400, 10000, 9630,   9280,   8950,   8620,   8310,

8020,   7730,   7460,   7200,   6950,   6710,   6470,   6250,   6040,   5830,

5640,   5450,   5260,   5090,   4920,   4760,   4600,   4450,   4310,   4170,

4040,   3910,   3790,   3670,   3550

};



static struct twl4030_bci_platform_data sdp3430_bci_data = {

	.battery_tmp_tbl	= sdp3430_batt_table,

	.tblsize		= ARRAY_SIZE(sdp3430_batt_table),

};



static struct omap2_hsmmc_info mmc[] = {

	{

		.mmc		= 1,
@@ -292,14 +276,6 @@ static struct twl4030_gpio_platform_data sdp3430_gpio_data = { 
	.setup		= sdp3430_twl_gpio_setup,

};



static struct twl4030_usb_data sdp3430_usb_data = {

	.usb_mode	= T2_USB_MODE_ULPI,

};



static struct twl4030_madc_platform_data sdp3430_madc_data = {

	.irq_line	= 1,

};



/* regulator consumer mappings */



/* ads7846 on SPI */
@@ -307,16 +283,6 @@ static struct regulator_consumer_supply sdp3430_vaux3_supplies[] = { 
	REGULATOR_SUPPLY("vcc", "spi1.0"),

};



static struct regulator_consumer_supply sdp3430_vdda_dac_supplies[] = {

	REGULATOR_SUPPLY("vdda_dac", "omapdss_venc"),

};



/* VPLL2 for digital video outputs */

static struct regulator_consumer_supply sdp3430_vpll2_supplies[] = {

	REGULATOR_SUPPLY("vdds_dsi", "omapdss"),

	REGULATOR_SUPPLY("vdds_dsi", "omapdss_dsi1"),

};



static struct regulator_consumer_supply sdp3430_vmmc1_supplies[] = {

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

};
@@ -433,54 +399,10 @@ static struct regulator_init_data sdp3430_vsim = { 
	.consumer_supplies	= sdp3430_vsim_supplies,

};



/* VDAC for DSS driving S-Video */

static struct regulator_init_data sdp3430_vdac = {

	.constraints = {

		.min_uV			= 1800000,

		.max_uV			= 1800000,

		.apply_uV		= true,

		.valid_modes_mask	= REGULATOR_MODE_NORMAL

					| REGULATOR_MODE_STANDBY,

		.valid_ops_mask		= REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

	.num_consumer_supplies	= ARRAY_SIZE(sdp3430_vdda_dac_supplies),

	.consumer_supplies	= sdp3430_vdda_dac_supplies,

};



static struct regulator_init_data sdp3430_vpll2 = {

	.constraints = {

		.name			= "VDVI",

		.min_uV			= 1800000,

		.max_uV			= 1800000,

		.apply_uV		= true,

		.valid_modes_mask	= REGULATOR_MODE_NORMAL

					| REGULATOR_MODE_STANDBY,

		.valid_ops_mask		= REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

	.num_consumer_supplies	= ARRAY_SIZE(sdp3430_vpll2_supplies),

	.consumer_supplies	= sdp3430_vpll2_supplies,

};



static struct twl4030_codec_audio_data sdp3430_audio;



static struct twl4030_codec_data sdp3430_codec = {

	.audio_mclk = 26000000,

	.audio = &sdp3430_audio,

};



static struct twl4030_platform_data sdp3430_twldata = {

	.irq_base	= TWL4030_IRQ_BASE,

	.irq_end	= TWL4030_IRQ_END,



	/* platform_data for children goes here */

	.bci		= &sdp3430_bci_data,

	.gpio		= &sdp3430_gpio_data,

	.madc		= &sdp3430_madc_data,

	.keypad		= &sdp3430_kp_data,

	.usb		= &sdp3430_usb_data,

	.codec		= &sdp3430_codec,



	.vaux1		= &sdp3430_vaux1,

	.vaux2		= &sdp3430_vaux2,
@@ -489,14 +411,21 @@ static struct twl4030_platform_data sdp3430_twldata = { 
	.vmmc1		= &sdp3430_vmmc1,

	.vmmc2		= &sdp3430_vmmc2,

	.vsim		= &sdp3430_vsim,

	.vdac		= &sdp3430_vdac,

	.vpll2		= &sdp3430_vpll2,

};



static int __init omap3430_i2c_init(void)

{

	/* i2c1 for PMIC only */

	omap3_pmic_get_config(&sdp3430_twldata,

			TWL_COMMON_PDATA_USB | TWL_COMMON_PDATA_BCI |

			TWL_COMMON_PDATA_MADC | TWL_COMMON_PDATA_AUDIO,

			TWL_COMMON_REGULATOR_VDAC | TWL_COMMON_REGULATOR_VPLL2);

	sdp3430_twldata.vdac->constraints.apply_uV = true;

	sdp3430_twldata.vpll2->constraints.apply_uV = true;

	sdp3430_twldata.vpll2->constraints.name = "VDVI";



	omap3_pmic_init("twl4030", &sdp3430_twldata);



	/* i2c2 on camera connector (for sensor control) and optional isp1301 */

	omap_register_i2c_bus(2, 400, NULL, 0);

	/* i2c3 on display connector (for DVI, tfp410) */

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

+10 −131
Original line number Diff line number Diff line
@@ -302,14 +302,6 @@ static struct omap_musb_board_data musb_board_data = { 
	.power			= 100,

};



static struct twl4030_usb_data omap4_usbphy_data = {

	.phy_init	= omap4430_phy_init,

	.phy_exit	= omap4430_phy_exit,

	.phy_power	= omap4430_phy_power,

	.phy_set_clock	= omap4430_phy_set_clk,

	.phy_suspend	= omap4430_phy_suspend,

};



static struct omap2_hsmmc_info mmc[] = {

	{

		.mmc		= 2,
@@ -332,10 +324,6 @@ static struct regulator_consumer_supply sdp4430_vaux_supply[] = { 
	REGULATOR_SUPPLY("vmmc", "omap_hsmmc.1"),

};



static struct regulator_consumer_supply sdp4430_vmmc_supply[] = {

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

};



static int omap4_twl6030_hsmmc_late_init(struct device *dev)

{

	int ret = 0;
@@ -394,61 +382,6 @@ static struct regulator_init_data sdp4430_vaux1 = { 
	.consumer_supplies      = sdp4430_vaux_supply,

};



static struct regulator_init_data sdp4430_vaux2 = {

	.constraints = {

		.min_uV			= 1200000,

		.max_uV			= 2800000,

		.apply_uV		= true,

		.valid_modes_mask	= REGULATOR_MODE_NORMAL

					| REGULATOR_MODE_STANDBY,

		.valid_ops_mask	 = REGULATOR_CHANGE_VOLTAGE

					| REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

};



static struct regulator_init_data sdp4430_vaux3 = {

	.constraints = {

		.min_uV			= 1000000,

		.max_uV			= 3000000,

		.apply_uV		= true,

		.valid_modes_mask	= REGULATOR_MODE_NORMAL

					| REGULATOR_MODE_STANDBY,

		.valid_ops_mask	 = REGULATOR_CHANGE_VOLTAGE

					| REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

};



/* VMMC1 for MMC1 card */

static struct regulator_init_data sdp4430_vmmc = {

	.constraints = {

		.min_uV			= 1200000,

		.max_uV			= 3000000,

		.apply_uV		= true,

		.valid_modes_mask	= REGULATOR_MODE_NORMAL

					| REGULATOR_MODE_STANDBY,

		.valid_ops_mask	 = REGULATOR_CHANGE_VOLTAGE

					| REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

	.num_consumer_supplies  = 1,

	.consumer_supplies      = sdp4430_vmmc_supply,

};



static struct regulator_init_data sdp4430_vpp = {

	.constraints = {

		.min_uV			= 1800000,

		.max_uV			= 2500000,

		.apply_uV		= true,

		.valid_modes_mask	= REGULATOR_MODE_NORMAL

					| REGULATOR_MODE_STANDBY,

		.valid_ops_mask	 = REGULATOR_CHANGE_VOLTAGE

					| REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

};



static struct regulator_init_data sdp4430_vusim = {

	.constraints = {

		.min_uV			= 1200000,
@@ -462,74 +395,10 @@ static struct regulator_init_data sdp4430_vusim = { 
	},

};



static struct regulator_init_data sdp4430_vana = {

	.constraints = {

		.min_uV			= 2100000,

		.max_uV			= 2100000,

		.valid_modes_mask	= REGULATOR_MODE_NORMAL

					| REGULATOR_MODE_STANDBY,

		.valid_ops_mask	 = REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

};



static struct regulator_init_data sdp4430_vcxio = {

	.constraints = {

		.min_uV			= 1800000,

		.max_uV			= 1800000,

		.valid_modes_mask	= REGULATOR_MODE_NORMAL

					| REGULATOR_MODE_STANDBY,

		.valid_ops_mask	 = REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

};



static struct regulator_init_data sdp4430_vdac = {

	.constraints = {

		.min_uV			= 1800000,

		.max_uV			= 1800000,

		.valid_modes_mask	= REGULATOR_MODE_NORMAL

					| REGULATOR_MODE_STANDBY,

		.valid_ops_mask	 = REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

};



static struct regulator_init_data sdp4430_vusb = {

	.constraints = {

		.min_uV			= 3300000,

		.max_uV			= 3300000,

		.apply_uV		= true,

		.valid_modes_mask	= REGULATOR_MODE_NORMAL

					| REGULATOR_MODE_STANDBY,

		.valid_ops_mask	 =	REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

};



static struct regulator_init_data sdp4430_clk32kg = {

	.constraints = {

		.valid_ops_mask		= REGULATOR_CHANGE_STATUS,

	},

};



static struct twl4030_platform_data sdp4430_twldata = {

	.irq_base	= TWL6030_IRQ_BASE,

	.irq_end	= TWL6030_IRQ_END,



	/* Regulators */

	.vmmc		= &sdp4430_vmmc,

	.vpp		= &sdp4430_vpp,

	.vusim		= &sdp4430_vusim,

	.vana		= &sdp4430_vana,

	.vcxio		= &sdp4430_vcxio,

	.vdac		= &sdp4430_vdac,

	.vusb		= &sdp4430_vusb,

	.vaux1		= &sdp4430_vaux1,

	.vaux2		= &sdp4430_vaux2,

	.vaux3		= &sdp4430_vaux3,

	.clk32kg	= &sdp4430_clk32kg,

	.usb		= &omap4_usbphy_data

};



static struct i2c_board_info __initdata sdp4430_i2c_3_boardinfo[] = {
@@ -547,6 +416,16 @@ static struct i2c_board_info __initdata sdp4430_i2c_4_boardinfo[] = { 
};

static int __init omap4_i2c_init(void)

{

	omap4_pmic_get_config(&sdp4430_twldata, TWL_COMMON_PDATA_USB,

			TWL_COMMON_REGULATOR_VDAC |

			TWL_COMMON_REGULATOR_VAUX2 |

			TWL_COMMON_REGULATOR_VAUX3 |

			TWL_COMMON_REGULATOR_VMMC |

			TWL_COMMON_REGULATOR_VPP |

			TWL_COMMON_REGULATOR_VANA |

			TWL_COMMON_REGULATOR_VCXIO |

			TWL_COMMON_REGULATOR_VUSB |

			TWL_COMMON_REGULATOR_CLK32KG);

	omap4_pmic_init("twl6030", &sdp4430_twldata);

	omap_register_i2c_bus(2, 400, NULL, 0);

	omap_register_i2c_bus(3, 400, sdp4430_i2c_3_boardinfo,