Commit aa1d54c6 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

net: dsa: vsc73xx: Remove dependency on CONFIG_OF 



There is no build time dependency on CONFIG_OF, but we do need to make
sure we gate the initialization of the gpio_chip::of_node member with a
proper check on CONFIG_OF_GPIO. This enables the driver to build on
platforms that do not have CONFIG_OF enabled.

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 704a0afb

drivers/net/dsa/Kconfig

+0 −3
Original line number Original line Diff line number Diff line
@@ -105,7 +105,6 @@ config NET_DSA_SMSC_LAN9303_MDIO 




config NET_DSA_VITESSE_VSC73XX

config NET_DSA_VITESSE_VSC73XX

	tristate

	tristate

	depends on OF

	depends on NET_DSA

	depends on NET_DSA

	select FIXED_PHY

	select FIXED_PHY

	select VITESSE_PHY

	select VITESSE_PHY
@@ -116,7 +115,6 @@ config NET_DSA_VITESSE_VSC73XX 




config NET_DSA_VITESSE_VSC73XX_SPI

config NET_DSA_VITESSE_VSC73XX_SPI

	tristate "Vitesse VSC7385/7388/7395/7398 SPI mode support"

	tristate "Vitesse VSC7385/7388/7395/7398 SPI mode support"

	depends on OF

	depends on NET_DSA

	depends on NET_DSA

	depends on SPI

	depends on SPI

	select NET_DSA_VITESSE_VSC73XX

	select NET_DSA_VITESSE_VSC73XX
@@ -126,7 +124,6 @@ config NET_DSA_VITESSE_VSC73XX_SPI 




config NET_DSA_VITESSE_VSC73XX_PLATFORM

config NET_DSA_VITESSE_VSC73XX_PLATFORM

	tristate "Vitesse VSC7385/7388/7395/7398 Platform mode support"

	tristate "Vitesse VSC7385/7388/7395/7398 Platform mode support"

	depends on OF

	depends on NET_DSA

	depends on NET_DSA

	depends on HAS_IOMEM

	depends on HAS_IOMEM

	select NET_DSA_VITESSE_VSC73XX

	select NET_DSA_VITESSE_VSC73XX

drivers/net/dsa/vitesse-vsc73xx-core.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -1111,7 +1111,9 @@ static int vsc73xx_gpio_probe(struct vsc73xx *vsc) 
	vsc->gc.ngpio = 4;

	vsc->gc.ngpio = 4;

	vsc->gc.owner = THIS_MODULE;

	vsc->gc.owner = THIS_MODULE;

	vsc->gc.parent = vsc->dev;

	vsc->gc.parent = vsc->dev;

#if IS_ENABLED(CONFIG_OF_GPIO)

	vsc->gc.of_node = vsc->dev->of_node;

	vsc->gc.of_node = vsc->dev->of_node;

#endif

	vsc->gc.base = -1;

	vsc->gc.base = -1;

	vsc->gc.get = vsc73xx_gpio_get;

	vsc->gc.get = vsc73xx_gpio_get;

	vsc->gc.set = vsc73xx_gpio_set;

	vsc->gc.set = vsc73xx_gpio_set;

CRA Git | Maintained and supported by SUSTech CRA and CCSE