From: Samuel Ortiz <sameo@linux.intel.com>
To: Santosh Shilimkar <santosh.shilimkar@ti.com>, tony@atomide.com
Cc: linux-omap@vger.kernel.org, ben@fluff.org.uk,
lrg@slimlogic.co.uk, paul@pwsan.com, Balaji T K <balajitk@ti.com>
Subject: Re: [PATCH 20/24] twl6030: add base addr for ID0, ID1, ID2
Date: Fri, 19 Feb 2010 12:41:43 +0100 [thread overview]
Message-ID: <20100219114142.GD10255@sortiz.org> (raw)
In-Reply-To: <1266335895-32741-20-git-send-email-santosh.shilimkar@ti.com>
On Tue, Feb 16, 2010 at 09:28:11PM +0530, Santosh Shilimkar wrote:
> 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
Tony, I'm taking this patch. Please let me know if you prefer it to go through
your tree.
Cheers,
Samuel.
> 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
>
--
Intel Open Source Technology Centre
http://oss.intel.com/
next prev parent reply other threads:[~2010-02-19 11:40 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-16 15:57 [PATCH 01/24] omap 3/4: uart: fix full-fifo write abort Santosh Shilimkar
2010-02-16 15:57 ` [PATCH 02/24] omap2/3/4: ioremap omap_globals module Santosh Shilimkar
2010-02-16 15:57 ` [PATCH 03/24] omap4: sdma: Enable the idle modes on omap4 Santosh Shilimkar
2010-02-16 15:57 ` [PATCH 04/24] omap: sdma: Limit the secure reserve channel fix for omap3 Santosh Shilimkar
2010-02-16 15:57 ` [PATCH 05/24] omap4: Add needed IRQ line into irqs.h Santosh Shilimkar
2010-02-16 15:57 ` [PATCH 06/24] omap4: Fix omap_type() for omap4 Santosh Shilimkar
2010-02-16 15:57 ` [PATCH 07/24] omap 3/4: Remove overlapping mapping of L4_WKUP io space Santosh Shilimkar
2010-02-16 15:57 ` [PATCH 08/24] omap4: clocks: Make Uart driver's clock calls OMAP4 compatible Santosh Shilimkar
2010-02-16 15:58 ` [PATCH 09/24] omap4: clocks: Make mcbsp " Santosh Shilimkar
2010-02-16 15:58 ` [PATCH 10/24] omap4: clokcs: Make gpio " Santosh Shilimkar
2010-02-16 15:58 ` [PATCH 11/24] omap4: clocks: Make watchdog " Santosh Shilimkar
2010-02-16 15:58 ` [PATCH 12/24] omap4: clocks: Make dmtimer clocks " Santosh Shilimkar
2010-02-16 15:58 ` [PATCH 13/24] omap4: clocks: Remove clock hacks from timer-gp.c Santosh Shilimkar
2010-02-16 15:58 ` [PATCH 14/24] omap4: Enable WDT and McBSP support Santosh Shilimkar
2010-02-16 15:58 ` [PATCH 15/24] omap4: clocks: Convert i2c clocks data to fclks Santosh Shilimkar
2010-02-16 15:58 ` [PATCH 16/24] omap4: Add i2c support on omap4 platform Santosh Shilimkar
2010-02-16 15:58 ` [PATCH 17/24] omap4: Add i2c board support for " Santosh Shilimkar
2010-02-16 15:58 ` [PATCH 18/24] omap4: clocks: Make i2c driver's clock calls OMAP4 compatible Santosh Shilimkar
2010-02-16 15:58 ` [PATCH 19/24] twl6030: Fix vsel calculations in set/get voltage api's Santosh Shilimkar
2010-02-16 15:58 ` [PATCH 20/24] twl6030: add base addr for ID0, ID1, ID2 Santosh Shilimkar
2010-02-16 15:58 ` [PATCH 21/24] omap4: add i2c1 peripherals data Santosh Shilimkar
2010-02-16 15:58 ` [PATCH 22/24] omap4: add regulator board data for TWL6030 Santosh Shilimkar
2010-02-16 15:58 ` [PATCH 23/24] omap4: Enable RTC and regulator support Santosh Shilimkar
2010-02-16 15:58 ` [PATCH 24/24] omap4: multi-omap: Allow build to work Santosh Shilimkar
2010-02-16 16:15 ` Shilimkar, Santosh
2010-02-17 9:12 ` Gadiyar, Anand
2010-02-17 17:20 ` Tony Lindgren
2010-02-16 18:53 ` Tony Lindgren
2010-02-17 5:05 ` Shilimkar, Santosh
2010-02-16 23:30 ` Paul Walmsley
2010-02-19 11:41 ` Samuel Ortiz [this message]
2010-02-19 22:33 ` [PATCH 20/24] twl6030: add base addr for ID0, ID1, ID2 Tony Lindgren
2010-02-16 23:22 ` [PATCH 18/24] omap4: clocks: Make i2c driver's clock calls OMAP4 compatible Paul Walmsley
2010-02-16 18:50 ` [PATCH 16/24] omap4: Add i2c support on omap4 platform Tony Lindgren
2010-02-17 5:04 ` Shilimkar, Santosh
2010-02-16 23:21 ` Paul Walmsley
2010-02-17 5:23 ` Shilimkar, Santosh
2010-02-16 23:22 ` [PATCH 15/24] omap4: clocks: Convert i2c clocks data to fclks Paul Walmsley
2010-02-16 18:42 ` [PATCH 14/24] omap4: Enable WDT and McBSP support Tony Lindgren
2010-02-16 18:41 ` [PATCH 13/24] omap4: clocks: Remove clock hacks from timer-gp.c Tony Lindgren
2010-02-17 5:02 ` Shilimkar, Santosh
2010-02-17 17:21 ` Tony Lindgren
2010-02-16 22:57 ` [PATCH 11/24] omap4: clocks: Make watchdog driver's clock calls OMAP4 compatible Paul Walmsley
2010-02-16 22:34 ` [PATCH 09/24] omap4: clocks: Make mcbsp " Paul Walmsley
2010-02-16 18:38 ` [PATCH 08/24] omap4: clocks: Make Uart " Tony Lindgren
2010-02-16 22:32 ` Paul Walmsley
2010-02-16 22:08 ` [PATCH 05/24] omap4: Add needed IRQ line into irqs.h Paul Walmsley
2010-02-17 5:01 ` Shilimkar, Santosh
2010-02-17 5:32 ` Paul Walmsley
2010-02-17 5:51 ` Shilimkar, Santosh
2010-02-17 6:02 ` Shilimkar, Santosh
2010-02-17 6:45 ` Paul Walmsley
2010-02-17 7:25 ` Shilimkar, Santosh
2010-02-17 7:32 ` Paul Walmsley
2010-02-17 7:36 ` Shilimkar, Santosh
2010-02-16 22:04 ` [PATCH 02/24] omap2/3/4: ioremap omap_globals module Paul Walmsley
2010-02-17 5:30 ` Shilimkar, Santosh
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=20100219114142.GD10255@sortiz.org \
--to=sameo@linux.intel.com \
--cc=balajitk@ti.com \
--cc=ben@fluff.org.uk \
--cc=linux-omap@vger.kernel.org \
--cc=lrg@slimlogic.co.uk \
--cc=paul@pwsan.com \
--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