Skip to contentSkip to conversation

ARM: mmp: Add compatible entries for OLPC XO laptops

PATCH RESEND New Daniel Drake 2 participants 3 messages Jul 16, 2013 – Aug 8, 2013

Subsystems (4)
Device tree bindings Arm (32-bit) Arm sub-architectures Mmp support
lore
Share & tools
lore

Daniel Drake

author
#0 lore raw

PATCH RESEND 1/2 ARM: mmp: Add compatible entries for OLPC XO laptops

Add compatible entries to enable booting of OLPC XO-1.75 (MMP2) and OLPC XO-4 (MMP3).

Signed-off-by Chris Ball <[email protected]>
Signed-off-by Daniel Drake <[email protected]>
---
 Documentation/devicetree/bindings/arm/mrvl/intc.txt | 4 ++--
 Documentation/devicetree/bindings/arm/mrvl/mrvl.txt | 8 ++++++++
 arch/arm/mach-mmp/irq.c                             | 1 +
 arch/arm/mach-mmp/mmp2-dt.c                         | 2 ++
 4 files changed, 13 insertions(+), 2 deletions(-)

Resending after 1 month with no response.

Documentation/devicetree/bindings/arm/mrvl/intc.txt +2 -2
index 8b53273..3554fb9 100644
@@ -1,8 +1,8 @@
 * Marvell MMP Interrupt controller
 
 Required properties:
-- compatible : Should be "mrvl,mmp-intc", "mrvl,mmp2-intc" or
-  "mrvl,mmp2-mux-intc"
+- compatible : One of: mrvl,mmp-intc mrvl,mmp2-intc mrvl,mmp3-intc
+  mrvl,mmp2-mux-intc
 - reg : Address and length of the register set of the interrupt controller.
   If the interrupt controller is intc, address and length means the range
   of the whold interrupt controller. If the interrupt controller is mux-intc,
Documentation/devicetree/bindings/arm/mrvl/mrvl.txt +8 -0
index 117d741..236e884 100644
@@ -12,3 +12,11 @@ Required root node properties:
 MMP2 Brownstone Board
 Required root node properties:
 	- compatible = "mrvl,mmp2-brownstone";
+
+OLPC XO-1.75 (CL2) based on MMP2
+Required root node properties:
+	- compatible = "olpc,xo-1.75";
+
+OLPC XO-4 (CL4) based on MMP3
+Required root node properties:
+	- compatible = "olpc,xo-cl4";
arch/arm/mach-mmp/irq.c +1 -0
index 3c71246..d60b85a 100644
@@ -329,6 +329,7 @@ void __init mmp2_init_icu(void)
 static const struct of_device_id intc_ids[] __initconst = {
 	{ .compatible = "mrvl,mmp-intc", .data = &mmp_conf },
 	{ .compatible = "mrvl,mmp2-intc", .data = &mmp2_conf },
+	{ .compatible = "mrvl,mmp3-intc", .data = &mmp2_conf },
 	{}
 };
arch/arm/mach-mmp/mmp2-dt.c +2 -0
index 4ac2567..e67bd9f 100644
@@ -44,6 +44,8 @@ static void __init mmp2_dt_init(void)
 
 static const char *mmp2_dt_board_compat[] __initdata = {
 	"mrvl,mmp2-brownstone",
+	"olpc,xo-1.75",
+	"olpc,xo-cl4",
 	NULL,
 };
Signature · 1 line
1.8.1.4
#1 lore raw

PATCH RESEND 1/2 ARM: mmp: Add compatible entries for OLPC XO laptops

Quoted 35 lines · Daniel Drake

Add compatible entries to enable booting of OLPC XO-1.75 (MMP2) and OLPC XO-4 (MMP3).

Signed-off-by Chris Ball <[email protected]>
Signed-off-by Daniel Drake <[email protected]>
---
 Documentation/devicetree/bindings/arm/mrvl/intc.txt | 4 ++--
 Documentation/devicetree/bindings/arm/mrvl/mrvl.txt | 8 ++++++++
 arch/arm/mach-mmp/irq.c                             | 1 +
 arch/arm/mach-mmp/mmp2-dt.c                         | 2 ++
 4 files changed, 13 insertions(+), 2 deletions(-)

Resending after 1 month with no response.

Documentation/devicetree/bindings/arm/mrvl/intc.txt +2 -2
index 8b53273..3554fb9 100644
@@ -1,8 +1,8 @@
 * Marvell MMP Interrupt controller
 
 Required properties:
-- compatible : Should be "mrvl,mmp-intc", "mrvl,mmp2-intc" or
-  "mrvl,mmp2-mux-intc"
+- compatible : One of: mrvl,mmp-intc mrvl,mmp2-intc mrvl,mmp3-intc
+  mrvl,mmp2-mux-intc
 - reg : Address and length of the register set of the interrupt controller.
   If the interrupt controller is intc, address and length means the range
   of the whold interrupt controller. If the interrupt controller is mux-intc,
Documentation/devicetree/bindings/arm/mrvl/mrvl.txt +0 -0
index 117d741..236e884 100644
@@ -12,3 +12,11 @@ Required root node properties:
 MMP2 Brownstone Board

Documentation/devicetree/bindings/arm/mrvl/mrvl.txt Required root node properties: · line 22

Quoted 10 lines
Documentation/devicetree/bindings/arm/mrvl/mrvl.txt +8 -0
 Required root node properties:
 	- compatible = "mrvl,mmp2-brownstone";
+
+OLPC XO-1.75 (CL2) based on MMP2
+Required root node properties:
+	- compatible = "olpc,xo-1.75";
+
+OLPC XO-4 (CL4) based on MMP3
+Required root node properties:
+	- compatible = "olpc,xo-cl4";

documentation not consistnt with code

Best Regards,
J.

Quoted 32 lines
arch/arm/mach-mmp/irq.c +1 -0
index 3c71246..d60b85a 100644
@@ -329,6 +329,7 @@ void __init mmp2_init_icu(void)
 static const struct of_device_id intc_ids[] __initconst = {
 	{ .compatible = "mrvl,mmp-intc", .data = &mmp_conf },
 	{ .compatible = "mrvl,mmp2-intc", .data = &mmp2_conf },
+	{ .compatible = "mrvl,mmp3-intc", .data = &mmp2_conf },
 	{}
 };
arch/arm/mach-mmp/mmp2-dt.c +2 -0
index 4ac2567..e67bd9f 100644
@@ -44,6 +44,8 @@ static void __init mmp2_dt_init(void)
 
 static const char *mmp2_dt_board_compat[] __initdata = {
 	"mrvl,mmp2-brownstone",
+	"olpc,xo-1.75",
+	"olpc,xo-cl4",
 	NULL,
 };
Signature · 6 lines
1.8.1.4

_______________________________________________
devicetree-discuss mailing list
devicetree-discuss at lists.ozlabs.org
https://lists.ozlabs.org/listinfo/devicetree-discuss
author
#2 lore raw

PATCH RESEND 1/2 ARM: mmp: Add compatible entries for OLPC XO laptops

Hi,

Quoted 1 line · Jean-Christophe PLAGNIOL-VILLARD

documentation not consistnt with code

Sorry for the slow response - I have been away.
That may also explain why I seem to be missing something: I can't see any inconsistency.

Any chance you can briefly clarify the issue you have spotted?

Thanks
Daniel