All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] ARM: dts: sun6i: Add a dts file for the Mele A1000G quad top set box
@ 2015-06-01 15:02 ` Hans de Goede
  0 siblings, 0 replies; 14+ messages in thread
From: Hans de Goede @ 2015-06-01 15:02 UTC (permalink / raw)
  To: Maxime Ripard
  Cc: Ian Campbell, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
	devicetree, linux-sunxi-/JYPxA39Uh5TLH3MbocFFw, 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.

Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
---
 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%)

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index b308baf..a413d7b 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -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 \
diff --git a/arch/arm/boot/dts/sun6i-a31-m9.dts b/arch/arm/boot/dts/sun6i-a31-a1000g-quad.dts
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
--- a/arch/arm/boot/dts/sun6i-a31-m9.dts
+++ b/arch/arm/boot/dts/sun6i-a31-a1000g-quad.dts
@@ -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;
diff --git a/arch/arm/boot/dts/sun6i-a31-m9.dts b/arch/arm/boot/dts/sun6i-a31-m9.dts
index a5660d6..6e0e5687 100644
--- a/arch/arm/boot/dts/sun6i-a31-m9.dts
+++ b/arch/arm/boot/dts/sun6i-a31-m9.dts
@@ -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 {
-- 
2.4.2

^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [PATCH] ARM: dts: sun6i: Add a dts file for the Mele A1000G quad top set box
@ 2015-06-01 15:02 ` Hans de Goede
  0 siblings, 0 replies; 14+ messages in thread
From: Hans de Goede @ 2015-06-01 15:02 UTC (permalink / raw)
  To: linux-arm-kernel

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 <hdegoede@redhat.com>
---
 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%)

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index b308baf..a413d7b 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -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 \
diff --git a/arch/arm/boot/dts/sun6i-a31-m9.dts b/arch/arm/boot/dts/sun6i-a31-a1000g-quad.dts
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
--- a/arch/arm/boot/dts/sun6i-a31-m9.dts
+++ b/arch/arm/boot/dts/sun6i-a31-a1000g-quad.dts
@@ -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;
diff --git a/arch/arm/boot/dts/sun6i-a31-m9.dts b/arch/arm/boot/dts/sun6i-a31-m9.dts
index a5660d6..6e0e5687 100644
--- a/arch/arm/boot/dts/sun6i-a31-m9.dts
+++ b/arch/arm/boot/dts/sun6i-a31-m9.dts
@@ -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 {
-- 
2.4.2

^ permalink raw reply related	[flat|nested] 14+ messages in thread

* Re: [PATCH] ARM: dts: sun6i: Add a dts file for the Mele A1000G quad top set box
  2015-06-01 15:02 ` Hans de Goede
@ 2015-06-01 18:07     ` Ian Campbell
  -1 siblings, 0 replies; 14+ messages in thread
From: Ian Campbell @ 2015-06-01 18:07 UTC (permalink / raw)
  To: Hans de Goede
  Cc: Maxime Ripard, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
	devicetree, linux-sunxi-/JYPxA39Uh5TLH3MbocFFw

On Mon, 2015-06-01 at 17:02 +0200, Hans de Goede wrote:
> 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?

^ permalink raw reply	[flat|nested] 14+ messages in thread

* [PATCH] ARM: dts: sun6i: Add a dts file for the Mele A1000G quad top set box
@ 2015-06-01 18:07     ` Ian Campbell
  0 siblings, 0 replies; 14+ messages in thread
From: Ian Campbell @ 2015-06-01 18:07 UTC (permalink / raw)
  To: linux-arm-kernel

On Mon, 2015-06-01 at 17:02 +0200, Hans de Goede wrote:
> 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?

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PATCH] ARM: dts: sun6i: Add a dts file for the Mele A1000G quad top set box
  2015-06-01 18:07     ` Ian Campbell
@ 2015-06-01 18:12         ` Hans de Goede
  -1 siblings, 0 replies; 14+ messages in thread
From: Hans de Goede @ 2015-06-01 18:12 UTC (permalink / raw)
  To: Ian Campbell
  Cc: Maxime Ripard, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
	devicetree, linux-sunxi-/JYPxA39Uh5TLH3MbocFFw

Hi,

On 01-06-15 20:07, Ian Campbell wrote:
> On Mon, 2015-06-01 at 17:02 +0200, Hans de Goede wrote:
>> 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
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 14+ messages in thread

* [PATCH] ARM: dts: sun6i: Add a dts file for the Mele A1000G quad top set box
@ 2015-06-01 18:12         ` Hans de Goede
  0 siblings, 0 replies; 14+ messages in thread
From: Hans de Goede @ 2015-06-01 18:12 UTC (permalink / raw)
  To: linux-arm-kernel

Hi,

On 01-06-15 20:07, Ian Campbell wrote:
> On Mon, 2015-06-01 at 17:02 +0200, Hans de Goede wrote:
>> 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

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PATCH] ARM: dts: sun6i: Add a dts file for the Mele A1000G quad top set box
  2015-06-01 15:02 ` Hans de Goede
@ 2015-06-02 15:58     ` Maxime Ripard
  -1 siblings, 0 replies; 14+ messages in thread
From: Maxime Ripard @ 2015-06-02 15:58 UTC (permalink / raw)
  To: Hans de Goede
  Cc: Ian Campbell, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
	devicetree, linux-sunxi-/JYPxA39Uh5TLH3MbocFFw

[-- Attachment #1: Type: text/plain, Size: 1048 bytes --]

On Mon, Jun 01, 2015 at 05:02:59PM +0200, Hans de Goede wrote:
> 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 <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
> ---
>  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

-- 
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 14+ messages in thread

* [PATCH] ARM: dts: sun6i: Add a dts file for the Mele A1000G quad top set box
@ 2015-06-02 15:58     ` Maxime Ripard
  0 siblings, 0 replies; 14+ messages in thread
From: Maxime Ripard @ 2015-06-02 15:58 UTC (permalink / raw)
  To: linux-arm-kernel

On Mon, Jun 01, 2015 at 05:02:59PM +0200, Hans de Goede wrote:
> 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 <hdegoede@redhat.com>
> ---
>  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

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

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PATCH] ARM: dts: sun6i: Add a dts file for the Mele A1000G quad top set box
  2015-06-02 15:58     ` Maxime Ripard
@ 2015-06-02 18:32       ` Hans de Goede
  -1 siblings, 0 replies; 14+ messages in thread
From: Hans de Goede @ 2015-06-02 18:32 UTC (permalink / raw)
  To: Maxime Ripard
  Cc: Ian Campbell, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
	devicetree, linux-sunxi-/JYPxA39Uh5TLH3MbocFFw

Hi,

On 06/02/2015 05:58 PM, Maxime Ripard wrote:
> On Mon, Jun 01, 2015 at 05:02:59PM +0200, Hans de Goede wrote:
>> 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 <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
>> ---
>>   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.

> 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

>
> Maxime
>

^ permalink raw reply	[flat|nested] 14+ messages in thread

* [PATCH] ARM: dts: sun6i: Add a dts file for the Mele A1000G quad top set box
@ 2015-06-02 18:32       ` Hans de Goede
  0 siblings, 0 replies; 14+ messages in thread
From: Hans de Goede @ 2015-06-02 18:32 UTC (permalink / raw)
  To: linux-arm-kernel

Hi,

On 06/02/2015 05:58 PM, Maxime Ripard wrote:
> On Mon, Jun 01, 2015 at 05:02:59PM +0200, Hans de Goede wrote:
>> 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 <hdegoede@redhat.com>
>> ---
>>   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.

> 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

>
> Maxime
>

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PATCH] ARM: dts: sun6i: Add a dts file for the Mele A1000G quad top set box
  2015-06-02 18:32       ` Hans de Goede
@ 2015-06-02 21:49           ` Maxime Ripard
  -1 siblings, 0 replies; 14+ messages in thread
From: Maxime Ripard @ 2015-06-02 21:49 UTC (permalink / raw)
  To: Hans de Goede
  Cc: Ian Campbell, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
	devicetree, linux-sunxi-/JYPxA39Uh5TLH3MbocFFw

