]> git.ipfire.org Git - thirdparty/openwrt.git/commitdiff
qualcommax: ipq50xx: backport upstreamed patches for adding ipq5018 GE PHY support
authorGeorge Moussalem <george.moussalem@outlook.com>
Tue, 19 Aug 2025 12:39:06 +0000 (16:39 +0400)
committerRobert Marko <robimarko@gmail.com>
Mon, 15 Sep 2025 08:29:41 +0000 (10:29 +0200)
Use upstreamed patch for adding driver support and the the mdio and phy
nodes.

Signed-off-by: George Moussalem <george.moussalem@outlook.com>
Link: https://github.com/openwrt/openwrt/pull/19890
Signed-off-by: Robert Marko <robimarko@gmail.com>
12 files changed:
target/linux/qualcommax/ipq50xx/config-default
target/linux/qualcommax/patches-6.12/0056-v6.17-clk-qcom-gcc-ipq5018-fix-GE-PHY-reset.patch [moved from target/linux/qualcommax/patches-6.12/0711-clk-qcom-gcc-ipq5018-fix-ge-phy-reset.patch with 71% similarity]
target/linux/qualcommax/patches-6.12/0057-v6.17-net-phy-qcom-at803x-Add-Qualcomm-IPQ5018-Internal-PHY-support.patch [moved from target/linux/qualcommax/patches-6.12/0712-net-phy-qcom-at803x-add-qualcomm-ipq5018-internal-phy-support.patch with 74% similarity]
target/linux/qualcommax/patches-6.12/0058-v6.18-arm64-dts-qcom-ipq5018-Add-MDIO-buses.patch [moved from target/linux/qualcommax/patches-6.12/0713-arm64-dts-qcom-ipq5018-add-mdio-buses.patch with 71% similarity]
target/linux/qualcommax/patches-6.12/0059-v6.18-arm64-dts-qcom-ipq5018-Add-GE-PHY-to-internal-mdio-bus.patch [moved from target/linux/qualcommax/patches-6.12/0714-arm64-dts-qcom-ipq5018-add-ge-phy-to-internal-mdio-bus.patch with 79% similarity]
target/linux/qualcommax/patches-6.12/0306-arm64-dts-qcom-ipq5018-Add-PWM-node.patch
target/linux/qualcommax/patches-6.12/0324-arm64-dts-qcom-ipq5018-Add-crypto-nodes.patch
target/linux/qualcommax/patches-6.12/0337-arm64-dts-qcom-ipq5018-Add-PRNG-node.patch
target/linux/qualcommax/patches-6.12/0339-arm64-dts-qcom-ipq5018-Add-QUP1-UART2-node.patch
target/linux/qualcommax/patches-6.12/0340-arm64-dts-qcom-ipq5018-Add-QUP3-I2C-node.patch
target/linux/qualcommax/patches-6.12/0421-arm64-dts-qcom-ipq5018-Add-SPI-nand-node.patch
target/linux/qualcommax/patches-6.12/0704-arm64-dts-qcom-ipq5018-Add-ethernet-cmn-node.patch

index 95cd5eb88d7352d251f4cfd58c4a661d078dabd1..ac3226363728fee07bb697bc674c3883099eb485 100644 (file)
@@ -1,7 +1,6 @@
 CONFIG_GPIO_WATCHDOG=y
 # CONFIG_GPIO_WATCHDOG_ARCH_INITCALL is not set
 CONFIG_GRO_CELLS=y
-CONFIG_IPQ5018_PHY=y
 CONFIG_IPQ_CMN_PLL=y
 CONFIG_IPQ_GCC_5018=y
 CONFIG_LEDS_PWM=y
similarity index 71%
rename from target/linux/qualcommax/patches-6.12/0711-clk-qcom-gcc-ipq5018-fix-ge-phy-reset.patch
rename to target/linux/qualcommax/patches-6.12/0056-v6.17-clk-qcom-gcc-ipq5018-fix-GE-PHY-reset.patch
index 72d86c67832660d5403d3e5c8fb20412497fadda..902ad425155d4be73c6ceda63ee2a638e9258c6c 100644 (file)
@@ -1,11 +1,7 @@
-From 19600588e6403ff9f6c1e985fc025afb9160a56f Mon Sep 17 00:00:00 2001
+From f6a4a55ae5d99f865e106916a9295548e381de47 Mon Sep 17 00:00:00 2001
 From: George Moussalem <george.moussalem@outlook.com>
