Commit 713bb31c authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'amlogic-fixes' of... 

Merge tag 'amlogic-fixes' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into fixes

Amlogic fixes for v4.16-rc1
- DT: fix UART address ranges
- DT: enable PHY interrupts

* tag 'amlogic-fixes' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
  ARM64: dts: meson: uart: fix address space range
  ARM64: dts: meson-gxl: add internal ethernet PHY irq
parents e2c8d283 77f5cdbd

arch/arm64/boot/dts/amlogic/meson-axg.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -165,14 +165,14 @@ spicc1: spi@15000 { 


			uart_A: serial@24000 {

				compatible = "amlogic,meson-gx-uart", "amlogic,meson-uart";

				reg = <0x0 0x24000 0x0 0x14>;

				reg = <0x0 0x24000 0x0 0x18>;

				interrupts = <GIC_SPI 26 IRQ_TYPE_EDGE_RISING>;

				status = "disabled";

			};



			uart_B: serial@23000 {

				compatible = "amlogic,meson-gx-uart", "amlogic,meson-uart";

				reg = <0x0 0x23000 0x0 0x14>;

				reg = <0x0 0x23000 0x0 0x18>;

				interrupts = <GIC_SPI 75 IRQ_TYPE_EDGE_RISING>;

				status = "disabled";

			};

arch/arm64/boot/dts/amlogic/meson-gx.dtsi

+5 −5
Original line number Diff line number Diff line
@@ -235,14 +235,14 @@ reset: reset-controller@4404 { 


			uart_A: serial@84c0 {

				compatible = "amlogic,meson-gx-uart";

				reg = <0x0 0x84c0 0x0 0x14>;

				reg = <0x0 0x84c0 0x0 0x18>;

				interrupts = <GIC_SPI 26 IRQ_TYPE_EDGE_RISING>;

				status = "disabled";

			};



			uart_B: serial@84dc {

				compatible = "amlogic,meson-gx-uart";

				reg = <0x0 0x84dc 0x0 0x14>;

				reg = <0x0 0x84dc 0x0 0x18>;

				interrupts = <GIC_SPI 75 IRQ_TYPE_EDGE_RISING>;

				status = "disabled";

			};
@@ -287,7 +287,7 @@ pwm_ef: pwm@86c0 { 


			uart_C: serial@8700 {

				compatible = "amlogic,meson-gx-uart";

				reg = <0x0 0x8700 0x0 0x14>;

				reg = <0x0 0x8700 0x0 0x18>;

				interrupts = <GIC_SPI 93 IRQ_TYPE_EDGE_RISING>;

				status = "disabled";

			};
@@ -404,14 +404,14 @@ sec_AO: ao-secure@140 { 


			uart_AO: serial@4c0 {

				compatible = "amlogic,meson-gx-uart", "amlogic,meson-ao-uart";

				reg = <0x0 0x004c0 0x0 0x14>;

				reg = <0x0 0x004c0 0x0 0x18>;

				interrupts = <GIC_SPI 193 IRQ_TYPE_EDGE_RISING>;

				status = "disabled";

			};



			uart_AO_B: serial@4e0 {

				compatible = "amlogic,meson-gx-uart", "amlogic,meson-ao-uart";

				reg = <0x0 0x004e0 0x0 0x14>;

				reg = <0x0 0x004e0 0x0 0x18>;

				interrupts = <GIC_SPI 197 IRQ_TYPE_EDGE_RISING>;

				status = "disabled";

			};

arch/arm64/boot/dts/amlogic/meson-gxl.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -631,6 +631,7 @@ internal_mdio: mdio@e40908ff { 


			internal_phy: ethernet-phy@8 {

				compatible = "ethernet-phy-id0181.4400", "ethernet-phy-ieee802.3-c22";

				interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;

				reg = <8>;

				max-speed = <100>;

			};