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

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

Merge branch 'for_3.6/cleanup/twl-irq' of... 

Merge branch 'for_3.6/cleanup/twl-irq' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into fixes-non-critical
parents 4348be7a 3e7b706c

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

+0 −3
Original line number Diff line number Diff line
@@ -218,9 +218,6 @@ static struct twl4030_gpio_platform_data sdp2430_gpio_data = { 
};



static struct twl4030_platform_data sdp2430_twldata = {

	.irq_base	= TWL4030_IRQ_BASE,

	.irq_end	= TWL4030_IRQ_END,



	/* platform_data for children goes here */

	.gpio		= &sdp2430_gpio_data,

	.vmmc1		= &sdp2430_vmmc1,

arch/arm/mach-omap2/board-omap3logic.c

+0 −3
Original line number Diff line number Diff line
@@ -93,9 +93,6 @@ static struct twl4030_usb_data omap3logic_usb_data = { 




static struct twl4030_platform_data omap3logic_twldata = {

	.irq_base	= TWL4030_IRQ_BASE,

	.irq_end	= TWL4030_IRQ_END,



	/* platform_data for children goes here */

	.gpio		= &omap3logic_gpio_data,

	.vmmc1		= &omap3logic_vmmc1,

arch/arm/mach-omap2/twl-common.c

+0 −9
Original line number Diff line number Diff line
@@ -213,10 +213,6 @@ static struct twl_regulator_driver_data omap3_vdd2_drvdata = { 
void __init omap3_pmic_get_config(struct twl4030_platform_data *pmic_data,

				  u32 pdata_flags, u32 regulators_flags)

{

	if (!pmic_data->irq_base)

		pmic_data->irq_base = TWL4030_IRQ_BASE;

	if (!pmic_data->irq_end)

		pmic_data->irq_end = TWL4030_IRQ_END;

	if (!pmic_data->vdd1) {

		omap3_vdd1.driver_data = &omap3_vdd1_drvdata;

		omap3_vdd1_drvdata.data = voltdm_lookup("mpu_iva");
@@ -481,11 +477,6 @@ static struct regulator_init_data omap4_v2v1_idata = { 
void __init omap4_pmic_get_config(struct twl4030_platform_data *pmic_data,

				  u32 pdata_flags, u32 regulators_flags)

{

	if (!pmic_data->irq_base)

		pmic_data->irq_base = TWL6030_IRQ_BASE;

	if (!pmic_data->irq_end)

		pmic_data->irq_end = TWL6030_IRQ_END;



	if (!pmic_data->vdd1) {

		omap4_vdd1.driver_data = &omap4_vdd1_drvdata;

		omap4_vdd1_drvdata.data = voltdm_lookup("mpu");

include/linux/i2c/twl.h

+0 −1
Original line number Diff line number Diff line
@@ -683,7 +683,6 @@ struct twl4030_audio_data { 
};



struct twl4030_platform_data {

	unsigned				irq_base, irq_end;

	struct twl4030_clock_init_data		*clock;

	struct twl4030_bci_platform_data	*bci;

	struct twl4030_gpio_platform_data	*gpio;