mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2025-09-25 07:41:40 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

net: sun8i-emac: remove support for old binding

Browse Source 
The original DT binding used by U-Boot's sun8i-emac driver was not really
agreed upon, and deviated from the "official" binding now used by the
kernel. Since now all U-Boot users have been converted to the new
binding, we can remove support for the old DT nodes from the driver.

Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Acked-by: Maxime Ripard <maxime.ripard@bootlin.com>
Reviewed-by: Jagan Teki <jagan@openedev.com>
This commit is contained in:
Andre Przywara 2018-04-04 01:31:20 +01:00 committed by Jagan Teki
parent 0bb48ef243
commit ecd0cec04c
1 changed files with 25 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
drivers/net/sun8i_emac.c
View File

@ -456,7 +456,7 @@ static int parse_phy_pins(struct udevice *dev)
{ {
int offset; int offset;
const char *pin_name; const char *pin_name;
int drive, pull, i; int drive, pull = SUN4I_PINCTRL_NO_PULL, i;
offset = fdtdec_lookup_phandle(gd->fdt_blob, dev_of_offset(dev), offset = fdtdec_lookup_phandle(gd->fdt_blob, dev_of_offset(dev),
"pinctrl-0"); "pinctrl-0");
@ -476,31 +476,20 @@ static int parse_phy_pins(struct udevice *dev)
drive = SUN4I_PINCTRL_30_MA; drive = SUN4I_PINCTRL_30_MA;
else else
drive = SUN4I_PINCTRL_40_MA; drive = SUN4I_PINCTRL_40_MA;
} else {
drive = fdt_getprop_u32_default_node(gd->fdt_blob, offset, 0,
"allwinner,drive", 4);
} }
if (fdt_get_property(gd->fdt_blob, offset, "bias-pull-up", NULL)) if (fdt_get_property(gd->fdt_blob, offset, "bias-pull-up", NULL))
pull = SUN4I_PINCTRL_PULL_UP; pull = SUN4I_PINCTRL_PULL_UP;
else if (fdt_get_property(gd->fdt_blob, offset, "bias-disable", NULL))
pull = SUN4I_PINCTRL_NO_PULL;
else if (fdt_get_property(gd->fdt_blob, offset, "bias-pull-down", NULL)) else if (fdt_get_property(gd->fdt_blob, offset, "bias-pull-down", NULL))
pull = SUN4I_PINCTRL_PULL_DOWN; pull = SUN4I_PINCTRL_PULL_DOWN;
else
pull = fdt_getprop_u32_default_node(gd->fdt_blob, offset, 0,
"allwinner,pull", 0);
for (i = 0; ; i++) { for (i = 0; ; i++) {
int pin; int pin;
pin_name = fdt_stringlist_get(gd->fdt_blob, offset,
"allwinner,pins", i, NULL);
if (!pin_name) {
pin_name = fdt_stringlist_get(gd->fdt_blob, offset, pin_name = fdt_stringlist_get(gd->fdt_blob, offset,
"pins", i, NULL); "pins", i, NULL);
if (!pin_name) if (!pin_name)
break; break;
}
pin = sunxi_name_to_gpio(pin_name); pin = sunxi_name_to_gpio(pin_name);
if (pin < 0) if (pin < 0)
@ -798,6 +787,7 @@ static int sun8i_emac_eth_ofdata_to_platdata(struct udevice *dev)
struct eth_pdata *pdata = &sun8i_pdata->eth_pdata; struct eth_pdata *pdata = &sun8i_pdata->eth_pdata;
struct emac_eth_dev *priv = dev_get_priv(dev); struct emac_eth_dev *priv = dev_get_priv(dev);
const char *phy_mode; const char *phy_mode;
const fdt32_t *reg;
int node = dev_of_offset(dev); int node = dev_of_offset(dev);
int offset = 0; int offset = 0;
#ifdef CONFIG_DM_GPIO #ifdef CONFIG_DM_GPIO
@ -805,18 +795,12 @@ static int sun8i_emac_eth_ofdata_to_platdata(struct udevice *dev)
int ret = 0; int ret = 0;
#endif #endif
pdata->iobase = devfdt_get_addr_name(dev, "emac");
if (pdata->iobase == FDT_ADDR_T_NONE)
pdata->iobase = devfdt_get_addr(dev); pdata->iobase = devfdt_get_addr(dev);
if (pdata->iobase == FDT_ADDR_T_NONE) { if (pdata->iobase == FDT_ADDR_T_NONE) {
debug("%s: Cannot find MAC base address\n", __func__); debug("%s: Cannot find MAC base address\n", __func__);
return -EINVAL; return -EINVAL;
} }
priv->sysctl_reg = devfdt_get_addr_name(dev, "syscon");
if (priv->sysctl_reg == FDT_ADDR_T_NONE) {
const fdt32_t *reg;
offset = fdtdec_lookup_phandle(gd->fdt_blob, node, "syscon"); offset = fdtdec_lookup_phandle(gd->fdt_blob, node, "syscon");
if (offset < 0) { if (offset < 0) {
debug("%s: cannot find syscon node\n", __func__); debug("%s: cannot find syscon node\n", __func__);
@ -830,10 +814,6 @@ static int sun8i_emac_eth_ofdata_to_platdata(struct udevice *dev)
} }
priv->sysctl_reg = fdt_translate_address((void *)gd->fdt_blob, priv->sysctl_reg = fdt_translate_address((void *)gd->fdt_blob,
offset, reg); offset, reg);
} else {
priv->sysctl_reg -= 0x30;
}
if (priv->sysctl_reg == FDT_ADDR_T_NONE) { if (priv->sysctl_reg == FDT_ADDR_T_NONE) {
debug("%s: Cannot find syscon base address\n", __func__); debug("%s: Cannot find syscon base address\n", __func__);
return -EINVAL; return -EINVAL;
@ -843,10 +823,7 @@ static int sun8i_emac_eth_ofdata_to_platdata(struct udevice *dev)
priv->phyaddr = -1; priv->phyaddr = -1;
priv->use_internal_phy = false; priv->use_internal_phy = false;
offset = fdtdec_lookup_phandle(gd->fdt_blob, node, "phy"); offset = fdtdec_lookup_phandle(gd->fdt_blob, node, "phy-handle");
if (offset < 0)
offset = fdtdec_lookup_phandle(gd->fdt_blob, node,
"phy-handle");
if (offset < 0) { if (offset < 0) {
debug("%s: Cannot find PHY address\n", __func__); debug("%s: Cannot find PHY address\n", __func__);
return -EINVAL; return -EINVAL;
@ -873,10 +850,6 @@ static int sun8i_emac_eth_ofdata_to_platdata(struct udevice *dev)
} }
if (priv->variant == H3_EMAC) { if (priv->variant == H3_EMAC) {
if (fdt_getprop(gd->fdt_blob, node,
"allwinner,use-internal-phy", NULL)) {
priv->use_internal_phy = true;
} else {
int parent = fdt_parent_offset(gd->fdt_blob, offset); int parent = fdt_parent_offset(gd->fdt_blob, offset);
if (parent >= 0 && if (parent >= 0 &&
@ -884,7 +857,6 @@ static int sun8i_emac_eth_ofdata_to_platdata(struct udevice *dev)
"allwinner,sun8i-h3-mdio-internal")) "allwinner,sun8i-h3-mdio-internal"))
priv->use_internal_phy = true; priv->use_internal_phy = true;
} }
}
priv->interface = pdata->phy_interface; priv->interface = pdata->phy_interface;