arm64: dts: rk3399: rename android-next to android

[firefly-linux-kernel-4.4.55.git] / arch / arm64 / boot / dts / rockchip / rk3399-mid-818-android.dts

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts
index 7bf26d7fb4521604e787d5513234a10d355ca435..28906815a93c1f1196662880cfc62b5c8034abb2 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts
@@ -51,6 +51,19 @@
 / {
        compatible = "rockchip,rk3399-mid", "rockchip,rk3399";
 
+       edp_panel: edp-panel {
+               compatible = "lg,lp079qx1-sp0v", "panel-simple";
+               bus-format = <MEDIA_BUS_FMT_RGB666_1X18>;
+               backlight = <&backlight>;
+               power-supply = <&vcc3v3_s0>;
+               enable-gpios = <&gpio3 8 GPIO_ACTIVE_HIGH>;
+               ports {
+                       panel_in_edp: endpoint {
+                               remote-endpoint = <&edp_out_panel>;
+                       };
+               };
+       };
+
        hall_sensor: hall-mh248 {
                compatible = "hall-mh248";
                pinctrl-names = "default";
@@ -85,6 +98,7 @@
                pinctrl-names = "default";
                pinctrl-0 = <&host_vbus_drv>;
                regulator-name = "vcc5v0_host";
+               regulator-always-on;
        };
 
        vdd_log: vdd-log {
@@ -101,7 +115,7 @@
 
        backlight: backlight {
                compatible = "pwm-backlight";
-               pwms = <&vop0_pwm 0 25000 PWM_POLARITY_INVERTED>;
+               pwms = <&pwm0 0 25000 PWM_POLARITY_INVERTED>;
                brightness-levels = <
                        0   1   51  52  52  53  53  54
                        54  55  55  56  56  57  57  58
@@ -146,23 +160,6 @@
                regulator-boot-on;
        };
 
-       io-domains {
-               compatible = "rockchip,rk3399-io-voltage-domain";
-               rockchip,grf = <&grf>;
-
-               bt656-supply = <&vcc1v8_dvp>;
-               audio-supply = <&vcca1v8_codec>;
-               sdmmc-supply = <&vcc_sd>;
-               gpio1830-supply = <&vcc_3v0>;
-       };
-
-       pmu-io-domains {
-               compatible = "rockchip,rk3399-pmu-io-voltage-domain";
-               rockchip,grf = <&pmugrf>;
-
-               pmu1830-supply = <&vcc_1v8>;
-       };
-
        es8316-sound {
                compatible = "simple-audio-card";
                simple-audio-card,format = "i2s";
@@ -748,6 +745,15 @@
        };
 };
 
+&io_domains {
+       status = "okay";
+
+       bt656-supply = <&vcc1v8_dvp>;
+       audio-supply = <&vcca1v8_codec>;
+       sdmmc-supply = <&vcc_sd>;
+       gpio1830-supply = <&vcc_3v0>;
+};
+
 &isp0 {
        status = "okay";
 };
@@ -756,6 +762,22 @@
        status = "okay";
 };
 
+&isp0_mmu {
+       status = "okay";
+};
+
+&isp1_mmu {
+       status = "okay";
+};
+
+&vpu {
+       status = "okay";
+};
+
+&rkvdec {
+       status = "okay";
+};
+
 &cpu_l0 {
        cpu-supply = <&vdd_cpu_l>;
 };
@@ -865,9 +887,7 @@
        status = "okay";
 };
 
-&vop0_pwm {
-       assigned-clocks = <&cru SCLK_VOP0_PWM>;
-       assigned-clock-rates = <50000000>;
+&pwm0 {
        status = "okay";
 };
 
@@ -924,12 +944,6 @@
                };
        };
 
-       lcdpwr-enable {
-               lcdpwr_enable_h: lcdpwr-enable-h {
-                       rockchip,pins = <3 8 RK_FUNC_GPIO &pcfg_pull_up>;
-               };
-       };
-
        lsm330_a {
                lsm330a_irq_gpio: lsm330a-irq-gpio {
                        rockchip,pins = <2 27 RK_FUNC_GPIO &pcfg_pull_none>;
@@ -975,49 +989,45 @@
        };
 };
 
-&rk_screen {
-       #include <dt-bindings/display/screen-timing/lcd-LP097Qx2.dtsi>
-};
-
-&cdn_dp_sound {
+&edp {
        status = "okay";
+       ports {
+               edp_out: port@1 {
+                       reg = <1>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       edp_out_panel: endpoint@0 {
+                               reg = <0>;
+                               remote-endpoint = <&panel_in_edp>;
+                       };
+               };
+       };
 };
 
-&cdn_dp_fb {
-       status = "okay";
-       extcon = <&fusb0>;
-       phys = <&tcphy0_dp>;
-       dp_vop_sel = <DISPLAY_SOURCE_LCDC1>;
+&edp_in_vopl {
+       status = "disabled";
 };
 
-&vopb_rk_fb {
-       status = "okay";
-       rockchip,cabc_mode = <1>;
-       power_ctr: power_ctr {
-               rockchip,debug = <0>;
-
-               lcd_en: lcd-en {
-                       rockchip,power_type = <GPIO>;
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&lcdpwr_enable_h>;
-                       gpios = <&gpio3 8 GPIO_ACTIVE_HIGH>;
-                       rockchip,delay = <10>;
-               };
-       };
+&hdmi {
+       status = "disabled";
 };
 
-&vopl_rk_fb {
+&cdn_dp {
        status = "okay";
+       extcon = <&fusb0>;
+       phys = <&tcphy0_dp>;
 };
 
-&edp_rk_fb {
-       status = "okay";
+&dp_in_vopb {
+       status = "disabled";
 };
 
-&pvtm {
+&pmu_io_domains {
        status = "okay";
+       pmu1830-supply = <&vcc_1v8>;
 };
 
-&pmu_pvtm {
+&route_edp {
        status = "okay";
+       logo,mode = "center";
 };