diff options
| author | Grygorii Strashko <grygorii.strashko@ti.com> | 2019-02-20 10:25:19 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2019-02-21 10:33:51 -0500 |
| commit | dba235fa70cbedf7dd64d5763299451be4b9de16 (patch) | |
| tree | f44ce125db37a156cd4c1417884519f00e1497bb | |
| parent | bae2bf97939aebd74dfd8f0b76b4902a19e63eef (diff) | |
net: ethernet: ti: cpsw: deprecate cpsw-phy-sel driver
Deprecate cpsw-phy-sel driver as it's been replaced with new
TI phy-gmii-sel PHY driver.
Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>
| -rw-r--r-- | drivers/net/ethernet/ti/Kconfig | 6 | ||||
| -rw-r--r-- | drivers/net/ethernet/ti/cpsw.h | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/drivers/net/ethernet/ti/Kconfig b/drivers/net/ethernet/ti/Kconfig index bb126be1eb72..8b21b40a9fe5 100644 --- a/drivers/net/ethernet/ti/Kconfig +++ b/drivers/net/ethernet/ti/Kconfig | |||
| @@ -49,10 +49,11 @@ config TI_DAVINCI_CPDMA | |||
| 49 | will be called davinci_cpdma. This is recommended. | 49 | will be called davinci_cpdma. This is recommended. |
| 50 | 50 | ||
| 51 | config TI_CPSW_PHY_SEL | 51 | config TI_CPSW_PHY_SEL |
| 52 | bool | 52 | bool "TI CPSW Phy mode Selection (DEPRECATED)" |
| 53 | default n | ||
| 53 | ---help--- | 54 | ---help--- |
| 54 | This driver supports configuring of the phy mode connected to | 55 | This driver supports configuring of the phy mode connected to |
| 55 | the CPSW. | 56 | the CPSW. DEPRECATED: use PHY_TI_GMII_SEL. |
| 56 | 57 | ||
| 57 | config TI_CPSW_ALE | 58 | config TI_CPSW_ALE |
| 58 | tristate "TI CPSW ALE Support" | 59 | tristate "TI CPSW ALE Support" |
| @@ -64,7 +65,6 @@ config TI_CPSW | |||
| 64 | depends on ARCH_DAVINCI || ARCH_OMAP2PLUS || COMPILE_TEST | 65 | depends on ARCH_DAVINCI || ARCH_OMAP2PLUS || COMPILE_TEST |
| 65 | select TI_DAVINCI_CPDMA | 66 | select TI_DAVINCI_CPDMA |
| 66 | select TI_DAVINCI_MDIO | 67 | select TI_DAVINCI_MDIO |
| 67 | select TI_CPSW_PHY_SEL | ||
| 68 | select TI_CPSW_ALE | 68 | select TI_CPSW_ALE |
| 69 | select MFD_SYSCON | 69 | select MFD_SYSCON |
| 70 | select REGMAP | 70 | select REGMAP |
diff --git a/drivers/net/ethernet/ti/cpsw.h b/drivers/net/ethernet/ti/cpsw.h index cf111db3dc27..907e05fc22e4 100644 --- a/drivers/net/ethernet/ti/cpsw.h +++ b/drivers/net/ethernet/ti/cpsw.h | |||
| @@ -21,7 +21,13 @@ | |||
| 21 | ((mac)[2] << 16) | ((mac)[3] << 24)) | 21 | ((mac)[2] << 16) | ((mac)[3] << 24)) |
| 22 | #define mac_lo(mac) (((mac)[4] << 0) | ((mac)[5] << 8)) | 22 | #define mac_lo(mac) (((mac)[4] << 0) | ((mac)[5] << 8)) |
| 23 | 23 | ||
| 24 | #if IS_ENABLED(CONFIG_TI_CPSW_PHY_SEL) | ||
| 24 | void cpsw_phy_sel(struct device *dev, phy_interface_t phy_mode, int slave); | 25 | void cpsw_phy_sel(struct device *dev, phy_interface_t phy_mode, int slave); |
| 26 | #else | ||
| 27 | static inline | ||
| 28 | void cpsw_phy_sel(struct device *dev, phy_interface_t phy_mode, int slave) | ||
| 29 | {} | ||
| 30 | #endif | ||
| 25 | int ti_cm_get_macid(struct device *dev, int slave, u8 *mac_addr); | 31 | int ti_cm_get_macid(struct device *dev, int slave, u8 *mac_addr); |
| 26 | 32 | ||
| 27 | #endif /* __CPSW_H__ */ | 33 | #endif /* __CPSW_H__ */ |
