summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaptor Engineering Development Team <support@raptorengineering.com>2019-05-03 09:44:50 +0000
committerRaptor Engineering Development Team <support@raptorengineering.com>2019-05-03 09:47:38 +0000
commite97ed63c2118273a987e4efd922e479ea54ac4c6 (patch)
tree1796f92de873b8154d8ccc5bd5befe68a69c3ceb
parentd32565cb60fbf6a13801dca1373b5c46dcb631b6 (diff)
downloadblackbird-obmc-linux-e97ed63c2118273a987e4efd922e479ea54ac4c6.tar.gz
blackbird-obmc-linux-e97ed63c2118273a987e4efd922e479ea54ac4c6.zip
pinctrl/aspeed: Remove COND2 condition from GPIOR1
On Blackbird hardware, ball T19 is set to FWSPICS2# even when COND2 (SCU94[1:0] == 0x0) is not met. Since COND2 is listed as a requirement for FWSPICS2#, the pinmux controller can choose to set SCU88[25]=1 even when GPIOR1 is hogged. Due to the documentation error, this results in ball T19 assigned to FWSPICS2# instead of GPIOR1, leading to a failure of the Blackbird platform. Tested on Blackbird harwdare; GPIOR1 functions normally with this patch and does not reliably function without it. Signed-off-by: Timothy Pearson <tpearson@raptorengineering.com>
-rw-r--r--drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c b/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c
index 676f90d3c5f3..e3f9d6738115 100644
--- a/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c
+++ b/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c
@@ -958,7 +958,7 @@ SSSF_PIN_DECL(N20, GPIOQ7, PEWAKE, SIG_DESC_SET(SCU2C, 29));
SSSF_PIN_DECL(AA19, GPIOR0, FWSPICS1, SIG_DESC_SET(SCU88, 24), COND2);
#define T19 137
-SSSF_PIN_DECL(T19, GPIOR1, FWSPICS2, SIG_DESC_SET(SCU88, 25), COND2);
+SSSF_PIN_DECL(T19, GPIOR1, FWSPICS2, SIG_DESC_SET(SCU88, 25));
#define T17 138
SSSF_PIN_DECL(T17, GPIOR2, SPI2CS0, SIG_DESC_SET(SCU88, 26), COND2);
OpenPOWER on IntegriCloud