arm: omap: add minimal support for Nokia RM-696

PATCH New Aaro Koskinen 4 participants 9 messages Mar 5, 2012 – Oct 19, 2012

Subsystems (3)

Arm (32-bit) Arm sub-architectures OMAP2+ support

lore

Share & tools

lore

Aaro Koskinen

author

2012-03-05 16:57 UTC #0 lore raw

PATCH 1/1 arm: omap: add minimal support for Nokia RM-696

Add minimal support for Nokia RM-696 board.

Signed-off-by Aaro Koskinen <[email protected]>

---

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(-)

arch/arm/mach-omap2/Kconfig +2 -1

index e20c8ab..b740c2e 100644
@@ -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"

arch/arm/mach-omap2/board-rm680.c +13 -1

index 8678b38..094473e 100644
@@ -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

arch/arm/plat-omap/include/plat/uncompress.h +1 -0

index 6ee9049..cc3f11b 100644
@@ -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);

Signature · 1 line

1.7.2.5

Tony Lindgren

maintainer

2012-03-05 18:38 UTC #1 lore raw

PATCH 1/1 arm: omap: add minimal support for Nokia RM-696

Quoted 1 line · Aaro Koskinen

Add minimal support for Nokia RM-696 board.

Thanks applying into board branch.

Regards,

Tony

Pavel Machek

2012-05-01 10:47 UTC #2 lore raw

PATCH 1/1 arm: omap: add minimal support for Nokia RM-696

In reply to Aaro Koskinen

Hi!

Quoted 18 lines

Add minimal support for Nokia RM-696 board.
Signed-off-by Aaro Koskinen <[email protected]>
---
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(-)
arch/arm/mach-omap2/Kconfig +0 -0
index e20c8ab..b740c2e 100644

arch/arm/mach-omap2/Kconfig config MACH_NOKIA_N8X0 · line 253

Quoted 10 lines

arch/arm/mach-omap2/Kconfig +2 -1

@@ -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...

arch/arm/mach-omap2/board-rm680.c line 3

Quoted 11 lines

arch/arm/mach-omap2/Kconfig +0 -0

 config MACH_NOKIA_RX51
 	bool "Nokia RX-51 board"

arch/arm/mach-omap2/board-rm680.c +1 -1

index 8678b38..094473e 100644
@@ -1,5 +1,5 @@
 /*
- * Board support file for Nokia RM-680.
+ * Board support file for Nokia RM-680/696.
  *

And a comment.

Signature · 2 lines

(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

Tony Lindgren

maintainer

2012-05-04 18:11 UTC #3 lore raw

PATCH 1/1 arm: omap: add minimal support for Nokia RM-696

Hi Pavel,

Quoted 33 lines · Pavel Machek

Hi!
Quoted 18 lines
Add minimal support for Nokia RM-696 board.
Signed-off-by Aaro Koskinen <[email protected]>
---
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(-)
arch/arm/mach-omap2/Kconfig +0 -0
index e20c8ab..b740c2e 100644
arch/arm/mach-omap2/Kconfig config MACH_NOKIA_N8X0 · line 253
Quoted 10 lines
arch/arm/mach-omap2/Kconfig +2 -1
@@ -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...

Quoted 13 lines

arch/arm/mach-omap2/board-rm680.c line 3
Quoted 11 lines
arch/arm/mach-omap2/Kconfig +0 -0
 config MACH_NOKIA_RX51
 	bool "Nokia RX-51 board"
arch/arm/mach-omap2/board-rm680.c +1 -1
index 8678b38..094473e 100644
@@ -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

Pavel Machek

2012-10-17 18:33 UTC #4 lore raw

PATCH 1/1 Nokia N9/N900/N950 -- mention product names

Hi!

This adds product names (that most users know) to Kconfig and board comments.

Signed-off-by Pavel Machek <[email protected]>

arch/arm/mach-omap2/Kconfig +2 -2

index 346fd26..da08226 100644
@@ -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

arch/arm/mach-omap2/board-rm680.c +1 -1

index 0ad1bb3b..26965f3 100644
@@ -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
  *

arch/arm/mach-omap2/board-rx51.c +1 -1

index 345dd93..b60ca9d 100644
@@ -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
  *

Signature · 2 lines

(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

Aaro Koskinen

maintainer

2012-10-17 19:25 UTC #5 lore raw

PATCH 1/1 Nokia N9/N900/N950 -- mention product names

Hi,

Some minor comments:

Quoted 2 lines · Pavel Machek

This adds product names (that most users know) to Kconfig and board comments.

Good idea. :-)

arch/arm/mach-omap2/Kconfig config MACH_NOKIA_N8X0 · line 266

Quoted 12 lines

Signed-off-by Pavel Machek <[email protected]>

arch/arm/mach-omap2/Kconfig +1 -1

index 346fd26..da08226 100644
@@ -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)".

Quoted 16 lines

arch/arm/mach-omap2/Kconfig +1 -1

 	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

arch/arm/mach-omap2/board-rm680.c +0 -0

index 0ad1bb3b..26965f3 100644

arch/arm/mach-omap2/board-rm680.c line 2

Quoted 3 lines

arch/arm/mach-omap2/board-rm680.c +1 -1

@@ -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,

Pavel Machek

2012-10-17 21:03 UTC #6 lore raw

PATCH 1/1 Nokia N9/N900/N950 -- mention product names

This adds product names (that most users know) to Kconfig and board comments.

Signed-off-by Pavel Machek <[email protected]>

arch/arm/mach-omap2/Kconfig +2 -2

index 346fd26..f03f19a 100644
@@ -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

arch/arm/mach-omap2/board-rm680.c +1 -1

index 0ad1bb3b..96f8757 100644
@@ -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
  *

arch/arm/mach-omap2/board-rx51.c +1 -1

index 345dd93..b60ca9d 100644
@@ -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
  *

Signature · 2 lines

(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

Aaro Koskinen

maintainer

2012-10-17 21:21 UTC #7 lore raw

PATCH 1/1 Nokia N9/N900/N950 -- mention product names

Quoted 5 lines · Pavel Machek

This adds product names (that most users know) to Kconfig and board comments.
Signed-off-by Pavel Machek <[email protected]>

Reviewed-by Aaro Koskinen <[email protected]>

Quoted 53 lines

arch/arm/mach-omap2/Kconfig +2 -2

index 346fd26..f03f19a 100644
@@ -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

arch/arm/mach-omap2/board-rm680.c +1 -1

index 0ad1bb3b..96f8757 100644
@@ -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
  *

arch/arm/mach-omap2/board-rx51.c +1 -1

index 345dd93..b60ca9d 100644
@@ -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
  *

Signature · 8 lines

-- 
(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

Tony Lindgren

maintainer

2012-10-19 17:02 UTC #8 lore raw

PATCH 1/1 Nokia N9/N900/N950 -- mention product names

Quoted 8 lines · Aaro Koskinen

Quoted 5 lines · Pavel Machek
This adds product names (that most users know) to Kconfig and board comments.
Signed-off-by Pavel Machek <[email protected]>
Reviewed-by Aaro Koskinen <[email protected]>

Thanks applying into omap-for-v3.8/board branch.

Regards,

Tony