[PATCH 0/2] ARM: dts: exynos: Fix port nodes names for Snow and Peach Pit DTS

[PATCH 0/2] ARM: dts: exynos: Fix port nodes names for Snow and Peach Pit DTS

[Javier Martinez Canillas]

Hello Krzysztof,

This small series fixes the lookup for the lvds-to-eDP bridge found in
the Exynos5250 Snow and Exynos5420 Peach Pit Chromebooks. The problem
was introduced by the commits that fixed the recent DTC warnings and
it was that the OF graph logic expects the nodes to always be called
'port'.

So the correct fix for the DTC warnings is to add a '#address-cells',
'#size-cells' and 'reg' properties when there is more than one port.

Best regards,
Javier


Javier Martinez Canillas (2):
  ARM: dts: exynos: Fix port nodes names for Exynos5250 Snow board
  ARM: dts: exynos: Fix port nodes names for Exynos5420 Peach Pit board

 arch/arm/boot/dts/exynos5250-snow-common.dtsi | 13 ++++++++++---
 arch/arm/boot/dts/exynos5420-peach-pit.dts    | 13 ++++++++++---
 2 files changed, 20 insertions(+), 6 deletions(-)

-- 
2.5.5

[PATCH 1/2] ARM: dts: exynos: Fix port nodes names for Exynos5250 Snow board

[Javier Martinez Canillas]

