* [PATCH] ARM: mx5/mx51_3ds: Add watchdog support
@ 2010-12-09 17:50 Daiane Angolini
2010-12-09 18:42 ` Uwe Kleine-König
0 siblings, 1 reply; 6+ messages in thread
From: Daiane Angolini @ 2010-12-09 17:50 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Daiane Angolini <daiane.angolini@freescale.com>
---
arch/arm/mach-mx5/Kconfig | 1 +
arch/arm/mach-mx5/board-mx51_3ds.c | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-mx5/Kconfig b/arch/arm/mach-mx5/Kconfig
index 5011f42..b6180e5 100644
--- a/arch/arm/mach-mx5/Kconfig
+++ b/arch/arm/mach-mx5/Kconfig
@@ -30,6 +30,7 @@ config MACH_MX51_BABBAGE
config MACH_MX51_3DS
bool "Support MX51PDK (3DS)"
select SOC_IMX51
+ select IMX_HAVE_PLATFORM_IMX2_WDT
select IMX_HAVE_PLATFORM_IMX_UART
select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
select IMX_HAVE_PLATFORM_SPI_IMX
diff --git a/arch/arm/mach-mx5/board-mx51_3ds.c b/arch/arm/mach-mx5/board-mx51_3ds.c
index 6cc2805..54b3f25 100644
--- a/arch/arm/mach-mx5/board-mx51_3ds.c
+++ b/arch/arm/mach-mx5/board-mx51_3ds.c
@@ -174,6 +174,7 @@ static void __init mxc_board_init(void)
imx51_add_sdhci_esdhc_imx(0, NULL);
mxc_init_keypad();
+ imx51_add_imx2_wdt(0, NULL);
}
static void __init mx51_3ds_timer_init(void)
--
1.7.0.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH] ARM: mx5/mx51_3ds: Add watchdog support
2010-12-09 17:50 [PATCH] ARM: mx5/mx51_3ds: Add watchdog support Daiane Angolini
@ 2010-12-09 18:42 ` Uwe Kleine-König
2010-12-09 18:50 ` Daiane Angolini
0 siblings, 1 reply; 6+ messages in thread
From: Uwe Kleine-König @ 2010-12-09 18:42 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Dec 09, 2010 at 03:50:49PM -0200, Daiane Angolini wrote:
> Signed-off-by: Daiane Angolini <daiane.angolini@freescale.com>
This is a duplicate of
http://mid.gmane.org/1291749285-11406-2-git-send-email-fabio.estevam at freescale.com
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | http://www.pengutronix.de/ |
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] ARM: mx5/mx51_3ds: Add watchdog support
2010-12-09 18:42 ` Uwe Kleine-König
@ 2010-12-09 18:50 ` Daiane Angolini
2010-12-09 19:09 ` Uwe Kleine-König
0 siblings, 1 reply; 6+ messages in thread
From: Daiane Angolini @ 2010-12-09 18:50 UTC (permalink / raw)
To: linux-arm-kernel
Hi Uwe,
On 12/09/2010 04:42 PM, Uwe Kleine-K?nig wrote:
> On Thu, Dec 09, 2010 at 03:50:49PM -0200, Daiane Angolini wrote:
>> Signed-off-by: Daiane Angolini<daiane.angolini@freescale.com>
> This is a duplicate of
>
> http://mid.gmane.org/1291749285-11406-2-git-send-email-fabio.estevam at freescale.com
My patch is for iMX51_3DS board, and Fabio's patch in the link you sent
me is for iMX27_3DS
Regards,
Daiane
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] ARM: mx5/mx51_3ds: Add watchdog support
2010-12-09 18:50 ` Daiane Angolini
@ 2010-12-09 19:09 ` Uwe Kleine-König
2011-01-21 11:37 ` Daiane Angolini
0 siblings, 1 reply; 6+ messages in thread
From: Uwe Kleine-König @ 2010-12-09 19:09 UTC (permalink / raw)
To: linux-arm-kernel
Hallo Daiane,
On Thu, Dec 09, 2010 at 04:50:58PM -0200, Daiane Angolini wrote:
> On 12/09/2010 04:42 PM, Uwe Kleine-K?nig wrote:
>> On Thu, Dec 09, 2010 at 03:50:49PM -0200, Daiane Angolini wrote:
>>> Signed-off-by: Daiane Angolini<daiane.angolini@freescale.com>
>> This is a duplicate of
>>
>> http://mid.gmane.org/1291749285-11406-2-git-send-email-fabio.estevam at freescale.com
> My patch is for iMX51_3DS board, and Fabio's patch in the link you sent
> me is for iMX27_3DS
You're right, I mixed up the series. There is another one (
http://mid.gmane.org/1291660714-16396-1-git-send-email-fabio.estevam at freescale.com
) for mx51. I just searched in my mail folder, found 3ds and thought
this was the mx51 series.
Sorry and Ack for your patch
Uwe
--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | http://www.pengutronix.de/ |
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] ARM: mx5/mx51_3ds: Add watchdog support
2010-12-09 19:09 ` Uwe Kleine-König
@ 2011-01-21 11:37 ` Daiane Angolini
2011-01-24 7:47 ` Sascha Hauer
0 siblings, 1 reply; 6+ messages in thread
From: Daiane Angolini @ 2011-01-21 11:37 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
Is this patch ok?
Daiane
On 12/09/2010 05:09 PM, Uwe Kleine-K?nig wrote:
> Hallo Daiane,
>
> On Thu, Dec 09, 2010 at 04:50:58PM -0200, Daiane Angolini wrote:
>> On 12/09/2010 04:42 PM, Uwe Kleine-K?nig wrote:
>>> On Thu, Dec 09, 2010 at 03:50:49PM -0200, Daiane Angolini wrote:
>>>> Signed-off-by: Daiane Angolini<daiane.angolini@freescale.com>
>>> This is a duplicate of
>>>
>>> http://mid.gmane.org/1291749285-11406-2-git-send-email-fabio.estevam at freescale.com
>> My patch is for iMX51_3DS board, and Fabio's patch in the link you sent
>> me is for iMX27_3DS
> You're right, I mixed up the series. There is another one (
> http://mid.gmane.org/1291660714-16396-1-git-send-email-fabio.estevam at freescale.com
> ) for mx51. I just searched in my mail folder, found 3ds and thought
> this was the mx51 series.
>
> Sorry and Ack for your patch
> Uwe
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] ARM: mx5/mx51_3ds: Add watchdog support
2011-01-21 11:37 ` Daiane Angolini
@ 2011-01-24 7:47 ` Sascha Hauer
0 siblings, 0 replies; 6+ messages in thread
From: Sascha Hauer @ 2011-01-24 7:47 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Jan 21, 2011 at 09:37:32AM -0200, Daiane Angolini wrote:
> Hi,
>
> Is this patch ok?
Yes, it's ok, applied now. Sorry for not reacting earlier.
Sascha
>
> Daiane
>
> On 12/09/2010 05:09 PM, Uwe Kleine-K?nig wrote:
> >Hallo Daiane,
> >
> >On Thu, Dec 09, 2010 at 04:50:58PM -0200, Daiane Angolini wrote:
> >>On 12/09/2010 04:42 PM, Uwe Kleine-K?nig wrote:
> >>>On Thu, Dec 09, 2010 at 03:50:49PM -0200, Daiane Angolini wrote:
> >>>>Signed-off-by: Daiane Angolini<daiane.angolini@freescale.com>
> >>>This is a duplicate of
> >>>
> >>>http://mid.gmane.org/1291749285-11406-2-git-send-email-fabio.estevam at freescale.com
> >>My patch is for iMX51_3DS board, and Fabio's patch in the link you sent
> >>me is for iMX27_3DS
> >You're right, I mixed up the series. There is another one (
> >http://mid.gmane.org/1291660714-16396-1-git-send-email-fabio.estevam at freescale.com
> >) for mx51. I just searched in my mail folder, found 3ds and thought
> >this was the mx51 series.
> >
> >Sorry and Ack for your patch
> >Uwe
> >
>
>
>
--
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 |
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-01-24 7:47 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-12-09 17:50 [PATCH] ARM: mx5/mx51_3ds: Add watchdog support Daiane Angolini
2010-12-09 18:42 ` Uwe Kleine-König
2010-12-09 18:50 ` Daiane Angolini
2010-12-09 19:09 ` Uwe Kleine-König
2011-01-21 11:37 ` Daiane Angolini
2011-01-24 7:47 ` Sascha Hauer
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).