diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/designware.c | 15 | ||||
| -rw-r--r-- | drivers/usb/host/ehci-mx6.c | 17 |
2 files changed, 23 insertions, 9 deletions
diff --git a/drivers/net/designware.c b/drivers/net/designware.c index b8ba00b..5d92257 100644 --- a/drivers/net/designware.c +++ b/drivers/net/designware.c @@ -91,9 +91,8 @@ static int dw_mdio_write(struct mii_dev *bus, int addr, int devad, int reg, } #if defined(CONFIG_DM_ETH) && CONFIG_IS_ENABLED(DM_GPIO) -static int dw_mdio_reset(struct mii_dev *bus) +static int __dw_mdio_reset(struct udevice *dev) { - struct udevice *dev = bus->priv; struct dw_eth_dev *priv = dev_get_priv(dev); struct dw_eth_pdata *pdata = dev_get_plat(dev); int ret; @@ -122,6 +121,13 @@ static int dw_mdio_reset(struct mii_dev *bus) return 0; } + +static int dw_mdio_reset(struct mii_dev *bus) +{ + struct udevice *dev = bus->priv; + + return __dw_mdio_reset(dev); +} #endif #if IS_ENABLED(CONFIG_DM_MDIO) @@ -142,9 +148,10 @@ int designware_eth_mdio_write(struct udevice *mdio_dev, int addr, int devad, int #if CONFIG_IS_ENABLED(DM_GPIO) int designware_eth_mdio_reset(struct udevice *mdio_dev) { - struct mdio_perdev_priv *pdata = dev_get_uclass_priv(mdio_dev); + struct mdio_perdev_priv *mdio_pdata = dev_get_uclass_priv(mdio_dev); + struct udevice *dev = mdio_pdata->mii_bus->priv; - return dw_mdio_reset(pdata->mii_bus); + return __dw_mdio_reset(dev->parent); } #endif diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c index 7642a31..06be9de 100644 --- a/drivers/usb/host/ehci-mx6.c +++ b/drivers/usb/host/ehci-mx6.c @@ -265,6 +265,8 @@ int usb_phy_mode(int port) } #endif +#if !defined(CONFIG_PHY) +/* Should be done in the MXS PHY driver */ static void usb_oc_config(struct usbnc_regs *usbnc, int index) { void __iomem *ctrl = (void __iomem *)(&usbnc->ctrl[index]); @@ -285,6 +287,7 @@ static void usb_oc_config(struct usbnc_regs *usbnc, int index) clrbits_le32(ctrl, UCTRL_PWR_POL); #endif } +#endif #if !CONFIG_IS_ENABLED(DM_USB) /** @@ -432,10 +435,12 @@ struct ehci_mx6_priv_data { struct clk clk; struct phy phy; enum usb_init_type init_type; +#if !defined(CONFIG_PHY) int portnr; void __iomem *phy_addr; void __iomem *misc_addr; void __iomem *anatop_addr; +#endif }; static int mx6_init_after_reset(struct ehci_ctrl *dev) @@ -448,14 +453,14 @@ static int mx6_init_after_reset(struct ehci_ctrl *dev) usb_power_config_mx6(priv->anatop_addr, priv->portnr); usb_power_config_mx7(priv->misc_addr); usb_power_config_mx7ulp(priv->phy_addr); -#endif usb_oc_config(priv->misc_addr, priv->portnr); -#if !defined(CONFIG_PHY) && (defined(CONFIG_MX6) || defined(CONFIG_MX7ULP)) +#if defined(CONFIG_MX6) || defined(CONFIG_MX7ULP) usb_internal_phy_clock_gate(priv->phy_addr, 1); usb_phy_enable(ehci, priv->phy_addr); #endif +#endif #if CONFIG_IS_ENABLED(DM_REGULATOR) if (priv->vbus_supply) { @@ -558,6 +563,7 @@ static int ehci_usb_of_to_plat(struct udevice *dev) static int mx6_parse_dt_addrs(struct udevice *dev) { +#if !defined(CONFIG_PHY) struct ehci_mx6_priv_data *priv = dev_get_priv(dev); int phy_off, misc_off; const void *blob = gd->fdt_blob; @@ -594,7 +600,7 @@ static int mx6_parse_dt_addrs(struct udevice *dev) priv->misc_addr = addr; -#if !defined(CONFIG_PHY) && defined(CONFIG_MX6) +#if defined(CONFIG_MX6) int anatop_off; /* Resolve ANATOP offset through USB PHY node */ @@ -608,6 +614,7 @@ static int mx6_parse_dt_addrs(struct udevice *dev) priv->anatop_addr = addr; #endif +#endif return 0; } @@ -661,14 +668,14 @@ static int ehci_usb_probe(struct udevice *dev) usb_power_config_mx6(priv->anatop_addr, priv->portnr); usb_power_config_mx7(priv->misc_addr); usb_power_config_mx7ulp(priv->phy_addr); -#endif usb_oc_config(priv->misc_addr, priv->portnr); -#if !defined(CONFIG_PHY) && (defined(CONFIG_MX6) || defined(CONFIG_MX7ULP)) +#if defined(CONFIG_MX6) || defined(CONFIG_MX7ULP) usb_internal_phy_clock_gate(priv->phy_addr, 1); usb_phy_enable(ehci, priv->phy_addr); #endif +#endif #if CONFIG_IS_ENABLED(DM_REGULATOR) if (priv->vbus_supply) { |