diff options
| author | Olof Johansson <olof@lixom.net> | 2013-01-16 15:27:47 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-16 15:27:47 -0500 |
| commit | ad6f27617317bd4343759a95b1f69c11a766d09a (patch) | |
| tree | 3e32a5cf6c391bddae21c10ce1174ff2ec8690d2 | |
| parent | 6960d46a88477c1a8404d225a21331131c5113c2 (diff) | |
| parent | 1bea07f16da0d77689cda7abe73939dd1dfdea22 (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
| -rw-r--r-- | arch/arm/boot/dts/sunxi.dtsi | 6 |
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 @@ | |||
| 60 | }; | 60 | }; |
| 61 | 61 | ||
| 62 | uart0: uart@01c28000 { | 62 | uart0: uart@01c28000 { |
| 63 | compatible = "ns8250"; | 63 | compatible = "snps,dw-apb-uart"; |
| 64 | reg = <0x01c28000 0x400>; | 64 | reg = <0x01c28000 0x400>; |
| 65 | interrupts = <1>; | 65 | interrupts = <1>; |
| 66 | reg-shift = <2>; | 66 | reg-shift = <2>; |
| 67 | reg-io-width = <4>; | ||
| 67 | clock-frequency = <24000000>; | 68 | clock-frequency = <24000000>; |
| 68 | status = "disabled"; | 69 | status = "disabled"; |
| 69 | }; | 70 | }; |
| 70 | 71 | ||
| 71 | uart1: uart@01c28400 { | 72 | uart1: uart@01c28400 { |
| 72 | compatible = "ns8250"; | 73 | compatible = "snps,dw-apb-uart"; |
| 73 | reg = <0x01c28400 0x400>; | 74 | reg = <0x01c28400 0x400>; |
| 74 | interrupts = <2>; | 75 | interrupts = <2>; |
| 75 | reg-shift = <2>; | 76 | reg-shift = <2>; |
| 77 | reg-io-width = <4>; | ||
| 76 | clock-frequency = <24000000>; | 78 | clock-frequency = <24000000>; |
| 77 | status = "disabled"; | 79 | status = "disabled"; |
| 78 | }; | 80 | }; |
