summaryrefslogtreecommitdiffstats
path: root/dts/src/arm64/rockchip
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2016-11-15 09:02:29 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2017-01-10 08:48:45 +0100
commit37beaba4559bf62e6f4b35abc4ded9f7e7ed6796 (patch)
tree968d658900dc8f298ca13af7262813100e7680ba /dts/src/arm64/rockchip
parentc580e8422c0cb6dfe963c826a9d83214e6f0aa8a (diff)
downloadbarebox-37beaba4559bf62e6f4b35abc4ded9f7e7ed6796.tar.gz
barebox-37beaba4559bf62e6f4b35abc4ded9f7e7ed6796.tar.xz
dts: update to v4.9-rc3
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'dts/src/arm64/rockchip')
-rw-r--r--dts/src/arm64/rockchip/rk3368-geekbox.dts3
-rw-r--r--dts/src/arm64/rockchip/rk3368-orion-r68-meta.dts4
2 files changed, 0 insertions, 7 deletions
diff --git a/dts/src/arm64/rockchip/rk3368-geekbox.dts b/dts/src/arm64/rockchip/rk3368-geekbox.dts
index 46cdddfcea..e5eeca2c24 100644
--- a/dts/src/arm64/rockchip/rk3368-geekbox.dts
+++ b/dts/src/arm64/rockchip/rk3368-geekbox.dts
@@ -116,7 +116,6 @@
cap-mmc-highspeed;
clock-frequency = <150000000>;
disable-wp;
- keep-power-in-suspend;
non-removable;
num-slots = <1>;
vmmc-supply = <&vcc_io>;
@@ -258,8 +257,6 @@
};
vcc_sd: SWITCH_REG1 {
- regulator-always-on;
- regulator-boot-on;
regulator-name = "vcc_sd";
};
diff --git a/dts/src/arm64/rockchip/rk3368-orion-r68-meta.dts b/dts/src/arm64/rockchip/rk3368-orion-r68-meta.dts
index 5797933ef8..ea0a8eceef 100644
--- a/dts/src/arm64/rockchip/rk3368-orion-r68-meta.dts
+++ b/dts/src/arm64/rockchip/rk3368-orion-r68-meta.dts
@@ -152,8 +152,6 @@
gpio = <&gpio3 11 GPIO_ACTIVE_LOW>;
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>;
- regulator-always-on;
- regulator-boot-on;
vin-supply = <&vcc_io>;
};
@@ -201,7 +199,6 @@
bus-width = <8>;
cap-mmc-highspeed;
disable-wp;
- keep-power-in-suspend;
mmc-pwrseq = <&emmc_pwrseq>;
mmc-hs200-1_2v;
mmc-hs200-1_8v;
@@ -350,7 +347,6 @@
clock-freq-min-max = <400000 50000000>;
cap-sd-highspeed;
card-detect-delay = <200>;
- keep-power-in-suspend;
num-slots = <1>;
pinctrl-names = "default";
pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>;