ARCH_GPIO_BASE 1000 for I2S short Issue.

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

Author: Ecce_Li

drivers/pinctrl/core.c

@@ -637,16 +637,24 @@ static int pinctrl_gpio_direction(unsigned gpio, bool input)
 	}
 	#ifdef CONFIG_I2S_SHORT
 	/* For pin 185 and 186 are shorted.*/
-	if (gpio == 186) 
+	#ifdef ARCH_GPIO_BASE
+	if (gpio % 1000 == 186)  //% 1000 for ARCH_GPIO_BASE Issue
+	#else
+	if (gpio == 186)
+	#endif
 		input = true;
 	#endif	
 	mutex_lock(&pctldev->mutex);
 
 	/* Convert to the pin controllers number space */
 	#ifdef CONFIG_I2S_SHORT
 	/* For pin 185 and 186 are shorted.*/
+	#ifdef ARCH_GPIO_BASE
+	if (gpio % 1000 == 185) { // % 1000 for ARCH_GPIO_BASE Issue
+	#else
 	if (gpio == 185) {
-		pin = gpio_to_pin(range, 186);
+	#endif
+		pin = gpio_to_pin(range, gpio + 1);
 		ret = pinmux_gpio_direction(pctldev, range, pin, true);
 	}
 	#endif

drivers/pinctrl/pinctrl-rockchip.c

@@ -2097,6 +2097,9 @@ static int _rockchip_pmx_gpio_set_direction(struct gpio_chip *chip,
 	#ifdef CONFIG_I2S_SHORT
 	/* For GPIO 185 and 186 are shorted. */
 	gpio_pin = bank->pin_base + pin;
+	#ifdef ARCH_GPIO_BASE	// % 1000 for ARCH_GPIO_BASE 1000
+	gpio_pin = gpio_pin % 1000;
+	#endif
 	if (gpio_pin == 185 || gpio_pin == 186) {
 		ret = rockchip_set_pull(bank, 2, PIN_CONFIG_BIAS_DISABLE);
 		if (ret < 0)