* [PATCH] twl6030: add base addr for ID0, ID1, ID2
2010-02-16 15:41 ` [PATCH] twl6030: Fix vsel calculations in set/get voltage api's Santosh Shilimkar
@ 2010-02-16 15:41 ` Santosh Shilimkar
0 siblings, 0 replies; 4+ messages in thread
From: Santosh Shilimkar @ 2010-02-16 15:41 UTC (permalink / raw)
To: tony; +Cc: linux-omap, ben, sameo, lrg, paul, Balaji T K
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
Cc: Samuel Ortiz <sameo@linux.intel.com>
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH] twl6030: add base addr for ID0, ID1, ID2
@ 2010-02-18 17:00 balajitk
2010-02-18 17:05 ` Krishnamoorthy, Balaji T
0 siblings, 1 reply; 4+ messages in thread
From: balajitk @ 2010-02-18 17:00 UTC (permalink / raw)
To: linux-omap, sameo; +Cc: tony, santosh.shilimkar, Balaji T K
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* RE: [PATCH] twl6030: add base addr for ID0, ID1, ID2
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
0 siblings, 1 reply; 4+ messages in thread
From: Krishnamoorthy, Balaji T @ 2010-02-18 17:05 UTC (permalink / raw)
To: Krishnamoorthy, Balaji T, linux-omap@vger.kernel.org,
sameo@linux.intel.com
Cc: tony@atomide.com, Shilimkar, Santosh
Sending this as a separate patch which was earlier combined with the series http://marc.info/?l=linux-omap&m=126633460408606&w=2
> -----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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] twl6030: add base addr for ID0, ID1, ID2
2010-02-18 17:05 ` Krishnamoorthy, Balaji T
@ 2010-02-19 12:14 ` Samuel Ortiz
0 siblings, 0 replies; 4+ messages in thread
From: Samuel Ortiz @ 2010-02-19 12:14 UTC (permalink / raw)
To: Krishnamoorthy, Balaji T
Cc: linux-omap@vger.kernel.org, tony@atomide.com, Shilimkar, Santosh
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/
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-02-19 12:12 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
-- 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
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox