[PATCH] ARM: dts: sunxi: Update simplfb nodes so that u-boot can find them

[PATCH] ARM: dts: sunxi: Update simplfb nodes so that u-boot can find them

[Hans de Goede]

Review of the u-boot sunxi simplefb patches has led to the decision that
u-boot should not use a specific path to find the nodes as this goes contrary
to how devicetree usually works.

Instead a platform specific compatible + properties should be used for this.

The simplefb bindings have already been updated to reflect this, this patch
brings the sunxi devicetree files in line with the new binding, and the
actual u-boot implementation as it is going upstream.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 arch/arm/boot/dts/sun4i-a10.dtsi  | 5 +++--
 arch/arm/boot/dts/sun5i-a10s.dtsi | 5 +++--
 arch/arm/boot/dts/sun6i-a31.dtsi  | 5 +++--
 arch/arm/boot/dts/sun7i-a20.dtsi  | 5 +++--
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi
index 92d8aa6..bbc366f 100644
--- a/arch/arm/boot/dts/sun4i-a10.dtsi
+++ b/arch/arm/boot/dts/sun4i-a10.dtsi
@@ -32,8 +32,9 @@
 		#size-cells = <1>;
 		ranges;
 
-		framebuffer0-hdmi {
-			compatible = "simple-framebuffer";
+		framebuffer at 0 {
+			compatible = "sunxi,framebuffer", "simple-framebuffer";
+			sunxi,pipeline = "de_be0-lcd0-hdmi";
 			clocks = <&pll5 1>, <&ahb_gates 36>, <&ahb_gates 43>,
 				 <&ahb_gates 44>;
 			status = "disabled";
diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi
index c678e56..20509d7 100644
--- a/arch/arm/boot/dts/sun5i-a10s.dtsi
+++ b/arch/arm/boot/dts/sun5i-a10s.dtsi
@@ -29,8 +29,9 @@
 		#size-cells = <1>;
 		ranges;
 
-		framebuffer0-hdmi {
-			compatible = "simple-framebuffer";
+		framebuffer at 0 {
+			compatible = "sunxi,framebuffer", "simple-framebuffer";
+			sunxi,pipeline = "de_be0-lcd0-hdmi";
 			clocks = <&pll5 1>, <&ahb_gates 36>, <&ahb_gates 43>,
 				 <&ahb_gates 44>;
 			status = "disabled";
diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi
index ccc03f3..3b1c735 100644
--- a/arch/arm/boot/dts/sun6i-a31.dtsi
+++ b/arch/arm/boot/dts/sun6i-a31.dtsi
@@ -67,8 +67,9 @@
 		#size-cells = <1>;
 		ranges;
 
-		framebuffer0-hdmi {
-			compatible = "simple-framebuffer";
+		framebuffer at 0 {
+			compatible = "sunxi,framebuffer", "simple-framebuffer";
+			sunxi,pipeline = "de_be0-lcd0-hdmi";
 			clocks = <&pll6>;
 			status = "disabled";
 		};
diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
index 89766cb..0c9c216 100644
--- a/arch/arm/boot/dts/sun7i-a20.dtsi
+++ b/arch/arm/boot/dts/sun7i-a20.dtsi
@@ -69,8 +69,9 @@
 		#size-cells = <1>;
 		ranges;
 
-		framebuffer0-hdmi {
-			compatible = "simple-framebuffer";
+		framebuffer at 0 {
+			compatible = "sunxi,framebuffer", "simple-framebuffer";
+			sunxi,pipeline = "de_be0-lcd0-hdmi";
 			clocks = <&pll5 1>, <&ahb_gates 36>, <&ahb_gates 43>,
 				 <&ahb_gates 44>;
 			status = "disabled";
-- 
2.1.0

[PATCH] ARM: dts: sunxi: Update simplfb nodes so that u-boot can find them

[Maxime Ripard]

Hi,

On Mon, Nov 17, 2014 at 04:40:16PM +0100, Hans de Goede wrote:
> Review of the u-boot sunxi simplefb patches has led to the decision that
> u-boot should not use a specific path to find the nodes as this goes contrary
> to how devicetree usually works.
> 
> Instead a platform specific compatible + properties should be used for this.
> 
> The simplefb bindings have already been updated to reflect this, this patch
> brings the sunxi devicetree files in line with the new binding, and the
> actual u-boot implementation as it is going upstream.
> 
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> ---
>  arch/arm/boot/dts/sun4i-a10.dtsi  | 5 +++--
>  arch/arm/boot/dts/sun5i-a10s.dtsi | 5 +++--
>  arch/arm/boot/dts/sun6i-a31.dtsi  | 5 +++--
>  arch/arm/boot/dts/sun7i-a20.dtsi  | 5 +++--
>  4 files changed, 12 insertions(+), 8 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi
> index 92d8aa6..bbc366f 100644
> --- a/arch/arm/boot/dts/sun4i-a10.dtsi
> +++ b/arch/arm/boot/dts/sun4i-a10.dtsi
> @@ -32,8 +32,9 @@
>  		#size-cells = <1>;
>  		ranges;
>  
> -		framebuffer0-hdmi {
> -			compatible = "simple-framebuffer";
> +		framebuffer at 0 {
> +			compatible = "sunxi,framebuffer", "simple-framebuffer";

This compatible isn't following the
standard. allwinner,sunxi-framebuffer would be more appropriate.

I must say I'm also a bit concerned that this whole binding thing is
not stabilizing while we are quite close from the end of the ARM merge
window.

I wouldn't be very pleased to merge any more patch modifying again
this binding.

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/20141117/c5cf1920/attachment.sig>

[PATCH] ARM: dts: sunxi: Update simplfb nodes so that u-boot can find them

[Hans de Goede]

Hi,

On 11/17/2014 04:59 PM, Maxime Ripard wrote:
> Hi,
> 
> On Mon, Nov 17, 2014 at 04:40:16PM +0100, Hans de Goede wrote:
>> Review of the u-boot sunxi simplefb patches has led to the decision that
>> u-boot should not use a specific path to find the nodes as this goes contrary
>> to how devicetree usually works.
>>
>> Instead a platform specific compatible + properties should be used for this.
>>
>> The simplefb bindings have already been updated to reflect this, this patch
>> brings the sunxi devicetree files in line with the new binding, and the
>> actual u-boot implementation as it is going upstream.
>>
>> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
>> ---
>>  arch/arm/boot/dts/sun4i-a10.dtsi  | 5 +++--
>>  arch/arm/boot/dts/sun5i-a10s.dtsi | 5 +++--
>>  arch/arm/boot/dts/sun6i-a31.dtsi  | 5 +++--
>>  arch/arm/boot/dts/sun7i-a20.dtsi  | 5 +++--
>>  4 files changed, 12 insertions(+), 8 deletions(-)
>>
>> diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi
>> index 92d8aa6..bbc366f 100644
>> --- a/arch/arm/boot/dts/sun4i-a10.dtsi
>> +++ b/arch/arm/boot/dts/sun4i-a10.dtsi
>> @@ -32,8 +32,9 @@
>>  		#size-cells = <1>;
>>  		ranges;
>>  
>> -		framebuffer0-hdmi {
>> -			compatible = "simple-framebuffer";
>> +		framebuffer at 0 {
>> +			compatible = "sunxi,framebuffer", "simple-framebuffer";
> 
> This compatible isn't following the
> standard. allwinner,sunxi-framebuffer would be more appropriate.

Oh, good catch, I'll respin this patch set and the bindings documentation
patches to change this.

> I must say I'm also a bit concerned that this whole binding thing is
> not stabilizing while we are quite close from the end of the ARM merge
> window.

I understand, it was presumed to be stable when I posted the first set of dts
patches, but then it turned out Ian had some concerns about how we had
decided u-boot would find the prepopulated nodes. Ian and Grant and I discussed
this on irc yesterday and came up with a solution we all like. Unfortunately
we all missed the "sunxi," should be "allwinnner," thing. I'll go and fix that
right away, and then these bindings should be 100% stable.

> I wouldn't be very pleased to merge any more patch modifying again
> this binding.

Understood, and I do not expect there be any such patch.

Regards,

Hans