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 'char-misc-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
sun5i-a13.dtsi
diff --git
a/arch/arm/boot/dts/sun5i-a13.dtsi
b/arch/arm/boot/dts/sun5i-a13.dtsi
index c463fd730c9155d8c9a491cf176a7320831e29fd..3490ef9ec6034b8d4fb0a100bca11152f1a5133d 100644
(file)
--- a/
arch/arm/boot/dts/sun5i-a13.dtsi
+++ b/
arch/arm/boot/dts/sun5i-a13.dtsi
@@
-275,7
+275,7
@@
ranges;
intc: interrupt-controller@01c20400 {
ranges;
intc: interrupt-controller@01c20400 {
- compatible = "allwinner,sun4i-ic";
+ compatible = "allwinner,sun4i-
a10-
ic";
reg = <0x01c20400 0x400>;
interrupt-controller;
#interrupt-cells = <1>;
reg = <0x01c20400 0x400>;
interrupt-controller;
#interrupt-cells = <1>;
@@
-329,7
+329,7
@@
};
timer@01c20c00 {
};
timer@01c20c00 {
- compatible = "allwinner,sun4i-timer";
+ compatible = "allwinner,sun4i-
a10-
timer";
reg = <0x01c20c00 0x90>;
interrupts = <22>;
clocks = <&osc24M>;
reg = <0x01c20c00 0x90>;
interrupts = <22>;
clocks = <&osc24M>;
@@
-341,7
+341,7
@@
};
sid: eeprom@01c23800 {
};
sid: eeprom@01c23800 {
- compatible = "allwinner,sun4i-sid";
+ compatible = "allwinner,sun4i-
a10-
sid";
reg = <0x01c23800 0x10>;
};
reg = <0x01c23800 0x10>;
};