ARM: dts: Update the NSPIRE DTS files for DRM

The DRM subsystem graphics drivers require more granular
definition of the connection between display drivers and
panels, and a proper panel compatible. This utilizes the
bindings merged to the DRM subsystem to properly define
the display on the NSPIRE devices.

We also do away with the undocumented DT binding
"lcd-type".

We add both the clocks to the CLCD block so the driver
have full control over its clocking.

Link: https://lore.kernel.org/r/20190810074230.6492-1-linus.walleij@linaro.org
Cc: Daniel Tang <dt.tangr@gmail.com>
Cc: Fabian Vogt <fabian@ritter-vogt.de>
Tested-by: Fabian Vogt <fabian@ritter-vogt.de>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/arch/arm/boot/dts/nspire-classic.dtsi b/arch/arm/boot/dts/nspire-classic.dtsi
index c53f42777851e8556dc8c04f7c330f0c9352e699..41744cc2bc72860e81903c0b1943f1c854f5898e 100644 (file)
--- a/arch/arm/boot/dts/nspire-classic.dtsi
+++ b/arch/arm/boot/dts/nspire-classic.dtsi
@@ -8,7 +8,11 @@
 /include/ "nspire.dtsi"
 
 &lcd {
-       lcd-type = "classic";
+       port {
+               clcd_pads: endpoint {
+                       remote-endpoint = <&panel_in>;
+               };
+       };
 };
 
 &fast_timer {
@@ -69,6 +73,15 @@ intc: interrupt-controller@DC000000 {
                        #interrupt-cells = <1>;
                };
        };
+
+       panel {
+               compatible = "ti,nspire-classic-lcd-panel";
+               port {
+                       panel_in: endpoint {
+                               remote-endpoint = <&clcd_pads>;
+                       };
+               };
+       };
        chosen {
                bootargs = "debug earlyprintk console=tty0 console=ttyS0,115200n8 root=/dev/ram0";
        };

diff --git a/arch/arm/boot/dts/nspire-cx.dts b/arch/arm/boot/dts/nspire-cx.dts
index da95c3736651f022c25bacbadcc26291ac724396..0c16b04e2744dd54e126f77377210e44f4ee9822 100644 (file)
--- a/arch/arm/boot/dts/nspire-cx.dts
+++ b/arch/arm/boot/dts/nspire-cx.dts
@@ -9,7 +9,11 @@
 /include/ "nspire.dtsi"
 
 &lcd {
-       lcd-type = "cx";
+       port {
+               clcd_pads: endpoint {
+                       remote-endpoint = <&panel_in>;
+               };
+       };
 };
 
 &fast_timer {
@@ -106,6 +110,15 @@ i2c@90050000 {
                        };
                };
        };
+
+       panel {
+               compatible = "ti,nspire-cx-lcd-panel";
+               port {
+                       panel_in: endpoint {
+                               remote-endpoint = <&clcd_pads>;
+                       };
+               };
+       };
        chosen {
                bootargs = "debug earlyprintk console=tty0 console=ttyAMA0,115200n8 root=/dev/ram0";
        };

diff --git a/arch/arm/boot/dts/nspire.dtsi b/arch/arm/boot/dts/nspire.dtsi
index c35fd66677166f9e93dd3a47b2f6bed9afdad46d..d9a0fd7524dc68668e9a956ffa638ff2ad3956b6 100644 (file)
--- a/arch/arm/boot/dts/nspire.dtsi
+++ b/arch/arm/boot/dts/nspire.dtsi
@@ -95,8 +95,14 @@ lcd: lcd@C0000000 {
                        reg = <0xC0000000 0x1000>;
                        interrupts = <21>;
 
-                       clocks = <&apb_pclk>;
-                       clock-names = "apb_pclk";
+                       /*
+                        * We assume the same clock is fed to APB and CLCDCLK.
+                        * There is some code to scale the clock down by a factor
+                        * 48 for the display so likely the frequency to the
+                        * display is 1MHz and the CLCDCLK is 48 MHz.
+                        */
+                       clocks = <&apb_pclk>, <&apb_pclk>;
+                       clock-names = "clcdclk", "apb_pclk";
                };
 
                adc: adc@C4000000 {