summaryrefslogtreecommitdiff
path: root/target/linux/generic/files/drivers
diff options
context:
space:
mode:
authorMirko Parthey <mirko.parthey@web.de>2017-06-26 18:25:46 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2017-07-02 22:44:06 +0200
commit1dace8cbe0ba32a4876cede2c9ee226462955dcd (patch)
tree01532da4b9d7ce6e8eb277a7ffc17cf33f58cf84 /target/linux/generic/files/drivers
parent896246b8c5835240de5dc72e6253b51528e69930 (diff)
downloadmtk-20170518-1dace8cbe0ba32a4876cede2c9ee226462955dcd.zip
mtk-20170518-1dace8cbe0ba32a4876cede2c9ee226462955dcd.tar.gz
mtk-20170518-1dace8cbe0ba32a4876cede2c9ee226462955dcd.tar.bz2
brcm47xx: resolve GPIO conflict for WRT54GSv1
On the Linksys WRT54GSv1, the adm6996 switch driver and the gpio_button_hotplug module both claim GPIO 6, which is connected to the Reset button. When the switch driver's request wins, the Reset button cannot work. This makes it impossible to enter failsafe mode without a serial console. Stop requesting the "adm_rc" GPIO in the switch driver, since it is not used anywhere. Fixes FS#792. Signed-off-by: Mirko Parthey <mirko.parthey@web.de>
Diffstat (limited to 'target/linux/generic/files/drivers')
-rw-r--r--target/linux/generic/files/drivers/net/phy/adm6996.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/target/linux/generic/files/drivers/net/phy/adm6996.c b/target/linux/generic/files/drivers/net/phy/adm6996.c
index 25776b8..d9ea828 100644
--- a/target/linux/generic/files/drivers/net/phy/adm6996.c
+++ b/target/linux/generic/files/drivers/net/phy/adm6996.c
@@ -67,7 +67,6 @@ struct adm6996_priv {
u8 eecs;
u8 eesk;
u8 eedi;
- u8 eerc;
enum adm6996_model model;
@@ -1141,7 +1140,6 @@ static int adm6996_gpio_probe(struct platform_device *pdev)
priv->eecs = pdata->eecs;
priv->eedi = pdata->eedi;
- priv->eerc = pdata->eerc;
priv->eesk = pdata->eesk;
priv->model = pdata->model;
@@ -1154,9 +1152,6 @@ static int adm6996_gpio_probe(struct platform_device *pdev)
ret = devm_gpio_request(&pdev->dev, priv->eedi, "adm_eedi");
if (ret)
return ret;
- ret = devm_gpio_request(&pdev->dev, priv->eerc, "adm_eerc");
- if (ret)
- return ret;
ret = devm_gpio_request(&pdev->dev, priv->eesk, "adm_eesk");
if (ret)
return ret;