The standard binding for DSI requires that the channel number
of the panel is encoded in DT. This adds the channel number in
all OMAP3-5 boards in preparation for using common infrastructure.

Reviewed-by: Laurent Pinchart <laurent.pinch...@ideasonboard.com>
Signed-off-by: Sebastian Reichel <sebastian.reic...@collabora.com>
---
 arch/arm/boot/dts/motorola-mapphone-common.dtsi | 3 ++-
 arch/arm/boot/dts/omap3-n950.dts                | 3 ++-
 arch/arm/boot/dts/omap3.dtsi                    | 3 +++
 arch/arm/boot/dts/omap4-sdp.dts                 | 6 ++++--
 arch/arm/boot/dts/omap4.dtsi                    | 6 ++++++
 arch/arm/boot/dts/omap5.dtsi                    | 6 ++++++
 6 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/arch/arm/boot/dts/motorola-mapphone-common.dtsi 
b/arch/arm/boot/dts/motorola-mapphone-common.dtsi
index 06fbffa81636..4ffe461c3808 100644
--- a/arch/arm/boot/dts/motorola-mapphone-common.dtsi
+++ b/arch/arm/boot/dts/motorola-mapphone-common.dtsi
@@ -207,8 +207,9 @@ dsi1_out_ep: endpoint {
                };
        };
 
-       lcd0: display {
+       lcd0: panel@0 {
                compatible = "panel-dsi-cm";
+               reg = <0>;
                label = "lcd0";
                vddi-supply = <&lcd_regulator>;
                reset-gpios = <&gpio4 5 GPIO_ACTIVE_HIGH>;      /* gpio101 */
diff --git a/arch/arm/boot/dts/omap3-n950.dts b/arch/arm/boot/dts/omap3-n950.dts
index 31d47a1fad84..80cf4e1177da 100644
--- a/arch/arm/boot/dts/omap3-n950.dts
+++ b/arch/arm/boot/dts/omap3-n950.dts
@@ -225,8 +225,9 @@ dsi_out_ep: endpoint {
                };
        };
 
-       lcd0: display {
+       lcd0: panel@0 {
                compatible = "nokia,himalaya", "panel-dsi-cm";
+               reg = <0>;
                label = "lcd0";
 
                pinctrl-names = "default";
diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi
index 1296d0643943..0ebbb6c11f04 100644
--- a/arch/arm/boot/dts/omap3.dtsi
+++ b/arch/arm/boot/dts/omap3.dtsi
@@ -898,6 +898,9 @@ dsi: encoder@4804fc00 {
                                ti,hwmods = "dss_dsi1";
                                clocks = <&dss1_alwon_fck>, <&dss2_alwon_fck>;
                                clock-names = "fck", "sys_clk";
+
+                               #address-cells = <1>;
+                               #size-cells = <0>;
                        };
 
                        rfbi: encoder@48050800 {
diff --git a/arch/arm/boot/dts/omap4-sdp.dts b/arch/arm/boot/dts/omap4-sdp.dts
index 91480ac1f328..8a8307517dab 100644
--- a/arch/arm/boot/dts/omap4-sdp.dts
+++ b/arch/arm/boot/dts/omap4-sdp.dts
@@ -662,8 +662,9 @@ dsi1_out_ep: endpoint {
                };
        };
 
-       lcd0: display {
+       lcd0: panel@0 {
                compatible = "tpo,taal", "panel-dsi-cm";
+               reg = <0>;
                label = "lcd0";
 
                reset-gpios = <&gpio4 6 GPIO_ACTIVE_HIGH>;      /* 102 */
@@ -687,8 +688,9 @@ dsi2_out_ep: endpoint {
                };
        };
 
-       lcd1: display {
+       lcd1: panel@0 {
                compatible = "tpo,taal", "panel-dsi-cm";
+               reg = <0>;
                label = "lcd1";
 
                reset-gpios = <&gpio4 8 GPIO_ACTIVE_HIGH>;      /* 104 */
diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
index 4400f5f8e099..c5b426616443 100644
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -551,6 +551,9 @@ dsi1: encoder@0 {
                                                clocks = <&l3_dss_clkctrl 
OMAP4_DSS_CORE_CLKCTRL 8>,
                                                         <&l3_dss_clkctrl 
OMAP4_DSS_CORE_CLKCTRL 10>;
                                                clock-names = "fck", "sys_clk";
+
+                                               #address-cells = <1>;
+                                               #size-cells = <0>;
                                        };
                                };
 
@@ -583,6 +586,9 @@ dsi2: encoder@0 {
                                                clocks = <&l3_dss_clkctrl 
OMAP4_DSS_CORE_CLKCTRL 8>,
                                                         <&l3_dss_clkctrl 
OMAP4_DSS_CORE_CLKCTRL 10>;
                                                clock-names = "fck", "sys_clk";
+
+                                               #address-cells = <1>;
+                                               #size-cells = <0>;
                                        };
                                };
 
diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
index fb889c5b00c9..0855c0a4050f 100644
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -491,6 +491,9 @@ dsi1: encoder@0 {
                                                status = "disabled";
                                                clocks = <&dss_clkctrl 
OMAP5_DSS_CORE_CLKCTRL 8>;
                                                clock-names = "fck";
+
+                                               #address-cells = <1>;
+                                               #size-cells = <0>;
                                        };
                                };
 
@@ -522,6 +525,9 @@ dsi2: encoder@0 {
                                                status = "disabled";
                                                clocks = <&dss_clkctrl 
OMAP5_DSS_CORE_CLKCTRL 8>;
                                                clock-names = "fck";
+
+                                               #address-cells = <1>;
+                                               #size-cells = <0>;
                                        };
                                };
 
-- 
2.27.0

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Reply via email to