lkml.org 
[lkml]   [2009]   [Oct]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH 1/5] mfd: twl4030-power: Rename DEVGROUP to DEV_GRP
    On 09 Oct 19, Samuel Ortiz wrote:
    > Hi Amit,
    >
    > I've applied patches 1,2 and 3 to my for-next branch.
    > I dont think patch 4 is really useful, and I'll wait for an ACK from Tony or
    > Nokia before pushing patch 5.
    >
    > Thanks for your work.
    >
    > Cheers,
    > Samuel.

    Samuel,

    I hope you meant you're taking patches 1, 2, 4 and 5.

    3 is the one just moving stuff around and may be discarded.

    Thanks.

    Regards,
    Amit

    > On Mon, Oct 19, 2009 at 03:10:44PM +0300, Amit Kucheria wrote:
    > > Stick to the names used in the reference manual
    > >
    > > Signed-off-by: Amit Kucheria <amit.kucheria@verdurent.com>
    > > Cc: sameo@linux.intel.com
    > > Cc: linux-omap@vger.kernel.org
    > > ---
    > > drivers/mfd/twl4030-power.c | 16 ++++++++--------
    > > 1 files changed, 8 insertions(+), 8 deletions(-)
    > >
    > > diff --git a/drivers/mfd/twl4030-power.c b/drivers/mfd/twl4030-power.c
    > > index d423e0c..82e3bcb 100644
    > > --- a/drivers/mfd/twl4030-power.c
    > > +++ b/drivers/mfd/twl4030-power.c
    > > @@ -69,12 +69,12 @@ static u8 twl4030_start_script_address = 0x2b;
    > >
    > > /* resource configuration registers */
    > >
    > > -#define DEVGROUP_OFFSET 0
    > > +#define DEV_GRP_OFFSET 0
    > > #define TYPE_OFFSET 1
    > >
    > > -/* Bit positions */
    > > -#define DEVGROUP_SHIFT 5
    > > -#define DEVGROUP_MASK (7 << DEVGROUP_SHIFT)
    > > +/* Bit positions in the registers */
    > > +#define DEV_GRP_SHIFT 5
    > > +#define DEV_GRP_MASK (7 << DEV_GRP_SHIFT)
    > > #define TYPE_SHIFT 0
    > > #define TYPE_MASK (7 << TYPE_SHIFT)
    > > #define TYPE2_SHIFT 3
    > > @@ -328,7 +328,7 @@ static int __init twl4030_configure_resource(struct twl4030_resconfig *rconfig)
    > >
    > > /* Set resource group */
    > > err = twl4030_i2c_read_u8(TWL4030_MODULE_PM_RECEIVER, &grp,
    > > - rconfig_addr + DEVGROUP_OFFSET);
    > > + rconfig_addr + DEV_GRP_OFFSET);
    > > if (err) {
    > > pr_err("TWL4030 Resource %d group could not be read\n",
    > > rconfig->resource);
    > > @@ -336,10 +336,10 @@ static int __init twl4030_configure_resource(struct twl4030_resconfig *rconfig)
    > > }
    > >
    > > if (rconfig->devgroup >= 0) {
    > > - grp &= ~DEVGROUP_MASK;
    > > - grp |= rconfig->devgroup << DEVGROUP_SHIFT;
    > > + grp &= ~DEV_GRP_MASK;
    > > + grp |= rconfig->devgroup << DEV_GRP_SHIFT;
    > > err = twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER,
    > > - grp, rconfig_addr + DEVGROUP_OFFSET);
    > > + grp, rconfig_addr + DEV_GRP_OFFSET);
    > > if (err < 0) {
    > > pr_err("TWL4030 failed to program devgroup\n");
    > > return err;
    > > --
    > > 1.6.3.3
    > >
    >
    > --
    > Intel Open Source Technology Centre
    > http://oss.intel.com/

    --
    ------------------------------------------------------------
    Amit Kucheria, Finland
    ------------------------------------------------------------


    \
     
     \ /
      Last update: 2009-10-20 08:11    [W:0.031 / U:1.924 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site