cddd459140
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>
31 lines
1.2 KiB
Diff
31 lines
1.2 KiB
Diff
From 3343551eb8a692aafcbf1a7eaf0b79965aa60ba9 Mon Sep 17 00:00:00 2001
|
|
From: Madalin Bucur <madalin.bucur@nxp.com>
|
|
Date: Wed, 16 Oct 2019 11:53:54 +0300
|
|
Subject: [PATCH] sdk_dpa: align to upstream PHY_INTERFACE_MODE
|
|
|
|
Signed-off-by: Madalin Bucur <madalin.bucur@nxp.com>
|
|
---
|
|
drivers/net/ethernet/freescale/sdk_dpaa/mac.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/freescale/sdk_dpaa/mac.c
|
|
+++ b/drivers/net/ethernet/freescale/sdk_dpaa/mac.c
|
|
@@ -76,7 +76,7 @@ static const char phy_str[][11] = {
|
|
[PHY_INTERFACE_MODE_RGMII_TXID] = "rgmii-txid",
|
|
[PHY_INTERFACE_MODE_RTBI] = "rtbi",
|
|
[PHY_INTERFACE_MODE_XGMII] = "xgmii",
|
|
- [PHY_INTERFACE_MODE_2500SGMII] = "sgmii-2500",
|
|
+ [PHY_INTERFACE_MODE_2500BASEX] = "sgmii-2500",
|
|
};
|
|
|
|
static phy_interface_t __pure __attribute__((nonnull)) str2phy(const char *str)
|
|
@@ -103,7 +103,7 @@ static const uint16_t phy2speed[] = {
|
|
[PHY_INTERFACE_MODE_RGMII_TXID] = SPEED_1000,
|
|
[PHY_INTERFACE_MODE_RTBI] = SPEED_1000,
|
|
[PHY_INTERFACE_MODE_XGMII] = SPEED_10000,
|
|
- [PHY_INTERFACE_MODE_2500SGMII] = SPEED_2500,
|
|
+ [PHY_INTERFACE_MODE_2500BASEX] = SPEED_2500,
|
|
};
|
|
|
|
static struct mac_device * __cold
|