Merge branch 'master' of git://git.denx.de/u-boot-socfpga

[u-boot] / arch / arm / dts / rk3399-evb.dts

diff --git a/arch/arm/dts/rk3399-evb.dts b/arch/arm/dts/rk3399-evb.dts
index bbcfcd0da9a67d7b2997affbb533e32e2ab66d3c..e1f867b600e3e12400c1d6b80254b2f370ffab19 100644 (file)
--- a/arch/arm/dts/rk3399-evb.dts
+++ b/arch/arm/dts/rk3399-evb.dts
@@ -7,6 +7,7 @@
 /dts-v1/;
 #include <dt-bindings/pwm/pwm.h>
 #include "rk3399.dtsi"
+#include "rk3399-sdram-lpddr3-4GB-1600.dtsi"
 
 / {
        model = "Rockchip RK3399 Evaluation Board";
@@ -23,11 +24,19 @@
                regulator-name = "vdd_center";
                regulator-min-microvolt = <800000>;
                regulator-max-microvolt = <1400000>;
+               regulator-init-microvolt = <950000>;
                regulator-always-on;
                regulator-boot-on;
                status = "okay";
        };
 
+       vccsys: vccsys {
+               compatible = "regulator-fixed";
+               regulator-name = "vccsys";
+               regulator-boot-on;
+               regulator-always-on;
+       };
+
        vcc3v3_sys: vcc3v3-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_sys";
@@ -43,6 +52,13 @@
                regulator-always-on;
                regulator-boot-on;
        };
+
+       vcc5v0_host: vcc5v0-host-en {
+               compatible = "regulator-fixed";
+               regulator-name = "vcc5v0_host";
+               gpio = <&gpio4 25 GPIO_ACTIVE_HIGH>;
+       };
+
 };
 
 &emmc_phy {
@@ -61,6 +77,11 @@
        status = "okay";
 };
 
+&sdmmc {
+       bus-width = <4>;
+       status = "okay";
+};
+
 &sdhci {
        bus-width = <8>;
        mmc-hs400-1_8v;
@@ -81,6 +102,11 @@
        status = "okay";
 };
 
+&dwc3_typec0 {
+       rockchip,vbus-gpio = <&gpio1 3 GPIO_ACTIVE_HIGH>;
+       status = "okay";
+};
+
 &usb_host1_ehci {
        status = "okay";
 };
@@ -89,6 +115,42 @@
        status = "okay";
 };
 
+&dwc3_typec1 {
+       rockchip,vbus-gpio = <&gpio1 4 GPIO_ACTIVE_HIGH>;
+       status = "okay";
+};
+
+&i2c0 {
+       status = "okay";
+       clock-frequency = <400000>;
+       i2c-scl-falling-time-ns = <50>;
+       i2c-scl-rising-time-ns = <100>;
+       u-boot,dm-pre-reloc;
+
+       rk808: pmic@1b {
+               compatible = "rockchip,rk808";
+               clock-output-names = "xin32k", "wifibt_32kin";
+               interrupt-parent = <&gpio0>;
+               interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&pmic_int_l>;
+               reg = <0x1b>;
+               rockchip,system-power-controller;
+               #clock-cells = <1>;
+               u-boot,dm-pre-reloc;
+               status = "okay";
+
+               vcc12-supply = <&vcc3v3_sys>;
+               regulators {
+                       vcc33_lcd: SWITCH_REG2 {
+                               regulator-always-on;
+                               regulator-boot-on;
+                               regulator-name = "vcc33_lcd";
+                       };
+               };
+       };
+};
+
 &pinctrl {
        pmic {
                pmic_int_l: pmic-int-l {