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 'for-linus-4.12b-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
arch
/
arm64
/
boot
/
dts
/
socionext
/
uniphier-ld20.dtsi
diff --git
a/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi
b/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi
index a6b3a70dae831bf0206a5c3500b3fd779d25b10b..6193f11acb78dba818f17e954db47a4e23593888 100644
(file)
--- a/
arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi
+++ b/
arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi
@@
-209,7
+209,7
@@
<1 10 4>;
};
<1 10 4>;
};
- soc {
+ soc
@0
{
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
@@
-378,6
+378,8
@@
compatible = "socionext,uniphier-sd4hc", "cdns,sd4hc";
reg = <0x5a000000 0x400>;
interrupts = <0 78 4>;
compatible = "socionext,uniphier-sd4hc", "cdns,sd4hc";
reg = <0x5a000000 0x400>;
interrupts = <0 78 4>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_emmc>;
clocks = <&sys_clk 4>;
bus-width = <8>;
mmc-ddr-1_8v;
clocks = <&sys_clk 4>;
bus-width = <8>;
mmc-ddr-1_8v;