Issue 185 and 186 are shorted and avoid 186 setting output high.

Change-Id: I551aa172107eedf54d6175f8b3304889012330e6
Reviewed-on: https://tp-biosrd-v02/gerrit/81549
Reviewed-by: Scorpio Chang(張志賢) <Scorpio_Chang@asus.com>
Tested-by: Scorpio Chang(張志賢) <Scorpio_Chang@asus.com>

Author: Ecce_Li

drivers/pinctrl/core.c

@@ -635,15 +635,21 @@ static int pinctrl_gpio_direction(unsigned gpio, bool input)
 	if (ret) {
 		return ret;
 	}
-
+	/* For pin 185 and 186 are shorted.*/
+	if (gpio == 186) {
+		input = true;
+	}	
 	mutex_lock(&pctldev->mutex);
 
 	/* Convert to the pin controllers number space */
+	if (gpio == 185) {
+		pin = gpio_to_pin(range, 186);
+		ret = pinmux_gpio_direction(pctldev, range, pin, true);
+	}
 	pin = gpio_to_pin(range, gpio);
 	ret = pinmux_gpio_direction(pctldev, range, pin, input);
 
 	mutex_unlock(&pctldev->mutex);
-
 	return ret;
 }
 

drivers/pinctrl/pinctrl-rockchip.c

@@ -2071,11 +2071,12 @@ static int _rockchip_pmx_gpio_set_direction(struct gpio_chip *chip,
 	u32 data;
 
 	bank = gc_to_pin_bank(chip);
-
 	ret = rockchip_set_mux(bank, pin, RK_FUNC_GPIO);
 	if (ret < 0)
 		return ret;
-
+	/* For pin 185 and 186 are shorted. */
+	if (bank->pin_base + pin == 186)
+		input = true;
 	//clk_enable(bank->clk);
 	raw_spin_lock_irqsave(&bank->slock, flags);
 
@@ -2085,8 +2086,9 @@ static int _rockchip_pmx_gpio_set_direction(struct gpio_chip *chip,
 		data |= BIT(pin);
 	else
 		data &= ~BIT(pin);
+	if (bank->pin_base + pin == 185) 
+		data &= ~BIT(2);
 	writel_relaxed(data, bank->reg_base + GPIO_SWPORT_DDR);
-
 	raw_spin_unlock_irqrestore(&bank->slock, flags);
 	//clk_disable(bank->clk);