ARM: dts: sun6i: Add a dts file for the Mele A1000G quad top set box

PATCH New Hans de Goede 3 participants 7 messages Jun 1, 2015 – Jun 3, 2015

Subsystems (3)

Device tree bindings Arm/Allwinner sunXi SoC support Arm and arm64 SoC sub-architectures (common parts)

lore

Share & tools

lore

Hans de Goede

author

2015-06-01 15:02 UTC #0 lore raw

PATCH 1/1 ARM: dts: sun6i: Add a dts file for the Mele A1000G quad top set box

The Mele A1000G-quad and the Mele M9 have the same PCB, sofar we've been using the same dts for both models. Unfortunately this does not work for the otg controller, on the M9 this is routed to a micro-usb connector on the outside, while as on the A1000G-quad it is connected to an usb to sata bridge (which is not populated on the M9 pcb).

This commit adds a new dts for the Mele-A1000G-quad to allow using different otg controller settings on the 2 boards.

Signed-off-by Hans de Goede <[email protected]>

---
 arch/arm/boot/dts/Makefile                                        | 1 +
 arch/arm/boot/dts/{sun6i-a31-m9.dts => sun6i-a31-a1000g-quad.dts} | 4 ++--
 arch/arm/boot/dts/sun6i-a31-m9.dts                                | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)
 copy arch/arm/boot/dts/{sun6i-a31-m9.dts => sun6i-a31-a1000g-quad.dts} (97%)

arch/arm/boot/dts/Makefile +1 -0

index b308baf..a413d7b 100644
@@ -546,6 +546,7 @@ dtb-$(CONFIG_MACH_SUN5I) += \
 	sun5i-a13-olinuxino-micro.dtb \
 	sun5i-a13-utoo-p66.dtb
 dtb-$(CONFIG_MACH_SUN6I) += \
+	sun6i-a31-a1000g-quad.dtb \
 	sun6i-a31-app4-evb1.dtb \
 	sun6i-a31-colombus.dtb \
 	sun6i-a31-hummingbird.dtb \

arch/arm/boot/dts/sun6i-a31-a1000g-quad.dts renamed from arch/arm/boot/dts/sun6i-a31-m9.dts +2 -2

