From: rmallon@gmail.com (Ryan Mallon)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 08/11] ep93xx: Move EP93XX_WATCHDOG_BASE define to driver
Date: Sat, 14 Jan 2012 08:46:39 +1100 [thread overview]
Message-ID: <4F10A63F.1050100@gmail.com> (raw)
In-Reply-To: <ADE657CA350FB648AAC2C43247A983F001F3F99EBB0B@AUSP01VMBX24.collaborationhost.net>
On 14/01/12 04:45, H Hartley Sweeten wrote:
> On Tuesday, January 10, 2012 8:15 PM, Ryan Mallon wrote:
>> The EP93xx watchdog driver is the only user of this define, move it there.
>>
>> Cc: Hartley Sweeten <hsweeten@visionengravers.com>
>> Cc: Mika Westerberg <mika.westerberg@iki.fi>
>> Cc: Wim Van Sebroeck <wim@iguana.be>
>> Signed-off-by: Ryan Mallon <rmallon@gmail.com>
>> ---
>> arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h | 2 --
>> drivers/watchdog/ep93xx_wdt.c | 1 +
>> 2 files changed, 1 insertions(+), 2 deletions(-)
>>
>> diff --git a/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h b/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h
>> index 387f745..225790d 100644
>> --- a/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h
>> +++ b/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h
>> @@ -127,7 +127,5 @@
>> #define EP93XX_SYSCON_SYSCFG_LCSN1 (1<<0)
>> #define EP93XX_SYSCON_SWLOCK EP93XX_SYSCON_REG(0xc0)
>>
>> -#define EP93XX_WATCHDOG_BASE EP93XX_APB_IOMEM(0x00140000)
>> -
>>
>> #endif
>> diff --git a/drivers/watchdog/ep93xx_wdt.c b/drivers/watchdog/ep93xx_wdt.c index 726b7df..82f648a 100644
>> --- a/drivers/watchdog/ep93xx_wdt.c
>> +++ b/drivers/watchdog/ep93xx_wdt.c
>> @@ -49,6 +49,7 @@ static unsigned long boot_status;
>> #define WDT_IN_USE 0
>> #define WDT_OK_TO_CLOSE 1
>>
>> +#define EP93XX_WATCHDOG_BASE EP93XX_APB_IOMEM(0x00140000)
>> #define EP93XX_WDT_REG(x) (EP93XX_WATCHDOG_BASE + (x))
>> #define EP93XX_WDT_WATCHDOG EP93XX_WDT_REG(0x00)
>> #define EP93XX_WDT_WDSTATUS EP93XX_WDT_REG(0x04)
> Ryan,
>
> I have a patch to convert the watchdog driver to a platform device and
> use the WatchDog Timer Driver Core. This patch will end up moving the
> base define to soc.h instead. But, for now, this looks good.
Is your patch ready to go? I'm in no rush to get these patches in, and I
can add it to this series if you like, which would get rid of the need
for this patch and would also mean that we don't need the include of
<mach/ep93xx-regs.h> in the watchdog driver in the final patch.
Thanks,
~Ryan
next prev parent reply other threads:[~2012-01-13 21:46 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-11 3:14 [PATCH 00/11] ep93xx: Move SoC private bits to core Ryan Mallon
2012-01-11 3:14 ` [PATCH 01/11] ep93xx: Move PHYS_BASE defines to local SoC header file Ryan Mallon
2012-01-13 17:18 ` H Hartley Sweeten
2012-01-13 21:35 ` Ryan Mallon
2012-01-11 3:14 ` [PATCH 02/11] ep93xx: Move GPIO defines to gpio-ep93xx.h Ryan Mallon
2012-01-13 17:22 ` H Hartley Sweeten
2012-01-11 3:14 ` [PATCH 03/11] ep93xx: Move peripheral defines to local SoC header Ryan Mallon
2012-01-13 17:25 ` H Hartley Sweeten
2012-01-11 3:14 ` [PATCH 04/11] ep93xx: Configure GPIO ports in core code Ryan Mallon
2012-01-13 6:27 ` Mika Westerberg
2012-01-13 7:00 ` Ryan Mallon
2012-01-13 8:12 ` Mika Westerberg
2012-01-13 18:05 ` H Hartley Sweeten
2012-01-11 3:14 ` [PATCH 05/11] ep93xx: Move arch_reset to core.c Ryan Mallon
2012-01-13 17:28 ` H Hartley Sweeten
2012-01-11 3:14 ` [PATCH 06/11] ep93xx: Don't use system controller defines in audio drivers Ryan Mallon
2012-01-11 17:42 ` Mark Brown
2012-01-11 19:57 ` Ryan Mallon
2012-01-12 3:04 ` Mark Brown
2012-01-13 17:35 ` H Hartley Sweeten
2012-01-13 21:41 ` Ryan Mallon
2012-01-13 22:13 ` Mark Brown
2012-01-11 3:14 ` [PATCH 07/11] ep93xx: Make syscon access functions private to SoC Ryan Mallon
2012-01-13 17:38 ` H Hartley Sweeten
2012-01-13 21:43 ` Ryan Mallon
2012-01-11 3:14 ` [PATCH 08/11] ep93xx: Move EP93XX_WATCHDOG_BASE define to driver Ryan Mallon
2012-01-13 17:45 ` H Hartley Sweeten
2012-01-13 21:46 ` Ryan Mallon [this message]
2012-01-13 22:48 ` H Hartley Sweeten
2012-01-11 3:14 ` [PATCH 09/11] ep93xx: Move crunch code to mach-ep93xx directory Ryan Mallon
2012-01-13 17:51 ` H Hartley Sweeten
2012-01-13 21:16 ` Ryan Mallon
2012-01-13 21:52 ` Russell King - ARM Linux
2012-01-11 3:14 ` [PATCH 10/11] ep93xx: Move EP93XX_SYSCON defines to SoC private header Ryan Mallon
2012-01-13 17:52 ` H Hartley Sweeten
2012-01-11 3:14 ` [PATCH 11/11] ep93xx: Remove unnecessary includes of ep93xx-regs.h Ryan Mallon
2012-01-13 17:54 ` H Hartley Sweeten
2012-01-12 0:17 ` [PATCH 00/11] ep93xx: Move SoC private bits to core Ryan Mallon
2012-01-13 17:56 ` H Hartley Sweeten
2012-01-14 19:07 ` Mika Westerberg
2012-01-16 4:51 ` Ryan Mallon
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=4F10A63F.1050100@gmail.com \
--to=rmallon@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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;
as well as URLs for NNTP newsgroup(s).