diff options
| author | Mirko Parthey <mirko.parthey@web.de> | 2017-06-26 18:25:46 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2017-07-02 22:44:06 +0200 |
| commit | 1dace8cbe0ba32a4876cede2c9ee226462955dcd (patch) | |
| tree | 01532da4b9d7ce6e8eb277a7ffc17cf33f58cf84 /target/linux/generic/files | |
| parent | 896246b8c5835240de5dc72e6253b51528e69930 (diff) | |
| download | upstream-1dace8cbe0ba32a4876cede2c9ee226462955dcd.tar.gz upstream-1dace8cbe0ba32a4876cede2c9ee226462955dcd.tar.bz2 upstream-1dace8cbe0ba32a4876cede2c9ee226462955dcd.zip | |
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')
| -rw-r--r-- | target/linux/generic/files/drivers/net/phy/adm6996.c | 5 | ||||
| -rw-r--r-- | target/linux/generic/files/include/linux/platform_data/adm6996-gpio.h | 1 |
2 files changed, 0 insertions, 6 deletions
diff --git a/target/linux/generic/files/drivers/net/phy/adm6996.c b/target/linux/generic/files/drivers/net/phy/adm6996.c index 25776b8366..d9ea828929 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; diff --git a/target/linux/generic/files/include/linux/platform_data/adm6996-gpio.h b/target/linux/generic/files/include/linux/platform_data/adm6996-gpio.h index e4fcfafa74..d5af9bbf6e 100644 --- a/target/linux/generic/files/include/linux/platform_data/adm6996-gpio.h +++ b/target/linux/generic/files/include/linux/platform_data/adm6996-gpio.h @@ -23,7 +23,6 @@ struct adm6996_gpio_platform_data { u8 eecs; u8 eesk; u8 eedi; - u8 eerc; enum adm6996_model model; }; |