Commit 5c9cbade0629 ("ARM: dts: exynos: Fix DTC unit name warnings in
Exynos5250") fixed all the DTC warnings about mismatchs between unit
names and reg properties in Exynos5250 boards DTS.

But unfortunately it also added a regression on the Exynos5250 Snow
Chromebook when changing the port node names since the OF graph logic
expects the port nodes to be always named 'port'.

The Documentation/devicetree/bindings/graph.txt binding document says
that when there is more than one port, '#address-cells', '#size-cells'
and 'reg' properties should be used to number the port nodes.

Fixes: 5c9cbade0629 ("ARM: dts: exynos: Fix DTC unit name warnings in Exynos5250")
Reported-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
---

 arch/arm/boot/dts/exynos5250-snow-common.dtsi | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boot/dts/exynos5250-snow-common.dtsi b/arch/arm/boot/dts/exynos5250-snow-common.dtsi
index 419d59da1751..fadbea744e1a 100644
--- a/arch/arm/boot/dts/exynos5250-snow-common.dtsi
+++ b/arch/arm/boot/dts/exynos5250-snow-common.dtsi
@@ -242,7 +242,7 @@
 	hpd-gpios = <&gpx0 7 GPIO_ACTIVE_HIGH>;
 
 	ports {
-		port0 {
+		port {
 			dp_out: endpoint {
 				remote-endpoint = <&bridge_in>;
 			};
@@ -485,13 +485,20 @@
 		edid-emulation = <5>;
 
 		ports {
-			port0 {
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			port@0 {
+				reg = <0>;
+
 				bridge_out: endpoint {
 					remote-endpoint = <&panel_in>;
 				};
 			};
 
-			port1 {
+			port@1 {
+				reg = <1>;
+
 				bridge_in: endpoint {
 					remote-endpoint = <&dp_out>;
 				};
-- 
2.5.5

[PATCH 2/2] ARM: dts: exynos: Fix port nodes names for Exynos5420 Peach Pit board

[Javier Martinez Canillas]

Commit bea7eef6949c ("ARM: dts: exynos: Fix DTC unit name warnings in
Peach Pit") fixed the DTC warnings about mismatches between unit names
and reg properties in the Exynos5420 Peach Pit DTS.

But unfortunately it also added a regression on the Peach Pit when
changing the port node names since the OF graph logic expects the port
nodes to be always named 'port'.

The Documentation/devicetree/bindings/graph.txt binding document says
that when there is more than one port, '#address-cells', '#size-cells'
and 'reg' properties should be used to number the port nodes.

Fixes: bea7eef6949c ("ARM: dts: exynos: Fix DTC unit name warnings in  Peach Pit")
Reported-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>

---

 arch/arm/boot/dts/exynos5420-peach-pit.dts | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boot/dts/exynos5420-peach-pit.dts b/arch/arm/boot/dts/exynos5420-peach-pit.dts
index f3078430d866..7279f2a0b43d 100644
--- a/arch/arm/boot/dts/exynos5420-peach-pit.dts
+++ b/arch/arm/boot/dts/exynos5420-peach-pit.dts
@@ -163,7 +163,7 @@
 	hpd-gpios = <&gpx2 6 GPIO_ACTIVE_HIGH>;
 
 	ports {
-		port0 {
+		port {
 			dp_out: endpoint {
 				remote-endpoint = <&bridge_in>;
 			};
@@ -625,13 +625,20 @@
 		use-external-pwm;
 
 		ports {
-			port0 {
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			port@0 {
+				reg = <0>;
+
 				bridge_out: endpoint {
 					remote-endpoint = <&panel_in>;
 				};
 			};
 
-			port1 {
+			port@1 {
+				reg = <1>;
+
 				bridge_in: endpoint {
 					remote-endpoint = <&dp_out>;
 				};
-- 
2.5.5

Re: [PATCH 0/2] ARM: dts: exynos: Fix port nodes names for Snow and Peach Pit DTS

[Krzysztof Kozlowski]

On 06/06/2016 10:24 PM, Javier Martinez Canillas wrote:
> Hello Krzysztof,
> 
> This small series fixes the lookup for the lvds-to-eDP bridge found in
> the Exynos5250 Snow and Exynos5420 Peach Pit Chromebooks. The problem
> was introduced by the commits that fixed the recent DTC warnings and
> it was that the OF graph logic expects the nodes to always be called
> 'port'.
> 
> So the correct fix for the DTC warnings is to add a '#address-cells',
> '#size-cells' and 'reg' properties when there is more than one port.
> 
> Best regards,
> Javier
> 
> 
> Javier Martinez Canillas (2):
>   ARM: dts: exynos: Fix port nodes names for Exynos5250 Snow board
>   ARM: dts: exynos: Fix port nodes names for Exynos5420 Peach Pit board
> 
>  arch/arm/boot/dts/exynos5250-snow-common.dtsi | 13 ++++++++++---
>  arch/arm/boot/dts/exynos5420-peach-pit.dts    | 13 ++++++++++---
>  2 files changed, 20 insertions(+), 6 deletions(-)

Thanks for fixes. Applied both for v4.7.

Best regards,
Krzysztof

Re: [PATCH 1/2] ARM: dts: exynos: Fix port nodes names for Exynos5250 Snow board

[Marc Zyngier]

On 06/06/16 21:24, Javier Martinez Canillas wrote:
> Commit 5c9cbade0629 ("ARM: dts: exynos: Fix DTC unit name warnings in
> Exynos5250") fixed all the DTC warnings about mismatchs between unit
> names and reg properties in Exynos5250 boards DTS.
> 
> But unfortunately it also added a regression on the Exynos5250 Snow
> Chromebook when changing the port node names since the OF graph logic
> expects the port nodes to be always named 'port'.
> 
> The Documentation/devicetree/bindings/graph.txt binding document says
> that when there is more than one port, '#address-cells', '#size-cells'
> and 'reg' properties should be used to number the port nodes.
> 
> Fixes: 5c9cbade0629 ("ARM: dts: exynos: Fix DTC unit name warnings in Exynos5250")
> Reported-by: Marc Zyngier <marc.zyngier@arm.com>
> Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>

I've tested this on top of -rc1, and it indeed fixes the display
initialization I was seeing. It then dies in a horrible way, but that's
a separate bug.

So for this patch:

Tested-by: Marc Zyngier <marc.zyngier@arm.com>

Thanks,

	M.
-- 
Jazz is not dead. It just smells funny...