git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'mvebu-dt-5.1-2' of git://git.infradead.org/linux-mvebu into arm/dt
[sfrench/cifs-2.6.git]
/
arch
/
arm64
/
boot
/
dts
/
rockchip
/
rk3368-orion-r68-meta.dts
diff --git
a/arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts
b/arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts
index 96147d93dd1da3b4b43066d763ac47ae80150d8d..f5aa3cad67c5c22b826009930368fff37dba25f7 100644
(file)
--- a/
arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts
+++ b/
arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts
@@
-161,7
+161,6
@@
&emmc {
bus-width = <8>;
cap-mmc-highspeed;
- disable-wp;
mmc-pwrseq = <&emmc_pwrseq>;
mmc-hs200-1_2v;
mmc-hs200-1_8v;