projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'mips_5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux
[linux-2.6-microblaze.git]
/
arch
/
arm
/
boot
/
dts
/
ste-href.dtsi
diff --git
a/arch/arm/boot/dts/ste-href.dtsi
b/arch/arm/boot/dts/ste-href.dtsi
index
c97e8d2
..
961f2c7
100644
(file)
--- a/
arch/arm/boot/dts/ste-href.dtsi
+++ b/
arch/arm/boot/dts/ste-href.dtsi
@@
-163,6
+163,8
@@
bus-width = <8>;
cap-mmc-highspeed;
non-removable;
bus-width = <8>;
cap-mmc-highspeed;
non-removable;
+ no-sdio;
+ no-sd;
vmmc-supply = <&db8500_vsmps2_reg>;
pinctrl-names = "default", "sleep";
pinctrl-0 = <&mc2_a_1_default>;
vmmc-supply = <&db8500_vsmps2_reg>;
pinctrl-names = "default", "sleep";
pinctrl-0 = <&mc2_a_1_default>;
@@
-178,6
+180,8
@@
bus-width = <8>;
cap-mmc-highspeed;
non-removable;
bus-width = <8>;
cap-mmc-highspeed;
non-removable;
+ no-sdio;
+ no-sd;
vmmc-supply = <&ab8500_ldo_aux2_reg>;
pinctrl-names = "default", "sleep";
pinctrl-0 = <&mc4_a_1_default>;
vmmc-supply = <&ab8500_ldo_aux2_reg>;
pinctrl-names = "default", "sleep";
pinctrl-0 = <&mc4_a_1_default>;