-Date: Wed, 28 May 2025 08:37:25 +0400
-Subject: [PATCH v2 2/5] clk: qcom: gcc-ipq5018: fix GE PHY reset
-MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 7bit
-Message-Id: <20250528-ipq5018-ge-phy-v2-2-68fc3a8248dd@outlook.com>
+Date: Mon, 30 Jun 2025 16:35:00 +0400
+Subject: clk: qcom: gcc-ipq5018: fix GE PHY reset
 
 The MISC reset is supposed to trigger a resets across the MDC, DSP, and
 RX & TX clocks of the IPQ5018 internal GE PHY. So let's set the bitmask
@@ -14,11 +10,16 @@ driver.
 
 Link: https://git.codelinaro.org/clo/qsdk/oss/kernel/linux-ipq-5.4/-/commit/00743c3e82fa87cba4460e7a2ba32f473a9ce932
 
+Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
 Signed-off-by: George Moussalem <george.moussalem@outlook.com>
+Link: https://lore.kernel.org/r/20250630-ipq5018-ge-phy-v6-1-01be06378c15@outlook.com
+Signed-off-by: Bjorn Andersson <andersson@kernel.org>
 ---
  drivers/clk/qcom/gcc-ipq5018.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
+(limited to 'drivers/clk/qcom/gcc-ipq5018.c')
+
 --- a/drivers/clk/qcom/gcc-ipq5018.c
 +++ b/drivers/clk/qcom/gcc-ipq5018.c
 @@ -3660,7 +3660,7 @@ static const struct qcom_reset_map gcc_i
@@ -1,75 +1,39 @@
-From 9a89cb300c1ed5b90bae5684c88c85895a15c849 Mon Sep 17 00:00:00 2001
+From d46502279a11b48ede1d8bf65a229c8231bf0602 Mon Sep 17 00:00:00 2001
 From: George Moussalem <george.moussalem@outlook.com>
-Date: Mon, 02 Jun 2025 12:50:39 +0400
-Subject: [PATCH v3 3/5] net: phy: qcom: at803x: Add Qualcomm IPQ5018 Internal PHY support
-MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 7bit
-Message-Id: <20250602-ipq5018-ge-phy-v3-3-0d8f39f402a6@outlook.com>
+Date: Fri, 13 Jun 2025 05:55:08 +0400
+Subject: net: phy: qcom: at803x: Add Qualcomm IPQ5018 Internal PHY support
 
 The IPQ5018 SoC contains a single internal Gigabit Ethernet PHY which
 provides an MDI interface directly to an RJ45 connector or an external
 switch over a PHY to PHY link.
 
-The PHY supports 10/100/1000 mbps link modes, CDT, auto-negotiation and
-802.3az EEE.
+The PHY supports 10BASE-T/100BASE-TX/1000BASE-T link modes in SGMII
+interface mode, CDT, auto-negotiation and 802.3az EEE.
 
 Let's add support for this PHY in the at803x driver as it falls within
 the Qualcomm Atheros OUI.
 
+Reviewed-by: Andrew Lunn <andrew@lunn.ch>
 Signed-off-by: George Moussalem <george.moussalem@outlook.com>
+Link: https://patch.msgid.link/20250613-ipq5018-ge-phy-v5-2-9af06e34ea6b@outlook.com
+Signed-off-by: Jakub Kicinski <kuba@kernel.org>
 ---
- drivers/net/phy/qcom/Kconfig  |   2 +-
- drivers/net/phy/qcom/at803x.c | 185 ++++++++++++++++++++++++++++++++++++++++--
- 2 files changed, 178 insertions(+), 9 deletions(-)
+ drivers/net/phy/qcom/at803x.c | 167 ++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 167 insertions(+)
+
+(limited to 'drivers/net/phy/qcom/at803x.c')
 