[-- Attachment #1: Type: text/plain, Size: 1609 bytes --]

On Tue, Jun 02, 2015 at 08:32:59PM +0200, Hans de Goede wrote:
> Hi,
> 
> On 06/02/2015 05:58 PM, Maxime Ripard wrote:
> >On Mon, Jun 01, 2015 at 05:02:59PM +0200, Hans de Goede wrote:
> >>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 <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
> >>---
> >>  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.
> 
> >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

-- 
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 14+ messages in thread

* [PATCH] ARM: dts: sun6i: Add a dts file for the Mele A1000G quad top set box
@ 2015-06-02 21:49           ` Maxime Ripard
  0 siblings, 0 replies; 14+ messages in thread
From: Maxime Ripard @ 2015-06-02 21:49 UTC (permalink / raw)
  To: linux-arm-kernel

On Tue, Jun 02, 2015 at 08:32:59PM +0200, Hans de Goede wrote:
> Hi,
> 
> On 06/02/2015 05:58 PM, Maxime Ripard wrote:
> >On Mon, Jun 01, 2015 at 05:02:59PM +0200, Hans de Goede wrote:
> >>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 <hdegoede@redhat.com>
> >>---
> >>  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.
> 
> >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

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

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [linux-sunxi] Re: [PATCH] ARM: dts: sun6i: Add a dts file for the Mele A1000G quad top set box
  2015-06-02 21:49           ` Maxime Ripard
@ 2015-06-03  7:22             ` Hans de Goede
  -1 siblings, 0 replies; 14+ messages in thread
From: Hans de Goede @ 2015-06-03  7:22 UTC (permalink / raw)
  To: maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8
  Cc: Ian Campbell, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
	devicetree, linux-sunxi-/JYPxA39Uh5TLH3MbocFFw

Hi,

On 02-06-15 23:49, Maxime Ripard wrote:
> On Tue, Jun 02, 2015 at 08:32:59PM +0200, Hans de Goede wrote:
>> Hi,
>>
>> On 06/02/2015 05:58 PM, Maxime Ripard wrote:
>>> On Mon, Jun 01, 2015 at 05:02:59PM +0200, Hans de Goede wrote:
>>>> 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 <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
>>>> ---
>>>>   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.
>>
>>> 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.

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

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 14+ messages in thread

* [linux-sunxi] Re: [PATCH] ARM: dts: sun6i: Add a dts file for the Mele A1000G quad top set box
@ 2015-06-03  7:22             ` Hans de Goede
  0 siblings, 0 replies; 14+ messages in thread
From: Hans de Goede @ 2015-06-03  7:22 UTC (permalink / raw)
  To: linux-arm-kernel

Hi,

On 02-06-15 23:49, Maxime Ripard wrote:
> On Tue, Jun 02, 2015 at 08:32:59PM +0200, Hans de Goede wrote:
>> Hi,
>>
>> On 06/02/2015 05:58 PM, Maxime Ripard wrote:
>>> On Mon, Jun 01, 2015 at 05:02:59PM +0200, Hans de Goede wrote:
>>>> 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 <hdegoede@redhat.com>
>>>> ---
>>>>   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.
>>
>>> 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.

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

^ permalink raw reply	[flat|nested] 14+ messages in thread

end of thread, other threads:[~2015-06-03  7:22 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-06-01 15:02 [PATCH] ARM: dts: sun6i: Add a dts file for the Mele A1000G quad top set box Hans de Goede
2015-06-01 15:02 ` Hans de Goede
     [not found] ` <1433170979-13725-1-git-send-email-hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2015-06-01 18:07   ` Ian Campbell
2015-06-01 18:07     ` Ian Campbell
     [not found]     ` <1433182022.5748.281.camel-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org>
2015-06-01 18:12       ` Hans de Goede
2015-06-01 18:12         ` Hans de Goede
2015-06-02 15:58   ` Maxime Ripard
2015-06-02 15:58     ` Maxime Ripard
2015-06-02 18:32     ` Hans de Goede
2015-06-02 18:32       ` Hans de Goede
     [not found]       ` <556DF6DB.8040601-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2015-06-02 21:49         ` Maxime Ripard
2015-06-02 21:49           ` Maxime Ripard
2015-06-03  7:22           ` [linux-sunxi] " Hans de Goede
2015-06-03  7:22             ` Hans de Goede

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.