[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date: Wed, 12 Nov 2014 00:41:31 +0300
From: Sergei Shtylyov <sergei.shtylyov@...entembedded.com>
To: Johan Hovold <johan@...nel.org>,
Florian Fainelli <f.fainelli@...il.com>
CC: "David S. Miller" <davem@...emloft.net>,
linux-kernel@...r.kernel.org, netdev@...r.kernel.org
Subject: Re: [PATCH 8/9] net: phy: micrel: clean up led-mode setup
Hello.
On 11/11/2014 10:00 PM, Johan Hovold wrote:
> Clean up led-mode setup by introducing proper defines for PHY Control
> registers 1 and 2 and only passing the register to the setup function.
Not sure that's really better that it was before (modulo naming).
> Signed-off-by: Johan Hovold <johan@...nel.org>
> ---
> drivers/net/phy/micrel.c | 31 ++++++++++++++++++++++---------
> 1 file changed, 22 insertions(+), 9 deletions(-)
> diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
> index ec9ce35e934b..12e18f7273ce 100644
> --- a/drivers/net/phy/micrel.c
> +++ b/drivers/net/phy/micrel.c
> @@ -47,8 +47,12 @@
> #define KSZPHY_INTCS_ALL (KSZPHY_INTCS_LINK_UP |\
> KSZPHY_INTCS_LINK_DOWN)
>
> -/* general PHY control reg in vendor specific block. */
> -#define MII_KSZPHY_CTRL 0x1F
> +/* PHY Control 1 */
> +#define MII_KSZPHY_CTRL_1 0x1e
> +
> +/* PHY Control 2 / PHY Control (if no PHY Control 1) */
> +#define MII_KSZPHY_CTRL_2 0x1f
> +#define MII_KSZPHY_CTRL MII_KSZPHY_CTRL_2
> /* bitmap of PHY register to set interrupt mode */
> #define KSZPHY_CTRL_INT_ACTIVE_HIGH BIT(9)
> #define KSZ9021_CTRL_INT_ACTIVE_HIGH BIT(14)
> @@ -158,13 +162,12 @@ static int ks8737_config_intr(struct phy_device *phydev)
> return rc < 0 ? rc : 0;
> }
>
> -static int kszphy_setup_led(struct phy_device *phydev,
> - unsigned int reg, unsigned int shift)
> +static int kszphy_setup_led(struct phy_device *phydev, u32 reg)
> {
>
> struct device *dev = &phydev->dev;
> struct device_node *of_node = dev->of_node;
> - int rc, temp;
> + int rc, temp, shift;
> u32 val;
>
> if (!of_node && dev->parent->of_node)
> @@ -178,6 +181,17 @@ static int kszphy_setup_led(struct phy_device *phydev,
> return -EINVAL;
> }
>
> + switch (reg) {
> + case MII_KSZPHY_CTRL_1:
> + shift = 14;
> + break;
> + case MII_KSZPHY_CTRL_2:
> + shift = 4;
> + break;
> + default:
> + return -EINVAL;
> + }
> +
> temp = phy_read(phydev, reg);
> if (temp < 0) {
> rc = temp;
> @@ -220,15 +234,14 @@ static int kszphy_config_init(struct phy_device *phydev)
>
> static int kszphy_config_init_led8041(struct phy_device *phydev)
> {
> - /* single led control, register 0x1e bits 15..14 */
> - return kszphy_setup_led(phydev, 0x1e, 14);
> + return kszphy_setup_led(phydev, MII_KSZPHY_CTRL_1);
> }
>
> static int ksz8021_config_init(struct phy_device *phydev)
> {
> int rc;
>
> - kszphy_setup_led(phydev, 0x1f, 4);
> + kszphy_setup_led(phydev, MII_KSZPHY_CTRL_2);
>
> rc = ksz_config_flags(phydev);
> if (rc < 0)
> @@ -243,7 +256,7 @@ static int ks8051_config_init(struct phy_device *phydev)
> {
> int rc;
>
> - kszphy_setup_led(phydev, 0x1f, 4);
> + kszphy_setup_led(phydev, MII_KSZPHY_CTRL_2);
>
> rc = ksz_config_flags(phydev);
> return rc < 0 ? rc : 0;
WBR, Sergei
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists