Merge tag 'v3.8-rc5' into next/cleanup

Linux 3.8-rc5

Signed-off-by: Olof Johansson <olof@lixom.net>

1 files changed, 4 insertions, 2 deletions

diff --git a/arch/arm/boot/dts/sunxi.dtsi b/arch/arm/boot/dts/sunxi.dtsi
index 8bbc2bfef221..8b36abea9f2e 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";
                 };