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 tag 'u-boot-rockchip-20200501' of https://gitlab.denx.de/u-boot/custodians...
[oweals/u-boot.git]
/
arch
/
arm
/
dts
/
rk3399-rock960.dtsi
diff --git
a/arch/arm/dts/rk3399-rock960.dtsi
b/arch/arm/dts/rk3399-rock960.dtsi
index c7d48d41e184ee6f00dc82875a6178d894e22752..ba7c75c9f2a19ee243fe266414840b18311b4081 100644
(file)
--- a/
arch/arm/dts/rk3399-rock960.dtsi
+++ b/
arch/arm/dts/rk3399-rock960.dtsi
@@
-76,6
+76,15
@@
regulator-always-on;
vin-supply = <&vcc5v0_sys>;
};
regulator-always-on;
vin-supply = <&vcc5v0_sys>;
};
+
+ vcc_0v9: vcc-0v9 {
+ compatible = "regulator-fixed";
+ regulator-name = "vcc_0v9";
+ regulator-always-on;
+ regulator-min-microvolt = <900000>;
+ regulator-max-microvolt = <900000>;
+ vin-supply = <&vcc3v3_sys>;
+ };
};
&cpu_l0 {
};
&cpu_l0 {
@@
-384,6
+393,8
@@
num-lanes = <4>;
pinctrl-names = "default";
pinctrl-0 = <&pcie_clkreqn_cpm>;
num-lanes = <4>;
pinctrl-names = "default";
pinctrl-0 = <&pcie_clkreqn_cpm>;
+ vpcie0v9-supply = <&vcc_0v9>;
+ vpcie1v8-supply = <&vcca_1v8>;
vpcie3v3-supply = <&vcc3v3_pcie>;
status = "okay";
};
vpcie3v3-supply = <&vcc3v3_pcie>;
status = "okay";
};
@@
-531,7
+542,7
@@
cap-mmc-highspeed;
cap-sd-highspeed;
clock-frequency = <100000000>;
cap-mmc-highspeed;
cap-sd-highspeed;
clock-frequency = <100000000>;
-
clock-freq-min-max = <100000
100000000>;
+
max-frequency = <
100000000>;
cd-gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
disable-wp;
sd-uhs-sdr104;
cd-gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
disable-wp;
sd-uhs-sdr104;