Re: [PATCH 9/9] i2c: move twl4030-madc to new registration style

[David Brownell <david-b@pacbell.net>]

On Friday 26 September 2008, Felipe Balbi wrote:
>  arch/arm/mach-omap2/board-omap3beagle.c |    6 +
>  arch/arm/mach-omap2/board-overo.c       |    6 +

For the record:  this reverts those two little evil additions;
build fix, and correctness update for at least Beagle.

Steve, if Overo wires out any of the ADC channels on that
one connector, you may want to come up with a better fox.

- Dave

====== SNIP!
--- beagle.orig/arch/arm/mach-omap2/board-omap3beagle.c	2008-09-26 12:47:36.000000000 -0700
+++ beagle/arch/arm/mach-omap2/board-omap3beagle.c	2008-09-26 09:55:50.000000000 -0700
@@ -114,11 +114,6 @@ static struct twl4030_usb_data beagle_us
 	.usb_mode	= T2_USB_MODE_ULPI,
 };
 
-static struct twl4030_madc_platform_data beagle_madc_data = {
-	.imr		= TWL4030_MADC_IMR1,
-	.isr		= TWL4030_MADC_ISR1,
-};
-
 static struct twl4030_gpio_platform_data beagle_gpio_data = {
 	.gpio_base	= OMAP_MAX_GPIO_LINES,
 	.irq_base	= TWL4030_GPIO_IRQ_BASE,
@@ -135,7 +130,6 @@ static struct twl4030_platform_data beag
 	.irq_end	= TWL4030_IRQ_END,
 
 	/* platform_data for children goes here */
-	.madc		= &beagle_madc_data,
 	.usb		= &beagle_usb_data,
 	.gpio		= &beagle_gpio_data,
 };
--- beagle.orig/arch/arm/mach-omap2/board-overo.c	2008-09-26 12:47:36.000000000 -0700
+++ beagle/arch/arm/mach-omap2/board-overo.c	2008-09-26 10:02:29.000000000 -0700
@@ -152,16 +152,10 @@ static struct twl4030_gpio_platform_data
 	.irq_end	= TWL4030_GPIO_IRQ_END,
 };
 
-static struct twl4030_madc_platform_data overo_madc_data = {
-	.imr		= TWL4030_MADC_IMR1,
-	.isr		= TWL4030_MADC_ISR1,
-};
-
 static struct twl4030_platform_data overo_twldata = {
 	.irq_base	= TWL4030_IRQ_BASE,
 	.irq_end	= TWL4030_IRQ_END,
 	.gpio		= &overo_gpio_data,
-	.madc		= &overo_madc_data,
 };
 
 static struct i2c_board_info __initdata overo_i2c_boardinfo[] = {
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html