From: s.hauer@pengutronix.de (Sascha Hauer)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 3/6] arm/mach-mx3: add watchdog device to Phytec-boards
Date: Mon, 17 May 2010 11:51:58 +0200 [thread overview]
Message-ID: <20100517095158.GW31199@pengutronix.de> (raw)
In-Reply-To: <1272528202-24159-4-git-send-email-w.sang@pengutronix.de>
On Thu, Apr 29, 2010 at 10:03:19AM +0200, Wolfram Sang wrote:
> Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
> Cc: Sascha Hauer <s.hauer@pengutronix.de>
> ---
> arch/arm/mach-mx3/mach-pcm037.c | 1 +
> arch/arm/mach-mx3/mach-pcm043.c | 1 +
> 2 files changed, 2 insertions(+), 0 deletions(-)
Applied to mxc-master (also 4/6)
Sascha
>
> diff --git a/arch/arm/mach-mx3/mach-pcm037.c b/arch/arm/mach-mx3/mach-pcm037.c
> index 2df1ec5..5024284 100644
> --- a/arch/arm/mach-mx3/mach-pcm037.c
> +++ b/arch/arm/mach-mx3/mach-pcm037.c
> @@ -449,6 +449,7 @@ static int __init pcm037_camera_alloc_dma(const size_t buf_size)
> static struct platform_device *devices[] __initdata = {
> &pcm037_flash,
> &pcm037_sram_device,
> + &imx_wdt_device0,
> &pcm037_mt9t031,
> &pcm037_mt9v022,
> };
> diff --git a/arch/arm/mach-mx3/mach-pcm043.c b/arch/arm/mach-mx3/mach-pcm043.c
> index 1bf1ec2..78d9185 100644
> --- a/arch/arm/mach-mx3/mach-pcm043.c
> +++ b/arch/arm/mach-mx3/mach-pcm043.c
> @@ -150,6 +150,7 @@ static struct i2c_board_info pcm043_i2c_devices[] = {
> static struct platform_device *devices[] __initdata = {
> &pcm043_flash,
> &mxc_fec_device,
> + &imx_wdt_device0,
> };
>
> static struct pad_desc pcm043_pads[] = {
> --
> 1.7.0
>
>
--
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 |
next prev parent reply other threads:[~2010-05-17 9:51 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-29 8:03 IMX Watchdog driver for machs MX2 up to MX51 Wolfram Sang
2010-04-29 8:03 ` [PATCH 1/6] Driver for the watchdog timer on Freescale IMX2 (and later) processors Wolfram Sang
2010-05-14 2:49 ` Wolfram Sang
2010-05-14 15:56 ` Wim Van Sebroeck
2010-05-17 9:50 ` Sascha Hauer
2010-05-21 21:52 ` Wim Van Sebroeck
2010-05-25 9:18 ` Wolfram Sang
2010-05-25 10:12 ` Wim Van Sebroeck
2010-05-25 10:26 ` Wolfram Sang
2010-05-25 11:06 ` Wim Van Sebroeck
2010-04-29 8:03 ` [PATCH 2/6] arm/mach-mx2/3: Fix watchdog-devices to match the current driver Wolfram Sang
2010-05-17 9:51 ` Sascha Hauer
2010-04-29 8:03 ` [PATCH 3/6] arm/mach-mx3: add watchdog device to Phytec-boards Wolfram Sang
2010-05-17 9:51 ` Sascha Hauer [this message]
2010-04-29 8:03 ` [PATCH 4/6] arm/mach-mx2: " Wolfram Sang
2010-04-29 8:03 ` [PATCH 5/6] arm/mx25: add watchdog device Wolfram Sang
2010-05-06 10:21 ` Juergen Beisert
2010-05-17 9:49 ` Sascha Hauer
2010-05-17 10:33 ` [PATCH V2 " Wolfram Sang
2010-05-17 10:33 ` [PATCH V2 6/6] arm/mx51: " Wolfram Sang
2010-04-29 8:03 ` [PATCH " Wolfram Sang
2010-04-29 8:24 ` IMX Watchdog driver for machs MX2 up to MX51 Wolfram Sang
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=20100517095158.GW31199@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).