linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: s.hauer@pengutronix.de (Sascha Hauer)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/3] imx3: Add watchdog platform device support
Date: Mon, 22 Mar 2010 09:42:50 +0100	[thread overview]
Message-ID: <20100322084250.GH2241@pengutronix.de> (raw)
In-Reply-To: <1269011797-23203-1-git-send-email-vzapolskiy@gmail.com>

On Fri, Mar 19, 2010 at 06:16:37PM +0300, Vladimir Zapolskiy wrote:
> This patch adds support for build-in watchdog device found on
> Freescale imx31 and imx35 SoCs.

Added to mxc-master.

Sascha

> 
> Signed-off-by: Vladimir Zapolskiy <vzapolskiy@gmail.com>
> Cc: Sascha Hauer <s.hauer@pengutronix.de>
> Cc: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
> ---
>  arch/arm/mach-mx3/devices.c |   19 ++++++++++++++++++-
>  arch/arm/mach-mx3/devices.h |    3 ++-
>  2 files changed, 20 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/mach-mx3/devices.c b/arch/arm/mach-mx3/devices.c
> index 6adb586..f891115 100644
> --- a/arch/arm/mach-mx3/devices.c
> +++ b/arch/arm/mach-mx3/devices.c
> @@ -575,11 +575,26 @@ struct platform_device imx_ssi_device1 = {
>  	.resource = imx_ssi_resources1,
>  };
>  
> -static int mx3_devices_init(void)
> +static struct resource imx_wdt_resources[] = {
> +	{
> +		.flags = IORESOURCE_MEM,
> +	},
> +};
> +
> +struct platform_device imx_wdt_device0 = {
> +	.name           = "imx-wdt",
> +	.id             = 0,
> +	.num_resources  = ARRAY_SIZE(imx_wdt_resources),
> +	.resource       = imx_wdt_resources,
> +};
> +
> +static int __init mx3_devices_init(void)
>  {
>  	if (cpu_is_mx31()) {
>  		mxc_nand_resources[0].start = MX31_NFC_BASE_ADDR;
>  		mxc_nand_resources[0].end = MX31_NFC_BASE_ADDR + 0xfff;
> +		imx_wdt_resources[0].start = MX31_WDOG_BASE_ADDR;
> +		imx_wdt_resources[0].end = MX31_WDOG_BASE_ADDR + 0x3fff;
>  		mxc_register_device(&mxc_rnga_device, NULL);
>  	}
>  	if (cpu_is_mx35()) {
> @@ -597,6 +612,8 @@ static int mx3_devices_init(void)
>  		imx_ssi_resources0[1].end = MX35_INT_SSI1;
>  		imx_ssi_resources1[1].start = MX35_INT_SSI2;
>  		imx_ssi_resources1[1].end = MX35_INT_SSI2;
> +		imx_wdt_resources[0].start = MX35_WDOG_BASE_ADDR;
> +		imx_wdt_resources[0].end = MX35_WDOG_BASE_ADDR + 0x3fff;
>  	}
>  
>  	return 0;
> diff --git a/arch/arm/mach-mx3/devices.h b/arch/arm/mach-mx3/devices.h
> index 42cf175..4f77eb5 100644
> --- a/arch/arm/mach-mx3/devices.h
> +++ b/arch/arm/mach-mx3/devices.h
> @@ -25,4 +25,5 @@ extern struct platform_device mxc_spi_device1;
>  extern struct platform_device mxc_spi_device2;
>  extern struct platform_device imx_ssi_device0;
>  extern struct platform_device imx_ssi_device1;
> -
> +extern struct platform_device imx_ssi_device1;
> +extern struct platform_device imx_wdt_device0;
> -- 
> 1.6.6.1
> 
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

  reply	other threads:[~2010-03-22  8:42 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-03-19 15:13 [PATCH 1/3] watchdog: Add support for the Freescale MXC watchdog Vladimir Zapolskiy
2010-03-19 15:16 ` [PATCH 2/3] imx3: Add watchdog platform device support Vladimir Zapolskiy
2010-03-22  8:42   ` Sascha Hauer [this message]
2010-03-19 15:16 ` [PATCH 3/3] imx31: add watchdog device on litekit board Vladimir Zapolskiy
2010-03-22  8:43   ` Sascha Hauer
2010-03-20 12:09 ` [PATCH 1/3] watchdog: Add support for the Freescale MXC watchdog Wolfram Sang
2010-03-20 18:40   ` Vladimir Zapolskiy
2010-03-21 10:36     ` Wolfram Sang
2010-03-21 18:27       ` Vladimir Zapolskiy
2010-03-20 14:06 ` Russell King - ARM Linux
2010-03-20 17:58   ` Vladimir Zapolskiy

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=20100322084250.GH2241@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --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).