stable-tracking unification update

[Balaji Rao]

On Sat, Oct 25, 2008 at 09:10:01AM +0100, Andy Green wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Somebody in the thread at some point said:
>
> |> These are actually the workarounds I mentioned about I2C and PMU probing
> |> not working... I first tried the code same as after this patch, PMU
> |> probe was never called.  Only when I commented out the newish
> |> i2c_register_board_info and went back to explicitly registering the pmu
> |> device the old way could I get the PMU to be seen on boot.
> |>
> |> Did it work for you?  I didn't find out what the real problem is just
> |> worked around it and moved on.
> |
> | I didn't try it by hoped that it would work. :) I'm building it now..
> |
> | A quick check - Did you notice that I've removed pcf50633 from
> i2c_board_info
> | and added the wm8753 instead ? I don't understand why it would still
> interfere
> | with the PMU..
>
> I also mentioned that the uplevelled mokopatches dealt with the new way
> of passing i2c information into the wm8753 driver... it handles that
> action now.  Maybe that's what trashes up the PMU registration / bus
> attach stuff for PMU.
>
> Anyway that is why I removed wm8753 i2c registration from mach-gta02.c,
> it's now done in the gta02 wm8753 driver.

Ah, sorry for not noticing it. So we can remove the i2c_board_info
altogether from mach-gta02.c.

Signed-off-by: Balaji Rao <balajirrao at openmoko.org>

diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
index c78ada3..aa0a24d 100644
--- a/arch/arm/mach-s3c2440/mach-gta02.c
+++ b/arch/arm/mach-s3c2440/mach-gta02.c
@@ -98,16 +98,6 @@
 /* arbitrates which sensor IRQ owns the shared SPI bus */
 static spinlock_t motion_irq_lock;
 
-static struct pcf50633_platform_data gta02_pcf_pdata;
-
-static struct i2c_board_info gta02_i2c_devs[] __initdata = {
-		{
- 			I2C_BOARD_INFO("pcf50633", 0x73),
- 			.irq = GTA02_IRQ_PCF50633,
- 			.platform_data = &gta02_pcf_pdata,
- 		},
-};
-
 static int gta02_charger_online_status;
 static int gta02_charger_active_status;
 
@@ -1667,8 +1657,6 @@ static void __init gta02_machine_init(void)
 	mangle_pmu_pdata_by_system_rev();
 
 	platform_add_devices(gta02_devices, ARRAY_SIZE(gta02_devices));
-//	i2c_register_board_info(0, gta02_i2c_devs,
-//						ARRAY_SIZE(gta02_i2c_devs));
 
 	s3c2410_pm_init();