arm64: dts: rockchip: rk3368: revert xin32k use the fixed clk

[firefly-linux-kernel-4.4.55.git] / arch / arm64 / boot / dts / rockchip / rk3368-p9.dts

diff --git a/arch/arm64/boot/dts/rockchip/rk3368-p9.dts b/arch/arm64/boot/dts/rockchip/rk3368-p9.dts
index 3cbc43599e4d1af3b553e4297e1d106648384a99..a8f95117f0291816d90f1e2dc4f5b96186d848e3 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3368-p9.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3368-p9.dts
@@ -70,21 +70,6 @@
                };
        };
 
-       hdmi_sound: hdmi-sound {
-               status = "okay";
-               compatible = "simple-audio-card";
-               simple-audio-card,format = "i2s";
-               simple-audio-card,mclk-fs = <256>;
-               simple-audio-card,name = "rockchip,hdmi";
-
-               simple-audio-card,cpu {
-                       sound-dai = <&i2s_8ch>;
-               };
-               simple-audio-card,codec {
-                       sound-dai = <&hdmi>;
-               };
-       };
-
        sdio_pwrseq: sdio-pwrseq {
                compatible = "mmc-pwrseq-simple";
                clocks = <&rk818 1>;
@@ -103,7 +88,7 @@
 
        backlight: backlight {
                compatible = "pwm-backlight";
-               pwms = <&pwm0 0 25000 PWM_POLARITY_INVERTED>;
+               pwms = <&pwm0 0 25000 0>;
                brightness-levels = <
                          0   1   2   3   4   5   6   7
                          8   9  10  11  12  13  14  15
@@ -206,10 +191,16 @@
                regulator-min-microvolt = <3800000>;
                regulator-max-microvolt = <3800000>;
        };
-};
 
-&hdmi {
-       status = "okay";
+       vcc_host: vcc-host {
+               compatible = "regulator-fixed";
+               enable-active-high;
+               gpio = <&gpio0 4 GPIO_ACTIVE_HIGH>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&host_vbus_drv>;
+               regulator-name = "vcc_host";
+               regulator-always-on;
+       };
 };
 
 &cpu_l0 {
@@ -251,6 +242,7 @@
 &emmc {
        bus-width = <8>;
        cap-mmc-highspeed;
+       mmc-hs200-1_8v;
        supports-emmc;
        disable-wp;
        non-removable;
@@ -628,6 +620,23 @@
        status = "okay";
 };
 
+&u2phy {
+       status = "okay";
+
+       u2phy_host: host-port {
+               phy-supply = <&vcc_host>;
+               status = "okay";
+       };
+};
+
+&usb_host0_ehci {
+       status = "okay";
+};
+
+&usb_host0_ohci {
+       status = "okay";
+};
+
 &mipi_dsi_host {
        status = "okay";
 
@@ -668,6 +677,11 @@
        status = "okay";
 };
 
+&tsadc {
+       tsadc-supply = <&syr827>;
+       status = "okay";
+};
+
 &pinctrl {
        pmic {
                pmic_int_l: pmic-int-l {
@@ -693,6 +707,12 @@
                };
        };
 
+       usb2 {
+               host_vbus_drv: host-vbus-drv {
+                       rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO &pcfg_pull_none>;
+               };
+       };
+
        wireless-bluetooth {
                uart0_rts_gpio: uart0-rts-gpio {
                        rockchip,pins = <2 27 RK_FUNC_GPIO &pcfg_pull_none>;