Merge branch '2019-07-12-master-imports'

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

diff --git a/arch/arm/dts/rk3288-firefly.dts b/arch/arm/dts/rk3288-firefly.dts
index aed8d3a712b037b363464759c9c17a6adc1d1e67..2e075406f40cdaff77c07d511403d1026763234c 100644 (file)
--- a/arch/arm/dts/rk3288-firefly.dts
+++ b/arch/arm/dts/rk3288-firefly.dts
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * Copyright (c) 2014, 2015 FUKAUMI Naoki <naobsd@gmail.com>
- *
- * SPDX-License-Identifier:     GPL-2.0+ X11
  */
 
 /dts-v1/;
@@ -22,7 +21,6 @@
 };
 
 &dmc {
-       rockchip,num-channels = <2>;
        rockchip,pctl-timing = <0x29a 0xc8 0x1f8 0x42 0x4e 0x4 0xea 0xa
                0x5 0x0 0xa 0x7 0x19 0x24 0xa 0x7
                0x5 0xa 0x5 0x200 0x5 0x10 0x40 0x0
@@ -30,7 +28,7 @@
                0x5 0x0>;
        rockchip,phy-timing = <0x48f9aab4 0xea0910 0x1002c200
                0xa60 0x40 0x10 0x0>;
-       rockchip,sdram-channel = /bits/ 8 <0x1 0xa 0x3 0x2 0x1 0x0 0xf 0xf>;
+       /* Add a dummy value to cause of-platdata think this is bytes */
        rockchip,sdram-params = <0x30B25564 0x627 3 666000000 3 9 1>;
 };
 
@@ -51,6 +49,11 @@
                        rockchip,pins = <7 0 RK_FUNC_GPIO &pcfg_pull_up>;
                };
        };
+       usb_host {
+               host_vbus_drv: host-vbus-drv {
+                       rockchip,pins = <0 14 RK_FUNC_GPIO &pcfg_pull_none>;
+               };
+       };
 };
 
 &pwm1 {
@@ -62,6 +65,11 @@
        reg-shift = <2>;
 };
 
+&usb_host1 {
+       vbus-supply = <&vcc_host_5v>;
+       status = "okay";
+};
+
 &sdmmc {
        u-boot,dm-pre-reloc;
 };