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 'sunxi-fixes-for-3.14' of https://github.com/mripard/linux into fixes
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
sun4i-a10.dtsi
diff --git
a/arch/arm/boot/dts/sun4i-a10.dtsi
b/arch/arm/boot/dts/sun4i-a10.dtsi
index e3ff64cbd27928b1be5032d1ce3cc85f7e7c70a9..d4d2763f47948b65f7f0890696699a4b2b98f245 100644
(file)
--- a/
arch/arm/boot/dts/sun4i-a10.dtsi
+++ b/
arch/arm/boot/dts/sun4i-a10.dtsi
@@
-315,7
+315,7
@@
ranges;
emac: ethernet@01c0b000 {
ranges;
emac: ethernet@01c0b000 {
- compatible = "allwinner,sun4i-emac";
+ compatible = "allwinner,sun4i-
a10-
emac";
reg = <0x01c0b000 0x1000>;
interrupts = <55>;
clocks = <&ahb_gates 17>;
reg = <0x01c0b000 0x1000>;
interrupts = <55>;
clocks = <&ahb_gates 17>;
@@
-323,7
+323,7
@@
};
mdio@01c0b080 {
};
mdio@01c0b080 {
- compatible = "allwinner,sun4i-mdio";
+ compatible = "allwinner,sun4i-
a10-
mdio";
reg = <0x01c0b080 0x14>;
status = "disabled";
#address-cells = <1>;
reg = <0x01c0b080 0x14>;
status = "disabled";
#address-cells = <1>;