pinctrl: cannonlake: Modify COMMUNITY macros to be consistent

Modify COMMUNITY macros to be consistent with Tiger Lake and others.
No functional change intended.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Link: https://lore.kernel.org/r/20200929110306.40852-2-andriy.shevchenko@linux.intel.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/pinctrl/intel/pinctrl-cannonlake.c b/drivers/pinctrl/intel/pinctrl-cannonlake.c
index 515f57a..8078c77 100644 (file)
--- a/drivers/pinctrl/intel/pinctrl-cannonlake.c
+++ b/drivers/pinctrl/intel/pinctrl-cannonlake.c
@@ -30,12 +30,12 @@
                .gpio_base = (g),                       \
        }
 
-#define CNL_COMMUNITY(b, s, e, o, g)                   \
+#define CNL_COMMUNITY(b, s, e, ho, g)                  \
        {                                               \
                .barno = (b),                           \
                .padown_offset = CNL_PAD_OWN,           \
                .padcfglock_offset = CNL_PADCFGLOCK,    \
-               .hostown_offset = (o),                  \
+               .hostown_offset = (ho),                 \
                .is_offset = CNL_GPI_IS,                \
                .ie_offset = CNL_GPI_IE,                \
                .pin_base = (s),                        \
@@ -44,10 +44,10 @@
                .ngpps = ARRAY_SIZE(g),                 \
        }
 
-#define CNLLP_COMMUNITY(b, s, e, g)                    \
+#define CNL_LP_COMMUNITY(b, s, e, g)                   \
        CNL_COMMUNITY(b, s, e, CNL_LP_HOSTSW_OWN, g)
 
-#define CNLH_COMMUNITY(b, s, e, g)                     \
+#define CNL_H_COMMUNITY(b, s, e, g)                    \
        CNL_COMMUNITY(b, s, e, CNL_H_HOSTSW_OWN, g)
 
 /* Cannon Lake-H */
@@ -449,10 +449,10 @@ static const struct intel_function cnlh_functions[] = {
 };
 
 static const struct intel_community cnlh_communities[] = {
-       CNLH_COMMUNITY(0, 0, 50, cnlh_community0_gpps),
-       CNLH_COMMUNITY(1, 51, 154, cnlh_community1_gpps),
-       CNLH_COMMUNITY(2, 155, 248, cnlh_community3_gpps),
-       CNLH_COMMUNITY(3, 249, 298, cnlh_community4_gpps),
+       CNL_H_COMMUNITY(0, 0, 50, cnlh_community0_gpps),
+       CNL_H_COMMUNITY(1, 51, 154, cnlh_community1_gpps),
+       CNL_H_COMMUNITY(2, 155, 248, cnlh_community3_gpps),
+       CNL_H_COMMUNITY(3, 249, 298, cnlh_community4_gpps),
 };
 
 static const struct intel_pinctrl_soc_data cnlh_soc_data = {
@@ -810,9 +810,9 @@ static const struct intel_padgroup cnllp_community4_gpps[] = {
 };
 
 static const struct intel_community cnllp_communities[] = {
-       CNLLP_COMMUNITY(0, 0, 67, cnllp_community0_gpps),
-       CNLLP_COMMUNITY(1, 68, 180, cnllp_community1_gpps),
-       CNLLP_COMMUNITY(2, 181, 243, cnllp_community4_gpps),
+       CNL_LP_COMMUNITY(0, 0, 67, cnllp_community0_gpps),
+       CNL_LP_COMMUNITY(1, 68, 180, cnllp_community1_gpps),
+       CNL_LP_COMMUNITY(2, 181, 243, cnllp_community4_gpps),
 };
 
 static const struct intel_pinctrl_soc_data cnllp_soc_data = {