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>
35 lines
1.5 KiB
Diff
35 lines
1.5 KiB
Diff
From b022befd58e4f7306069c6d9831179e0c3a9b1b1 Mon Sep 17 00:00:00 2001
|
|
From: Yangbo Lu <yangbo.lu@nxp.com>
|
|
Date: Sat, 17 Jun 2017 16:16:58 +0800
|
|
Subject: [PATCH] dpaa_eth: use ptp-timer phandle instead of ptimer-handle
|
|
|
|
Layerscape DPAA platforms have updated dts to use ptp-timer phandle
|
|
instead of ptimer-handle for Fman RTC node. This patch is to
|
|
update it in driver.
|
|
|
|
Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
|
---
|
|
drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_common.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_common.c
|
|
+++ b/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_common.c
|
|
@@ -575,7 +575,7 @@ dpa_mac_probe(struct platform_device *_o
|
|
}
|
|
|
|
#ifdef CONFIG_FSL_DPAA_1588
|
|
- phandle_prop = of_get_property(mac_node, "ptimer-handle", &lenp);
|
|
+ phandle_prop = of_get_property(mac_node, "ptp-timer", &lenp);
|
|
if (phandle_prop && ((mac_dev->phy_if != PHY_INTERFACE_MODE_SGMII) ||
|
|
((mac_dev->phy_if == PHY_INTERFACE_MODE_SGMII) &&
|
|
(mac_dev->speed == SPEED_1000)))) {
|
|
@@ -595,7 +595,7 @@ dpa_mac_probe(struct platform_device *_o
|
|
if ((mac_dev->phy_if != PHY_INTERFACE_MODE_SGMII) ||
|
|
((mac_dev->phy_if == PHY_INTERFACE_MODE_SGMII) &&
|
|
(mac_dev->speed == SPEED_1000))) {
|
|
- ptp_priv.node = of_parse_phandle(mac_node, "ptimer-handle", 0);
|
|
+ ptp_priv.node = of_parse_phandle(mac_node, "ptp-timer", 0);
|
|
if (ptp_priv.node) {
|
|
ptp_priv.of_dev = of_find_device_by_node(ptp_priv.node);
|
|
if (unlikely(ptp_priv.of_dev == NULL)) {
|