Special Issue[I2S short]: p no pull-up/down and output mode for gpio 186

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

Author: Ecce_Li

arch/arm/Kconfig.debug

@@ -42,7 +42,8 @@ config FRAME_POINTER
 	  faster. However, if neither FRAME_POINTER nor ARM_UNWIND are enabled,
 	  when a problem occurs with the kernel, the information that is
 	  reported is severely limited.
-
+config I2S_SHORT
+	bool "Pin 185 and 186(I2S) is shorted in TinkerBoard."
 config ARM_UNWIND
 	bool "Enable stack unwinding support (EXPERIMENTAL)"
 	depends on AEABI

arch/arm/configs/miniarm-rk3288_defconfig

@@ -810,4 +810,5 @@ CONFIG_IR_XMP_DECODER=y
 CONFIG_LIRC_RPI=y
 CONFIG_RC_DEVICES=y
 CONFIG_LIRC_STAGING=y
-CONFIG_STAGING_MEDIA=y
+CONFIG_STAGING_MEDIA=y
+CONFIG_I2S_SHORT=y

drivers/pinctrl/core.c

@@ -635,17 +635,21 @@ static int pinctrl_gpio_direction(unsigned gpio, bool input)
 	if (ret) {
 		return ret;
 	}
+	#ifdef CONFIG_I2S_SHORT
 	/* For pin 185 and 186 are shorted.*/
-	if (gpio == 186) {
+	if (gpio == 186) 
 		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.*/
 	if (gpio == 185) {
 		pin = gpio_to_pin(range, 186);
 		ret = pinmux_gpio_direction(pctldev, range, pin, true);
 	}
+	#endif
 	pin = gpio_to_pin(range, gpio);
 	ret = pinmux_gpio_direction(pctldev, range, pin, input);
 

drivers/pinctrl/pinctrl-rockchip.c

@@ -1078,7 +1078,6 @@ static int rockchip_set_mux(struct rockchip_pin_bank *bank, int pin, int mux)
 				return ret;
 		}
 	}
-
 	data = (mask << (bit + 16));
 	rmask = data | (data >> 16);
 	data |= (mux & mask) << bit;
@@ -1872,7 +1871,11 @@ static int rockchip_set_pull(struct rockchip_pin_bank *bank,
 	int reg, ret, i, pull_type;
 	u8 bit;
 	u32 data, rmask;
-
+	#ifdef CONFIG_I2S_SHORT
+	/* For pin 185 and 186 are shorted. */
+	if(bank->bank_num == 6 && pin_num == 2) 
+		pull = PIN_CONFIG_BIAS_DISABLE;
+	#endif
 	dev_dbg(info->dev, "setting pull of GPIO%d-%d to %d\n",
 		 bank->bank_num, pin_num, pull);
 
@@ -2069,14 +2072,25 @@ static int _rockchip_pmx_gpio_set_direction(struct gpio_chip *chip,
 	int ret;
 	unsigned long flags;
 	u32 data;
+	#ifdef CONFIG_I2S_SHORT
+	unsigned long gpio_pin;
+	#endif
 
 	bank = gc_to_pin_bank(chip);
 	ret = rockchip_set_mux(bank, pin, RK_FUNC_GPIO);
 	if (ret < 0)
 		return ret;
+	#ifdef CONFIG_I2S_SHORT
 	/* For pin 185 and 186 are shorted. */
-	if (bank->pin_base + pin == 186)
-		input = true;
+	gpio_pin = bank->pin_base + pin;
+	if (gpio_pin == 185 || gpio_pin == 186) {
+		ret = rockchip_set_pull(bank, 2, PIN_CONFIG_BIAS_DISABLE);
+		if (ret < 0)
+			return ret;
+		if(gpio_pin == 186)
+			input = true;
+	}
+	#endif
 	//clk_enable(bank->clk);
 	raw_spin_lock_irqsave(&bank->slock, flags);
 
@@ -2086,8 +2100,11 @@ static int _rockchip_pmx_gpio_set_direction(struct gpio_chip *chip,
 		data |= BIT(pin);
 	else
 		data &= ~BIT(pin);
+	#ifdef CONFIG_I2S_SHORT
+	/* For pin 185 and 186 are shorted. */
 	if (bank->pin_base + pin == 185) 
 		data &= ~BIT(2);
+	#endif
 	writel_relaxed(data, bank->reg_base + GPIO_SWPORT_DDR);
 	raw_spin_unlock_irqrestore(&bank->slock, flags);
 	//clk_disable(bank->clk);