diff options
author | Yangbo Lu <yangbo.lu@nxp.com> | 2020-04-10 10:47:05 +0800 |
---|---|---|
committer | Petr Štetiar <ynezz@true.cz> | 2020-05-07 12:53:06 +0200 |
commit | cddd4591404fb4c53dc0b3c0b15b942cdbed4356 (patch) | |
tree | 392c1179de46b0f804e3789edca19069b64e6b44 /target/linux/layerscape/patches-5.4/701-net-0279-enetc-Set-MDIO_CFG_HOLD-to-the-recommended-value-of-.patch | |
parent | d1d2c0b5579ea4f69a42246c9318539d61ba1999 (diff) | |
download | upstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.tar.gz upstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.tar.bz2 upstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.zip |
layerscape: add patches-5.4
Add patches for linux-5.4. The patches are from NXP LSDK-20.04 release
which was tagged LSDK-20.04-V5.4.
https://source.codeaurora.org/external/qoriq/qoriq-components/linux/
For boards LS1021A-IOT, and Traverse-LS1043 which are not involved in
LSDK, port the dts patches from 4.14.
The patches are sorted into the following categories:
301-arch-xxxx
302-dts-xxxx
303-core-xxxx
701-net-xxxx
801-audio-xxxx
802-can-xxxx
803-clock-xxxx
804-crypto-xxxx
805-display-xxxx
806-dma-xxxx
807-gpio-xxxx
808-i2c-xxxx
809-jailhouse-xxxx
810-keys-xxxx
811-kvm-xxxx
812-pcie-xxxx
813-pm-xxxx
814-qe-xxxx
815-sata-xxxx
816-sdhc-xxxx
817-spi-xxxx
818-thermal-xxxx
819-uart-xxxx
820-usb-xxxx
821-vfio-xxxx
Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
Diffstat (limited to 'target/linux/layerscape/patches-5.4/701-net-0279-enetc-Set-MDIO_CFG_HOLD-to-the-recommended-value-of-.patch')
-rw-r--r-- | target/linux/layerscape/patches-5.4/701-net-0279-enetc-Set-MDIO_CFG_HOLD-to-the-recommended-value-of-.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/target/linux/layerscape/patches-5.4/701-net-0279-enetc-Set-MDIO_CFG_HOLD-to-the-recommended-value-of-.patch b/target/linux/layerscape/patches-5.4/701-net-0279-enetc-Set-MDIO_CFG_HOLD-to-the-recommended-value-of-.patch new file mode 100644 index 0000000000..02ead2712f --- /dev/null +++ b/target/linux/layerscape/patches-5.4/701-net-0279-enetc-Set-MDIO_CFG_HOLD-to-the-recommended-value-of-.patch @@ -0,0 +1,58 @@ +From 5961ca6738507031a64f8580ceb8ab0b630d47a5 Mon Sep 17 00:00:00 2001 +From: Vladimir Oltean <vladimir.oltean@nxp.com> +Date: Wed, 27 Nov 2019 19:21:13 +0200 +Subject: [PATCH] enetc: Set MDIO_CFG_HOLD to the recommended value of 2 + +This increases the MDIO hold time to 5 enet_clk cycles from the previous +value of 0. This is actually the out-of-reset value, that the driver was +previously overwriting with 0. Zero worked for the external MDIO, but +breaks communication with the internal MDIO buses on which the PCS of +ENETC SI's and Felix switch are found. + +Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> +--- + drivers/net/ethernet/freescale/enetc/enetc_mdio.c | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +--- a/drivers/net/ethernet/freescale/enetc/enetc_mdio.c ++++ b/drivers/net/ethernet/freescale/enetc/enetc_mdio.c +@@ -31,15 +31,19 @@ static inline void _enetc_mdio_wr(struct + _enetc_mdio_wr(mdio_priv, ENETC_##off, val) + #define enetc_mdio_rd_reg(off) enetc_mdio_rd(mdio_priv, off) + +-#define ENETC_MDC_DIV 258 +- + #define MDIO_CFG_CLKDIV(x) ((((x) >> 1) & 0xff) << 8) + #define MDIO_CFG_BSY BIT(0) + #define MDIO_CFG_RD_ER BIT(1) ++#define MDIO_CFG_HOLD(x) (((x) << 2) & GENMASK(4, 2)) + #define MDIO_CFG_ENC45 BIT(6) + /* external MDIO only - driven on neg MDC edge */ + #define MDIO_CFG_NEG BIT(23) + ++#define ENETC_EMDIO_CFG \ ++ (MDIO_CFG_HOLD(2) | \ ++ MDIO_CFG_CLKDIV(258) | \ ++ MDIO_CFG_NEG) ++ + #define MDIO_CTL_DEV_ADDR(x) ((x) & 0x1f) + #define MDIO_CTL_PORT_ADDR(x) (((x) & 0x1f) << 5) + #define MDIO_CTL_READ BIT(15) +@@ -61,7 +65,7 @@ int enetc_mdio_write(struct mii_bus *bus + u16 dev_addr; + int ret; + +- mdio_cfg = MDIO_CFG_CLKDIV(ENETC_MDC_DIV) | MDIO_CFG_NEG; ++ mdio_cfg = ENETC_EMDIO_CFG; + if (regnum & MII_ADDR_C45) { + dev_addr = (regnum >> 16) & 0x1f; + mdio_cfg |= MDIO_CFG_ENC45; +@@ -108,7 +112,7 @@ int enetc_mdio_read(struct mii_bus *bus, + u16 dev_addr, value; + int ret; + +- mdio_cfg = MDIO_CFG_CLKDIV(ENETC_MDC_DIV) | MDIO_CFG_NEG; ++ mdio_cfg = ENETC_EMDIO_CFG; + if (regnum & MII_ADDR_C45) { + dev_addr = (regnum >> 16) & 0x1f; + mdio_cfg |= MDIO_CFG_ENC45; |