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

Commit db695b5e authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v4.1-next-dts' of https://github.com/mbgg/linux-mediatek into next/dt 

Merge "ARM: mediatek: dts updates for v4.2" from Matthias Brugger:
- dts: add pinctrl/GPIO/EINT to mt8135
- dts: fix uart address for mt8127

* tag 'v4.1-next-dts' of https://github.com/mbgg/linux-mediatek:
  ARM: dts: mt8127: correct uart instance address
  ARM: dts: mt8135: Add pinctrl/GPIO/EINT node for mt8135.
parents 0258b15d 7d580545

arch/arm/boot/dts/mt8127.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ 
			      <0 0x10216000 0 0x2000>;

		};



		uart0: serial@11006000 {

		uart0: serial@11002000 {

			compatible = "mediatek,mt8127-uart","mediatek,mt6577-uart";

			reg = <0 0x11002000 0 0x400>;

			interrupts = <GIC_SPI 51 IRQ_TYPE_LEVEL_LOW>;
@@ -115,7 +115,7 @@ 
			status = "disabled";

		};



		uart1: serial@11007000 {

		uart1: serial@11003000 {

			compatible = "mediatek,mt8127-uart","mediatek,mt6577-uart";

			reg = <0 0x11003000 0 0x400>;

			interrupts = <GIC_SPI 52 IRQ_TYPE_LEVEL_LOW>;
@@ -123,7 +123,7 @@ 
			status = "disabled";

		};



		uart2: serial@11008000 {

		uart2: serial@11004000 {

			compatible = "mediatek,mt8127-uart","mediatek,mt6577-uart";

			reg = <0 0x11004000 0 0x400>;

			interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_LOW>;
@@ -131,7 +131,7 @@ 
			status = "disabled";

		};



		uart3: serial@11009000 {

		uart3: serial@11005000 {

			compatible = "mediatek,mt8127-uart","mediatek,mt6577-uart";

			reg = <0 0x11005000 0 0x400>;

			interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_LOW>;