diff options
| author | Yangbo Lu <yangbo.lu@freescale.com> | 2015-03-18 09:35:45 (GMT) |
|---|---|---|
| committer | Honghua Yin <Hong-Hua.Yin@freescale.com> | 2015-03-23 02:46:29 (GMT) |
| commit | d3c5a53142adb4ab63124db696c3428bc3c96de9 (patch) | |
| tree | 75aa42ee1ef7b1425b8a9686ce450b7738cb7a38 /drivers/net/ethernet/freescale/dpa | |
| parent | 829d5b2f7f643fa0a5a0aa67f3c4a69d07544c87 (diff) | |
| download | linux-fsl-qoriq-d3c5a53142adb4ab63124db696c3428bc3c96de9.tar.xz | |
dpaa_eth: fix compile error when selecting 1588 config
Signed-off-by: Yangbo Lu <yangbo.lu@freescale.com>
Change-Id: I56995d4297e8b1001dc8089ae650604dea311428
Reviewed-on: http://git.am.freescale.net:8181/32977
Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com>
Reviewed-by: Honghua Yin <Hong-Hua.Yin@freescale.com>
Diffstat (limited to 'drivers/net/ethernet/freescale/dpa')
| -rw-r--r-- | drivers/net/ethernet/freescale/dpa/dpaa_eth_common.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/net/ethernet/freescale/dpa/dpaa_eth_common.c b/drivers/net/ethernet/freescale/dpa/dpaa_eth_common.c index 6e12a81..8164383 100644 --- a/drivers/net/ethernet/freescale/dpa/dpaa_eth_common.c +++ b/drivers/net/ethernet/freescale/dpa/dpaa_eth_common.c @@ -552,10 +552,15 @@ dpa_mac_probe(struct platform_device *_of_dev) struct mac_device *mac_dev; #ifdef CONFIG_FSL_DPAA_1588 int lenp; + const phandle *phandle_prop; struct net_device *net_dev = NULL; struct dpa_priv_s *priv = NULL; struct device_node *timer_node; #endif +#ifdef CONFIG_PTP_1588_CLOCK_DPAA + int lenp_ptp; + const phandle *phandle_ptp; +#endif dpa_dev = &_of_dev->dev; @@ -601,11 +606,11 @@ dpa_mac_probe(struct platform_device *_of_dev) #endif #ifdef CONFIG_PTP_1588_CLOCK_DPAA - phandle_prop = of_get_property(mac_node, "ptimer-handle", &lenp); - if (phandle_prop && ((mac_dev->phy_if != PHY_INTERFACE_MODE_SGMII) || + phandle_ptp = of_get_property(mac_node, "ptimer-handle", &lenp_ptp); + if (phandle_ptp && ((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_find_node_by_phandle(*phandle_prop); + ptp_priv.node = of_find_node_by_phandle(*phandle_ptp); if (ptp_priv.node) { ptp_priv.of_dev = of_find_device_by_node(ptp_priv.node); if (unlikely(ptp_priv.of_dev == NULL)) { |