---- a/drivers/net/phy/qcom/Kconfig
-+++ b/drivers/net/phy/qcom/Kconfig
-@@ -7,7 +7,7 @@ config AT803X_PHY
-       select QCOM_NET_PHYLIB
-       depends on REGULATOR
-       help
--        Currently supports the AR8030, AR8031, AR8033, AR8035 model
-+        Currently supports the AR8030, AR8031, AR8033, AR8035, IPQ5018 model
- config QCA83XX_PHY
-       tristate "Qualcomm Atheros QCA833x PHYs"
 --- a/drivers/net/phy/qcom/at803x.c
 +++ b/drivers/net/phy/qcom/at803x.c
-@@ -7,19 +7,24 @@
-  * Author: Matus Ujhelyi <ujhelyi.m@gmail.com>
-  */
--#include <linux/phy.h>
--#include <linux/module.h>
--#include <linux/string.h>
--#include <linux/netdevice.h>
-+#include <linux/bitfield.h>
-+#include <linux/clk.h>
-+#include <linux/clk-provider.h>
- #include <linux/etherdevice.h>
- #include <linux/ethtool_netlink.h>
--#include <linux/bitfield.h>
--#include <linux/regulator/of_regulator.h>
--#include <linux/regulator/driver.h>
--#include <linux/regulator/consumer.h>
-+#include <linux/mfd/syscon.h>
-+#include <linux/module.h>
-+#include <linux/netdevice.h>
+@@ -19,6 +19,7 @@
+ #include <linux/regulator/consumer.h>
  #include <linux/of.h>
-+#include <linux/phy.h>
  #include <linux/phylink.h>
-+#include <linux/regmap.h>
-+#include <linux/regulator/consumer.h>
-+#include <linux/regulator/driver.h>
-+#include <linux/regulator/of_regulator.h>
 +#include <linux/reset.h>
  #include <linux/sfp.h>
-+#include <linux/string.h>
  #include <dt-bindings/net/qca-ar803x.h>
  
- #include "qcom.h"
-@@ -93,6 +98,8 @@
+@@ -93,6 +94,8 @@
  #define ATH8035_PHY_ID                                0x004dd072
  #define AT8030_PHY_ID_MASK                    0xffffffef
  
@@ -78,7 +42,7 @@ Signed-off-by: George Moussalem <george.moussalem@outlook.com>
  #define QCA9561_PHY_ID                                0x004dd042
  
  #define AT803X_PAGE_FIBER                     0
-@@ -105,6 +112,50 @@
+@@ -105,6 +108,48 @@
  /* disable hibernation mode */
  #define AT803X_DISABLE_HIBERNATION_MODE               BIT(2)
  
@@ -95,8 +59,8 @@ Signed-off-by: George Moussalem <george.moussalem@outlook.com>
 +
 +#define IPQ5018_PHY_MMD1_MSE_THRESH1          0x1000
 +#define IPQ5018_PHY_MMD1_MSE_THRESH2          0x1001
-+#define IPQ5018_PHY_PCS_AZ_CTRL1              0x8008
-+#define IPQ5018_PHY_PCS_AZ_CTRL2              0x8009
++#define IPQ5018_PHY_PCS_EEE_TX_TIMER          0x8008
++#define IPQ5018_PHY_PCS_EEE_RX_TIMER          0x8009
 +#define IPQ5018_PHY_PCS_CDT_THRESH_CTRL3      0x8074
 +#define IPQ5018_PHY_PCS_CDT_THRESH_CTRL4      0x8075
 +#define IPQ5018_PHY_PCS_CDT_THRESH_CTRL5      0x8076
@@ -108,8 +72,8 @@ Signed-off-by: George Moussalem <george.moussalem@outlook.com>
 +
 +#define IPQ5018_PHY_MMD1_MSE_THRESH1_VAL      0xf1
 +#define IPQ5018_PHY_MMD1_MSE_THRESH2_VAL      0x1f6
