From: Samuel Ortiz <sameo@linux.intel.com>
To: "Krishnamoorthy, Balaji T" <balajitk@ti.com>
Cc: "linux-omap@vger.kernel.org" <linux-omap@vger.kernel.org>,
"tony@atomide.com" <tony@atomide.com>,
"Shilimkar, Santosh" <santosh.shilimkar@ti.com>
Subject: Re: [PATCH] twl6030: add base addr for ID0, ID1, ID2
Date: Fri, 19 Feb 2010 13:14:06 +0100 [thread overview]
Message-ID: <20100219121405.GH10255@sortiz.org> (raw)
In-Reply-To: <19F8576C6E063C45BE387C64729E7394044D71B3E9@dbde02.ent.ti.com>
On Thu, Feb 18, 2010 at 10:35:11PM +0530, Krishnamoorthy, Balaji T wrote:
> Sending this as a separate patch which was earlier combined with the series http://marc.info/?l=linux-omap&m=126633460408606&w=2
>
And it's been applied to my for-next branch, thanks.
Cheers,
Samuel.
> > -----Original Message-----
> > From: Krishnamoorthy, Balaji T
> > Sent: Thursday, February 18, 2010 10:30 PM
> > To: linux-omap@vger.kernel.org; sameo@linux.intel.com
> > Cc: tony@atomide.com; Shilimkar, Santosh; Krishnamoorthy, Balaji T
> > Subject: [PATCH] twl6030: add base addr for ID0, ID1, ID2
> >
> > From: Balaji T K <balajitk@ti.com>
> >
> > Add base address for generic slave ID0, ID1, ID2
> > and introduced one more entry to align RTC module number between
> > twl4030 and twl6030
> >
> > Signed-off-by: Balaji T K <balajitk@ti.com>
> > ---
> > drivers/mfd/twl-core.c | 7 +++++--
> > include/linux/i2c/twl.h | 5 +++++
> > 2 files changed, 10 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
> > index 2a76065..d820e87 100644
> > --- a/drivers/mfd/twl-core.c
> > +++ b/drivers/mfd/twl-core.c
> > @@ -204,6 +204,7 @@
> > /* subchip/slave 3 0x4B - AUDIO */
> > #define TWL6030_BASEADD_AUDIO 0x0000
> > #define TWL6030_BASEADD_RSV 0x0000
> > +#define TWL6030_BASEADD_ZERO 0x0000
> >
> > /* Few power values */
> > #define R_CFG_BOOT 0x05
> > @@ -319,9 +320,11 @@ static struct twl_mapping twl6030_map[] = {
> > { SUB_CHIP_ID1, TWL6030_BASEADD_CHARGER },
> > { SUB_CHIP_ID1, TWL6030_BASEADD_GASGAUGE },
> > { SUB_CHIP_ID1, TWL6030_BASEADD_PWM },
> > - { SUB_CHIP_ID2, TWL6030_BASEADD_RSV },
> > - { SUB_CHIP_ID2, TWL6030_BASEADD_RSV },
> > + { SUB_CHIP_ID0, TWL6030_BASEADD_ZERO },
> > + { SUB_CHIP_ID1, TWL6030_BASEADD_ZERO },
> >
> > + { SUB_CHIP_ID2, TWL6030_BASEADD_ZERO },
> > + { SUB_CHIP_ID2, TWL6030_BASEADD_ZERO },
> > { SUB_CHIP_ID2, TWL6030_BASEADD_RSV },
> > { SUB_CHIP_ID2, TWL6030_BASEADD_RSV },
> > { SUB_CHIP_ID2, TWL6030_BASEADD_RSV },
> > diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h
> > index bf1c5be..fcf9286 100644
> > --- a/include/linux/i2c/twl.h
> > +++ b/include/linux/i2c/twl.h
> > @@ -80,6 +80,11 @@
> > #define TWL_MODULE_PM_MASTER TWL4030_MODULE_PM_MASTER
> > #define TWL_MODULE_PM_RECEIVER TWL4030_MODULE_PM_RECEIVER
> > #define TWL_MODULE_RTC TWL4030_MODULE_RTC
> > +#define TWL_MODULE_PWM TWL4030_MODULE_PWM0
> > +
> > +#define TWL6030_MODULE_ID0 0x0D
> > +#define TWL6030_MODULE_ID1 0x0E
> > +#define TWL6030_MODULE_ID2 0x0F
> >
> > #define GPIO_INTR_OFFSET 0
> > #define KEYPAD_INTR_OFFSET 1
> > --
> > 1.6.0.4
>
--
Intel Open Source Technology Centre
http://oss.intel.com/
next prev parent reply other threads:[~2010-02-19 12:12 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-18 17:00 [PATCH] twl6030: add base addr for ID0, ID1, ID2 balajitk
2010-02-18 17:05 ` Krishnamoorthy, Balaji T
2010-02-19 12:14 ` Samuel Ortiz [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-02-16 15:41 [PATCH] omap 3/4: uart: fix full-fifo write abort Santosh Shilimkar
2010-02-16 15:41 ` [PATCH] omap2/3/4: ioremap omap_globals module Santosh Shilimkar
2010-02-16 15:41 ` [PATCH] omap4: sdma: Enable the idle modes on omap4 Santosh Shilimkar
2010-02-16 15:41 ` [PATCH] omap: sdma: Limit the secure reserve channel fix for omap3 Santosh Shilimkar
2010-02-16 15:41 ` [PATCH] omap4: Add needed IRQ line into irqs.h Santosh Shilimkar
2010-02-16 15:41 ` [PATCH] omap4: Fix omap_type() for omap4 Santosh Shilimkar
2010-02-16 15:41 ` [PATCH] omap 3/4: Remove overlapping mapping of L4_WKUP io space Santosh Shilimkar
2010-02-16 15:41 ` [PATCH] omap4: clocks: Make Uart driver's clock calls OMAP4 compatible Santosh Shilimkar
2010-02-16 15:41 ` [PATCH] omap4: clocks: Make mcbsp " Santosh Shilimkar
2010-02-16 15:41 ` [PATCH] omap4: clokcs: Make gpio " Santosh Shilimkar
2010-02-16 15:41 ` [PATCH] omap4: clocks: Make watchdog " Santosh Shilimkar
2010-02-16 15:41 ` [PATCH] omap4: clocks: Make dmtimer clocks " Santosh Shilimkar
2010-02-16 15:41 ` [PATCH] omap4: clocks: Remove clock hacks from timer-gp.c Santosh Shilimkar
2010-02-16 15:41 ` [PATCH] omap4: Enable WDT and McBSP support Santosh Shilimkar
2010-02-16 15:41 ` [PATCH] omap4: clocks: Convert i2c clocks data to fclks Santosh Shilimkar
2010-02-16 15:41 ` [PATCH] omap4: Add i2c support on omap4 platform Santosh Shilimkar
2010-02-16 15:41 ` [PATCH] omap4: Add i2c board support for " Santosh Shilimkar
2010-02-16 15:41 ` [PATCH] omap4: clocks: Make i2c driver's clock calls OMAP4 compatible Santosh Shilimkar
2010-02-16 15:41 ` [PATCH] twl6030: Fix vsel calculations in set/get voltage api's Santosh Shilimkar
2010-02-16 15:41 ` [PATCH] twl6030: add base addr for ID0, ID1, ID2 Santosh Shilimkar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100219121405.GH10255@sortiz.org \
--to=sameo@linux.intel.com \
--cc=balajitk@ti.com \
--cc=linux-omap@vger.kernel.org \
--cc=santosh.shilimkar@ti.com \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox