@@ -1079,16 +1079,13 @@ static int rockchip_set_mux(struct rockchip_pin_bank *bank, int pin, int mux)
10791079 }
10801080 }
10811081 #ifdef CONFIG_I2S_SHORT
1082- if (bank -> bank_num == 6 && (pin == 1 || pin == 2 ))
1083- {
1082+ if (bank -> bank_num == 6 && (pin == 1 || pin == 2 )) {
10841083 mask = 0xf ;
10851084 bit = 1 * 2 ;
10861085 data = (mask << (bit + 16 ));
10871086 rmask = data | (data >> 16 );
10881087 data |= (((mux << 2 ) | mux ) & mask ) << bit ;
1089- }
1090- else
1091- {
1088+ } else {
10921089 data = (mask << (bit + 16 ));
10931090 rmask = data | (data >> 16 );
10941091 data |= (mux & mask ) << bit ;
@@ -1889,7 +1886,7 @@ static int rockchip_set_pull(struct rockchip_pin_bank *bank,
18891886 u8 bit ;
18901887 u32 data , rmask ;
18911888 #ifdef CONFIG_I2S_SHORT
1892- /* For pin 185 and 186 are shorted. */
1889+ /* For GPIO 185 and 186 are shorted. */
18931890 if (bank -> bank_num == 6 && pin_num == 2 )
18941891 pull = PIN_CONFIG_BIAS_DISABLE ;
18951892 #endif
@@ -2098,7 +2095,7 @@ static int _rockchip_pmx_gpio_set_direction(struct gpio_chip *chip,
20982095 if (ret < 0 )
20992096 return ret ;
21002097 #ifdef CONFIG_I2S_SHORT
2101- /* For pin 185 and 186 are shorted. */
2098+ /* For GPIO 185 and 186 are shorted. */
21022099 gpio_pin = bank -> pin_base + pin ;
21032100 if (gpio_pin == 185 || gpio_pin == 186 ) {
21042101 ret = rockchip_set_pull (bank , 2 , PIN_CONFIG_BIAS_DISABLE );
@@ -2118,7 +2115,7 @@ static int _rockchip_pmx_gpio_set_direction(struct gpio_chip *chip,
21182115 else
21192116 data &= ~BIT (pin );
21202117 #ifdef CONFIG_I2S_SHORT
2121- /* For pin 185 and 186 are shorted. */
2118+ /* For GPIO 185 and 186 are shorted. */
21222119 if (gpio_pin == 185 )
21232120 data &= ~BIT (2 );
21242121 #endif
0 commit comments