* [PATCH v3 1/5] net: phy: Add missing kernel doc to phy functions
2020-04-30 16:30 [PATCH v3 0/5] TI Ethernet PHY changes Dan Murphy
@ 2020-04-30 16:30 ` Dan Murphy
2020-05-04 9:45 ` Michal Simek
2020-04-30 16:30 ` [PATCH v3 2/5] net: phy: Fix kernel doc issues in phy.h Dan Murphy
` (3 subsequent siblings)
4 siblings, 1 reply; 11+ messages in thread
From: Dan Murphy @ 2020-04-30 16:30 UTC (permalink / raw)
To: u-boot
Add kernel doc to the phy_read/write utility functions in phy.h
Signed-off-by: Dan Murphy <dmurphy@ti.com>
---
include/phy.h | 39 +++++++++++++++++++++++++++++++++++++++
1 file changed, 39 insertions(+)
diff --git a/include/phy.h b/include/phy.h
index b5de14cbfc29..c1f6509e42fc 100644
--- a/include/phy.h
+++ b/include/phy.h
@@ -170,6 +170,13 @@ struct fixed_link {
int asym_pause;
};
+/**
+ * phy_read - Convenience function for reading a given PHY register
+ * @phydev: the phy_device struct
+ * @devad: The MMD to read from
+ * @regnum: register number to read
+ * @return: value for success or negative errno for failure
+ */
static inline int phy_read(struct phy_device *phydev, int devad, int regnum)
{
struct mii_dev *bus = phydev->bus;
@@ -182,6 +189,14 @@ static inline int phy_read(struct phy_device *phydev, int devad, int regnum)
return bus->read(bus, phydev->addr, devad, regnum);
}
+/**
+ * phy_write - Convenience function for writing a given PHY register
+ * @phydev: the phy_device struct
+ * @devad: The MMD to read from
+ * @regnum: register number to write
+ * @val: value to write to @regnum
+ * @return: 0 for success or negative errno for failure
+ */
static inline int phy_write(struct phy_device *phydev, int devad, int regnum,
u16 val)
{
@@ -195,6 +210,13 @@ static inline int phy_write(struct phy_device *phydev, int devad, int regnum,
return bus->write(bus, phydev->addr, devad, regnum, val);
}
+/**
+ * phy_mmd_start_indirect - Convenience function for writing MMD registers
+ * @phydev: the phy_device struct
+ * @devad: The MMD to read from
+ * @regnum: register number to write
+ * @return: None
+ */
static inline void phy_mmd_start_indirect(struct phy_device *phydev, int devad,
int regnum)
{
@@ -209,6 +231,14 @@ static inline void phy_mmd_start_indirect(struct phy_device *phydev, int devad,
(devad | MII_MMD_CTRL_NOINCR));
}
+/**
+ * phy_read_mmd - Convenience function for reading a register
+ * from an MMD on a given PHY.
+ * @phydev: The phy_device struct
+ * @devad: The MMD to read from
+ * @regnum: The register on the MMD to read
+ * @return: Value for success or negative errno for failure
+ */
static inline int phy_read_mmd(struct phy_device *phydev, int devad,
int regnum)
{
@@ -233,6 +263,15 @@ static inline int phy_read_mmd(struct phy_device *phydev, int devad,
return phy_read(phydev, MDIO_DEVAD_NONE, MII_MMD_DATA);
}
+/**
+ * phy_write_mmd - Convenience function for writing a register
+ * on an MMD on a given PHY.
+ * @phydev: The phy_device struct
+ * @devad: The MMD to read from
+ * @regnum: The register on the MMD to read
+ * @val: value to write to @regnum
+ * @return: 0 for success or negative errno for failure
+ */
static inline int phy_write_mmd(struct phy_device *phydev, int devad,
int regnum, u16 val)
{
--
2.25.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH v3 1/5] net: phy: Add missing kernel doc to phy functions
2020-04-30 16:30 ` [PATCH v3 1/5] net: phy: Add missing kernel doc to phy functions Dan Murphy
@ 2020-05-04 9:45 ` Michal Simek
0 siblings, 0 replies; 11+ messages in thread
From: Michal Simek @ 2020-05-04 9:45 UTC (permalink / raw)
To: u-boot
On 30. 04. 20 18:30, Dan Murphy wrote:
> Add kernel doc to the phy_read/write utility functions in phy.h
>
> Signed-off-by: Dan Murphy <dmurphy@ti.com>
> ---
> include/phy.h | 39 +++++++++++++++++++++++++++++++++++++++
> 1 file changed, 39 insertions(+)
>
> diff --git a/include/phy.h b/include/phy.h
> index b5de14cbfc29..c1f6509e42fc 100644
> --- a/include/phy.h
> +++ b/include/phy.h
> @@ -170,6 +170,13 @@ struct fixed_link {
> int asym_pause;
> };
>
> +/**
> + * phy_read - Convenience function for reading a given PHY register
> + * @phydev: the phy_device struct
> + * @devad: The MMD to read from
> + * @regnum: register number to read
> + * @return: value for success or negative errno for failure
> + */
> static inline int phy_read(struct phy_device *phydev, int devad, int regnum)
> {
> struct mii_dev *bus = phydev->bus;
> @@ -182,6 +189,14 @@ static inline int phy_read(struct phy_device *phydev, int devad, int regnum)
> return bus->read(bus, phydev->addr, devad, regnum);
> }
>
> +/**
> + * phy_write - Convenience function for writing a given PHY register
> + * @phydev: the phy_device struct
> + * @devad: The MMD to read from
> + * @regnum: register number to write
> + * @val: value to write to @regnum
> + * @return: 0 for success or negative errno for failure
> + */
> static inline int phy_write(struct phy_device *phydev, int devad, int regnum,
> u16 val)
> {
> @@ -195,6 +210,13 @@ static inline int phy_write(struct phy_device *phydev, int devad, int regnum,
> return bus->write(bus, phydev->addr, devad, regnum, val);
> }
>
> +/**
> + * phy_mmd_start_indirect - Convenience function for writing MMD registers
> + * @phydev: the phy_device struct
> + * @devad: The MMD to read from
> + * @regnum: register number to write
> + * @return: None
> + */
> static inline void phy_mmd_start_indirect(struct phy_device *phydev, int devad,
> int regnum)
> {
> @@ -209,6 +231,14 @@ static inline void phy_mmd_start_indirect(struct phy_device *phydev, int devad,
> (devad | MII_MMD_CTRL_NOINCR));
> }
>
> +/**
> + * phy_read_mmd - Convenience function for reading a register
> + * from an MMD on a given PHY.
> + * @phydev: The phy_device struct
> + * @devad: The MMD to read from
> + * @regnum: The register on the MMD to read
> + * @return: Value for success or negative errno for failure
> + */
> static inline int phy_read_mmd(struct phy_device *phydev, int devad,
> int regnum)
> {
> @@ -233,6 +263,15 @@ static inline int phy_read_mmd(struct phy_device *phydev, int devad,
> return phy_read(phydev, MDIO_DEVAD_NONE, MII_MMD_DATA);
> }
>
> +/**
> + * phy_write_mmd - Convenience function for writing a register
> + * on an MMD on a given PHY.
> + * @phydev: The phy_device struct
> + * @devad: The MMD to read from
> + * @regnum: The register on the MMD to read
> + * @val: value to write to @regnum
> + * @return: 0 for success or negative errno for failure
> + */
> static inline int phy_write_mmd(struct phy_device *phydev, int devad,
> int regnum, u16 val)
> {
>
Acked-by: Michal Simek <michal.simek@xilinx.com>
Thanks,
Michal
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v3 2/5] net: phy: Fix kernel doc issues in phy.h
2020-04-30 16:30 [PATCH v3 0/5] TI Ethernet PHY changes Dan Murphy
2020-04-30 16:30 ` [PATCH v3 1/5] net: phy: Add missing kernel doc to phy functions Dan Murphy
@ 2020-04-30 16:30 ` Dan Murphy
2020-05-04 9:45 ` Michal Simek
2020-04-30 16:30 ` [PATCH v3 3/5] net: phy: Add helper routines to set and clear bits Dan Murphy
` (2 subsequent siblings)
4 siblings, 1 reply; 11+ messages in thread
From: Dan Murphy @ 2020-04-30 16:30 UTC (permalink / raw)
To: u-boot
Fix kernel doc warnings in phy.h. Mostly the warnings were due to the
return missing the semi-colon.
Signed-off-by: Dan Murphy <dmurphy@ti.com>
---
include/phy.h | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/include/phy.h b/include/phy.h
index c1f6509e42fc..34c2af719b67 100644
--- a/include/phy.h
+++ b/include/phy.h
@@ -314,26 +314,23 @@ static inline int is_10g_interface(phy_interface_t interface)
/**
* phy_init() - Initializes the PHY drivers
- *
* This function registers all available PHY drivers
*
- * @return 0 if OK, -ve on error
+ * @return: 0 if OK, -ve on error
*/
int phy_init(void);
/**
* phy_reset() - Resets the specified PHY
- *
* Issues a reset of the PHY and waits for it to complete
*
* @phydev: PHY to reset
- * @return 0 if OK, -ve on error
+ * @return: 0 if OK, -ve on error
*/
int phy_reset(struct phy_device *phydev);
/**
* phy_find_by_mask() - Searches for a PHY on the specified MDIO bus
- *
* The function checks the PHY addresses flagged in phy_mask and returns a
* phy_device pointer if it detects a PHY.
* This function should only be called if just one PHY is expected to be present
@@ -343,7 +340,7 @@ int phy_reset(struct phy_device *phydev);
* @bus: MII/MDIO bus to scan
* @phy_mask: bitmap of PYH addresses to scan
* @interface: type of MAC-PHY interface
- * @return pointer to phy_device if a PHY is found, or NULL otherwise
+ * @return: pointer to phy_device if a PHY is found, or NULL otherwise
*/
struct phy_device *phy_find_by_mask(struct mii_dev *bus, unsigned phy_mask,
phy_interface_t interface);
@@ -359,7 +356,6 @@ void phy_connect_dev(struct phy_device *phydev, struct udevice *dev);
/**
* phy_connect() - Creates a PHY device for the Ethernet interface
- *
* Creates a PHY device for the PHY at the given address, if one doesn't exist
* already, and associates it with the Ethernet device.
* The function may be called with addr <= 0, in this case addr value is ignored
@@ -371,7 +367,7 @@ void phy_connect_dev(struct phy_device *phydev, struct udevice *dev);
* @addr: PHY address on MDIO bus
* @dev: Ethernet device to associate to the PHY
* @interface: type of MAC-PHY interface
- * @return pointer to phy_device if a PHY is found, or NULL otherwise
+ * @return: pointer to phy_device if a PHY is found, or NULL otherwise
*/
struct phy_device *phy_connect(struct mii_dev *bus, int addr,
struct udevice *dev,
@@ -395,7 +391,6 @@ void phy_connect_dev(struct phy_device *phydev, struct eth_device *dev);
/**
* phy_connect() - Creates a PHY device for the Ethernet interface
- *
* Creates a PHY device for the PHY@the given address, if one doesn't exist
* already, and associates it with the Ethernet device.
* The function may be called with addr <= 0, in this case addr value is ignored
@@ -407,7 +402,7 @@ void phy_connect_dev(struct phy_device *phydev, struct eth_device *dev);
* @addr: PHY address on MDIO bus
* @dev: Ethernet device to associate to the PHY
* @interface: type of MAC-PHY interface
- * @return pointer to phy_device if a PHY is found, or NULL otherwise
+ * @return: pointer to phy_device if a PHY is found, or NULL otherwise
*/
struct phy_device *phy_connect(struct mii_dev *bus, int addr,
struct eth_device *dev,
@@ -467,7 +462,7 @@ int get_phy_id(struct mii_dev *bus, int addr, int devad, u32 *phy_id);
* phy_get_interface_by_name() - Look up a PHY interface name
*
* @str: PHY interface name, e.g. "mii"
- * @return PHY_INTERFACE_MODE_... value, or -1 if not found
+ * @return: PHY_INTERFACE_MODE_... value, or -1 if not found
*/
int phy_get_interface_by_name(const char *str);
@@ -475,6 +470,7 @@ int phy_get_interface_by_name(const char *str);
* phy_interface_is_rgmii - Convenience function for testing if a PHY interface
* is RGMII (all variants)
* @phydev: the phy_device struct
+ * @return: true if MII bus is RGMII or false if it is not
*/
static inline bool phy_interface_is_rgmii(struct phy_device *phydev)
{
@@ -486,6 +482,7 @@ static inline bool phy_interface_is_rgmii(struct phy_device *phydev)
* phy_interface_is_sgmii - Convenience function for testing if a PHY interface
* is SGMII (all variants)
* @phydev: the phy_device struct
+ * @return: true if MII bus is SGMII or false if it is not
*/
static inline bool phy_interface_is_sgmii(struct phy_device *phydev)
{
--
2.25.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH v3 2/5] net: phy: Fix kernel doc issues in phy.h
2020-04-30 16:30 ` [PATCH v3 2/5] net: phy: Fix kernel doc issues in phy.h Dan Murphy
@ 2020-05-04 9:45 ` Michal Simek
0 siblings, 0 replies; 11+ messages in thread
From: Michal Simek @ 2020-05-04 9:45 UTC (permalink / raw)
To: u-boot
On 30. 04. 20 18:30, Dan Murphy wrote:
> Fix kernel doc warnings in phy.h. Mostly the warnings were due to the
> return missing the semi-colon.
>
> Signed-off-by: Dan Murphy <dmurphy@ti.com>
> ---
> include/phy.h | 19 ++++++++-----------
> 1 file changed, 8 insertions(+), 11 deletions(-)
>
> diff --git a/include/phy.h b/include/phy.h
> index c1f6509e42fc..34c2af719b67 100644
> --- a/include/phy.h
> +++ b/include/phy.h
> @@ -314,26 +314,23 @@ static inline int is_10g_interface(phy_interface_t interface)
>
> /**
> * phy_init() - Initializes the PHY drivers
> - *
> * This function registers all available PHY drivers
> *
> - * @return 0 if OK, -ve on error
> + * @return: 0 if OK, -ve on error
> */
> int phy_init(void);
>
> /**
> * phy_reset() - Resets the specified PHY
> - *
> * Issues a reset of the PHY and waits for it to complete
> *
> * @phydev: PHY to reset
> - * @return 0 if OK, -ve on error
> + * @return: 0 if OK, -ve on error
> */
> int phy_reset(struct phy_device *phydev);
>
> /**
> * phy_find_by_mask() - Searches for a PHY on the specified MDIO bus
> - *
nit: This shouldn't be needed but I am fine with it.
> * The function checks the PHY addresses flagged in phy_mask and returns a
> * phy_device pointer if it detects a PHY.
> * This function should only be called if just one PHY is expected to be present
> @@ -343,7 +340,7 @@ int phy_reset(struct phy_device *phydev);
> * @bus: MII/MDIO bus to scan
> * @phy_mask: bitmap of PYH addresses to scan
> * @interface: type of MAC-PHY interface
> - * @return pointer to phy_device if a PHY is found, or NULL otherwise
> + * @return: pointer to phy_device if a PHY is found, or NULL otherwise
> */
> struct phy_device *phy_find_by_mask(struct mii_dev *bus, unsigned phy_mask,
> phy_interface_t interface);
> @@ -359,7 +356,6 @@ void phy_connect_dev(struct phy_device *phydev, struct udevice *dev);
>
> /**
> * phy_connect() - Creates a PHY device for the Ethernet interface
> - *
> * Creates a PHY device for the PHY at the given address, if one doesn't exist
> * already, and associates it with the Ethernet device.
> * The function may be called with addr <= 0, in this case addr value is ignored
> @@ -371,7 +367,7 @@ void phy_connect_dev(struct phy_device *phydev, struct udevice *dev);
> * @addr: PHY address on MDIO bus
> * @dev: Ethernet device to associate to the PHY
> * @interface: type of MAC-PHY interface
> - * @return pointer to phy_device if a PHY is found, or NULL otherwise
> + * @return: pointer to phy_device if a PHY is found, or NULL otherwise
> */
> struct phy_device *phy_connect(struct mii_dev *bus, int addr,
> struct udevice *dev,
> @@ -395,7 +391,6 @@ void phy_connect_dev(struct phy_device *phydev, struct eth_device *dev);
>
> /**
> * phy_connect() - Creates a PHY device for the Ethernet interface
> - *
> * Creates a PHY device for the PHY at the given address, if one doesn't exist
> * already, and associates it with the Ethernet device.
> * The function may be called with addr <= 0, in this case addr value is ignored
> @@ -407,7 +402,7 @@ void phy_connect_dev(struct phy_device *phydev, struct eth_device *dev);
> * @addr: PHY address on MDIO bus
> * @dev: Ethernet device to associate to the PHY
> * @interface: type of MAC-PHY interface
> - * @return pointer to phy_device if a PHY is found, or NULL otherwise
> + * @return: pointer to phy_device if a PHY is found, or NULL otherwise
> */
> struct phy_device *phy_connect(struct mii_dev *bus, int addr,
> struct eth_device *dev,
> @@ -467,7 +462,7 @@ int get_phy_id(struct mii_dev *bus, int addr, int devad, u32 *phy_id);
> * phy_get_interface_by_name() - Look up a PHY interface name
> *
> * @str: PHY interface name, e.g. "mii"
> - * @return PHY_INTERFACE_MODE_... value, or -1 if not found
> + * @return: PHY_INTERFACE_MODE_... value, or -1 if not found
> */
> int phy_get_interface_by_name(const char *str);
>
> @@ -475,6 +470,7 @@ int phy_get_interface_by_name(const char *str);
> * phy_interface_is_rgmii - Convenience function for testing if a PHY interface
> * is RGMII (all variants)
> * @phydev: the phy_device struct
> + * @return: true if MII bus is RGMII or false if it is not
> */
> static inline bool phy_interface_is_rgmii(struct phy_device *phydev)
> {
> @@ -486,6 +482,7 @@ static inline bool phy_interface_is_rgmii(struct phy_device *phydev)
> * phy_interface_is_sgmii - Convenience function for testing if a PHY interface
> * is SGMII (all variants)
> * @phydev: the phy_device struct
> + * @return: true if MII bus is SGMII or false if it is not
> */
> static inline bool phy_interface_is_sgmii(struct phy_device *phydev)
> {
>
Acked-by: Michal Simek <michal.simek@xilinx.com>
Thanks,
Michal
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v3 3/5] net: phy: Add helper routines to set and clear bits
2020-04-30 16:30 [PATCH v3 0/5] TI Ethernet PHY changes Dan Murphy
2020-04-30 16:30 ` [PATCH v3 1/5] net: phy: Add missing kernel doc to phy functions Dan Murphy
2020-04-30 16:30 ` [PATCH v3 2/5] net: phy: Fix kernel doc issues in phy.h Dan Murphy
@ 2020-04-30 16:30 ` Dan Murphy
2020-05-04 9:46 ` Michal Simek
2020-04-30 16:30 ` [PATCH v3 4/5] net: phy: Add support for TI PHY init Dan Murphy
2020-04-30 16:30 ` [PATCH v3 5/5] net: phy: Add DP8382x phy registration to " Dan Murphy
4 siblings, 1 reply; 11+ messages in thread
From: Dan Murphy @ 2020-04-30 16:30 UTC (permalink / raw)
To: u-boot
Add phy_set/clear_bit helper routines so that ported drivers from the
kernel can use these functions.
Signed-off-by: Dan Murphy <dmurphy@ti.com>
---
include/phy.h | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 54 insertions(+)
diff --git a/include/phy.h b/include/phy.h
index 34c2af719b67..fedd14609192 100644
--- a/include/phy.h
+++ b/include/phy.h
@@ -296,6 +296,60 @@ static inline int phy_write_mmd(struct phy_device *phydev, int devad,
return phy_write(phydev, MDIO_DEVAD_NONE, MII_MMD_DATA, val);
}
+/**
+ * phy_set_bits_mmd - Convenience function for setting bits in a register
+ * on MMD
+ * @phydev: the phy_device struct
+ * @devad: the MMD containing register to modify
+ * @regnum: register number to modify
+ * @val: bits to set
+ * @return: 0 for success or negative errno for failure
+ */
+static inline int phy_set_bits_mmd(struct phy_device *phydev, int devad,
+ u32 regnum, u16 val)
+{
+ int value, ret;
+
+ value = phy_read_mmd(phydev, devad, regnum);
+ if (value < 0)
+ return value;
+
+ value |= val;
+
+ ret = phy_write_mmd(phydev, devad, regnum, value);
+ if (ret < 0)
+ return ret;
+
+ return 0;
+}
+
+/**
+ * phy_clear_bits_mmd - Convenience function for clearing bits in a register
+ * on MMD
+ * @phydev: the phy_device struct
+ * @devad: the MMD containing register to modify
+ * @regnum: register number to modify
+ * @val: bits to clear
+ * @return: 0 for success or negative errno for failure
+ */
+static inline int phy_clear_bits_mmd(struct phy_device *phydev, int devad,
+ u32 regnum, u16 val)
+{
+ int value, ret;
+
+ value = phy_read_mmd(phydev, devad, regnum);
+ if (value < 0)
+ return value;
+
+ value &= ~val;
+
+ ret = phy_write_mmd(phydev, devad, regnum, value);
+ if (ret < 0)
+ return ret;
+
+ return 0;
+}
+
#ifdef CONFIG_PHYLIB_10G
extern struct phy_driver gen10g_driver;
--
2.25.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH v3 3/5] net: phy: Add helper routines to set and clear bits
2020-04-30 16:30 ` [PATCH v3 3/5] net: phy: Add helper routines to set and clear bits Dan Murphy
@ 2020-05-04 9:46 ` Michal Simek
0 siblings, 0 replies; 11+ messages in thread
From: Michal Simek @ 2020-05-04 9:46 UTC (permalink / raw)
To: u-boot
On 30. 04. 20 18:30, Dan Murphy wrote:
> Add phy_set/clear_bit helper routines so that ported drivers from the
> kernel can use these functions.
>
> Signed-off-by: Dan Murphy <dmurphy@ti.com>
> ---
> include/phy.h | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 54 insertions(+)
>
> diff --git a/include/phy.h b/include/phy.h
> index 34c2af719b67..fedd14609192 100644
> --- a/include/phy.h
> +++ b/include/phy.h
> @@ -296,6 +296,60 @@ static inline int phy_write_mmd(struct phy_device *phydev, int devad,
> return phy_write(phydev, MDIO_DEVAD_NONE, MII_MMD_DATA, val);
> }
>
> +/**
> + * phy_set_bits_mmd - Convenience function for setting bits in a register
> + * on MMD
> + * @phydev: the phy_device struct
> + * @devad: the MMD containing register to modify
> + * @regnum: register number to modify
> + * @val: bits to set
> + * @return: 0 for success or negative errno for failure
> + */
> +static inline int phy_set_bits_mmd(struct phy_device *phydev, int devad,
> + u32 regnum, u16 val)
> +{
> + int value, ret;
> +
> + value = phy_read_mmd(phydev, devad, regnum);
> + if (value < 0)
> + return value;
> +
> + value |= val;
> +
> + ret = phy_write_mmd(phydev, devad, regnum, value);
> + if (ret < 0)
> + return ret;
> +
> + return 0;
> +}
> +
> +/**
> + * phy_clear_bits_mmd - Convenience function for clearing bits in a register
> + * on MMD
> + * @phydev: the phy_device struct
> + * @devad: the MMD containing register to modify
> + * @regnum: register number to modify
> + * @val: bits to clear
> + * @return: 0 for success or negative errno for failure
> + */
> +static inline int phy_clear_bits_mmd(struct phy_device *phydev, int devad,
> + u32 regnum, u16 val)
> +{
> + int value, ret;
> +
> + value = phy_read_mmd(phydev, devad, regnum);
> + if (value < 0)
> + return value;
> +
> + value &= ~val;
> +
> + ret = phy_write_mmd(phydev, devad, regnum, value);
> + if (ret < 0)
> + return ret;
> +
> + return 0;
> +}
> +
> #ifdef CONFIG_PHYLIB_10G
> extern struct phy_driver gen10g_driver;
>
>
Acked-by: Michal Simek <michal.simek@xilinx.com>
Thanks,
Michal
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v3 4/5] net: phy: Add support for TI PHY init
2020-04-30 16:30 [PATCH v3 0/5] TI Ethernet PHY changes Dan Murphy
` (2 preceding siblings ...)
2020-04-30 16:30 ` [PATCH v3 3/5] net: phy: Add helper routines to set and clear bits Dan Murphy
@ 2020-04-30 16:30 ` Dan Murphy
2020-05-04 9:46 ` Michal Simek
2020-04-30 16:30 ` [PATCH v3 5/5] net: phy: Add DP8382x phy registration to " Dan Murphy
4 siblings, 1 reply; 11+ messages in thread
From: Dan Murphy @ 2020-04-30 16:30 UTC (permalink / raw)
To: u-boot
ti_phy_init function was allocated to the DP83867 PHY. This function
name is to generic for a specific PHY. The function can be moved to a
TI specific file that can register all TI PHYs that are defined in the
defconfig. The ti_phy_init file will contain all TI PHYs initialization
so that only phy_ti_init can be called from the framework.
In addition to the above the config flag for the DP83867 needs to be changed
in the Kconfig and dependent defconfig files. The config flag that was
used for the DP83867 was also generic in nature so a more specific
config flag for the DP83867 was created.
Acked-by: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: Dan Murphy <dmurphy@ti.com>
---
configs/am65x_evm_a53_defconfig | 2 +-
configs/am65x_hs_evm_a53_defconfig | 2 +-
configs/dra7xx_evm_defconfig | 2 +-
configs/dra7xx_hs_evm_defconfig | 2 +-
configs/dra7xx_hs_evm_usb_defconfig | 2 +-
configs/j721e_evm_a72_defconfig | 2 +-
configs/j721e_hs_evm_a72_defconfig | 2 +-
configs/k2g_evm_defconfig | 2 +-
configs/xilinx_versal_virt_defconfig | 2 +-
configs/xilinx_zynqmp_virt_defconfig | 2 +-
drivers/net/phy/Kconfig | 15 +++++++++++++++
drivers/net/phy/Makefile | 3 ++-
drivers/net/phy/dp83867.c | 3 ++-
drivers/net/phy/ti_phy_init.c | 18 ++++++++++++++++++
drivers/net/phy/ti_phy_init.h | 15 +++++++++++++++
15 files changed, 62 insertions(+), 12 deletions(-)
create mode 100644 drivers/net/phy/ti_phy_init.c
create mode 100644 drivers/net/phy/ti_phy_init.h
diff --git a/configs/am65x_evm_a53_defconfig b/configs/am65x_evm_a53_defconfig
index 542bbd992c53..c8cc9b2f7d8d 100644
--- a/configs/am65x_evm_a53_defconfig
+++ b/configs/am65x_evm_a53_defconfig
@@ -101,7 +101,7 @@ CONFIG_SPI_FLASH_SFDP_SUPPORT
CONFIG_SPI_FLASH_STMICRO=y
# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
CONFIG_SPI_FLASH_MTD=y
-CONFIG_PHY_TI=y
+CONFIG_PHY_TI_DP83867=y
CONFIG_PHY_FIXED=y
CONFIG_DM_ETH=y
CONFIG_E1000=y
diff --git a/configs/am65x_hs_evm_a53_defconfig b/configs/am65x_hs_evm_a53_defconfig
index 9f43cee39611..738bd01b059f 100644
--- a/configs/am65x_hs_evm_a53_defconfig
+++ b/configs/am65x_hs_evm_a53_defconfig
@@ -103,7 +103,7 @@ CONFIG_SPI_FLASH_SFDP_SUPPORT
CONFIG_SPI_FLASH_STMICRO=y
# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
CONFIG_SPI_FLASH_MTD=y
-CONFIG_PHY_TI=y
+CONFIG_PHY_TI_DP83867=y
CONFIG_PHY_FIXED=y
CONFIG_DM_ETH=y
CONFIG_E1000=y
diff --git a/configs/dra7xx_evm_defconfig b/configs/dra7xx_evm_defconfig
index 4d765da4e052..9ad462cdc6de 100644
--- a/configs/dra7xx_evm_defconfig
+++ b/configs/dra7xx_evm_defconfig
@@ -86,7 +86,7 @@ CONFIG_DM_SPI_FLASH=y
CONFIG_SF_DEFAULT_MODE=0
CONFIG_SF_DEFAULT_SPEED=76800000
CONFIG_SPI_FLASH_SPANSION=y
-CONFIG_PHY_TI=y
+CONFIG_PHY_TI_DP83867=y
CONFIG_DM_ETH=y
CONFIG_PHY_GIGE=y
CONFIG_MII=y
diff --git a/configs/dra7xx_hs_evm_defconfig b/configs/dra7xx_hs_evm_defconfig
index c25d4ce5c142..9aa452460765 100644
--- a/configs/dra7xx_hs_evm_defconfig
+++ b/configs/dra7xx_hs_evm_defconfig
@@ -89,7 +89,7 @@ CONFIG_DM_SPI_FLASH=y
CONFIG_SF_DEFAULT_MODE=0
CONFIG_SF_DEFAULT_SPEED=76800000
CONFIG_SPI_FLASH_SPANSION=y
-CONFIG_PHY_TI=y
+CONFIG_PHY_TI_DP83867=y
CONFIG_DM_ETH=y
CONFIG_PHY_GIGE=y
CONFIG_MII=y
diff --git a/configs/dra7xx_hs_evm_usb_defconfig b/configs/dra7xx_hs_evm_usb_defconfig
index 8e74496b2ccd..d282468212e9 100644
--- a/configs/dra7xx_hs_evm_usb_defconfig
+++ b/configs/dra7xx_hs_evm_usb_defconfig
@@ -87,7 +87,7 @@ CONFIG_SF_DEFAULT_MODE=0
CONFIG_SF_DEFAULT_SPEED=76800000
CONFIG_SPI_FLASH_BAR=y
CONFIG_SPI_FLASH_SPANSION=y
-CONFIG_PHY_TI=y
+CONFIG_PHY_TI_DP83867=y
CONFIG_DM_ETH=y
CONFIG_PHY_GIGE=y
CONFIG_MII=y
diff --git a/configs/j721e_evm_a72_defconfig b/configs/j721e_evm_a72_defconfig
index e9e82bb4309d..29ae8d720753 100644
--- a/configs/j721e_evm_a72_defconfig
+++ b/configs/j721e_evm_a72_defconfig
@@ -124,7 +124,7 @@ CONFIG_SPI_FLASH_SFDP_SUPPORT
CONFIG_SPI_FLASH_STMICRO=y
# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
CONFIG_SPI_FLASH_MTD=y
-CONFIG_PHY_TI=y
+CONFIG_PHY_TI_DP83867=y
CONFIG_PHY_FIXED=y
CONFIG_DM_ETH=y
CONFIG_TI_AM65_CPSW_NUSS=y
diff --git a/configs/j721e_hs_evm_a72_defconfig b/configs/j721e_hs_evm_a72_defconfig
index a723e2718e5e..7174fda72a01 100644
--- a/configs/j721e_hs_evm_a72_defconfig
+++ b/configs/j721e_hs_evm_a72_defconfig
@@ -114,7 +114,7 @@ CONFIG_SPI_FLASH_SFDP_SUPPORT
CONFIG_SPI_FLASH_STMICRO=y
# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
CONFIG_SPI_FLASH_MTD=y
-CONFIG_PHY_TI=y
+CONFIG_PHY_TI_DP83867=y
CONFIG_PHY_FIXED=y
CONFIG_DM_ETH=y
CONFIG_TI_AM65_CPSW_NUSS=y
diff --git a/configs/k2g_evm_defconfig b/configs/k2g_evm_defconfig
index 5abf5faa450e..14cf1b997d91 100644
--- a/configs/k2g_evm_defconfig
+++ b/configs/k2g_evm_defconfig
@@ -58,7 +58,7 @@ CONFIG_PHYLIB=y
CONFIG_PHY_MARVELL=y
CONFIG_PHY_MICREL=y
CONFIG_PHY_MICREL_KSZ8XXX=y
-CONFIG_PHY_TI=y
+CONFIG_PHY_TI_DP83867=y
CONFIG_DM_ETH=y
CONFIG_MII=y
CONFIG_DRIVER_TI_KEYSTONE_NET=y
diff --git a/configs/xilinx_versal_virt_defconfig b/configs/xilinx_versal_virt_defconfig
index e8c349261207..dcd841b8e299 100644
--- a/configs/xilinx_versal_virt_defconfig
+++ b/configs/xilinx_versal_virt_defconfig
@@ -61,7 +61,7 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_PHY_MARVELL=y
CONFIG_PHY_NATSEMI=y
CONFIG_PHY_REALTEK=y
-CONFIG_PHY_TI=y
+CONFIG_PHY_TI_DP83867=y
CONFIG_PHY_VITESSE=y
CONFIG_PHY_FIXED=y
CONFIG_PHY_GIGE=y
diff --git a/configs/xilinx_zynqmp_virt_defconfig b/configs/xilinx_zynqmp_virt_defconfig
index 7b09edd78e1b..b7b671282a87 100644
--- a/configs/xilinx_zynqmp_virt_defconfig
+++ b/configs/xilinx_zynqmp_virt_defconfig
@@ -101,7 +101,7 @@ CONFIG_PHY_MICREL=y
CONFIG_PHY_MICREL_KSZ90X1=y
CONFIG_PHY_NATSEMI=y
CONFIG_PHY_REALTEK=y
-CONFIG_PHY_TI=y
+CONFIG_PHY_TI_DP83867=y
CONFIG_PHY_VITESSE=y
CONFIG_PHY_XILINX_GMII2RGMII=y
CONFIG_PHY_FIXED=y
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index d1f049e62ab7..a8ae1db4afe2 100644
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -243,6 +243,21 @@ config PHY_TERANETICS
config PHY_TI
bool "Texas Instruments Ethernet PHYs support"
+ ---help---
+ Adds PHY registration support for TI PHYs.
+
+config PHY_TI_GENERIC
+ select PHY_TI
+ bool "Texas Instruments Generic Ethernet PHYs support"
+ ---help---
+ Adds support for Generic TI PHYs that don't need special handling but
+ the PHY name is associated with a PHY ID.
+
+config PHY_TI_DP83867
+ select PHY_TI
+ bool "Texas Instruments Ethernet DP83867 PHY support"
+ ---help---
+ Adds support for the TI DP83867 1Gbit PHY.
config PHY_VITESSE
bool "Vitesse Ethernet PHYs support"
diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile
index 1d81516ecd1d..6e722331f1bf 100644
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
@@ -25,7 +25,8 @@ obj-$(CONFIG_PHY_NATSEMI) += natsemi.o
obj-$(CONFIG_PHY_REALTEK) += realtek.o
obj-$(CONFIG_PHY_SMSC) += smsc.o
obj-$(CONFIG_PHY_TERANETICS) += teranetics.o
-obj-$(CONFIG_PHY_TI) += dp83867.o
+obj-$(CONFIG_PHY_TI) += ti_phy_init.o
+obj-$(CONFIG_PHY_TI_DP83867) += dp83867.o
obj-$(CONFIG_PHY_XILINX) += xilinx_phy.o
obj-$(CONFIG_PHY_XILINX_GMII2RGMII) += xilinx_gmii2rgmii.o
obj-$(CONFIG_PHY_VITESSE) += vitesse.o
diff --git a/drivers/net/phy/dp83867.c b/drivers/net/phy/dp83867.c
index 50804c130efd..c9ed4a44d4db 100644
--- a/drivers/net/phy/dp83867.c
+++ b/drivers/net/phy/dp83867.c
@@ -12,6 +12,7 @@
#include <dm.h>
#include <dt-bindings/net/ti-dp83867.h>
+#include "ti_phy_init.h"
/* TI DP83867 */
#define DP83867_DEVADDR 0x1f
@@ -428,7 +429,7 @@ static struct phy_driver DP83867_driver = {
.shutdown = &genphy_shutdown,
};
-int phy_ti_init(void)
+int phy_dp83867_init(void)
{
phy_register(&DP83867_driver);
return 0;
diff --git a/drivers/net/phy/ti_phy_init.c b/drivers/net/phy/ti_phy_init.c
new file mode 100644
index 000000000000..277b29a26342
--- /dev/null
+++ b/drivers/net/phy/ti_phy_init.c
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * TI Generic PHY Init to register any TI Ethernet PHYs
+ *
+ * Author: Dan Murphy <dmurphy@ti.com>
+ *
+ * Copyright (C) 2019-20 Texas Instruments Inc.
+ */
+
+#include "ti_phy_init.h"
+
+int phy_ti_init(void)
+{
+#ifdef CONFIG_PHY_TI_DP83867
+ phy_dp83867_init();
+#endif
+ return 0;
+}
diff --git a/drivers/net/phy/ti_phy_init.h b/drivers/net/phy/ti_phy_init.h
new file mode 100644
index 000000000000..6c7f6c640a79
--- /dev/null
+++ b/drivers/net/phy/ti_phy_init.h
@@ -0,0 +1,15 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/*
+ * TI Generic Ethernet PHY
+ *
+ * Author: Dan Murphy <dmurphy@ti.com>
+ *
+ * Copyright (C) 2019-20 Texas Instruments Inc.
+ */
+
+#ifndef _TI_GEN_PHY_H
+#define _TI_GEN_PHY_H
+
+int phy_dp83867_init(void);
+
+#endif /* _TI_GEN_PHY_H */
--
2.25.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH v3 4/5] net: phy: Add support for TI PHY init
2020-04-30 16:30 ` [PATCH v3 4/5] net: phy: Add support for TI PHY init Dan Murphy
@ 2020-05-04 9:46 ` Michal Simek
2020-05-04 16:59 ` Dan Murphy
0 siblings, 1 reply; 11+ messages in thread
From: Michal Simek @ 2020-05-04 9:46 UTC (permalink / raw)
To: u-boot
On 30. 04. 20 18:30, Dan Murphy wrote:
> ti_phy_init function was allocated to the DP83867 PHY. This function
> name is to generic for a specific PHY. The function can be moved to a
> TI specific file that can register all TI PHYs that are defined in the
> defconfig. The ti_phy_init file will contain all TI PHYs initialization
> so that only phy_ti_init can be called from the framework.
>
> In addition to the above the config flag for the DP83867 needs to be changed
> in the Kconfig and dependent defconfig files. The config flag that was
> used for the DP83867 was also generic in nature so a more specific
> config flag for the DP83867 was created.
>
> Acked-by: Michal Simek <michal.simek@xilinx.com>
> Signed-off-by: Dan Murphy <dmurphy@ti.com>
> ---
> configs/am65x_evm_a53_defconfig | 2 +-
> configs/am65x_hs_evm_a53_defconfig | 2 +-
> configs/dra7xx_evm_defconfig | 2 +-
> configs/dra7xx_hs_evm_defconfig | 2 +-
> configs/dra7xx_hs_evm_usb_defconfig | 2 +-
> configs/j721e_evm_a72_defconfig | 2 +-
> configs/j721e_hs_evm_a72_defconfig | 2 +-
> configs/k2g_evm_defconfig | 2 +-
> configs/xilinx_versal_virt_defconfig | 2 +-
> configs/xilinx_zynqmp_virt_defconfig | 2 +-
> drivers/net/phy/Kconfig | 15 +++++++++++++++
> drivers/net/phy/Makefile | 3 ++-
> drivers/net/phy/dp83867.c | 3 ++-
> drivers/net/phy/ti_phy_init.c | 18 ++++++++++++++++++
> drivers/net/phy/ti_phy_init.h | 15 +++++++++++++++
> 15 files changed, 62 insertions(+), 12 deletions(-)
> create mode 100644 drivers/net/phy/ti_phy_init.c
> create mode 100644 drivers/net/phy/ti_phy_init.h
>
> diff --git a/configs/am65x_evm_a53_defconfig b/configs/am65x_evm_a53_defconfig
> index 542bbd992c53..c8cc9b2f7d8d 100644
> --- a/configs/am65x_evm_a53_defconfig
> +++ b/configs/am65x_evm_a53_defconfig
> @@ -101,7 +101,7 @@ CONFIG_SPI_FLASH_SFDP_SUPPORT
> CONFIG_SPI_FLASH_STMICRO=y
> # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
> CONFIG_SPI_FLASH_MTD=y
> -CONFIG_PHY_TI=y
> +CONFIG_PHY_TI_DP83867=y
> CONFIG_PHY_FIXED=y
> CONFIG_DM_ETH=y
> CONFIG_E1000=y
> diff --git a/configs/am65x_hs_evm_a53_defconfig b/configs/am65x_hs_evm_a53_defconfig
> index 9f43cee39611..738bd01b059f 100644
> --- a/configs/am65x_hs_evm_a53_defconfig
> +++ b/configs/am65x_hs_evm_a53_defconfig
> @@ -103,7 +103,7 @@ CONFIG_SPI_FLASH_SFDP_SUPPORT
> CONFIG_SPI_FLASH_STMICRO=y
> # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
> CONFIG_SPI_FLASH_MTD=y
> -CONFIG_PHY_TI=y
> +CONFIG_PHY_TI_DP83867=y
> CONFIG_PHY_FIXED=y
> CONFIG_DM_ETH=y
> CONFIG_E1000=y
> diff --git a/configs/dra7xx_evm_defconfig b/configs/dra7xx_evm_defconfig
> index 4d765da4e052..9ad462cdc6de 100644
> --- a/configs/dra7xx_evm_defconfig
> +++ b/configs/dra7xx_evm_defconfig
> @@ -86,7 +86,7 @@ CONFIG_DM_SPI_FLASH=y
> CONFIG_SF_DEFAULT_MODE=0
> CONFIG_SF_DEFAULT_SPEED=76800000
> CONFIG_SPI_FLASH_SPANSION=y
> -CONFIG_PHY_TI=y
> +CONFIG_PHY_TI_DP83867=y
> CONFIG_DM_ETH=y
> CONFIG_PHY_GIGE=y
> CONFIG_MII=y
> diff --git a/configs/dra7xx_hs_evm_defconfig b/configs/dra7xx_hs_evm_defconfig
> index c25d4ce5c142..9aa452460765 100644
> --- a/configs/dra7xx_hs_evm_defconfig
> +++ b/configs/dra7xx_hs_evm_defconfig
> @@ -89,7 +89,7 @@ CONFIG_DM_SPI_FLASH=y
> CONFIG_SF_DEFAULT_MODE=0
> CONFIG_SF_DEFAULT_SPEED=76800000
> CONFIG_SPI_FLASH_SPANSION=y
> -CONFIG_PHY_TI=y
> +CONFIG_PHY_TI_DP83867=y
> CONFIG_DM_ETH=y
> CONFIG_PHY_GIGE=y
> CONFIG_MII=y
> diff --git a/configs/dra7xx_hs_evm_usb_defconfig b/configs/dra7xx_hs_evm_usb_defconfig
> index 8e74496b2ccd..d282468212e9 100644
> --- a/configs/dra7xx_hs_evm_usb_defconfig
> +++ b/configs/dra7xx_hs_evm_usb_defconfig
> @@ -87,7 +87,7 @@ CONFIG_SF_DEFAULT_MODE=0
> CONFIG_SF_DEFAULT_SPEED=76800000
> CONFIG_SPI_FLASH_BAR=y
> CONFIG_SPI_FLASH_SPANSION=y
> -CONFIG_PHY_TI=y
> +CONFIG_PHY_TI_DP83867=y
> CONFIG_DM_ETH=y
> CONFIG_PHY_GIGE=y
> CONFIG_MII=y
> diff --git a/configs/j721e_evm_a72_defconfig b/configs/j721e_evm_a72_defconfig
> index e9e82bb4309d..29ae8d720753 100644
> --- a/configs/j721e_evm_a72_defconfig
> +++ b/configs/j721e_evm_a72_defconfig
> @@ -124,7 +124,7 @@ CONFIG_SPI_FLASH_SFDP_SUPPORT
> CONFIG_SPI_FLASH_STMICRO=y
> # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
> CONFIG_SPI_FLASH_MTD=y
> -CONFIG_PHY_TI=y
> +CONFIG_PHY_TI_DP83867=y
> CONFIG_PHY_FIXED=y
> CONFIG_DM_ETH=y
> CONFIG_TI_AM65_CPSW_NUSS=y
> diff --git a/configs/j721e_hs_evm_a72_defconfig b/configs/j721e_hs_evm_a72_defconfig
> index a723e2718e5e..7174fda72a01 100644
> --- a/configs/j721e_hs_evm_a72_defconfig
> +++ b/configs/j721e_hs_evm_a72_defconfig
> @@ -114,7 +114,7 @@ CONFIG_SPI_FLASH_SFDP_SUPPORT
> CONFIG_SPI_FLASH_STMICRO=y
> # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
> CONFIG_SPI_FLASH_MTD=y
> -CONFIG_PHY_TI=y
> +CONFIG_PHY_TI_DP83867=y
> CONFIG_PHY_FIXED=y
> CONFIG_DM_ETH=y
> CONFIG_TI_AM65_CPSW_NUSS=y
> diff --git a/configs/k2g_evm_defconfig b/configs/k2g_evm_defconfig
> index 5abf5faa450e..14cf1b997d91 100644
> --- a/configs/k2g_evm_defconfig
> +++ b/configs/k2g_evm_defconfig
> @@ -58,7 +58,7 @@ CONFIG_PHYLIB=y
> CONFIG_PHY_MARVELL=y
> CONFIG_PHY_MICREL=y
> CONFIG_PHY_MICREL_KSZ8XXX=y
> -CONFIG_PHY_TI=y
> +CONFIG_PHY_TI_DP83867=y
> CONFIG_DM_ETH=y
> CONFIG_MII=y
> CONFIG_DRIVER_TI_KEYSTONE_NET=y
> diff --git a/configs/xilinx_versal_virt_defconfig b/configs/xilinx_versal_virt_defconfig
> index e8c349261207..dcd841b8e299 100644
> --- a/configs/xilinx_versal_virt_defconfig
> +++ b/configs/xilinx_versal_virt_defconfig
> @@ -61,7 +61,7 @@ CONFIG_SPI_FLASH_WINBOND=y
> CONFIG_PHY_MARVELL=y
> CONFIG_PHY_NATSEMI=y
> CONFIG_PHY_REALTEK=y
> -CONFIG_PHY_TI=y
> +CONFIG_PHY_TI_DP83867=y
> CONFIG_PHY_VITESSE=y
> CONFIG_PHY_FIXED=y
> CONFIG_PHY_GIGE=y
> diff --git a/configs/xilinx_zynqmp_virt_defconfig b/configs/xilinx_zynqmp_virt_defconfig
> index 7b09edd78e1b..b7b671282a87 100644
> --- a/configs/xilinx_zynqmp_virt_defconfig
> +++ b/configs/xilinx_zynqmp_virt_defconfig
> @@ -101,7 +101,7 @@ CONFIG_PHY_MICREL=y
> CONFIG_PHY_MICREL_KSZ90X1=y
> CONFIG_PHY_NATSEMI=y
> CONFIG_PHY_REALTEK=y
> -CONFIG_PHY_TI=y
> +CONFIG_PHY_TI_DP83867=y
> CONFIG_PHY_VITESSE=y
> CONFIG_PHY_XILINX_GMII2RGMII=y
> CONFIG_PHY_FIXED=y
> diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
> index d1f049e62ab7..a8ae1db4afe2 100644
> --- a/drivers/net/phy/Kconfig
> +++ b/drivers/net/phy/Kconfig
> @@ -243,6 +243,21 @@ config PHY_TERANETICS
>
> config PHY_TI
> bool "Texas Instruments Ethernet PHYs support"
> + ---help---
> + Adds PHY registration support for TI PHYs.
> +
> +config PHY_TI_GENERIC
> + select PHY_TI
> + bool "Texas Instruments Generic Ethernet PHYs support"
> + ---help---
> + Adds support for Generic TI PHYs that don't need special handling but
> + the PHY name is associated with a PHY ID.
I spot one more thing here.
This fragment should be the part of 5/5 not 4/5.
Thanks,
Michal
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v3 4/5] net: phy: Add support for TI PHY init
2020-05-04 9:46 ` Michal Simek
@ 2020-05-04 16:59 ` Dan Murphy
0 siblings, 0 replies; 11+ messages in thread
From: Dan Murphy @ 2020-05-04 16:59 UTC (permalink / raw)
To: u-boot
Michal
On 5/4/20 4:46 AM, Michal Simek wrote:
> On 30. 04. 20 18:30, Dan Murphy wrote:
>> ti_phy_init function was allocated to the DP83867 PHY. This function
>> name is to generic for a specific PHY. The function can be moved to a
>> TI specific file that can register all TI PHYs that are defined in the
>> defconfig. The ti_phy_init file will contain all TI PHYs initialization
>> so that only phy_ti_init can be called from the framework.
>>
>> In addition to the above the config flag for the DP83867 needs to be changed
>> in the Kconfig and dependent defconfig files. The config flag that was
>> used for the DP83867 was also generic in nature so a more specific
>> config flag for the DP83867 was created.
>>
>> Acked-by: Michal Simek <michal.simek@xilinx.com>
>> Signed-off-by: Dan Murphy <dmurphy@ti.com>
>> ---
>> configs/am65x_evm_a53_defconfig | 2 +-
>> configs/am65x_hs_evm_a53_defconfig | 2 +-
>> configs/dra7xx_evm_defconfig | 2 +-
>> configs/dra7xx_hs_evm_defconfig | 2 +-
>> configs/dra7xx_hs_evm_usb_defconfig | 2 +-
>> configs/j721e_evm_a72_defconfig | 2 +-
>> configs/j721e_hs_evm_a72_defconfig | 2 +-
>> configs/k2g_evm_defconfig | 2 +-
>> configs/xilinx_versal_virt_defconfig | 2 +-
>> configs/xilinx_zynqmp_virt_defconfig | 2 +-
>> drivers/net/phy/Kconfig | 15 +++++++++++++++
>> drivers/net/phy/Makefile | 3 ++-
>> drivers/net/phy/dp83867.c | 3 ++-
>> drivers/net/phy/ti_phy_init.c | 18 ++++++++++++++++++
>> drivers/net/phy/ti_phy_init.h | 15 +++++++++++++++
>> 15 files changed, 62 insertions(+), 12 deletions(-)
>> create mode 100644 drivers/net/phy/ti_phy_init.c
>> create mode 100644 drivers/net/phy/ti_phy_init.h
>>
>> diff --git a/configs/am65x_evm_a53_defconfig b/configs/am65x_evm_a53_defconfig
>> index 542bbd992c53..c8cc9b2f7d8d 100644
>> --- a/configs/am65x_evm_a53_defconfig
>> +++ b/configs/am65x_evm_a53_defconfig
>> @@ -101,7 +101,7 @@ CONFIG_SPI_FLASH_SFDP_SUPPORT
>> CONFIG_SPI_FLASH_STMICRO=y
>> # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
>> CONFIG_SPI_FLASH_MTD=y
>> -CONFIG_PHY_TI=y
>> +CONFIG_PHY_TI_DP83867=y
>> CONFIG_PHY_FIXED=y
>> CONFIG_DM_ETH=y
>> CONFIG_E1000=y
>> diff --git a/configs/am65x_hs_evm_a53_defconfig b/configs/am65x_hs_evm_a53_defconfig
>> index 9f43cee39611..738bd01b059f 100644
>> --- a/configs/am65x_hs_evm_a53_defconfig
>> +++ b/configs/am65x_hs_evm_a53_defconfig
>> @@ -103,7 +103,7 @@ CONFIG_SPI_FLASH_SFDP_SUPPORT
>> CONFIG_SPI_FLASH_STMICRO=y
>> # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
>> CONFIG_SPI_FLASH_MTD=y
>> -CONFIG_PHY_TI=y
>> +CONFIG_PHY_TI_DP83867=y
>> CONFIG_PHY_FIXED=y
>> CONFIG_DM_ETH=y
>> CONFIG_E1000=y
>> diff --git a/configs/dra7xx_evm_defconfig b/configs/dra7xx_evm_defconfig
>> index 4d765da4e052..9ad462cdc6de 100644
>> --- a/configs/dra7xx_evm_defconfig
>> +++ b/configs/dra7xx_evm_defconfig
>> @@ -86,7 +86,7 @@ CONFIG_DM_SPI_FLASH=y
>> CONFIG_SF_DEFAULT_MODE=0
>> CONFIG_SF_DEFAULT_SPEED=76800000
>> CONFIG_SPI_FLASH_SPANSION=y
>> -CONFIG_PHY_TI=y
>> +CONFIG_PHY_TI_DP83867=y
>> CONFIG_DM_ETH=y
>> CONFIG_PHY_GIGE=y
>> CONFIG_MII=y
>> diff --git a/configs/dra7xx_hs_evm_defconfig b/configs/dra7xx_hs_evm_defconfig
>> index c25d4ce5c142..9aa452460765 100644
>> --- a/configs/dra7xx_hs_evm_defconfig
>> +++ b/configs/dra7xx_hs_evm_defconfig
>> @@ -89,7 +89,7 @@ CONFIG_DM_SPI_FLASH=y
>> CONFIG_SF_DEFAULT_MODE=0
>> CONFIG_SF_DEFAULT_SPEED=76800000
>> CONFIG_SPI_FLASH_SPANSION=y
>> -CONFIG_PHY_TI=y
>> +CONFIG_PHY_TI_DP83867=y
>> CONFIG_DM_ETH=y
>> CONFIG_PHY_GIGE=y
>> CONFIG_MII=y
>> diff --git a/configs/dra7xx_hs_evm_usb_defconfig b/configs/dra7xx_hs_evm_usb_defconfig
>> index 8e74496b2ccd..d282468212e9 100644
>> --- a/configs/dra7xx_hs_evm_usb_defconfig
>> +++ b/configs/dra7xx_hs_evm_usb_defconfig
>> @@ -87,7 +87,7 @@ CONFIG_SF_DEFAULT_MODE=0
>> CONFIG_SF_DEFAULT_SPEED=76800000
>> CONFIG_SPI_FLASH_BAR=y
>> CONFIG_SPI_FLASH_SPANSION=y
>> -CONFIG_PHY_TI=y
>> +CONFIG_PHY_TI_DP83867=y
>> CONFIG_DM_ETH=y
>> CONFIG_PHY_GIGE=y
>> CONFIG_MII=y
>> diff --git a/configs/j721e_evm_a72_defconfig b/configs/j721e_evm_a72_defconfig
>> index e9e82bb4309d..29ae8d720753 100644
>> --- a/configs/j721e_evm_a72_defconfig
>> +++ b/configs/j721e_evm_a72_defconfig
>> @@ -124,7 +124,7 @@ CONFIG_SPI_FLASH_SFDP_SUPPORT
>> CONFIG_SPI_FLASH_STMICRO=y
>> # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
>> CONFIG_SPI_FLASH_MTD=y
>> -CONFIG_PHY_TI=y
>> +CONFIG_PHY_TI_DP83867=y
>> CONFIG_PHY_FIXED=y
>> CONFIG_DM_ETH=y
>> CONFIG_TI_AM65_CPSW_NUSS=y
>> diff --git a/configs/j721e_hs_evm_a72_defconfig b/configs/j721e_hs_evm_a72_defconfig
>> index a723e2718e5e..7174fda72a01 100644
>> --- a/configs/j721e_hs_evm_a72_defconfig
>> +++ b/configs/j721e_hs_evm_a72_defconfig
>> @@ -114,7 +114,7 @@ CONFIG_SPI_FLASH_SFDP_SUPPORT
>> CONFIG_SPI_FLASH_STMICRO=y
>> # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
>> CONFIG_SPI_FLASH_MTD=y
>> -CONFIG_PHY_TI=y
>> +CONFIG_PHY_TI_DP83867=y
>> CONFIG_PHY_FIXED=y
>> CONFIG_DM_ETH=y
>> CONFIG_TI_AM65_CPSW_NUSS=y
>> diff --git a/configs/k2g_evm_defconfig b/configs/k2g_evm_defconfig
>> index 5abf5faa450e..14cf1b997d91 100644
>> --- a/configs/k2g_evm_defconfig
>> +++ b/configs/k2g_evm_defconfig
>> @@ -58,7 +58,7 @@ CONFIG_PHYLIB=y
>> CONFIG_PHY_MARVELL=y
>> CONFIG_PHY_MICREL=y
>> CONFIG_PHY_MICREL_KSZ8XXX=y
>> -CONFIG_PHY_TI=y
>> +CONFIG_PHY_TI_DP83867=y
>> CONFIG_DM_ETH=y
>> CONFIG_MII=y
>> CONFIG_DRIVER_TI_KEYSTONE_NET=y
>> diff --git a/configs/xilinx_versal_virt_defconfig b/configs/xilinx_versal_virt_defconfig
>> index e8c349261207..dcd841b8e299 100644
>> --- a/configs/xilinx_versal_virt_defconfig
>> +++ b/configs/xilinx_versal_virt_defconfig
>> @@ -61,7 +61,7 @@ CONFIG_SPI_FLASH_WINBOND=y
>> CONFIG_PHY_MARVELL=y
>> CONFIG_PHY_NATSEMI=y
>> CONFIG_PHY_REALTEK=y
>> -CONFIG_PHY_TI=y
>> +CONFIG_PHY_TI_DP83867=y
>> CONFIG_PHY_VITESSE=y
>> CONFIG_PHY_FIXED=y
>> CONFIG_PHY_GIGE=y
>> diff --git a/configs/xilinx_zynqmp_virt_defconfig b/configs/xilinx_zynqmp_virt_defconfig
>> index 7b09edd78e1b..b7b671282a87 100644
>> --- a/configs/xilinx_zynqmp_virt_defconfig
>> +++ b/configs/xilinx_zynqmp_virt_defconfig
>> @@ -101,7 +101,7 @@ CONFIG_PHY_MICREL=y
>> CONFIG_PHY_MICREL_KSZ90X1=y
>> CONFIG_PHY_NATSEMI=y
>> CONFIG_PHY_REALTEK=y
>> -CONFIG_PHY_TI=y
>> +CONFIG_PHY_TI_DP83867=y
>> CONFIG_PHY_VITESSE=y
>> CONFIG_PHY_XILINX_GMII2RGMII=y
>> CONFIG_PHY_FIXED=y
>> diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
>> index d1f049e62ab7..a8ae1db4afe2 100644
>> --- a/drivers/net/phy/Kconfig
>> +++ b/drivers/net/phy/Kconfig
>> @@ -243,6 +243,21 @@ config PHY_TERANETICS
>>
>> config PHY_TI
>> bool "Texas Instruments Ethernet PHYs support"
>> + ---help---
>> + Adds PHY registration support for TI PHYs.
>> +
>> +config PHY_TI_GENERIC
>> + select PHY_TI
>> + bool "Texas Instruments Generic Ethernet PHYs support"
>> + ---help---
>> + Adds support for Generic TI PHYs that don't need special handling but
>> + the PHY name is associated with a PHY ID.
>
> I spot one more thing here.
> This fragment should be the part of 5/5 not 4/5.
Ack
> Thanks,
> Michal
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v3 5/5] net: phy: Add DP8382x phy registration to TI PHY init
2020-04-30 16:30 [PATCH v3 0/5] TI Ethernet PHY changes Dan Murphy
` (3 preceding siblings ...)
2020-04-30 16:30 ` [PATCH v3 4/5] net: phy: Add support for TI PHY init Dan Murphy
@ 2020-04-30 16:30 ` Dan Murphy
4 siblings, 0 replies; 11+ messages in thread
From: Dan Murphy @ 2020-04-30 16:30 UTC (permalink / raw)
To: u-boot
Add the DP8382X generic PHY registration to the TI PHY init file.
Acked-by: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: Dan Murphy <dmurphy@ti.com>
---
drivers/net/phy/ti_phy_init.c | 83 +++++++++++++++++++++++++++++++++++
1 file changed, 83 insertions(+)
diff --git a/drivers/net/phy/ti_phy_init.c b/drivers/net/phy/ti_phy_init.c
index 277b29a26342..50eff77692f1 100644
--- a/drivers/net/phy/ti_phy_init.c
+++ b/drivers/net/phy/ti_phy_init.c
@@ -7,12 +7,95 @@
* Copyright (C) 2019-20 Texas Instruments Inc.
*/
+#include <phy.h>
#include "ti_phy_init.h"
+#ifdef CONFIG_PHY_TI_GENERIC
+static struct phy_driver dp83822_driver = {
+ .name = "TI DP83822",
+ .uid = 0x2000a240,
+ .mask = 0xfffffff0,
+ .features = PHY_BASIC_FEATURES,
+ .config = &genphy_config_aneg,
+ .startup = &genphy_startup,
+ .shutdown = &genphy_shutdown,
+};
+
+static struct phy_driver dp83826nc_driver = {
+ .name = "TI DP83826NC",
+ .uid = 0x2000a110,
+ .mask = 0xfffffff0,
+ .features = PHY_BASIC_FEATURES,
+ .config = &genphy_config_aneg,
+ .startup = &genphy_startup,
+ .shutdown = &genphy_shutdown,
+};
+
+static struct phy_driver dp83826c_driver = {
+ .name = "TI DP83826C",
+ .uid = 0x2000a130,
+ .mask = 0xfffffff0,
+ .features = PHY_BASIC_FEATURES,
+ .config = &genphy_config_aneg,
+ .startup = &genphy_startup,
+ .shutdown = &genphy_shutdown,
+};
+
+static struct phy_driver dp83825s_driver = {
+ .name = "TI DP83825S",
+ .uid = 0x2000a140,
+ .mask = 0xfffffff0,
+ .features = PHY_BASIC_FEATURES,
+ .config = &genphy_config_aneg,
+ .startup = &genphy_startup,
+ .shutdown = &genphy_shutdown,
+};
+
+static struct phy_driver dp83825i_driver = {
+ .name = "TI DP83825I",
+ .uid = 0x2000a150,
+ .mask = 0xfffffff0,
+ .features = PHY_BASIC_FEATURES,
+ .config = &genphy_config_aneg,
+ .startup = &genphy_startup,
+ .shutdown = &genphy_shutdown,
+};
+
+static struct phy_driver dp83825m_driver = {
+ .name = "TI DP83825M",
+ .uid = 0x2000a160,
+ .mask = 0xfffffff0,
+ .features = PHY_BASIC_FEATURES,
+ .config = &genphy_config_aneg,
+ .startup = &genphy_startup,
+ .shutdown = &genphy_shutdown,
+};
+
+static struct phy_driver dp83825cs_driver = {
+ .name = "TI DP83825CS",
+ .uid = 0x2000a170,
+ .mask = 0xfffffff0,
+ .features = PHY_BASIC_FEATURES,
+ .config = &genphy_config_aneg,
+ .startup = &genphy_startup,
+ .shutdown = &genphy_shutdown,
+};
+#endif /* CONFIG_PHY_TI_GENERIC */
+
int phy_ti_init(void)
{
#ifdef CONFIG_PHY_TI_DP83867
phy_dp83867_init();
#endif
+
+#ifdef CONFIG_PHY_TI_GENERIC
+ phy_register(&dp83822_driver);
+ phy_register(&dp83825s_driver);
+ phy_register(&dp83825i_driver);
+ phy_register(&dp83825m_driver);
+ phy_register(&dp83825cs_driver);
+ phy_register(&dp83826c_driver);
+ phy_register(&dp83826nc_driver);
+#endif
return 0;
}
--
2.25.1
^ permalink raw reply related [flat|nested] 11+ messages in thread