niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

pinctrl: renesas: rzg2l: Rename RZG2L_SINGLE_PIN_GET_PORT macro

Browse source 
Rename RZG2L_SINGLE_PIN_GET_PORT -> RZG2L_SINGLE_PIN_GET_PORT_OFFSET.

Also, rename port -> port_offset in rzg2l_pinctrl_pinconf_set/get for
readability.

Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Reviewed-by: Biju Das <biju.das.jz@bp.renesas.com>
Link: https://lore.kernel.org/r/20211110224622.16022-3-prabhakar.mahadev-lad.rj@bp.renesas.com
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
This commit is contained in:
Lad Prabhakar 2021-11-10 22:46:18 +00:00 • committed by Geert Uytterhoeven
parent aa52b00844
commit c76629a63b
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/pinctrl/renesas/pinctrl-rzg2l.c
View file

@ -77,7 +77,7 @@
#define RZG2L_SINGLE_PIN BIT(31) #define RZG2L_SINGLE_PIN BIT(31)
#define RZG2L_SINGLE_PIN_PACK(p, b, f) (RZG2L_SINGLE_PIN | \ #define RZG2L_SINGLE_PIN_PACK(p, b, f) (RZG2L_SINGLE_PIN | \
((p) << 24) | ((b) << 20) | (f)) ((p) << 24) | ((b) << 20) | (f))
#define RZG2L_SINGLE_PIN_GET_PORT(x) (((x) & GENMASK(30, 24)) >> 24) #define RZG2L_SINGLE_PIN_GET_PORT_OFFSET(x) (((x) & GENMASK(30, 24)) >> 24)
#define RZG2L_SINGLE_PIN_GET_BIT(x) (((x) & GENMASK(22, 20)) >> 20) #define RZG2L_SINGLE_PIN_GET_BIT(x) (((x) & GENMASK(22, 20)) >> 20)
#define RZG2L_SINGLE_PIN_GET_CFGS(x) ((x) & GENMASK(19, 0)) #define RZG2L_SINGLE_PIN_GET_CFGS(x) ((x) & GENMASK(19, 0))
@ -432,10 +432,10 @@ static int rzg2l_pinctrl_pinconf_get(struct pinctrl_dev *pctldev,
enum pin_config_param param = pinconf_to_config_param(*config); enum pin_config_param param = pinconf_to_config_param(*config);
const struct pinctrl_pin_desc *pin = &pctrl->desc.pins[_pin]; const struct pinctrl_pin_desc *pin = &pctrl->desc.pins[_pin];
unsigned int *pin_data = pin->drv_data; unsigned int *pin_data = pin->drv_data;
u32 port_offset = 0, reg;
unsigned int arg = 0; unsigned int arg = 0;
unsigned long flags; unsigned long flags;
void __iomem *addr; void __iomem *addr;
u32 port = 0, reg;
u32 cfg = 0; u32 cfg = 0;
u8 bit = 0; u8 bit = 0;
@ -443,7 +443,7 @@ static int rzg2l_pinctrl_pinconf_get(struct pinctrl_dev *pctldev,
return -EINVAL; return -EINVAL;
if (*pin_data & RZG2L_SINGLE_PIN) { if (*pin_data & RZG2L_SINGLE_PIN) {
port = RZG2L_SINGLE_PIN_GET_PORT(*pin_data); port_offset = RZG2L_SINGLE_PIN_GET_PORT_OFFSET(*pin_data);
cfg = RZG2L_SINGLE_PIN_GET_CFGS(*pin_data); cfg = RZG2L_SINGLE_PIN_GET_CFGS(*pin_data);
bit = RZG2L_SINGLE_PIN_GET_BIT(*pin_data); bit = RZG2L_SINGLE_PIN_GET_BIT(*pin_data);
} }
@ -454,7 +454,7 @@ static int rzg2l_pinctrl_pinconf_get(struct pinctrl_dev *pctldev,
return -EINVAL; return -EINVAL;
spin_lock_irqsave(&pctrl->lock, flags); spin_lock_irqsave(&pctrl->lock, flags);
/* handle _L/_H for 32-bit register read/write */ /* handle _L/_H for 32-bit register read/write */
addr = pctrl->base + IEN(port); addr = pctrl->base + IEN(port_offset);
if (bit >= 4) { if (bit >= 4) {
bit -= 4; bit -= 4;
addr += 4; addr += 4;
@ -502,9 +502,9 @@ static int rzg2l_pinctrl_pinconf_set(struct pinctrl_dev *pctldev,
const struct pinctrl_pin_desc *pin = &pctrl->desc.pins[_pin]; const struct pinctrl_pin_desc *pin = &pctrl->desc.pins[_pin];
unsigned int *pin_data = pin->drv_data; unsigned int *pin_data = pin->drv_data;
enum pin_config_param param; enum pin_config_param param;
u32 port_offset = 0, reg;
unsigned long flags; unsigned long flags;
void __iomem *addr; void __iomem *addr;
u32 port = 0, reg;
unsigned int i; unsigned int i;
u32 cfg = 0; u32 cfg = 0;
u8 bit = 0; u8 bit = 0;
@ -513,7 +513,7 @@ static int rzg2l_pinctrl_pinconf_set(struct pinctrl_dev *pctldev,
return -EINVAL; return -EINVAL;
if (*pin_data & RZG2L_SINGLE_PIN) { if (*pin_data & RZG2L_SINGLE_PIN) {
port = RZG2L_SINGLE_PIN_GET_PORT(*pin_data); port_offset = RZG2L_SINGLE_PIN_GET_PORT_OFFSET(*pin_data);
cfg = RZG2L_SINGLE_PIN_GET_CFGS(*pin_data); cfg = RZG2L_SINGLE_PIN_GET_CFGS(*pin_data);
bit = RZG2L_SINGLE_PIN_GET_BIT(*pin_data); bit = RZG2L_SINGLE_PIN_GET_BIT(*pin_data);
} }
@ -529,7 +529,7 @@ static int rzg2l_pinctrl_pinconf_set(struct pinctrl_dev *pctldev,
return -EINVAL; return -EINVAL;
/* handle _L/_H for 32-bit register read/write */ /* handle _L/_H for 32-bit register read/write */
addr = pctrl->base + IEN(port); addr = pctrl->base + IEN(port_offset);
if (bit >= 4) { if (bit >= 4) {
bit -= 4; bit -= 4;
addr += 4; addr += 4;