kernel: bump 5.4 to 5.4.111
[openwrt/openwrt.git] / target / linux / layerscape / patches-5.4 / 701-net-0016-dpaa_eth-use-ptp-timer-phandle-instead-of-ptimer-han.patch
1 From b022befd58e4f7306069c6d9831179e0c3a9b1b1 Mon Sep 17 00:00:00 2001
2 From: Yangbo Lu <yangbo.lu@nxp.com>
3 Date: Sat, 17 Jun 2017 16:16:58 +0800
4 Subject: [PATCH] dpaa_eth: use ptp-timer phandle instead of ptimer-handle
5
6 Layerscape DPAA platforms have updated dts to use ptp-timer phandle
7 instead of ptimer-handle for Fman RTC node. This patch is to
8 update it in driver.
9
10 Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
11 ---
12 drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_common.c | 4 ++--
13 1 file changed, 2 insertions(+), 2 deletions(-)
14
15 --- a/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_common.c
16 +++ b/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_common.c
17 @@ -575,7 +575,7 @@ dpa_mac_probe(struct platform_device *_o
18 }
19
20 #ifdef CONFIG_FSL_DPAA_1588
21 - phandle_prop = of_get_property(mac_node, "ptimer-handle", &lenp);
22 + phandle_prop = of_get_property(mac_node, "ptp-timer", &lenp);
23 if (phandle_prop && ((mac_dev->phy_if != PHY_INTERFACE_MODE_SGMII) ||
24 ((mac_dev->phy_if == PHY_INTERFACE_MODE_SGMII) &&
25 (mac_dev->speed == SPEED_1000)))) {
26 @@ -595,7 +595,7 @@ dpa_mac_probe(struct platform_device *_o
27 if ((mac_dev->phy_if != PHY_INTERFACE_MODE_SGMII) ||
28 ((mac_dev->phy_if == PHY_INTERFACE_MODE_SGMII) &&
29 (mac_dev->speed == SPEED_1000))) {
30 - ptp_priv.node = of_parse_phandle(mac_node, "ptimer-handle", 0);
31 + ptp_priv.node = of_parse_phandle(mac_node, "ptp-timer", 0);
32 if (ptp_priv.node) {
33 ptp_priv.of_dev = of_find_device_by_node(ptp_priv.node);
34 if (unlikely(ptp_priv.of_dev == NULL)) {