Merge tag 'ceph-for-4.9-rc1' of git://github.com/ceph/ceph-client

[cascardo/linux.git] / arch / arm / boot / dts / rk3288-evb.dtsi

diff --git a/arch/arm/boot/dts/rk3288-evb.dtsi b/arch/arm/boot/dts/rk3288-evb.dtsi
index 963365d..d59208b 100644 (file)
--- a/arch/arm/boot/dts/rk3288-evb.dtsi
+++ b/arch/arm/boot/dts/rk3288-evb.dtsi
@@ -48,7 +48,7 @@
                reg = <0x0 0x80000000>;
        };
 
-       backlight {
+       backlight: backlight {
                compatible = "pwm-backlight";
                brightness-levels = <
                          0   1   2   3   4   5   6   7
@@ -97,6 +97,21 @@
                #clock-cells = <0>;
        };
 
+       panel: panel {
+               compatible ="lg,lp079qx1-sp0v", "simple-panel";
+               backlight = <&backlight>;
+               enable-gpios = <&gpio7 4 GPIO_ACTIVE_HIGH>;
+               pinctrl-0 = <&lcd_cs>;
+
+               ports {
+                       panel_in: port {
+                               panel_in_edp: endpoint {
+                                       remote-endpoint = <&edp_out_panel>;
+                               };
+                       };
+               };
+       };
+
        gpio-keys {
                compatible = "gpio-keys";
                autorepeat;
@@ -170,6 +185,28 @@
        cpu0-supply = <&vdd_cpu>;
 };
 
+&edp {
+       force-hpd;
+       status = "okay";
+
+       ports {
+               edp_out: port@1 {
+                       reg = <1>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+
+                       edp_out_panel: endpoint {
+                               reg = <0>;
+                               remote-endpoint = <&panel_in_edp>;
+                       };
+               };
+       };
+};
+
+&edp_phy {
+       status = "okay";
+};
+
 &emmc {
        bus-width = <8>;
        cap-mmc-highspeed;
@@ -280,6 +317,12 @@
                };
        };
 
+       lcd {
+               lcd_cs: lcd-cs {
+                       rockchip,pins = <7 4 RK_FUNC_GPIO &pcfg_pull_none>;
+               };
+       };
+
        pmic {
                pmic_int: pmic-int {
                        rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO &pcfg_pull_up>;