Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad6f2761 authored by Olof Johansson's avatar Olof Johansson
Browse files

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
parents 6960d46a 1bea07f1

arch/arm/boot/dts/sunxi.dtsi

+4 −2
Original line number Original line Diff line number Diff line
@@ -60,19 +60,21 @@ 
		};

		};





		uart0: uart@01c28000 {

		uart0: uart@01c28000 {

			compatible = "ns8250";

			compatible = "snps,dw-apb-uart";

			reg = <0x01c28000 0x400>;

			reg = <0x01c28000 0x400>;

			interrupts = <1>;

			interrupts = <1>;

			reg-shift = <2>;

			reg-shift = <2>;

			reg-io-width = <4>;

			clock-frequency = <24000000>;

			clock-frequency = <24000000>;

			status = "disabled";

			status = "disabled";

		};

		};





		uart1: uart@01c28400 {

		uart1: uart@01c28400 {

			compatible = "ns8250";

			compatible = "snps,dw-apb-uart";

			reg = <0x01c28400 0x400>;

			reg = <0x01c28400 0x400>;

			interrupts = <2>;

			interrupts = <2>;

			reg-shift = <2>;

			reg-shift = <2>;

			reg-io-width = <4>;

			clock-frequency = <24000000>;

			clock-frequency = <24000000>;

			status = "disabled";

			status = "disabled";

		};

		};