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

3 files changed, 8 insertions, 7 deletions

diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
index a80632641b39..70c776ef7aa7 100644
--- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
@@ -165,14 +165,14 @@
 
                         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";
                         };
diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
index 6cb3c2a52baf..4ee2e7951482 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
@@ -235,14 +235,14 @@
 
                         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 @@
 
                         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 @@
 
                         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";
                         };
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
index 4f355f17eed6..c8514110b9da 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
@@ -631,6 +631,7 @@
 
                         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>;
                         };