similarity index 97%
copy from arch/arm/boot/dts/sun6i-a31-m9.dts
copy to arch/arm/boot/dts/sun6i-a31-a1000g-quad.dts
index a5660d6..4404f37 100644
@@ -48,8 +48,8 @@
 #include <dt-bindings/pinctrl/sun4i-a10.h>
 
 / {
-	model = "Mele M9 / A1000G Quad top set box";
-	compatible = "mele,m9", "allwinner,sun6i-a31";
+	model = "Mele A1000G Quad top set box";
+	compatible = "mele,a1000g-quad", "allwinner,sun6i-a31";
 
 	aliases {
 		serial0 = &uart0;

arch/arm/boot/dts/sun6i-a31-m9.dts +1 -1

index a5660d6..6e0e5687 100644
@@ -48,7 +48,7 @@
 #include <dt-bindings/pinctrl/sun4i-a10.h>
 
 / {
-	model = "Mele M9 / A1000G Quad top set box";
+	model = "Mele M9 top set box";
 	compatible = "mele,m9", "allwinner,sun6i-a31";
 
 	aliases {

Signature · 1 line

2.4.2

Ian Campbell

2015-06-01 18:07 UTC #1 lore raw

PATCH 1/1 ARM: dts: sun6i: Add a dts file for the Mele A1000G quad top set box

Quoted 8 lines · Hans de Goede

The Mele A1000G-quad and the Mele M9 have the same PCB, sofar we've been using the same dts for both models. Unfortunately this does not work for the otg controller, on the M9 this is routed to a micro-usb connector on the outside, while as on the A1000G-quad it is connected to an usb to sata bridge (which is not populated on the M9 pcb).
This commit adds a new dts for the Mele-A1000G-quad to allow using different otg controller settings on the 2 boards.

But isn't intending to actually change the otg settings, right?

Hans de Goede

author

2015-06-01 18:12 UTC #2 lore raw

PATCH 1/1 ARM: dts: sun6i: Add a dts file for the Mele A1000G quad top set box

Hi,

Quoted 11 lines · Ian Campbell

Quoted 8 lines · Hans de Goede
The Mele A1000G-quad and the Mele M9 have the same PCB, sofar we've been using the same dts for both models. Unfortunately this does not work for the otg controller, on the M9 this is routed to a micro-usb connector on the outside, while as on the A1000G-quad it is connected to an usb to sata bridge (which is not populated on the M9 pcb).
This commit adds a new dts for the Mele-A1000G-quad to allow using different otg controller settings on the 2 boards.
But isn't intending to actually change the otg settings, right?

Right, that comes in a separate commit as the otg kernel driver is still in the process of being merged. For those curious the actual commit making the changes can be found in my sunxi-wip kernel branch (hint it is a boring change, do not bother looking).

Regards,

Hans

Maxime Ripard

2015-06-02 15:58 UTC #3 lore raw

PATCH 1/1 ARM: dts: sun6i: Add a dts file for the Mele A1000G quad top set box

In reply to Hans de Goede

Quoted 6 lines · Hans de Goede

The Mele A1000G-quad and the Mele M9 have the same PCB, sofar we've been using the same dts for both models. Unfortunately this does not work for the otg controller, on the M9 this is routed to a micro-usb connector on the outside, while as on the A1000G-quad it is connected to an usb to sata bridge (which is not populated on the M9 pcb).

Quoted 7 lines

This commit adds a new dts for the Mele-A1000G-quad to allow using different otg controller settings on the 2 boards.
Signed-off-by Hans de Goede <[email protected]>
---
 arch/arm/boot/dts/Makefile                                        | 1 +
 arch/arm/boot/dts/{sun6i-a31-m9.dts => sun6i-a31-a1000g-quad.dts} | 4 ++--

Didn't we say that we were trying to set the vendor name in the DTs now, at least for the new ones?

I can fix this and apply it if it's ok for you.

Maxime

Signature · 10 lines

Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150602/0c6d6879/attachment.sig>

Hans de Goede

author

2015-06-02 18:32 UTC #4 lore raw

PATCH 1/1 ARM: dts: sun6i: Add a dts file for the Mele A1000G quad top set box

Hi,

Quoted 10 lines · Maxime Ripard

Quoted 9 lines · Hans de Goede
The Mele A1000G-quad and the Mele M9 have the same PCB, sofar we've been using the same dts for both models. Unfortunately this does not work for the otg controller, on the M9 this is routed to a micro-usb connector on the outside, while as on the A1000G-quad it is connected to an usb to sata bridge (which is not populated on the M9 pcb).
This commit adds a new dts for the Mele-A1000G-quad to allow using different otg controller settings on the 2 boards.

Quoted 7 lines

Quoted 4 lines
Signed-off-by Hans de Goede <[email protected]>
---
  arch/arm/boot/dts/Makefile                                        | 1 +
  arch/arm/boot/dts/{sun6i-a31-m9.dts => sun6i-a31-a1000g-quad.dts} | 4 ++--
Didn't we say that we were trying to set the vendor name in the DTs now, at least for the new ones?

I think we said that Paul would write a proposal to standardize naming for future boards, but that never materialized.

Quoted 1 line

I can fix this and apply it if it's ok for you.

I'm fine with throwing -mele- in there, or not, what ever you prefer.

Regards,

Hans

Quoted 3 lines

Maxime

Maxime Ripard

2015-06-02 21:49 UTC #5 lore raw

PATCH 1/1 ARM: dts: sun6i: Add a dts file for the Mele A1000G quad top set box

Quoted 21 lines · Hans de Goede

Hi,
Quoted 10 lines · Maxime Ripard
Quoted 9 lines · Hans de Goede
The Mele A1000G-quad and the Mele M9 have the same PCB, sofar we've been using the same dts for both models. Unfortunately this does not work for the otg controller, on the M9 this is routed to a micro-usb connector on the outside, while as on the A1000G-quad it is connected to an usb to sata bridge (which is not populated on the M9 pcb).
This commit adds a new dts for the Mele-A1000G-quad to allow using different otg controller settings on the 2 boards.
Quoted 7 lines
Quoted 4 lines
Signed-off-by Hans de Goede <[email protected]>
---
 arch/arm/boot/dts/Makefile                                        | 1 +
 arch/arm/boot/dts/{sun6i-a31-m9.dts => sun6i-a31-a1000g-quad.dts} | 4 ++--
Didn't we say that we were trying to set the vendor name in the DTs now, at least for the new ones?

Quoted 7 lines

I think we said that Paul would write a proposal to standardize naming for future boards, but that never materialized.
Quoted 1 line
I can fix this and apply it if it's ok for you.
I'm fine with throwing -mele- in there, or not, what ever you prefer.

Ok, applied and fixed the name.

This is probably going to be the last patch pulled for 4.2, unless something important shows up in the next few days.

Maxime

Signature · 10 lines

Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150602/8cf8a62b/attachment.sig>

Hans de Goede

author

2015-06-03 07:22 UTC #6 lore raw

Hi,

Quoted 27 lines · Maxime Ripard

Quoted 26 lines · Hans de Goede
Hi,
Quoted 10 lines · Maxime Ripard
Quoted 9 lines · Hans de Goede
The Mele A1000G-quad and the Mele M9 have the same PCB, sofar we've been using the same dts for both models. Unfortunately this does not work for the otg controller, on the M9 this is routed to a micro-usb connector on the outside, while as on the A1000G-quad it is connected to an usb to sata bridge (which is not populated on the M9 pcb).
This commit adds a new dts for the Mele-A1000G-quad to allow using different otg controller settings on the 2 boards.
Quoted 7 lines
Quoted 4 lines
Signed-off-by Hans de Goede <[email protected]>
---
  arch/arm/boot/dts/Makefile                                        | 1 +
  arch/arm/boot/dts/{sun6i-a31-m9.dts => sun6i-a31-a1000g-quad.dts} | 4 ++--
Didn't we say that we were trying to set the vendor name in the DTs now, at least for the new ones?
I think we said that Paul would write a proposal to standardize naming for future boards, but that never materialized.
Quoted 1 line
I can fix this and apply it if it's ok for you.

Quoted 7 lines

Quoted 2 lines
I'm fine with throwing -mele- in there, or not, what ever you prefer.
Ok, applied and fixed the name.
This is probably going to be the last patch pulled for 4.2, unless something important shows up in the next few days.

That is fine with me, the only thing which I've pending on the dts side is a hole lot of musb related patches which belong in 4.3 anyways.

What about the "ARM: dts: sun8i: Add Ippo-q8h v1.2 with A33 and 1024x600 lcd support" commit? You had a remark on doing that differently to which I replied, so that one is still in limbo a bit...

Regards,

Hans