| b.liu | e958203 | 2025-04-17 19:18:16 +0800 | [diff] [blame] | 1 | From 3fa6171fbe38125b2841d7947e976b172db47c45 Mon Sep 17 00:00:00 2001 |
| 2 | From: Yangbo Lu <yangbo.lu@nxp.com> |
| 3 | Date: Wed, 5 Sep 2018 14:50:10 +0800 |
| 4 | Subject: [PATCH] fmd: use "fsl,fman-ptp-timer" compatible for ptp probe |
| 5 | |
| 6 | Current ptp compatible "fsl,fman-rtc" used for ptp probe |
| 7 | in fmd driver couldn't involve PowerPC DPAA FMan PTP timer. |
| 8 | Let's use "fsl,fman-ptp-timer" instead to support DPAA FMan |
| 9 | PTP timer of both ARM and PowerPC. |
| 10 | |
| 11 | Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> |
| 12 | --- |
| 13 | drivers/net/ethernet/freescale/sdk_fman/src/wrapper/lnxwrp_fm.c | 6 +++--- |
| 14 | 1 file changed, 3 insertions(+), 3 deletions(-) |
| 15 | |
| 16 | --- a/drivers/net/ethernet/freescale/sdk_fman/src/wrapper/lnxwrp_fm.c |
| 17 | +++ b/drivers/net/ethernet/freescale/sdk_fman/src/wrapper/lnxwrp_fm.c |
| 18 | @@ -687,9 +687,9 @@ static t_LnxWrpFmDev * ReadFmDevTreeNode |
| 19 | if (WARN_ON(strlen("ptp-timer") >= sizeof(ids[0].name))) |
| 20 | return NULL; |
| 21 | strcpy(ids[0].name, "ptp-timer"); |
| 22 | - if (WARN_ON(strlen("fsl,fman-rtc") >= sizeof(ids[0].compatible))) |
| 23 | + if (WARN_ON(strlen("fsl,fman-ptp-timer") >= sizeof(ids[0].compatible))) |
| 24 | return NULL; |
| 25 | - strcpy(ids[0].compatible, "fsl,fman-rtc"); |
| 26 | + strcpy(ids[0].compatible, "fsl,fman-ptp-timer"); |
| 27 | for_each_child_of_node(fm_node, dev_node) { |
| 28 | if (likely(of_match_node(ids, dev_node) != NULL)) { |
| 29 | _errno = of_address_to_resource(dev_node, 0, &res); |
| 30 | @@ -920,7 +920,7 @@ static t_Error ConfigureFmDev(t_LnxWrpFm |
| 31 | |
| 32 | if (p_LnxWrpFmDev->fmRtcPhysBaseAddr) |
| 33 | { |
| 34 | - dev_res = __devm_request_region(p_LnxWrpFmDev->dev, p_LnxWrpFmDev->res, p_LnxWrpFmDev->fmRtcPhysBaseAddr, p_LnxWrpFmDev->fmRtcMemSize, "fman-rtc"); |
| 35 | + dev_res = __devm_request_region(p_LnxWrpFmDev->dev, p_LnxWrpFmDev->res, p_LnxWrpFmDev->fmRtcPhysBaseAddr, p_LnxWrpFmDev->fmRtcMemSize, "fman-ptp-timer"); |
| 36 | if (unlikely(dev_res == NULL)) |
| 37 | RETURN_ERROR(MAJOR, E_INVALID_STATE, ("__devm_request_region() failed")); |
| 38 | |