|
42 | 42 | #define CY8C95X0_PORTSEL 0x18 |
43 | 43 | /* Port settings, write PORTSEL first */ |
44 | 44 | #define CY8C95X0_INTMASK 0x19 |
45 | | -#define CY8C95X0_PWMSEL 0x1A |
| 45 | +#define CY8C95X0_SELPWM 0x1A |
46 | 46 | #define CY8C95X0_INVERT 0x1B |
47 | 47 | #define CY8C95X0_DIRECTION 0x1C |
48 | 48 | /* Drive mode register change state on writing '1' */ |
@@ -369,8 +369,8 @@ static bool cy8c95x0_volatile_register(struct device *dev, unsigned int reg) |
369 | 369 | case CY8C95X0_INPUT_(0) ... CY8C95X0_INPUT_(7): |
370 | 370 | case CY8C95X0_INTSTATUS_(0) ... CY8C95X0_INTSTATUS_(7): |
371 | 371 | case CY8C95X0_INTMASK: |
| 372 | + case CY8C95X0_SELPWM: |
372 | 373 | case CY8C95X0_INVERT: |
373 | | - case CY8C95X0_PWMSEL: |
374 | 374 | case CY8C95X0_DIRECTION: |
375 | 375 | case CY8C95X0_DRV_PU: |
376 | 376 | case CY8C95X0_DRV_PD: |
@@ -399,7 +399,7 @@ static bool cy8c95x0_muxed_register(unsigned int reg) |
399 | 399 | { |
400 | 400 | switch (reg) { |
401 | 401 | case CY8C95X0_INTMASK: |
402 | | - case CY8C95X0_PWMSEL: |
| 402 | + case CY8C95X0_SELPWM: |
403 | 403 | case CY8C95X0_INVERT: |
404 | 404 | case CY8C95X0_DIRECTION: |
405 | 405 | case CY8C95X0_DRV_PU: |
@@ -797,7 +797,7 @@ static int cy8c95x0_gpio_get_pincfg(struct cy8c95x0_pinctrl *chip, |
797 | 797 | reg = CY8C95X0_DIRECTION; |
798 | 798 | break; |
799 | 799 | case PIN_CONFIG_MODE_PWM: |
800 | | - reg = CY8C95X0_PWMSEL; |
| 800 | + reg = CY8C95X0_SELPWM; |
801 | 801 | break; |
802 | 802 | case PIN_CONFIG_OUTPUT: |
803 | 803 | reg = CY8C95X0_OUTPUT; |
@@ -876,7 +876,7 @@ static int cy8c95x0_gpio_set_pincfg(struct cy8c95x0_pinctrl *chip, |
876 | 876 | reg = CY8C95X0_DRV_PP_FAST; |
877 | 877 | break; |
878 | 878 | case PIN_CONFIG_MODE_PWM: |
879 | | - reg = CY8C95X0_PWMSEL; |
| 879 | + reg = CY8C95X0_SELPWM; |
880 | 880 | break; |
881 | 881 | case PIN_CONFIG_OUTPUT_ENABLE: |
882 | 882 | return cy8c95x0_pinmux_direction(chip, off, !arg); |
@@ -1161,7 +1161,7 @@ static void cy8c95x0_pin_dbg_show(struct pinctrl_dev *pctldev, struct seq_file * |
1161 | 1161 | bitmap_zero(mask, MAX_LINE); |
1162 | 1162 | __set_bit(pin, mask); |
1163 | 1163 |
|
1164 | | - if (cy8c95x0_read_regs_mask(chip, CY8C95X0_PWMSEL, pwm, mask)) { |
| 1164 | + if (cy8c95x0_read_regs_mask(chip, CY8C95X0_SELPWM, pwm, mask)) { |
1165 | 1165 | seq_puts(s, "not available"); |
1166 | 1166 | return; |
1167 | 1167 | } |
@@ -1206,7 +1206,7 @@ static int cy8c95x0_set_mode(struct cy8c95x0_pinctrl *chip, unsigned int off, bo |
1206 | 1206 | u8 port = cypress_get_port(chip, off); |
1207 | 1207 | u8 bit = cypress_get_pin_mask(chip, off); |
1208 | 1208 |
|
1209 | | - return cy8c95x0_regmap_write_bits(chip, CY8C95X0_PWMSEL, port, bit, mode ? bit : 0); |
| 1209 | + return cy8c95x0_regmap_write_bits(chip, CY8C95X0_SELPWM, port, bit, mode ? bit : 0); |
1210 | 1210 | } |
1211 | 1211 |
|
1212 | 1212 | static int cy8c95x0_pinmux_mode(struct cy8c95x0_pinctrl *chip, |
|
0 commit comments