-+#define IPQ5018_PHY_PCS_AZ_CTRL1_VAL          0x7880
-+#define IPQ5018_PHY_PCS_AZ_CTRL2_VAL          0xc8
++#define IPQ5018_PHY_PCS_EEE_TX_TIMER_VAL      0x7880
++#define IPQ5018_PHY_PCS_EEE_RX_TIMER_VAL      0xc8
 +#define IPQ5018_PHY_PCS_CDT_THRESH_CTRL3_VAL  0xc040
 +#define IPQ5018_PHY_PCS_CDT_THRESH_CTRL4_VAL  0xa060
 +#define IPQ5018_PHY_PCS_CDT_THRESH_CTRL5_VAL  0xc040
@@ -123,13 +87,11 @@ Signed-off-by: George Moussalem <george.moussalem@outlook.com>
 +#define IPQ5018_PHY_DEBUG_ANA_LDO_EFUSE_MASK  GENMASK(7, 4)
 +#define IPQ5018_PHY_DEBUG_ANA_LDO_EFUSE_DEFAULT       0x50
 +#define IPQ5018_PHY_DEBUG_ANA_DAC_FILTER      0xa080
-+
-+#define IPQ5018_TCSR_ETH_LDO_READY            BIT(0)
 +
  MODULE_DESCRIPTION("Qualcomm Atheros AR803x PHY driver");
  MODULE_AUTHOR("Matus Ujhelyi");
  MODULE_LICENSE("GPL");
