* [PATCH] arm: omap: add minimal support for Nokia RM-696
@ 2012-03-05 17:08 Aaro Koskinen
2012-03-05 18:38 ` Tony Lindgren
2012-05-01 10:48 ` Pavel Machek
0 siblings, 2 replies; 9+ messages in thread
From: Aaro Koskinen @ 2012-03-05 17:08 UTC (permalink / raw)
To: linux-arm-kernel
Add minimal support for Nokia RM-696 board.
Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com>
---
The patch is based & boot-tested with 3.3-rc6.
arch/arm/mach-omap2/Kconfig | 3 ++-
arch/arm/mach-omap2/board-rm680.c | 14 +++++++++++++-
arch/arm/plat-omap/include/plat/uncompress.h | 1 +
3 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index e20c8ab..b740c2e 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -245,10 +245,11 @@ config MACH_NOKIA_N8X0
select MACH_NOKIA_N810_WIMAX
config MACH_NOKIA_RM680
- bool "Nokia RM-680 board"
+ bool "Nokia RM-680/696 board"
depends on ARCH_OMAP3
default y
select OMAP_PACKAGE_CBB
+ select MACH_NOKIA_RM696
config MACH_NOKIA_RX51
bool "Nokia RX-51 board"
diff --git a/arch/arm/mach-omap2/board-rm680.c b/arch/arm/mach-omap2/board-rm680.c
index 8678b38..094473e 100644
--- a/arch/arm/mach-omap2/board-rm680.c
+++ b/arch/arm/mach-omap2/board-rm680.c
@@ -1,5 +1,5 @@
/*
- * Board support file for Nokia RM-680.
+ * Board support file for Nokia RM-680/696.
*
* Copyright (C) 2010 Nokia
*
@@ -154,3 +154,15 @@ MACHINE_START(NOKIA_RM680, "Nokia RM-680 board")
.timer = &omap3_timer,
.restart = omap_prcm_restart,
MACHINE_END
+
+MACHINE_START(NOKIA_RM696, "Nokia RM-696 board")
+ .atag_offset = 0x100,
+ .reserve = omap_reserve,
+ .map_io = omap3_map_io,
+ .init_early = omap3630_init_early,
+ .init_irq = omap3_init_irq,
+ .handle_irq = omap3_intc_handle_irq,
+ .init_machine = rm680_init,
+ .timer = &omap3_timer,
+ .restart = omap_prcm_restart,
+MACHINE_END
diff --git a/arch/arm/plat-omap/include/plat/uncompress.h b/arch/arm/plat-omap/include/plat/uncompress.h
index 6ee9049..cc3f11b 100644
--- a/arch/arm/plat-omap/include/plat/uncompress.h
+++ b/arch/arm/plat-omap/include/plat/uncompress.h
@@ -160,6 +160,7 @@ static inline void __arch_decomp_setup(unsigned long arch_id)
DEBUG_LL_OMAP3(3, igep0020);
DEBUG_LL_OMAP3(3, igep0030);
DEBUG_LL_OMAP3(3, nokia_rm680);
+ DEBUG_LL_OMAP3(3, nokia_rm696);
DEBUG_LL_OMAP3(3, nokia_rx51);
DEBUG_LL_OMAP3(3, omap3517evm);
DEBUG_LL_OMAP3(3, omap3_beagle);
--
1.7.2.5
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH] arm: omap: add minimal support for Nokia RM-696
2012-03-05 17:08 [PATCH] arm: omap: add minimal support for Nokia RM-696 Aaro Koskinen
@ 2012-03-05 18:38 ` Tony Lindgren
2012-05-01 10:48 ` Pavel Machek
1 sibling, 0 replies; 9+ messages in thread
From: Tony Lindgren @ 2012-03-05 18:38 UTC (permalink / raw)
To: linux-arm-kernel
* Aaro Koskinen <aaro.koskinen@nokia.com> [120305 08:25]:
> Add minimal support for Nokia RM-696 board.
Thanks applying into board branch.
Regards,
Tony
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH] arm: omap: add minimal support for Nokia RM-696
2012-03-05 17:08 [PATCH] arm: omap: add minimal support for Nokia RM-696 Aaro Koskinen
2012-03-05 18:38 ` Tony Lindgren
@ 2012-05-01 10:48 ` Pavel Machek
2012-05-04 18:11 ` Tony Lindgren
1 sibling, 1 reply; 9+ messages in thread
From: Pavel Machek @ 2012-05-01 10:48 UTC (permalink / raw)
To: linux-arm-kernel
Hi!
> Add minimal support for Nokia RM-696 board.
>
> Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com>
> ---
>
> The patch is based & boot-tested with 3.3-rc6.
>
>
> arch/arm/mach-omap2/Kconfig | 3 ++-
> arch/arm/mach-omap2/board-rm680.c | 14 +++++++++++++-
> arch/arm/plat-omap/include/plat/uncompress.h | 1 +
> 3 files changed, 16 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
> index e20c8ab..b740c2e 100644
> --- a/arch/arm/mach-omap2/Kconfig
> +++ b/arch/arm/mach-omap2/Kconfig
> @@ -245,10 +245,11 @@ config MACH_NOKIA_N8X0
> select MACH_NOKIA_N810_WIMAX
>
> config MACH_NOKIA_RM680
> - bool "Nokia RM-680 board"
> + bool "Nokia RM-680/696 board"
> depends on ARCH_OMAP3
> default y
> select OMAP_PACKAGE_CBB
> + select MACH_NOKIA_RM696
>
AFAICT, this is nokia N9. At least help text should state that...
> config MACH_NOKIA_RX51
> bool "Nokia RX-51 board"
> diff --git a/arch/arm/mach-omap2/board-rm680.c b/arch/arm/mach-omap2/board-rm680.c
> index 8678b38..094473e 100644
> --- a/arch/arm/mach-omap2/board-rm680.c
> +++ b/arch/arm/mach-omap2/board-rm680.c
> @@ -1,5 +1,5 @@
> /*
> - * Board support file for Nokia RM-680.
> + * Board support file for Nokia RM-680/696.
> *
And a comment.
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH] arm: omap: add minimal support for Nokia RM-696
2012-05-01 10:48 ` Pavel Machek
@ 2012-05-04 18:11 ` Tony Lindgren
2012-10-17 18:33 ` [PATCH] Nokia N9/N900/N950 -- mention product names Pavel Machek
0 siblings, 1 reply; 9+ messages in thread
From: Tony Lindgren @ 2012-05-04 18:11 UTC (permalink / raw)
To: linux-arm-kernel
Hi Pavel,
* Pavel Machek <pavel@ucw.cz> [120501 03:51]:
> Hi!
>
> > Add minimal support for Nokia RM-696 board.
> >
> > Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com>
> > ---
> >
> > The patch is based & boot-tested with 3.3-rc6.
> >
> >
> > arch/arm/mach-omap2/Kconfig | 3 ++-
> > arch/arm/mach-omap2/board-rm680.c | 14 +++++++++++++-
> > arch/arm/plat-omap/include/plat/uncompress.h | 1 +
> > 3 files changed, 16 insertions(+), 2 deletions(-)
> >
> > diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
> > index e20c8ab..b740c2e 100644
> > --- a/arch/arm/mach-omap2/Kconfig
> > +++ b/arch/arm/mach-omap2/Kconfig
> > @@ -245,10 +245,11 @@ config MACH_NOKIA_N8X0
> > select MACH_NOKIA_N810_WIMAX
> >
> > config MACH_NOKIA_RM680
> > - bool "Nokia RM-680 board"
> > + bool "Nokia RM-680/696 board"
> > depends on ARCH_OMAP3
> > default y
> > select OMAP_PACKAGE_CBB
> > + select MACH_NOKIA_RM696
> >
>
> AFAICT, this is nokia N9. At least help text should state that...
>
> > config MACH_NOKIA_RX51
> > bool "Nokia RX-51 board"
> > diff --git a/arch/arm/mach-omap2/board-rm680.c b/arch/arm/mach-omap2/board-rm680.c
> > index 8678b38..094473e 100644
> > --- a/arch/arm/mach-omap2/board-rm680.c
> > +++ b/arch/arm/mach-omap2/board-rm680.c
> > @@ -1,5 +1,5 @@
> > /*
> > - * Board support file for Nokia RM-680.
> > + * Board support file for Nokia RM-680/696.
> > *
>
> And a comment.
Sorry this is already in mainline tree as commit
63fc5f3bb3d0ca9ab4767a801b518aa6335f87ad.
Care to do a follow-up patch to add some N9 comments to Kconfig and
board-rm680.c?
Tony
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH] Nokia N9/N900/N950 -- mention product names
2012-05-04 18:11 ` Tony Lindgren
@ 2012-10-17 18:33 ` Pavel Machek
2012-10-17 19:25 ` Aaro Koskinen
0 siblings, 1 reply; 9+ messages in thread
From: Pavel Machek @ 2012-10-17 18:33 UTC (permalink / raw)
To: linux-arm-kernel
Hi!
This adds product names (that most users know) to Kconfig and board
comments.
Signed-off-by: Pavel Machek <pavel@ucw.cz>
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index 346fd26..da08226 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -263,14 +263,14 @@ config MACH_NOKIA_N8X0
select MACH_NOKIA_N810_WIMAX
config MACH_NOKIA_RM680
- bool "Nokia RM-680/696 board"
+ bool "Nokia N9/N950 (RM-680/696) phones"
depends on ARCH_OMAP3
default y
select OMAP_PACKAGE_CBB
select MACH_NOKIA_RM696
config MACH_NOKIA_RX51
- bool "Nokia RX-51 board"
+ bool "Nokia N900 phone (RX-51)"
depends on ARCH_OMAP3
default y
select OMAP_PACKAGE_CBB
diff --git a/arch/arm/mach-omap2/board-rm680.c b/arch/arm/mach-omap2/board-rm680.c
index 0ad1bb3b..26965f3 100644
--- a/arch/arm/mach-omap2/board-rm680.c
+++ b/arch/arm/mach-omap2/board-rm680.c
@@ -1,5 +1,5 @@
/*
- * Board support file for Nokia RM-680/696.
+ * Board support file for Nokia N9/N950 (aka RM-680/696).
*
* Copyright (C) 2010 Nokia
*
diff --git a/arch/arm/mach-omap2/board-rx51.c b/arch/arm/mach-omap2/board-rx51.c
index 345dd93..b60ca9d 100644
--- a/arch/arm/mach-omap2/board-rx51.c
+++ b/arch/arm/mach-omap2/board-rx51.c
@@ -1,5 +1,5 @@
/*
- * linux/arch/arm/mach-omap2/board-rx51.c
+ * Board support file for Nokia N900 (aka RX-51).
*
* Copyright (C) 2007, 2008 Nokia
*
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH] Nokia N9/N900/N950 -- mention product names
2012-10-17 18:33 ` [PATCH] Nokia N9/N900/N950 -- mention product names Pavel Machek
@ 2012-10-17 19:25 ` Aaro Koskinen
2012-10-17 21:03 ` Pavel Machek
0 siblings, 1 reply; 9+ messages in thread
From: Aaro Koskinen @ 2012-10-17 19:25 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
Some minor comments:
On Wed, Oct 17, 2012 at 08:33:08PM +0200, Pavel Machek wrote:
> This adds product names (that most users know) to Kconfig and board
> comments.
Good idea. :-)
> Signed-off-by: Pavel Machek <pavel@ucw.cz>
>
> diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
> index 346fd26..da08226 100644
> --- a/arch/arm/mach-omap2/Kconfig
> +++ b/arch/arm/mach-omap2/Kconfig
> @@ -263,14 +263,14 @@ config MACH_NOKIA_N8X0
> select MACH_NOKIA_N810_WIMAX
>
> config MACH_NOKIA_RM680
> - bool "Nokia RM-680/696 board"
> + bool "Nokia N9/N950 (RM-680/696) phones"
This should be "N950/N9 (RM-680/RM-696)" or perhaps for clarity
"N950 (RM-680) / N9 (RM-696)".
> depends on ARCH_OMAP3
> default y
> select OMAP_PACKAGE_CBB
> select MACH_NOKIA_RM696
>
> config MACH_NOKIA_RX51
> - bool "Nokia RX-51 board"
> + bool "Nokia N900 phone (RX-51)"
> depends on ARCH_OMAP3
> default y
> select OMAP_PACKAGE_CBB
> diff --git a/arch/arm/mach-omap2/board-rm680.c b/arch/arm/mach-omap2/board-rm680.c
> index 0ad1bb3b..26965f3 100644
> --- a/arch/arm/mach-omap2/board-rm680.c
> +++ b/arch/arm/mach-omap2/board-rm680.c
> @@ -1,5 +1,5 @@
> /*
> - * Board support file for Nokia RM-680/696.
> + * Board support file for Nokia N9/N950 (aka RM-680/696).
Same here.
Thanks,
A.
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH] Nokia N9/N900/N950 -- mention product names
2012-10-17 19:25 ` Aaro Koskinen
@ 2012-10-17 21:03 ` Pavel Machek
2012-10-17 21:21 ` Aaro Koskinen
0 siblings, 1 reply; 9+ messages in thread
From: Pavel Machek @ 2012-10-17 21:03 UTC (permalink / raw)
To: linux-arm-kernel
This adds product names (that most users know) to Kconfig and board
comments.
Signed-off-by: Pavel Machek <pavel@ucw.cz>
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index 346fd26..f03f19a 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -263,14 +263,14 @@ config MACH_NOKIA_N8X0
select MACH_NOKIA_N810_WIMAX
config MACH_NOKIA_RM680
- bool "Nokia RM-680/696 board"
+ bool "Nokia N950 (RM-680) / N9 (RM-696) phones"
depends on ARCH_OMAP3
default y
select OMAP_PACKAGE_CBB
select MACH_NOKIA_RM696
config MACH_NOKIA_RX51
- bool "Nokia RX-51 board"
+ bool "Nokia N900 (RX-51) phone"
depends on ARCH_OMAP3
default y
select OMAP_PACKAGE_CBB
diff --git a/arch/arm/mach-omap2/board-rm680.c b/arch/arm/mach-omap2/board-rm680.c
index 0ad1bb3b..96f8757 100644
--- a/arch/arm/mach-omap2/board-rm680.c
+++ b/arch/arm/mach-omap2/board-rm680.c
@@ -1,5 +1,5 @@
/*
- * Board support file for Nokia RM-680/696.
+ * Board support file for Nokia N950 (RM-680) / N9 (RM-696).
*
* Copyright (C) 2010 Nokia
*
diff --git a/arch/arm/mach-omap2/board-rx51.c b/arch/arm/mach-omap2/board-rx51.c
index 345dd93..b60ca9d 100644
--- a/arch/arm/mach-omap2/board-rx51.c
+++ b/arch/arm/mach-omap2/board-rx51.c
@@ -1,5 +1,5 @@
/*
- * linux/arch/arm/mach-omap2/board-rx51.c
+ * Board support file for Nokia N900 (aka RX-51).
*
* Copyright (C) 2007, 2008 Nokia
*
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH] Nokia N9/N900/N950 -- mention product names
2012-10-17 21:03 ` Pavel Machek
@ 2012-10-17 21:21 ` Aaro Koskinen
2012-10-19 17:02 ` Tony Lindgren
0 siblings, 1 reply; 9+ messages in thread
From: Aaro Koskinen @ 2012-10-17 21:21 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Oct 17, 2012 at 11:03:00PM +0200, Pavel Machek wrote:
>
> This adds product names (that most users know) to Kconfig and board
> comments.
>
> Signed-off-by: Pavel Machek <pavel@ucw.cz>
Reviewed-by: Aaro Koskinen <aaro.koskinen@iki.fi>
A.
>
> diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
> index 346fd26..f03f19a 100644
> --- a/arch/arm/mach-omap2/Kconfig
> +++ b/arch/arm/mach-omap2/Kconfig
> @@ -263,14 +263,14 @@ config MACH_NOKIA_N8X0
> select MACH_NOKIA_N810_WIMAX
>
> config MACH_NOKIA_RM680
> - bool "Nokia RM-680/696 board"
> + bool "Nokia N950 (RM-680) / N9 (RM-696) phones"
> depends on ARCH_OMAP3
> default y
> select OMAP_PACKAGE_CBB
> select MACH_NOKIA_RM696
>
> config MACH_NOKIA_RX51
> - bool "Nokia RX-51 board"
> + bool "Nokia N900 (RX-51) phone"
> depends on ARCH_OMAP3
> default y
> select OMAP_PACKAGE_CBB
> diff --git a/arch/arm/mach-omap2/board-rm680.c b/arch/arm/mach-omap2/board-rm680.c
> index 0ad1bb3b..96f8757 100644
> --- a/arch/arm/mach-omap2/board-rm680.c
> +++ b/arch/arm/mach-omap2/board-rm680.c
> @@ -1,5 +1,5 @@
> /*
> - * Board support file for Nokia RM-680/696.
> + * Board support file for Nokia N950 (RM-680) / N9 (RM-696).
> *
> * Copyright (C) 2010 Nokia
> *
> diff --git a/arch/arm/mach-omap2/board-rx51.c b/arch/arm/mach-omap2/board-rx51.c
> index 345dd93..b60ca9d 100644
> --- a/arch/arm/mach-omap2/board-rx51.c
> +++ b/arch/arm/mach-omap2/board-rx51.c
> @@ -1,5 +1,5 @@
> /*
> - * linux/arch/arm/mach-omap2/board-rx51.c
> + * Board support file for Nokia N900 (aka RX-51).
> *
> * Copyright (C) 2007, 2008 Nokia
> *
>
> --
> (english) http://www.livejournal.com/~pavelmachek
> (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH] Nokia N9/N900/N950 -- mention product names
2012-10-17 21:21 ` Aaro Koskinen
@ 2012-10-19 17:02 ` Tony Lindgren
0 siblings, 0 replies; 9+ messages in thread
From: Tony Lindgren @ 2012-10-19 17:02 UTC (permalink / raw)
To: linux-arm-kernel
* Aaro Koskinen <aaro.koskinen@iki.fi> [121017 14:22]:
> On Wed, Oct 17, 2012 at 11:03:00PM +0200, Pavel Machek wrote:
> >
> > This adds product names (that most users know) to Kconfig and board
> > comments.
> >
> > Signed-off-by: Pavel Machek <pavel@ucw.cz>
>
> Reviewed-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Thanks applying into omap-for-v3.8/board branch.
Regards,
Tony
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2012-10-19 17:02 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-05 17:08 [PATCH] arm: omap: add minimal support for Nokia RM-696 Aaro Koskinen
2012-03-05 18:38 ` Tony Lindgren
2012-05-01 10:48 ` Pavel Machek
2012-05-04 18:11 ` Tony Lindgren
2012-10-17 18:33 ` [PATCH] Nokia N9/N900/N950 -- mention product names Pavel Machek
2012-10-17 19:25 ` Aaro Koskinen
2012-10-17 21:03 ` Pavel Machek
2012-10-17 21:21 ` Aaro Koskinen
2012-10-19 17:02 ` Tony Lindgren
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).