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

[oweals/u-boot.git] / arch / arm / dts / rk3288-tinker.dts

diff --git a/arch/arm/dts/rk3288-tinker.dts b/arch/arm/dts/rk3288-tinker.dts
index c0550970ea70c7d59608f846fc26253547345f34..4b8405fd82445ffc22d7af4abe1be711d15f14b2 100644 (file)
--- a/arch/arm/dts/rk3288-tinker.dts
+++ b/arch/arm/dts/rk3288-tinker.dts
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * (C) Copyright 2016 Rockchip Electronics Co., Ltd
- *
- * SPDX-License-Identifier:     GPL-2.0+ X11
  */
 
 /dts-v1/;
@@ -16,20 +15,12 @@
        };
 };
 
-&dmc {
-       rockchip,pctl-timing = <0x215 0xc8 0x0 0x35 0x26 0x2 0x70 0x2000d
-               0x6 0x0 0x8 0x4 0x17 0x24 0xd 0x6
-               0x4 0x8 0x4 0x76 0x4 0x0 0x30 0x0
-               0x1 0x2 0x2 0x4 0x0 0x0 0xc0 0x4
-               0x8 0x1f4>;
-       rockchip,phy-timing = <0x48d7dd93 0x187008d8 0x121076
-               0x0 0xc3 0x6 0x2>;
-       rockchip,sdram-params = <0x20d266a4 0x5b6 2 533000000 6 9 0>;
-};
-
-
 &pinctrl {
-       u-boot,dm-pre-reloc;
+       usb {
+               host_vbus_drv: host-vbus-drv {
+                       rockchip,pins = <0 14 RK_FUNC_GPIO &pcfg_pull_none>;
+               };
+       };
 };
 
 &pwm1 {
@@ -37,22 +28,17 @@
 };
 
 &uart2 {
-       u-boot,dm-pre-reloc;
        reg-shift = <2>;
 };
 
-&sdmmc {
-       u-boot,dm-pre-reloc;
-};
-
-&emmc {
-       u-boot,dm-pre-reloc;
-};
-
-&gpio3 {
-       u-boot,dm-pre-reloc;
+&usb_host1 {
+       vbus-supply = <&vcc5v0_host>;
+       status = "okay";
 };
 
-&gpio8 {
-       u-boot,dm-pre-reloc;
+&i2c2 {
+    m24c08@50 {
+        compatible = "at,24c08", "i2c-eeprom";
+        reg = <0x50>;
+    };
 };