-@@ -130,6 +181,11 @@ struct at803x_context {
+@@ -130,6 +175,11 @@ struct at803x_context {
        u16 led_control;
  };
  
@@ -141,7 +103,7 @@ Signed-off-by: George Moussalem <george.moussalem@outlook.com>
  static int at803x_write_page(struct phy_device *phydev, int page)
  {
        int mask;
-@@ -960,6 +1016,105 @@ static int at8035_probe(struct phy_devic
+@@ -960,6 +1010,109 @@ static int at8035_probe(struct phy_devic
        return at8035_parse_dt(phydev);
  }
  
@@ -171,7 +133,7 @@ Signed-off-by: George Moussalem <george.moussalem@outlook.com>
 +static int ipq5018_config_init(struct phy_device *phydev)
 +{
 +      struct ipq5018_priv *priv = phydev->priv;
-+      u16 val = 0;
++      u16 val;
 +
 +      /*
 +       * set LDO efuse: first temporarily store ANA_DAC_FILTER value from
@@ -184,11 +146,11 @@ Signed-off-by: George Moussalem <george.moussalem@outlook.com>
 +                            IPQ5018_PHY_DEBUG_ANA_LDO_EFUSE_DEFAULT);
 +      at803x_debug_reg_write(phydev, IPQ5018_PHY_DEBUG_ANA_DAC_FILTER, val);
 +
-+      /* set 8023AZ CTRL values */
-+      phy_write_mmd(phydev, MDIO_MMD_PCS, IPQ5018_PHY_PCS_AZ_CTRL1,
-+                    IPQ5018_PHY_PCS_AZ_CTRL1_VAL);
-+      phy_write_mmd(phydev, MDIO_MMD_PCS, IPQ5018_PHY_PCS_AZ_CTRL2,
-+                    IPQ5018_PHY_PCS_AZ_CTRL2_VAL);
++      /* set 8023AZ EEE TX and RX timer values */
++      phy_write_mmd(phydev, MDIO_MMD_PCS, IPQ5018_PHY_PCS_EEE_TX_TIMER,
++                    IPQ5018_PHY_PCS_EEE_TX_TIMER_VAL);
++      phy_write_mmd(phydev, MDIO_MMD_PCS, IPQ5018_PHY_PCS_EEE_RX_TIMER,
++                    IPQ5018_PHY_PCS_EEE_RX_TIMER_VAL);
 +
 +      /* set MSE threshold values */
 +      phy_write_mmd(phydev, MDIO_MMD_PMAPMD, IPQ5018_PHY_MMD1_MSE_THRESH1,
@@ -212,6 +174,10 @@ Signed-off-by: George Moussalem <george.moussalem@outlook.com>
 +
 +static void ipq5018_link_change_notify(struct phy_device *phydev)
 +{
++      /*
++       * Reset the FIFO buffer upon link disconnects to clear any residual data
++       * which may cause issues with the FIFO which it cannot recover from.
++       */
 +      mdiobus_modify_changed(phydev->mdio.bus, phydev->mdio.addr,
 +                             IPQ5018_PHY_FIFO_CONTROL, IPQ5018_PHY_FIFO_RESET,
 +                             phydev->link ? IPQ5018_PHY_FIFO_RESET : 0);
@@ -231,7 +197,7 @@ Signed-off-by: George Moussalem <george.moussalem@outlook.com>
 +                                                        "qcom,dac-preset-short-cable");
 +
 +      priv->rst = devm_reset_control_array_get_exclusive(dev);
-+      if (IS_ERR_OR_NULL(priv->rst))
++      if (IS_ERR(priv->rst))
 +              return dev_err_probe(dev, PTR_ERR(priv->rst),
 +                                   "failed to acquire reset\n");
 +
@@ -247,7 +213,7 @@ Signed-off-by: George Moussalem <george.moussalem@outlook.com>
  static struct phy_driver at803x_driver[] = {
  {
        /* Qualcomm Atheros AR8035 */
-@@ -1052,6 +1207,19 @@ static struct phy_driver at803x_driver[]
+@@ -1052,6 +1205,19 @@ static struct phy_driver at803x_driver[]
        .soft_reset             = genphy_soft_reset,
        .config_aneg            = at803x_config_aneg,
  }, {
@@ -267,7 +233,7 @@ Signed-off-by: George Moussalem <george.moussalem@outlook.com>
        /* Qualcomm Atheros QCA9561 */
        PHY_ID_MATCH_EXACT(QCA9561_PHY_ID),
        .name                   = "Qualcomm Atheros QCA9561 built-in PHY",
-@@ -1077,6 +1245,7 @@ static const struct mdio_device_id __may
+@@ -1077,6 +1243,7 @@ static const struct mdio_device_id __may
        { PHY_ID_MATCH_EXACT(ATH8032_PHY_ID) },
        { PHY_ID_MATCH_EXACT(ATH8035_PHY_ID) },
        { PHY_ID_MATCH_EXACT(ATH9331_PHY_ID) },
similarity index 71%
rename from target/linux/qualcommax/patches-6.12/0713-arm64-dts-qcom-ipq5018-add-mdio-buses.patch
rename to target/linux/qualcommax/patches-6.12/0058-v6.18-arm64-dts-qcom-ipq5018-Add-MDIO-buses.patch
index 81842e0dc5df87006351eb269b984664cb5f86eb..59f6bc2cc4745a9f81eb97b14865d4aebd7b36bf 100644 (file)
@@ -1,11 +1,7 @@
-From 97a159dd7747724619e54cb3460d9b8d4ed08be7 Mon Sep 17 00:00:00 2001
+From 1e2261a669a9596ba435c6fe524e026bac0f0e2f Mon Sep 17 00:00:00 2001
 From: George Moussalem <george.moussalem@outlook.com>
-Date: Mon, 02 Jun 2025 12:50:40 +0400
-Subject: [PATCH v3 4/5] arm64: dts: qcom: ipq5018: Add MDIO buses
-MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 7bit
-Message-Id: <20250602-ipq5018-ge-phy-v3-4-0d8f39f402a6@outlook.com>
+Date: Mon, 30 Jun 2025 16:35:01 +0400
+Subject: arm64: dts: qcom: ipq5018: Add MDIO buses
 
 IPQ5018 contains two mdio buses of which one bus is used to control the
 SoC's internal GE PHY, while the other bus is connected to external PHYs
@@ -16,13 +12,17 @@ simply add the mdio nodes for them.
 
 Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
 Signed-off-by: George Moussalem <george.moussalem@outlook.com>
+Link: https://lore.kernel.org/r/20250630-ipq5018-ge-phy-v6-2-01be06378c15@outlook.com
+Signed-off-by: Bjorn Andersson <andersson@kernel.org>
 ---
  arch/arm64/boot/dts/qcom/ipq5018.dtsi | 24 ++++++++++++++++++++++++
  1 file changed, 24 insertions(+)
 
+(limited to 'arch/arm64/boot/dts/qcom/ipq5018.dtsi')
+
 --- a/arch/arm64/boot/dts/qcom/ipq5018.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq5018.dtsi
-@@ -191,6 +191,30 @@
+@@ -185,6 +185,30 @@
                        status = "disabled";
                };
  
@@ -50,6 +50,6 @@ Signed-off-by: George Moussalem <george.moussalem@outlook.com>
 +                      status = "disabled";
 +              };
 +
-               cmn_pll: clock-controller@9b000 {
-                       compatible = "qcom,ipq9574-cmn-pll";
-                       reg = <0x0009b000 0x800>;
+               qfprom: qfprom@a0000 {
+                       compatible = "qcom,ipq5018-qfprom", "qcom,qfprom";
+                       reg = <0x000a0000 0x1000>;
similarity index 79%
rename from target/linux/qualcommax/patches-6.12/0714-arm64-dts-qcom-ipq5018-add-ge-phy-to-internal-mdio-bus.patch
rename to target/linux/qualcommax/patches-6.12/0059-v6.18-arm64-dts-qcom-ipq5018-Add-GE-PHY-to-internal-mdio-bus.patch
index 987a84ca2ede419de6c5cb790225708f8c5e33a5..e8d96b8e0a981cca03f14fc7024e774f1057f6cd 100644 (file)
@@ -1,11 +1,7 @@
-From 1b733e878ac1292c6e0f2e9a49685b80c35619b0 Mon Sep 17 00:00:00 2001
+From f5f2b835e316df29b89e28ed7e467df473932e8d Mon Sep 17 00:00:00 2001
 From: George Moussalem <george.moussalem@outlook.com>
-Date: Mon, 02 Jun 2025 12:50:41 +0400
-Subject: [PATCH v3 5/5] arm64: dts: qcom: ipq5018: Add GE PHY to internal mdio bus
-MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 7bit
-Message-Id: <20250602-ipq5018-ge-phy-v3-5-0d8f39f402a6@outlook.com>
+Date: Mon, 30 Jun 2025 16:35:02 +0400
+Subject: arm64: dts: qcom: ipq5018: Add GE PHY to internal mdio bus
 
 The IPQ5018 SoC contains an internal GE PHY, always at phy address 7.
 As such, let's add the GE PHY node to the SoC dtsi.
@@ -20,16 +16,20 @@ So let's create two DT fixed clocks and register them in the GCC node.
 
 Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
 Signed-off-by: George Moussalem <george.moussalem@outlook.com>
+Link: https://lore.kernel.org/r/20250630-ipq5018-ge-phy-v6-3-01be06378c15@outlook.com
+Signed-off-by: Bjorn Andersson <andersson@kernel.org>
 ---
  arch/arm64/boot/dts/qcom/ipq5018.dtsi | 26 +++++++++++++++++++++++---
  1 file changed, 23 insertions(+), 3 deletions(-)
 
+(limited to 'arch/arm64/boot/dts/qcom/ipq5018.dtsi')
+
 --- a/arch/arm64/boot/dts/qcom/ipq5018.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq5018.dtsi
-@@ -23,6 +23,18 @@
-                       #clock-cells = <0>;
-               };
+@@ -17,6 +17,18 @@
+       #size-cells = <2>;
  
+       clocks {
 +              gephy_rx_clk: gephy-rx-clk {
 +                      compatible = "fixed-clock";
 +                      clock-frequency = <125000000>;
@@ -45,7 +45,7 @@ Signed-off-by: George Moussalem <george.moussalem@outlook.com>
                sleep_clk: sleep-clk {
                        compatible = "fixed-clock";
                        #clock-cells = <0>;
-@@ -193,7 +205,8 @@
+@@ -187,7 +199,8 @@
  
                mdio0: mdio@88000 {
                        compatible = "qcom,ipq5018-mdio";
@@ -55,7 +55,7 @@ Signed-off-by: George Moussalem <george.moussalem@outlook.com>
                        #address-cells = <1>;
                        #size-cells = <0>;
  
-@@ -201,6 +214,13 @@
+@@ -195,6 +208,13 @@
                        clock-names = "gcc_mdio_ahb_clk";
  
                        status = "disabled";
@@ -69,7 +69,7 @@ Signed-off-by: George Moussalem <george.moussalem@outlook.com>
                };
  
                mdio1: mdio@90000 {
-@@ -395,8 +415,8 @@
+@@ -346,8 +366,8 @@
                                 <&pcie0_phy>,
                                 <&pcie1_phy>,
                                 <0>,
index b72f45ed3f097f9e9351dafffdc3ce7bb663245a..a0158f6c1ee95ee1be490e01d3134f04efb35a3c 100644 (file)
@@ -8,7 +8,7 @@ Signed-off-by: George Moussalem <george.moussalem@outlook.com>
 ---
 --- a/arch/arm64/boot/dts/qcom/ipq5018.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq5018.dtsi
-@@ -341,6 +341,16 @@
+@@ -385,6 +385,16 @@
                        reg = <0x01937000 0x21000>;
                };
  
index e20bde308d2183ce375871675497da046c554d73..de06d9424415651cbff9c5adcfa36274d6e33329 100644 (file)
@@ -8,7 +8,7 @@ Signed-off-by: George Moussalem <george.moussalem@outlook.com>
 ---
 --- a/arch/arm64/boot/dts/qcom/ipq5018.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq5018.dtsi
-@@ -296,6 +296,30 @@
+@@ -340,6 +340,30 @@
                        #thermal-sensor-cells = <1>;
                };
  
index 1343a61ea8003871fc5620d521a9862ab16d6a74..f1499158feaa85316a6320ef80223aff936a0f2e 100644 (file)
@@ -8,7 +8,7 @@ Signed-off-by: George Moussalem <george.moussalem@outlook.com>
 ---
 --- a/arch/arm64/boot/dts/qcom/ipq5018.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq5018.dtsi
-@@ -257,6 +257,14 @@
+@@ -301,6 +301,14 @@
                        };
                };
  
index de1df4579ba283833150ea8d889a4dc08a0e4be9..4b5fc5d32e9e177c1e3291b604e357ef082c776c 100644 (file)
@@ -8,7 +8,7 @@ Signed-off-by: George Moussalem <george.moussalem@outlook.com>
 ---
 --- a/arch/arm64/boot/dts/qcom/ipq5018.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq5018.dtsi
-@@ -420,6 +420,16 @@
+@@ -464,6 +464,16 @@
                        status = "disabled";
                };
  
index c8802806f5562865891c73ad3290c985f7918f48..24acc55cdb36cfa4a4ef5f28530ef850e09f2270 100644 (file)
@@ -8,7 +8,7 @@ Signed-off-by: George Moussalem <george.moussalem@outlook.com>
 ---
 --- a/arch/arm64/boot/dts/qcom/ipq5018.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq5018.dtsi
-@@ -444,6 +444,21 @@
+@@ -488,6 +488,21 @@
                        status = "disabled";
                };
  
index cc6df41db56cd27022a495510dde738a64225ca8..f7304f25a49623598577f36e406a7d74dd7bbc95 100644 (file)
@@ -13,7 +13,7 @@ Signed-off-by: George Moussalem <george.moussalem@outlook.com>
 
 --- a/arch/arm64/boot/dts/qcom/ipq5018.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq5018.dtsi
-@@ -459,6 +459,36 @@
+@@ -503,6 +503,36 @@
                        status = "disabled";
                };
  
index c831080bafd297e12418c2e47a889157bcf363b6..04508da2b7c07d721c4c4979fd4f9dc83ad3edf9 100644 (file)
@@ -20,10 +20,10 @@ Signed-off-by: Ziyang Huang <hzyitc@outlook.com>
 +                      #clock-cells = <0>;
 +              };
 +
-               sleep_clk: sleep-clk {
+               gephy_rx_clk: gephy-rx-clk {
                        compatible = "fixed-clock";
-                       #clock-cells = <0>;
-@@ -185,6 +191,17 @@
+                       clock-frequency = <125000000>;
+@@ -229,6 +235,17 @@
                        status = "disabled";
                };