pinctrl: bcm: Convert drivers to use struct pingroup and PINCTRL_PINGROUP()
Subsystems (2)
PATCH 1/1 pinctrl: bcm: Convert drivers to use struct pingroup and PINCTRL_PINGROUP()
The pin control header provides struct pingroup and PINCTRL_PINGROUP() macro. Utilize them instead of open coded variants in the driver.
--- drivers/pinctrl/bcm/pinctrl-bcm6318.c | 121 ++++++++++----------- drivers/pinctrl/bcm/pinctrl-bcm63268.c | 139 +++++++++++-------------- drivers/pinctrl/bcm/pinctrl-bcm6328.c | 85 +++++++-------- drivers/pinctrl/bcm/pinctrl-bcm6358.c | 20 ++-- drivers/pinctrl/bcm/pinctrl-bcm6362.c | 121 ++++++++++----------- drivers/pinctrl/bcm/pinctrl-bcm6368.c | 91 +++++++--------- drivers/pinctrl/bcm/pinctrl-bcm63xx.h | 2 + 7 files changed, 259 insertions(+), 320 deletions(-)
drivers/pinctrl/bcm/pinctrl-bcm6318.c +54 -67
@@ -27,12 +27,6 @@#define BCM6318_PAD_REG 0x54#define BCM6328_PAD_MASK GENMASK(3, 0) -struct bcm6318_pingroup { -const char *name; -const unsigned *const pins; -const unsigned num_pins; -}; -struct bcm6318_function {const char *name;const char *const *groups;
@@ -146,64 +140,57 @@ static unsigned gpio47_pins[] = { 47 };static unsigned gpio48_pins[] = {48 };static unsigned gpio49_pins[] = {49 }; -#define BCM6318_GROUP (n) \ - { \ - .name = #n, \ - .pins = n##_pins, \ - .num_pins = ARRAY_SIZE(n##_pins), \ - } - -static struct bcm6318_pingroup bcm6318_groups[] = { -BCM6318_GROUP (gpio0), -BCM6318_GROUP (gpio1), -BCM6318_GROUP (gpio2), -BCM6318_GROUP (gpio3), -BCM6318_GROUP (gpio4), -BCM6318_GROUP (gpio5), -BCM6318_GROUP (gpio6), -BCM6318_GROUP (gpio7), -BCM6318_GROUP (gpio8), -BCM6318_GROUP (gpio9), -BCM6318_GROUP (gpio10), -BCM6318_GROUP (gpio11), -BCM6318_GROUP (gpio12), -BCM6318_GROUP (gpio13), -BCM6318_GROUP (gpio14), -BCM6318_GROUP (gpio15), -BCM6318_GROUP (gpio16), -BCM6318_GROUP (gpio17), -BCM6318_GROUP (gpio18), -BCM6318_GROUP (gpio19), -BCM6318_GROUP (gpio20), -BCM6318_GROUP (gpio21), -BCM6318_GROUP (gpio22), -BCM6318_GROUP (gpio23), -BCM6318_GROUP (gpio24), -BCM6318_GROUP (gpio25), -BCM6318_GROUP (gpio26), -BCM6318_GROUP (gpio27), -BCM6318_GROUP (gpio28), -BCM6318_GROUP (gpio29), -BCM6318_GROUP (gpio30), -BCM6318_GROUP (gpio31), -BCM6318_GROUP (gpio32), -BCM6318_GROUP (gpio33), -BCM6318_GROUP (gpio34), -BCM6318_GROUP (gpio35), -BCM6318_GROUP (gpio36), -BCM6318_GROUP (gpio37), -BCM6318_GROUP (gpio38), -BCM6318_GROUP (gpio39), -BCM6318_GROUP (gpio40), -BCM6318_GROUP (gpio41), -BCM6318_GROUP (gpio42), -BCM6318_GROUP (gpio43), -BCM6318_GROUP (gpio44), -BCM6318_GROUP (gpio45), -BCM6318_GROUP (gpio46), -BCM6318_GROUP (gpio47), -BCM6318_GROUP (gpio48), -BCM6318_GROUP (gpio49), +static struct pingroup bcm6318_groups[] = { +BCM_PIN_GROUP (gpio0), +BCM_PIN_GROUP (gpio1), +BCM_PIN_GROUP (gpio2), +BCM_PIN_GROUP (gpio3), +BCM_PIN_GROUP (gpio4), +BCM_PIN_GROUP (gpio5), +BCM_PIN_GROUP (gpio6), +BCM_PIN_GROUP (gpio7), +BCM_PIN_GROUP (gpio8), +BCM_PIN_GROUP (gpio9), +BCM_PIN_GROUP (gpio10), +BCM_PIN_GROUP (gpio11), +BCM_PIN_GROUP (gpio12), +BCM_PIN_GROUP (gpio13), +BCM_PIN_GROUP (gpio14), +BCM_PIN_GROUP (gpio15), +BCM_PIN_GROUP (gpio16), +BCM_PIN_GROUP (gpio17), +BCM_PIN_GROUP (gpio18), +BCM_PIN_GROUP (gpio19), +BCM_PIN_GROUP (gpio20), +BCM_PIN_GROUP (gpio21), +BCM_PIN_GROUP (gpio22), +BCM_PIN_GROUP (gpio23), +BCM_PIN_GROUP (gpio24), +BCM_PIN_GROUP (gpio25), +BCM_PIN_GROUP (gpio26), +BCM_PIN_GROUP (gpio27), +BCM_PIN_GROUP (gpio28), +BCM_PIN_GROUP (gpio29), +BCM_PIN_GROUP (gpio30), +BCM_PIN_GROUP (gpio31), +BCM_PIN_GROUP (gpio32), +BCM_PIN_GROUP (gpio33), +BCM_PIN_GROUP (gpio34), +BCM_PIN_GROUP (gpio35), +BCM_PIN_GROUP (gpio36), +BCM_PIN_GROUP (gpio37), +BCM_PIN_GROUP (gpio38), +BCM_PIN_GROUP (gpio39), +BCM_PIN_GROUP (gpio40), +BCM_PIN_GROUP (gpio41), +BCM_PIN_GROUP (gpio42), +BCM_PIN_GROUP (gpio43), +BCM_PIN_GROUP (gpio44), +BCM_PIN_GROUP (gpio45), +BCM_PIN_GROUP (gpio46), +BCM_PIN_GROUP (gpio47), +BCM_PIN_GROUP (gpio48), +BCM_PIN_GROUP (gpio49), };/* GPIO_MODE */
@@ -368,10 +355,10 @@ static const char *bcm6318_pinctrl_get_group_name(struct pinctrl_dev *pctldev,static int bcm6318_pinctrl_get_group_pins (struct pinctrl_dev *pctldev,unsigned group,const unsigned **pins, -unsigned *num_pins) +unsigned *npins) { *pins = bcm6318_groups[group].pins; - *num_pins = bcm6318_groups[group].num_pins; + *npins = bcm6318_groups[group].npins;return 0 ; }
@@ -424,7 +411,7 @@ static int bcm6318_pinctrl_set_mux(struct pinctrl_dev *pctldev, unsigned selector, unsigned group) {struct bcm63xx_pinctrl *pc =pinctrl_dev_get_drvdata (pctldev); -const struct bcm6318_pingroup *pg = &bcm6318_groups[group]; +const struct pingroup *pg = &bcm6318_groups[group];const struct bcm6318_function *f = &bcm6318_funcs[selector];bcm6318_rmw_mux (pc, pg->pins[0 ], f->mode_val, f->mux_val);
drivers/pinctrl/bcm/pinctrl-bcm63268.c +63 -76
172 lines not on this page · raw message
drivers/pinctrl/bcm/pinctrl-bcm6328.c +39 -46
105 lines not on this page · raw message
drivers/pinctrl/bcm/pinctrl-bcm6358.c +8 -12
@@ -35,9 +35,7 @@#define BCM6358_MODE_MUX_SYS_IRQ BIT(15)struct bcm6358_pingroup { -const char *name; -const unsigned *const pins; -const unsigned num_pins; +struct pingroup grp;const uint16_t mode_val;
@@ -131,9 +129,7 @@ static unsigned sys_irq_grp_pins[] = { 5 };#define BCM6358_GPIO_MUX_GROUP (n, bit, dir) \ { \ - .name = #n, \ - .pins = n##_pins, \ - .num_pins = ARRAY_SIZE(n##_pins), \ + .grp = BCM_PIN_GROUP(n), \ .mode_val = BCM6358_MODE_MUX_##bit, \ .direction = dir, \ }
@@ -219,15 +215,15 @@ static int bcm6358_pinctrl_get_group_count(struct pinctrl_dev *pctldev)static const char *bcm6358_pinctrl_get_group_name (struct pinctrl_dev *pctldev,unsigned group) { -return bcm6358_groups[group].name; +return bcm6358_groups[group].grp.name; }static int bcm6358_pinctrl_get_group_pins (struct pinctrl_dev *pctldev,unsigned group,const unsigned **pins, -unsigned *num_pins) +unsigned *npins) { - *pins = bcm6358_groups[group].pins; - *num_pins = bcm6358_groups[group].num_pins; + *pins = bcm6358_groups[group].grp.pins; + *npins = bcm6358_groups[group].grp.npins;return 0 ; }
@@ -264,12 +260,12 @@ static int bcm6358_pinctrl_set_mux(struct pinctrl_dev *pctldev,unsigned int mask = val;unsigned pin; -for (pin =0 ; pin < pg->num_pins; pin++) +for (pin =0 ; pin < pg->grp.npins; pin++) mask |= (unsigned long )bcm6358_pins[pin].drv_data;regmap_field_update_bits (priv->overlays, mask, val); -for (pin =0 ; pin < pg->num_pins; pin++) { +for (pin =0 ; pin < pg->grp.npins; pin++) {struct pinctrl_gpio_range *range;unsigned int hw_gpio = bcm6358_pins[pin].number;
drivers/pinctrl/bcm/pinctrl-bcm6362.c +54 -67
152 lines not on this page · raw message
drivers/pinctrl/bcm/pinctrl-bcm6368.c +39 -52
129 lines not on this page · raw message
drivers/pinctrl/bcm/pinctrl-bcm63xx.h +2 -0
@@ -21,6 +21,8 @@ struct bcm63xx_pinctrl_soc {unsigned int ngpios; }; +#define BCM_PIN_GROUP (n) PINCTRL_PINGROUP(#n, n##_pins, ARRAY_SIZE(n##_pins)) +struct bcm63xx_pinctrl {struct device *dev;struct regmap *regs;
Signature · 1 line
2.35.1
Quoted 4 lines · Andy Shevchenko
The pin control header provides struct pingroup and
PINCTRL_PINGROUP()macro. Utilize them instead of open coded variants in the driver.Signed-off-by Andy Shevchenko <[email protected]>
This looks very tasty. Can we get a test or ACK from one of the BCM people? (Álvaro/Jonas)
Yours,
Linus Walleij
Quoted 10 lines · Linus Walleij
Quoted 4 lines · Andy Shevchenko
The pin control header provides struct pingroup and
PINCTRL_PINGROUP()macro. Utilize them instead of open coded variants in the driver.Signed-off-by Andy Shevchenko <[email protected]>This looks very tasty. Can we get a test or ACK from one of the BCM people? (Álvaro/Jonas)
Any news?
Signature · 9 lines
With Best Regards, Andy Shevchenko _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 4 lines · Andy Shevchenko
The pin control header provides struct pingroup and
PINCTRL_PINGROUP()macro. Utilize them instead of open coded variants in the driver.Signed-off-by Andy Shevchenko <[email protected]>
Patch applied due to non-responsive maintainers!
Thanks for fixing this up Andy.
Yours,
Linus Walleij