target/linux/lantiq/patches-3.3/0072-fix_i2c_clock.patch

   1 Index: linux-3.3.8/arch/mips/lantiq/falcon/sysctrl.c
   2 ===================================================================
   3 --- linux-3.3.8.orig/arch/mips/lantiq/falcon/sysctrl.c  2012-08-02 15:14:10.811781411 +0200
   4 +++ linux-3.3.8/arch/mips/lantiq/falcon/sysctrl.c       2012-08-02 15:16:24.587787128 +0200
   5 @@ -171,6 +171,7 @@
   6         clk->cl.con_id = NULL;
   7         clk->cl.clk = clk;
   8         clk->module = module;
   9 +       clk->bits = bits;
  10         clk->activate = ltq_sysctl_activate;
  11         clk->deactivate = ltq_sysctl_deactivate;
  12         clk->enable = ltq_sysctl_clken;
  13 @@ -206,5 +207,5 @@
  14         clkdev_add_sys("falcon_gpio.3", SYSCTL_SYS1, ACTS_PADCTRL3 | ACTS_P3);
  15         clkdev_add_sys("falcon_gpio.4", SYSCTL_SYS1, ACTS_PADCTRL4 | ACTS_P4);
  16         clkdev_add_sys("ltq_asc.1", SYSCTL_SYS1, ACTS_ASC1_ACT);
  17 -       clkdev_add_sys("falcon_i2c", SYSCTL_SYS1, ACTS_I2C_ACT);
  18 +       clkdev_add_sys("i2c-falcon.0", SYSCTL_SYS1, ACTS_I2C_ACT);
  19  }
  20 Index: linux-3.3.8/drivers/i2c/busses/i2c-falcon.c
  21 ===================================================================
  22 --- linux-3.3.8.orig/drivers/i2c/busses/i2c-falcon.c    2012-08-02 15:14:10.939781415 +0200
  23 +++ linux-3.3.8/drivers/i2c/busses/i2c-falcon.c 2012-08-02 15:15:59.667786063 +0200
  24 @@ -824,7 +824,7 @@
  25                 dev_err(&pdev->dev, "failed to get i2c clk\n");
  26                 return -ENOENT;
  27         }
  28 -
  29 +       clk_activate(clk);
  30         /* allocate private data */
  31         priv = kzalloc(sizeof(*priv), GFP_KERNEL);
  32         if (!priv) {