pinctrl: meson: Rename REG_* to MESON_REG_*

Currently compilation test fails on x86 due to name collision. The usual
way to fix that is to move both conflicting parts to their own namespaces.

Rename REG_* to MESON_REG_* as a prerequisite for enabling COMPILE_TEST.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>
Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>

diff --git a/drivers/pinctrl/meson/pinctrl-meson.c b/drivers/pinctrl/meson/pinctrl-meson.c
index 4985144..5b46a09 100644 (file)
--- a/drivers/pinctrl/meson/pinctrl-meson.c
+++ b/drivers/pinctrl/meson/pinctrl-meson.c
@@ -218,13 +218,13 @@ static int meson_pinconf_set_output(struct meson_pinctrl *pc,
                                    unsigned int pin,
                                    bool out)
 {
-       return meson_pinconf_set_gpio_bit(pc, pin, REG_DIR, !out);
+       return meson_pinconf_set_gpio_bit(pc, pin, MESON_REG_DIR, !out);
 }
 
 static int meson_pinconf_get_output(struct meson_pinctrl *pc,
                                    unsigned int pin)
 {
-       int ret = meson_pinconf_get_gpio_bit(pc, pin, REG_DIR);
+       int ret = meson_pinconf_get_gpio_bit(pc, pin, MESON_REG_DIR);
 
        if (ret < 0)
                return ret;
@@ -236,13 +236,13 @@ static int meson_pinconf_set_drive(struct meson_pinctrl *pc,
                                   unsigned int pin,
                                   bool high)
 {
-       return meson_pinconf_set_gpio_bit(pc, pin, REG_OUT, high);
+       return meson_pinconf_set_gpio_bit(pc, pin, MESON_REG_OUT, high);
 }
 
 static int meson_pinconf_get_drive(struct meson_pinctrl *pc,
                                   unsigned int pin)
 {
-       return meson_pinconf_get_gpio_bit(pc, pin, REG_OUT);
+       return meson_pinconf_get_gpio_bit(pc, pin, MESON_REG_OUT);
 }
 
 static int meson_pinconf_set_output_drive(struct meson_pinctrl *pc,
@@ -269,7 +269,7 @@ static int meson_pinconf_disable_bias(struct meson_pinctrl *pc,
        if (ret)
                return ret;
 
-       meson_calc_reg_and_bit(bank, pin, REG_PULLEN, &reg, &bit);
+       meson_calc_reg_and_bit(bank, pin, MESON_REG_PULLEN, &reg, &bit);
        ret = regmap_update_bits(pc->reg_pullen, reg, BIT(bit), 0);
        if (ret)
                return ret;
@@ -288,7 +288,7 @@ static int meson_pinconf_enable_bias(struct meson_pinctrl *pc, unsigned int pin,
        if (ret)
                return ret;
 
-       meson_calc_reg_and_bit(bank, pin, REG_PULL, &reg, &bit);
+       meson_calc_reg_and_bit(bank, pin, MESON_REG_PULL, &reg, &bit);
        if (pull_up)
                val = BIT(bit);
 
@@ -296,7 +296,7 @@ static int meson_pinconf_enable_bias(struct meson_pinctrl *pc, unsigned int pin,
        if (ret)
                return ret;
 
-       meson_calc_reg_and_bit(bank, pin, REG_PULLEN, &reg, &bit);
+       meson_calc_reg_and_bit(bank, pin, MESON_REG_PULLEN, &reg, &bit);
        ret = regmap_update_bits(pc->reg_pullen, reg, BIT(bit), BIT(bit));
        if (ret)
                return ret;
@@ -321,7 +321,7 @@ static int meson_pinconf_set_drive_strength(struct meson_pinctrl *pc,
        if (ret)
                return ret;
 
-       meson_calc_reg_and_bit(bank, pin, REG_DS, &reg, &bit);
+       meson_calc_reg_and_bit(bank, pin, MESON_REG_DS, &reg, &bit);
 
        if (drive_strength_ua <= 500) {
                ds_val = MESON_PINCONF_DRV_500UA;
@@ -407,7 +407,7 @@ static int meson_pinconf_get_pull(struct meson_pinctrl *pc, unsigned int pin)
        if (ret)
                return ret;
 
-       meson_calc_reg_and_bit(bank, pin, REG_PULLEN, &reg, &bit);
+       meson_calc_reg_and_bit(bank, pin, MESON_REG_PULLEN, &reg, &bit);
 
        ret = regmap_read(pc->reg_pullen, reg, &val);
        if (ret)
@@ -416,7 +416,7 @@ static int meson_pinconf_get_pull(struct meson_pinctrl *pc, unsigned int pin)
        if (!(val & BIT(bit))) {
                conf = PIN_CONFIG_BIAS_DISABLE;
        } else {
-               meson_calc_reg_and_bit(bank, pin, REG_PULL, &reg, &bit);
+               meson_calc_reg_and_bit(bank, pin, MESON_REG_PULL, &reg, &bit);
 
                ret = regmap_read(pc->reg_pull, reg, &val);
                if (ret)
@@ -447,7 +447,7 @@ static int meson_pinconf_get_drive_strength(struct meson_pinctrl *pc,
        if (ret)
                return ret;
 
-       meson_calc_reg_and_bit(bank, pin, REG_DS, &reg, &bit);
+       meson_calc_reg_and_bit(bank, pin, MESON_REG_DS, &reg, &bit);
 
        ret = regmap_read(pc->reg_ds, reg, &val);
        if (ret)
@@ -595,7 +595,7 @@ static int meson_gpio_get(struct gpio_chip *chip, unsigned gpio)
        if (ret)
                return ret;
 
-       meson_calc_reg_and_bit(bank, gpio, REG_IN, &reg, &bit);
+       meson_calc_reg_and_bit(bank, gpio, MESON_REG_IN, &reg, &bit);
        regmap_read(pc->reg_gpio, reg, &val);
 
        return !!(val & BIT(bit));

diff --git a/drivers/pinctrl/meson/pinctrl-meson.h b/drivers/pinctrl/meson/pinctrl-meson.h
index ff5372e..b197827 100644 (file)
--- a/drivers/pinctrl/meson/pinctrl-meson.h
+++ b/drivers/pinctrl/meson/pinctrl-meson.h
@@ -63,13 +63,13 @@ struct meson_reg_desc {
  * enum meson_reg_type - type of registers encoded in @meson_reg_desc
  */
 enum meson_reg_type {
-       REG_PULLEN,
-       REG_PULL,
-       REG_DIR,
-       REG_OUT,
-       REG_IN,
-       REG_DS,
-       NUM_REG,
+       MESON_REG_PULLEN,
+       MESON_REG_PULL,
+       MESON_REG_DIR,
+       MESON_REG_OUT,
+       MESON_REG_IN,
+       MESON_REG_DS,
+       MESON_NUM_REG,
 };
 
 /**
@@ -102,7 +102,7 @@ struct meson_bank {
        unsigned int last;
        int irq_first;
        int irq_last;
-       struct meson_reg_desc regs[NUM_REG];
+       struct meson_reg_desc regs[MESON_NUM_REG];
 };
 
 struct meson_pinctrl_data {
@@ -150,12 +150,12 @@ struct meson_pinctrl {
                .irq_first      = fi,                                   \
                .irq_last       = li,                                   \
                .regs = {                                               \
-                       [REG_PULLEN]    = { per, peb },                 \
-                       [REG_PULL]      = { pr, pb },                   \
-                       [REG_DIR]       = { dr, db },                   \
-                       [REG_OUT]       = { or, ob },                   \
-                       [REG_IN]        = { ir, ib },                   \
-                       [REG_DS]        = { dsr, dsb },                 \
+                       [MESON_REG_PULLEN]      = { per, peb },         \
+                       [MESON_REG_PULL]        = { pr, pb },           \
+                       [MESON_REG_DIR]         = { dr, db },           \
+                       [MESON_REG_OUT]         = { or, ob },           \
+                       [MESON_REG_IN]          = { ir, ib },           \
+                       [MESON_REG_DS]          = { dsr, dsb },         \
                },                                                      \
         }