pinctrl: Cleanup Meson8 driver

[deliverable/linux.git] / drivers / pinctrl / meson / pinctrl-meson.h

diff --git a/drivers/pinctrl/meson/pinctrl-meson.h b/drivers/pinctrl/meson/pinctrl-meson.h
index bfea8adc79534bb14282a9aa1d2d2a4d5647ed71..bc48c781ca5148a5704b62f4b1e254e87815d4e2 100644 (file)
--- a/drivers/pinctrl/meson/pinctrl-meson.h
+++ b/drivers/pinctrl/meson/pinctrl-meson.h
@@ -155,6 +155,8 @@ struct meson_pinctrl {
        struct meson_domain *domains;
 };
 
+#define PIN(x, b)      (b + x)
+
 #define GROUP(grp, r, b)                                               \
        {                                                               \
                .name = #grp,                                           \
@@ -165,10 +167,10 @@ struct meson_pinctrl {
                .domain = 0,                                            \
         }
 
-#define GPIO_GROUP(gpio)                                               \
+#define GPIO_GROUP(gpio, b)                                            \
        {                                                               \
                .name = #gpio,                                          \
-               .pins = (const unsigned int[]){ PIN_ ## gpio},          \
+               .pins = (const unsigned int[]){ PIN(gpio, b) },         \
                .num_pins = 1,                                          \
                .is_gpio = true,                                        \
         }
@@ -204,6 +206,6 @@ struct meson_pinctrl {
                },                                                      \
         }
 
-#define MESON_PIN(x) PINCTRL_PIN(PIN_ ## x, #x)
+#define MESON_PIN(x, b) PINCTRL_PIN(PIN(x, b), #x)
 
 extern struct meson_pinctrl_data meson8_pinctrl_data;