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

Commit 552c497c authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'sunxi-fixes-for-4.13-2' of... 

Merge tag 'sunxi-fixes-for-4.13-2' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into fixes

Pull "Allwinner fixes for 4.13, round 2" from Chen-Yu Tsai:

Three fixes adding a missing alias for the Ethernet controller on A64
boards. One adding a missing interrupt for the pin controller.

* tag 'sunxi-fixes-for-4.13-2' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  arm64: allwinner: h5: fix pinctrl IRQs
  arm64: allwinner: a64: sopine: add missing ethernet0 alias
  arm64: allwinner: a64: pine64: add missing ethernet0 alias
  arm64: allwinner: a64: bananapi-m64: add missing ethernet0 alias
parents 872784bf d86e63e1

arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ 
	compatible = "sinovoip,bananapi-m64", "allwinner,sun50i-a64";



	aliases {

		ethernet0 = &emac;

		serial0 = &uart0;

		serial1 = &uart1;

	};

arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ 
	compatible = "pine64,pine64", "allwinner,sun50i-a64";



	aliases {

		ethernet0 = &emac;

		serial0 = &uart0;

		serial1 = &uart1;

		serial2 = &uart2;

arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 
		     "allwinner,sun50i-a64";



	aliases {

		ethernet0 = &emac;

		serial0 = &uart0;

	};

arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi

+3 −0
Original line number Diff line number Diff line
@@ -120,5 +120,8 @@ 
};



&pio {

	interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>,

		     <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>,

		     <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;

	compatible = "allwinner,sun50i-h5-pinctrl";

};