4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andy Shevchenko andriy.shevchenko@linux.intel.com Date: Thu, 24 Aug 2017 11:19:33 +0300 Subject: [PATCH 4.9 16/32] pinctrl: intel: Read back TX buffer state
From: Andy Shevchenko andriy.shevchenko@linux.intel.com
commit d68b42e30bbacd24354d644f430d088435b15e83 upstream.
In the same way as it's done in pinctrl-cherryview.c we would provide a readback TX buffer state.
Fixes: 17fab473693 ("pinctrl: intel: Set pin direction properly") Reported-by: "Bourque, Francis" francis.bourque@intel.com Signed-off-by: Andy Shevchenko andriy.shevchenko@linux.intel.com Acked-by: Mika Westerberg mika.westerberg@linux.intel.com Tested-by: "Bourque, Francis" francis.bourque@intel.com Signed-off-by: Linus Walleij linus.walleij@linaro.org Cc: Anthony de Boer adb@adb.ca Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org
--- drivers/pinctrl/intel/pinctrl-intel.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
--- a/drivers/pinctrl/intel/pinctrl-intel.c +++ b/drivers/pinctrl/intel/pinctrl-intel.c @@ -604,12 +604,17 @@ static int intel_gpio_get(struct gpio_ch { struct intel_pinctrl *pctrl = gpiochip_get_data(chip); void __iomem *reg; + u32 padcfg0;
reg = intel_get_padcfg(pctrl, offset, PADCFG0); if (!reg) return -EINVAL;
- return !!(readl(reg) & PADCFG0_GPIORXSTATE); + padcfg0 = readl(reg); + if (!(padcfg0 & PADCFG0_GPIOTXDIS)) + return !!(padcfg0 & PADCFG0_GPIOTXSTATE); + + return !!(padcfg0 & PADCFG0_GPIORXSTATE); }
static void intel_gpio_set(struct gpio_chip *chip, unsigned offset, int value)