Special Issue[I2S short]: gpio 185 and 186 with the same function selected.

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

Author: Ecce_Li

drivers/pinctrl/pinctrl-rockchip.c

@@ -1078,9 +1078,26 @@ static int rockchip_set_mux(struct rockchip_pin_bank *bank, int pin, int mux)
 				return ret;
 		}
 	}
+	#ifdef CONFIG_I2S_SHORT
+	if(bank->bank_num == 6 && (pin == 1 || pin == 2))
+	{
+		mask = 0xf;
+		bit = 1 * 2;
+		data = (mask << (bit + 16));
+		rmask = data | (data >> 16);
+		data |= (((mux << 2) | mux) & mask) << bit;
+	}
+	else
+	{
+		data = (mask << (bit + 16));
+		rmask = data | (data >> 16);
+		data |= (mux & mask) << bit;
+	}
+	#else
 	data = (mask << (bit + 16));
 	rmask = data | (data >> 16);
 	data |= (mux & mask) << bit;
+	#endif
 	ret = regmap_update_bits(regmap, reg, rmask, data);
 
 	return ret;