aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-01-16 12:27:47 -0800
committerOlof Johansson <olof@lixom.net>2013-01-16 12:27:47 -0800
commitad6f27617317bd4343759a95b1f69c11a766d09a (patch)
tree3e32a5cf6c391bddae21c10ce1174ff2ec8690d2 /arch/arm
parent6960d46a88477c1a8404d225a21331131c5113c2 (diff)
parent1bea07f16da0d77689cda7abe73939dd1dfdea22 (diff)
Merge tag 'sunxi-fixes-for-3.8-rc4' of git://github.com/mripard/linux into fixes
From Maxime Ripard: Sunxi dt fixes for 3.8-rc's * tag 'sunxi-fixes-for-3.8-rc4' of git://github.com/mripard/linux: ARM: sunxi: Use the Synosys APB UART instead of ns8250
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/sunxi.dtsi6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/sunxi.dtsi b/arch/arm/boot/dts/sunxi.dtsi
index 8bbc2bfef22..8b36abea9f2 100644
--- a/arch/arm/boot/dts/sunxi.dtsi
+++ b/arch/arm/boot/dts/sunxi.dtsi
@@ -60,19 +60,21 @@
};
uart0: uart@01c28000 {
- compatible = "ns8250";
+ compatible = "snps,dw-apb-uart";
reg = <0x01c28000 0x400>;
interrupts = <1>;
reg-shift = <2>;
+ reg-io-width = <4>;
clock-frequency = <24000000>;
status = "disabled";
};
uart1: uart@01c28400 {
- compatible = "ns8250";
+ compatible = "snps,dw-apb-uart";
reg = <0x01c28400 0x400>;
interrupts = <2>;
reg-shift = <2>;
+ reg-io-width = <4>;
clock-frequency = <24000000>;
status = "disabled";
};