Re: FIXED_PHY is broken...

[Florian Fainelli <f.fainelli@gmail.com>]

On 16/12/14 12:15, David Miller wrote:
> From: David Miller <davem@davemloft.net>
> Date: Tue, 16 Dec 2014 14:30:27 -0500 (EST)
> 
>> From: David Miller <davem@davemloft.net>
>> Date: Tue, 16 Dec 2014 11:25:34 -0500 (EST)
>>
>>> I get this now when I run oldconfig:
>>>
>>> warning: (NET_DSA_BCM_SF2 && BCMGENET && SYSTEMPORT) selects FIXED_PHY which has unmet direct dependencies (NETDEVICES && PHYLIB=y)
>>
>> Here is how I'm going to fix this.
>>
>> FIXED_PHY needs to be allowed to be modular, and built even if PHYLIB is
>> modular too.

You beat me to it, thanks David!

>>
>> ====================
>> [PATCH] net: Allow FIXED_PHY to be modular.
> 
> Ok, it takes a little more work, the problem is that there is already
> a module named fixed.ko in the regulator layer, so we have to rename
> this to something else.
> 
> ====================
> [PATCH] net: Allow FIXED_PHY to be modular.
> 
> Otherwise we get things like:
> 
> warning: (NET_DSA_BCM_SF2 && BCMGENET && SYSTEMPORT) selects FIXED_PHY which has unmet direct dependencies (NETDEVICES && PHYLIB=y)
> 
> In order to make this work we have to rename fixed.c to fixed_phy.c
> because the regulator drivers already have a module named "fixed.o".
> 
> Signed-off-by: David S. Miller <davem@davemloft.net>

Acked-by: Florian Fainelli <f.fainelli@gmail.com>

> ---
>  drivers/net/phy/Kconfig                  | 4 ++--
>  drivers/net/phy/Makefile                 | 2 +-
>  drivers/net/phy/{fixed.c => fixed_phy.c} | 0
>  include/linux/phy_fixed.h                | 2 +-
>  4 files changed, 4 insertions(+), 4 deletions(-)
>  rename drivers/net/phy/{fixed.c => fixed_phy.c} (100%)
> 
> diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
> index b4b0f80..a3c251b 100644
> --- a/drivers/net/phy/Kconfig
> +++ b/drivers/net/phy/Kconfig
> @@ -119,8 +119,8 @@ config MICREL_PHY
>  	  Supports the KSZ9021, VSC8201, KS8001 PHYs.
>  
>  config FIXED_PHY
> -	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
> -	depends on PHYLIB=y
> +	tristate "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
> +	depends on PHYLIB
>  	---help---
>  	  Adds the platform "fixed" MDIO Bus to cover the boards that use
>  	  PHYs that are not connected to the real MDIO bus.
> diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile
> index eb3b18b..501ea76 100644
> --- a/drivers/net/phy/Makefile
> +++ b/drivers/net/phy/Makefile
> @@ -17,7 +17,7 @@ obj-$(CONFIG_BCM87XX_PHY)	+= bcm87xx.o
>  obj-$(CONFIG_ICPLUS_PHY)	+= icplus.o
>  obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
>  obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
> -obj-$(CONFIG_FIXED_PHY)		+= fixed.o
> +obj-$(CONFIG_FIXED_PHY)		+= fixed_phy.o
>  obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
>  obj-$(CONFIG_MDIO_GPIO)		+= mdio-gpio.o
>  obj-$(CONFIG_NATIONAL_PHY)	+= national.o
> diff --git a/drivers/net/phy/fixed.c b/drivers/net/phy/fixed_phy.c
> similarity index 100%
> rename from drivers/net/phy/fixed.c
> rename to drivers/net/phy/fixed_phy.c
> diff --git a/include/linux/phy_fixed.h b/include/linux/phy_fixed.h
> index f2ca1b4..7e75bfe 100644
> --- a/include/linux/phy_fixed.h
> +++ b/include/linux/phy_fixed.h
> @@ -11,7 +11,7 @@ struct fixed_phy_status {
>  
>  struct device_node;
>  
> -#ifdef CONFIG_FIXED_PHY
> +#if IS_ENABLED(CONFIG_FIXED_PHY)
>  extern int fixed_phy_add(unsigned int irq, int phy_id,
>  			 struct fixed_phy_status *status);
>  extern struct phy_device *fixed_phy_register(unsigned int irq,
>