projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'gcc-plugins-v4.9-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
arch
/
arm64
/
boot
/
dts
/
rockchip
/
rk3368-geekbox.dts
diff --git
a/arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts
b/arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts
index
46cdddf
..
e5eeca2
100644
(file)
--- a/
arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts
+++ b/
arch/arm64/boot/dts/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";
};