Skip to contentSkip to conversation

net: designware: Make driver independent from DM_GPIO again

PATCH In review Alexey Brodkin 4 participants 5 messages Jun 27, 2016 – Jul 12, 2016 Network drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net: designware: Make driver independent from DM_GPIO again

Commit 90b7fc924adf "net: designware: support phy reset device-tree bindings" made DW GMAC driver dependent on DM_GPIO by unconditional usage of purely DM_GPIO stuff like:
* dm_gpio_XXX()
* gpio_request_by_name()

But since that driver as of today might be easily used without DM_GPIO (that's the case for Synopsys AXS10x boards) we're shielding all DM_GPIO things by ifdefs.

Cc Simon Glass <[email protected]>
Cc Beniamino Galvani <[email protected]>
Cc Joe Hershberger <[email protected]>
Cc Sjoerd Simons <[email protected]>
Cc Sonic Zhang <[email protected]>
Cc Bin Meng <[email protected]>
Cc Marek Vasut <[email protected]>
---
 drivers/net/designware.c | 10 ++++++++--
 drivers/net/designware.h |  7 ++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)
drivers/net/designware.c +8 -2
index 8858f07..8ba72e3 100644
@@ -80,7 +80,7 @@ static int dw_mdio_write(struct mii_dev *bus, int addr, int devad, int reg,
 	return ret;
 }
 
-#if CONFIG_DM_ETH
+#if defined(CONFIG_DM_ETH) && defined(CONFIG_DM_GPIO)
 static int dw_mdio_reset(struct mii_dev *bus)
 {
 	struct udevice *dev = bus->priv;
@@ -126,7 +126,7 @@ static int dw_mdio_init(const char *name, void *priv)
 	bus->read = dw_mdio_read;
 	bus->write = dw_mdio_write;
 	snprintf(bus->name, sizeof(bus->name), "%s", name);
-#ifdef CONFIG_DM_ETH
+#if defined(CONFIG_DM_ETH) && defined(CONFIG_DM_GPIO)
 	bus->reset = dw_mdio_reset;
 #endif
 
@@ -690,11 +690,15 @@ static const struct eth_ops designware_eth_ops = {
 static int designware_eth_ofdata_to_platdata(struct udevice *dev)
 {
 	struct dw_eth_pdata *dw_pdata = dev_get_platdata(dev);
+#ifdef CONFIG_DM_GPIO
 	struct dw_eth_dev *priv = dev_get_priv(dev);
+#endif
 	struct eth_pdata *pdata = &dw_pdata->eth_pdata;
 	const char *phy_mode;
 	const fdt32_t *cell;
+#ifdef CONFIG_DM_GPIO
 	int reset_flags = GPIOD_IS_OUT;
+#endif
 	int ret = 0;
 
 	pdata->iobase = dev_get_addr(dev);
@@ -712,6 +716,7 @@ static int designware_eth_ofdata_to_platdata(struct udevice *dev)
 	if (cell)
 		pdata->max_speed = fdt32_to_cpu(*cell);
 
+#ifdef CONFIG_DM_GPIO
 	if (fdtdec_get_bool(gd->fdt_blob, dev->of_offset,
 			    "snps,reset-active-low"))
 		reset_flags |= GPIOD_ACTIVE_LOW;
@@ -724,6 +729,7 @@ static int designware_eth_ofdata_to_platdata(struct udevice *dev)
 	} else if (ret == -ENOENT) {
 		ret = 0;
 	}
+#endif
 
 	return ret;
 }
drivers/net/designware.h +6 -1
index 51ba769..d345c5b 100644
@@ -8,7 +8,9 @@
 #ifndef _DW_ETH_H
 #define _DW_ETH_H
 
-#include <asm/gpio.h>
+#ifdef CONFIG_DM_GPIO
+#include <asm-generic/gpio.h>
+#endif
 
 #define CONFIG_TX_DESCR_NUM	16
 #define CONFIG_RX_DESCR_NUM	16
@@ -234,7 +236,10 @@ struct dw_eth_dev {
 #ifndef CONFIG_DM_ETH
 	struct eth_device *dev;
 #endif
+#ifdef CONFIG_DM_GPIO
 	struct gpio_desc reset_gpio;
+#endif
+
 	struct phy_device *phydev;
 	struct mii_dev *bus;
 };
Signature · 1 line
2.5.5
#1 lore raw

PATCH 1/1 net: designware: Make driver independent from DM_GPIO again

Quoted 18 lines · Alexey Brodkin

Commit 90b7fc924adf "net: designware: support phy reset device-tree bindings" made DW GMAC driver dependent on DM_GPIO by unconditional usage of purely DM_GPIO stuff like:
* dm_gpio_XXX()
* gpio_request_by_name()

But since that driver as of today might be easily used without DM_GPIO (that's the case for Synopsys AXS10x boards) we're shielding all DM_GPIO things by ifdefs.

Cc Simon Glass <[email protected]>
Cc Beniamino Galvani <[email protected]>
Cc Joe Hershberger <[email protected]>
Cc Sjoerd Simons <[email protected]>
Cc Sonic Zhang <[email protected]>
Cc Bin Meng <[email protected]>
Cc Marek Vasut <[email protected]>
Quoted 4 lines
---
 drivers/net/designware.c | 10 ++++++++--
 drivers/net/designware.h |  7 ++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)
#2 lore raw

PATCH 1/1 net: designware: Make driver independent from DM_GPIO again

In reply to Alexey Brodkin

Hi?Joe,

Quoted 18 lines · Alexey Brodkin

Commit 90b7fc924adf "net: designware: support phy reset device-tree bindings" made DW GMAC driver dependent on DM_GPIO by unconditional usage of purely DM_GPIO stuff like:
?* dm_gpio_XXX()
?* gpio_request_by_name()

But since that driver as of today might be easily used without DM_GPIO (that's the case for Synopsys AXS10x boards) we're shielding all DM_GPIO things by ifdefs.

Cc Simon Glass <[email protected]>
Cc Beniamino Galvani <[email protected]>
Cc Joe Hershberger <[email protected]>
Cc Sjoerd Simons <[email protected]>
Cc Sonic Zhang <[email protected]>
Cc Bin Meng <[email protected]>
Cc Marek Vasut <[email protected]>
Quoted 1 line

---

Any chance for this one to be applied?
Otherwise U-Boot for axs10x boards is not compilable any longer.

Regards,
Alexey

#3 lore raw

PATCH 1/1 net: designware: Make driver independent from DM_GPIO again

In reply to Alexey Brodkin
Quoted 10 lines · Alexey Brodkin

Commit 90b7fc924adf "net: designware: support phy reset device-tree bindings" made DW GMAC driver dependent on DM_GPIO by unconditional usage of purely DM_GPIO stuff like:
* dm_gpio_XXX()
* gpio_request_by_name()

But since that driver as of today might be easily used without DM_GPIO (that's the case for Synopsys AXS10x boards) we're shielding all DM_GPIO things by ifdefs.

Quoted 8 lines
Cc Simon Glass <[email protected]>
Cc Beniamino Galvani <[email protected]>
Cc Joe Hershberger <[email protected]>
Cc Sjoerd Simons <[email protected]>
Cc Sonic Zhang <[email protected]>
Cc Bin Meng <[email protected]>
Cc Marek Vasut <[email protected]>