summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/sunxi.dtsi
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-02-01 10:22:47 +0400
committerTakashi Iwai <tiwai@suse.de>2013-02-01 10:22:47 +0400
commit8058e14259ddc8c1824387198fc53700ed4cccc9 (patch)
treefaffb83ca5173e5f3cbfd4170de603ada4812e23 /arch/arm/boot/dts/sunxi.dtsi
parent9ddf1aeb2134e72275c97a2c6ff2e3eb04f2f27a (diff)
parent7da58046482fceb17c4a0d4afefd9507ec56de7f (diff)
downloadlinux-8058e14259ddc8c1824387198fc53700ed4cccc9.tar.xz
Merge branch 'usb-audio-fix' of git://git.alsa-project.org/alsa-kprivate into for-linus
Diffstat (limited to 'arch/arm/boot/dts/sunxi.dtsi')
-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 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";
};