arm64: dts: rockchip: rk3328: Use new define for RK3328 pins

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

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android.dts
index 3b3ff7cd52b6703971451a07bfa18442b9afb3fe..8de462d60f0d9f839dff5948dbaf0ab068ca3e39 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android.dts
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Fuzhou Rockchip Electronics Co., Ltd
+ * Copyright (c) 2017 Fuzhou Rockchip Electronics Co., Ltd
  *
  * This file is dual-licensed: you can use it either under the terms
  * of the GPL or the X11 license, at your option. Note that this dual
@@ -50,119 +50,40 @@
        compatible = "rockchip,android", "rockchip,rk3399-evb-rev3", "rockchip,rk3399";
 };
 
-&rk_screen {
-       #include <dt-bindings/display/screen-timing/lcd-tv080wum-nl0-mipi.dtsi>
-};
-
-&vopb_rk_fb {
+&mipi_dsi {
        status = "okay";
-       power_ctr: power_ctr {
-               rockchip,debug = <0>;
-               lcd_en: lcd-en {
-                       rockchip,power_type = <GPIO>;
-                       gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>;
-                       rockchip,delay = <10>;
-               };
-
-               /*lcd_cs: lcd-cs {
-                       rockchip,power_type = <GPIO>;
-                       gpios = <&gpio0 21 GPIO_ACTIVE_HIGH>;//GPIO_C5 = 21
-                       rockchip,delay = <10>;
-               };*/
-
-               /*lcd_rst: lcd-rst {
-                       rockchip,power_type = <GPIO>;
-                       gpios = <&gpio3 GPIO_D6 GPIO_ACTIVE_HIGH>;
-                       rockchip,delay = <5>;
-               };*/
-       };
-};
-
-&vopl_rk_fb {
-       status = "okay";
-};
-
-&mipi0_rk_fb {
-       status = "okay";
-};
-
-&hdmi_rk_fb {
-       status = "okay";
-       rockchip,hdmi_video_source = <DISPLAY_SOURCE_LCDC1>;
-};
-
-&i2s2 {
-       status = "okay";
-};
-
-&dw_hdmi_audio {
-       status = "okay";
-};
-
-&hdmi_sound {
-       status = "okay";
-};
-
-&spdif {
-       status = "okay";
-};
-
-&spdif_out {
-       status = "okay";
-};
-
-&spdif_sound {
-       status = "okay";
-};
-
-&i2c0 {
-       status = "okay";
-};
-
-&i2c1 {
-       status = "okay";
-       camera0: camera-module@10 {
+       panel {
+               compatible ="simple-panel-dsi";
+               reg = <0>;
+               backlight = <&backlight>;
+               enable-gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>;
+               dsi,flags = <(MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST |
+                               MIPI_DSI_MODE_VIDEO_SYNC_PULSE)>;
+               dsi,format = <MIPI_DSI_FMT_RGB888>;
+               dsi,lanes = <4>;
                status = "okay";
-               compatible = "omnivision,ov8858-v4l2-i2c-subdev";
-               reg = < 0x10 >;
-               device_type = "v4l2-i2c-subdev";
-
-               clocks = <&cru SCLK_CIF_OUT>;
-               clock-names = "clk_cif_out";
 
-               pinctrl-names = "rockchip,camera_default", "rockchip,camera_sleep";
-               pinctrl-0 = <&cam0_default_pins>;
-               pinctrl-1 = <&cam0_sleep_pins>;
-
-               rockchip,pd-gpio = <&gpio2 12 GPIO_ACTIVE_LOW>;
-               rockchip,camera-module-mclk-name = "clk_cif_out";
-               rockchip,camera-module-facing = "back";
-               rockchip,camera-module-name = "cmk-cb0695-fv1";
-               rockchip,camera-module-len-name = "lg9569a2";
-               rockchip,camera-module-fov-h = "66.0";
-               rockchip,camera-module-fov-v = "50.1";
-               rockchip,camera-module-orientation = <0>;
-               rockchip,camera-module-iq-flip = <0>;
-               rockchip,camera-module-iq-mirror = <0>;
-               rockchip,camera-module-flip = <0>;
-               rockchip,camera-module-mirror = <0>;
-
-               /* resolution.w, resolution.h, defrect.left, defrect.top, defrect.w, defrect.h */
-               rockchip,camera-module-defrect0 = <3264 2448 0 0 3264 2448>;
-               rockchip,camera-module-flash-support = <0>;
-               rockchip,camera-module-mipi-dphy-index = <0>;
+               display-timings {
+                       native-mode = <&timing0>;
+                       timing0: timing0 {
+                               clock-frequency = <160000000>;
+                               hactive = <1200>;
+                               vactive = <1920>;
+                               hback-porch = <21>;
+                               hfront-porch = <120>;
+                               vback-porch = <18>;
+                               vfront-porch = <21>;
+                               hsync-len = <20>;
+                               vsync-len = <3>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <0>;
+                               pixelclk-active = <0>;
+                       };
+               };
        };
 };
 
-&isp0 {
-       status = "okay";
-};
-
-&isp1 {
-       status = "okay";
-};
-
-&cif_isp0 {
+&route_mipi {
        status = "okay";
-       rockchip,camera-modules-attached = <&camera0>;
 };