Re: stable-tracking unification update

[Balaji Rao]

On Sat, Oct 25, 2008 at 05:26:43AM +0100, Andy Green wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Hi -
>
> I have rebased stable-tracking in git on the s3c6410 work tree, this has
> the great result that we have a single unified tree going on that can be
> built for both TLA01 (future unnamed 6410 product) and GTA01/02.  I'll
> keep rebasing it as new stuff comes in and Ben in turn will be rebasing
> it on upstream.
>
> There's a TLA01 config now in ./arch/arm/configs/tla01_defconfig which
> creates a working kernel on 6410 SMDK and it builds a mostly-working
> kernel for GTA02 just fine too with
> ./arch/arm/configs/gta02-moredrivers-defconfig.  So this is going to
> make adding drivers, especially shared ones, into TLA01 kernel much
> easier now.
>
> In addition, I dumped the andy-tracking patchset into stable-tracking.
> There might be some small breakage because andy-tracking had balaji's
> patches on top of stable-tracking, but except for some small mystery
> about the recent i2c device api update breaking in mach_gta02.c (worked
> around), it seems OK at first glance.
>
>

Andy,

I see that you have dumped andy-tracking into stable-tracking after removing
my patches - which is good. But I see some remains in mach-gta02.c coming
from cleanup-after-adding-andy-tracking-patchset.patch.

Here's a patch that fixes it.

Signed-off-by: Balaji Rao <[EMAIL PROTECTED]>

diff --git a/arch/arm/mach-s3c2440/mach-gta02.c 
b/arch/arm/mach-s3c2440/mach-gta02.c
index c78ada3..871adba 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;
 
@@ -921,6 +911,12 @@ struct platform_device s3c24xx_pwm_device = {
        .num_resources  = 0,
 };
 
+static struct i2c_board_info gta02_i2c_devs[] __initdata = {
+       {
+               I2C_BOARD_INFO("wm8753", 0x1a),
+       },
+};
+
 static struct s3c2410_nand_set gta02_nand_sets[] = {
        [0] = {
                .name           = "neo1973-nand",
@@ -1667,8 +1663,8 @@ 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));
+       i2c_register_board_info(0, gta02_i2c_devs,
+                                               ARRAY_SIZE(gta02_i2c_devs));
 
        s3c2410_pm_init();