recipes-bsp/linux/linux-omap-psp-2.6.32/0027-twl4030-madc-adjust-for-twl4030-twl-api-changes.patch

   1 From e102ffa8fcc1586ed7d4c1390b7b2c7d7d359c40 Mon Sep 17 00:00:00 2001
   2 From: Koen Kooi <koen@dominion.thruhere.net>
   3 Date: Mon, 15 Feb 2010 14:20:51 +0100
   4 Subject: [PATCH 27/45] twl4030-madc: adjust for twl4030 -> twl api changes
   5
   6 ---
   7  drivers/mfd/twl4030-madc.c |   18 +++++++++---------
   8  1 files changed, 9 insertions(+), 9 deletions(-)
   9
  10 diff --git a/drivers/mfd/twl4030-madc.c b/drivers/mfd/twl4030-madc.c
  11 index 7d83ab8..de6bdcd 100644
  12 --- a/drivers/mfd/twl4030-madc.c
  13 +++ b/drivers/mfd/twl4030-madc.c
  14 @@ -29,7 +29,7 @@
  15  #include <linux/fs.h>
  16  #include <linux/platform_device.h>
  17  #include <linux/miscdevice.h>
  18 -#include <linux/i2c/twl4030.h>
  19 +#include <linux/i2c/twl.h>
  20  #include <linux/i2c/twl4030-madc.h>
  21
  22  #include <asm/uaccess.h>
  23 @@ -73,7 +73,7 @@ static int twl4030_madc_read(struct twl4030_madc_data *madc, u8 reg)
  24         int ret;
  25         u8 val;
  26
  27 -       ret = twl4030_i2c_read_u8(TWL4030_MODULE_MADC, &val, reg);
  28 +       ret = twl_i2c_read_u8(TWL4030_MODULE_MADC, &val, reg);
  29         if (ret) {
  30                 dev_dbg(madc->dev, "unable to read register 0x%X\n", reg);
  31                 return ret;
  32 @@ -86,7 +86,7 @@ static void twl4030_madc_write(struct twl4030_madc_data *madc, u8 reg, u8 val)
  33  {
  34         int ret;
  35
  36 -       ret = twl4030_i2c_write_u8(TWL4030_MODULE_MADC, val, reg);
  37 +       ret = twl_i2c_write_u8(TWL4030_MODULE_MADC, val, reg);
  38         if (ret)
  39                 dev_err(madc->dev, "unable to write register 0x%X\n", reg);
  40  }
  41 @@ -342,13 +342,13 @@ static int twl4030_madc_set_current_generator(struct twl4030_madc_data *madc,
  42         if (chan > 1)
  43                 return EINVAL;
  44
  45 -       ret = twl4030_i2c_read_u8(TWL4030_MODULE_MAIN_CHARGE,
  46 +       ret = twl_i2c_read_u8(TWL4030_MODULE_MAIN_CHARGE,
  47                                   &regval, TWL4030_BCI_BCICTL1);
  48         if (on)
  49                 regval |= (chan) ? TWL4030_BCI_ITHEN : TWL4030_BCI_TYPEN;
  50         else
  51                 regval &= (chan) ? ~TWL4030_BCI_ITHEN : ~TWL4030_BCI_TYPEN;
  52 -       ret = twl4030_i2c_write_u8(TWL4030_MODULE_MAIN_CHARGE,
  53 +       ret = twl_i2c_write_u8(TWL4030_MODULE_MAIN_CHARGE,
  54                                    regval, TWL4030_BCI_BCICTL1);
  55
  56         return ret;
  57 @@ -453,21 +453,21 @@ static int __init twl4030_madc_probe(struct platform_device *pdev)
  58         twl4030_madc_set_current_generator(madc, 0, 1);
  59
  60         /* Enable ADCIN3 through 6 */
  61 -       ret = twl4030_i2c_read_u8(TWL4030_MODULE_USB,
  62 +       ret = twl_i2c_read_u8(TWL4030_MODULE_USB,
  63                                   &regval, TWL4030_USB_CARKIT_ANA_CTRL);
  64
  65         regval |= TWL4030_USB_SEL_MADC_MCPC;
  66
  67 -       ret = twl4030_i2c_write_u8(TWL4030_MODULE_USB,
  68 +       ret = twl_i2c_write_u8(TWL4030_MODULE_USB,
  69                                 regval, TWL4030_USB_CARKIT_ANA_CTRL);
  70
  71
  72 -       ret = twl4030_i2c_read_u8(TWL4030_MODULE_MAIN_CHARGE,
  73 +       ret = twl_i2c_read_u8(TWL4030_MODULE_MAIN_CHARGE,
  74                                   &regval, TWL4030_BCI_BCICTL1);
  75
  76         regval |= TWL4030_BCI_MESBAT;
  77
  78 -       ret = twl4030_i2c_write_u8(TWL4030_MODULE_MAIN_CHARGE,
  79 +       ret = twl_i2c_write_u8(TWL4030_MODULE_MAIN_CHARGE,
  80                                    regval, TWL4030_BCI_BCICTL1);
  81
  82         ret = request_irq(platform_get_irq(pdev, 0), twl4030_madc_irq_handler,
  83 --
  84 1.6.6.1
  85