projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 97568a36ee2fe627520e0126a5c9bb776a4cf03e..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>
/*
* Copyright (c) 2014, 2015 FUKAUMI Naoki <naobsd@gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0+ X11
*/
/dts-v1/;
*/
/dts-v1/;
@@
-50,6
+49,11
@@
rockchip,pins = <7 0 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
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 {
};
&pwm1 {
@@
-61,6
+65,11
@@
reg-shift = <2>;
};
reg-shift = <2>;
};
+&usb_host1 {
+ vbus-supply = <&vcc_host_5v>;
+ status = "okay";
+};
+
&sdmmc {
u-boot,dm-pre-reloc;
};
&sdmmc {
u-boot,dm-pre-reloc;
};