Skip to content

Commit

Permalink
Merge tag 'sunxi-fixes-for-3.8-rc4' of git://github.com/mripard/linux…
Browse files Browse the repository at this point in the history
… 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
  • Loading branch information
Olof Johansson committed Jan 16, 2013
2 parents 6960d46 + 1bea07f commit ad6f276
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions arch/arm/boot/dts/sunxi.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -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";
};
Expand Down

0 comments on commit ad6f276

Please sign in to comment.