|
@@ -71,16 +71,10 @@ unsigned int mii_mgr_write(unsigned int phy_addr,unsigned int phy_register,unsig
|
|
static int rtl8367s_hw_reset(void)
|
|
static int rtl8367s_hw_reset(void)
|
|
{
|
|
{
|
|
struct rtk_gsw *gsw = _gsw;
|
|
struct rtk_gsw *gsw = _gsw;
|
|
- int ret;
|
|
|
|
|
|
|
|
if (gsw->reset_pin < 0)
|
|
if (gsw->reset_pin < 0)
|
|
return 0;
|
|
return 0;
|
|
|
|
|
|
- ret = devm_gpio_request(gsw->dev, gsw->reset_pin, "mediatek,reset-pin");
|
|
|
|
-
|
|
|
|
- if (ret)
|
|
|
|
- printk("fail to devm_gpio_request\n");
|
|
|
|
-
|
|
|
|
gpio_direction_output(gsw->reset_pin, 0);
|
|
gpio_direction_output(gsw->reset_pin, 0);
|
|
|
|
|
|
usleep_range(1000, 1100);
|
|
usleep_range(1000, 1100);
|
|
@@ -89,10 +83,7 @@ static int rtl8367s_hw_reset(void)
|
|
|
|
|
|
mdelay(500);
|
|
mdelay(500);
|
|
|
|
|
|
- devm_gpio_free(gsw->dev, gsw->reset_pin);
|
|
|
|
-
|
|
|
|
return 0;
|
|
return 0;
|
|
-
|
|
|
|
}
|
|
}
|
|
|
|
|
|
static int rtl8367s_vlan_config(int want_at_p0)
|
|
static int rtl8367s_vlan_config(int want_at_p0)
|
|
@@ -235,6 +226,7 @@ static int rtk_gsw_probe(struct platform_device *pdev)
|
|
struct mii_bus *mdio_bus;
|
|
struct mii_bus *mdio_bus;
|
|
struct rtk_gsw *gsw;
|
|
struct rtk_gsw *gsw;
|
|
const char *pm;
|
|
const char *pm;
|
|
|
|
+ int ret;
|
|
|
|
|
|
mdio = of_parse_phandle(np, "mediatek,mdio", 0);
|
|
mdio = of_parse_phandle(np, "mediatek,mdio", 0);
|
|
|
|
|
|
@@ -256,6 +248,11 @@ static int rtk_gsw_probe(struct platform_device *pdev)
|
|
gsw->bus = mdio_bus;
|
|
gsw->bus = mdio_bus;
|
|
|
|
|
|
gsw->reset_pin = of_get_named_gpio(np, "mediatek,reset-pin", 0);
|
|
gsw->reset_pin = of_get_named_gpio(np, "mediatek,reset-pin", 0);
|
|
|
|
+ if (gsw->reset_pin >= 0) {
|
|
|
|
+ ret = devm_gpio_request(gsw->dev, gsw->reset_pin, "mediatek,reset-pin");
|
|
|
|
+ if (ret)
|
|
|
|
+ printk("fail to devm_gpio_request\n");
|
|
|
|
+ }
|
|
|
|
|
|
_gsw = gsw;
|
|
_gsw = gsw;
|
|
|
|
|