ARM64: dts: rk3399-android: change i2s2 bclk to 128fs for hdmi

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

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi
index bfda5a3f7e279ac2a2e61441606c8cea5a1500de..eced5e4dac03c52e41e1c421f07e9dda4ad5d738 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi
@@ -51,6 +51,12 @@
                bootargs = "earlycon=uart8250,mmio32,0xff1a0000 swiotlb=1";
        };
 
+       cpuinfo {
+               compatible = "rockchip,cpuinfo";
+               nvmem-cells = <&efuse_id>;
+               nvmem-cell-names = "id";
+       };
+
        ramoops_mem: ramoops_mem {
                reg = <0x0 0x110000 0x0 0xf0000>;
                reg-names = "ramoops_mem";
@@ -180,7 +186,7 @@
                rockchip,isp,dsiphy,reg = <0xff968000 0x8000>;
                rockchip,grf = <&grf>;
                rockchip,cru = <&cru>;
-               rockchip,gpios = <&gpio2 12 GPIO_ACTIVE_HIGH>;
+               rockchip,gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>;
                rockchip,isp,iommu-enable = <1>;
                power-domains = <&power RK3399_PD_ISP0>;
                iommus = <&isp0_mmu>;
@@ -222,7 +228,7 @@
                rockchip,isp,dsiphy,reg = <0xff968000 0x8000>;
                rockchip,grf = <&grf>;
                rockchip,cru = <&cru>;
-               rockchip,gpios = <&gpio2 12 GPIO_ACTIVE_HIGH>;
+               rockchip,gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>;
                rockchip,isp,iommu-enable = <1>;
                power-domains = <&power RK3399_PD_ISP1>;
                iommus = <&isp1_mmu>;
@@ -234,6 +240,13 @@
                rockchip,uboot-charge-on = <1>;
                rockchip,android-charge-on = <0>;
        };
+
+       hdmi_dp_sound: hdmi-dp-sound {
+               status = "disabled";
+               compatible = "rockchip,rk3399-hdmi-dp";
+               rockchip,cpu = <&i2s2>;
+               rockchip,codec = <&hdmi>, <&cdn_dp>;
+       };
 };
 
 &vopb {
@@ -256,6 +269,8 @@
        #address-cells = <1>;
        #size-cells = <0>;
        #sound-dai-cells = <0>;
+       ddc-i2c-scl-high-time-ns = <9625>;
+       ddc-i2c-scl-low-time-ns = <10000>;
        status = "okay";
 };
 
@@ -296,6 +311,7 @@
 
 &i2s2 {
        #sound-dai-cells = <0>;
+       rockchip,bclk-fs = <128>;
 };
 
 &rkvdec {
@@ -306,6 +322,14 @@
        dr_mode = "otg";
 };
 
+&iep {
+       status = "okay";
+};
+
+&iep_mmu {
+       status = "okay";
+};
+
 &vpu {
        status = "okay";
 };
@@ -365,7 +389,7 @@
                isp_flash_trigger_as_gpio: isp_flash_trigger_as_gpio {
                        /*ISP_FLASHTRIGOU*/
                        rockchip,pins =
-                               <0 17 RK_FUNC_GPIO &pcfg_pull_none>;
+                               <1 3 RK_FUNC_GPIO &pcfg_pull_none>;
                };
        };
 };