pinctrl: sunrisepoint: Replace SPT_COMMUNITY() by INTEL_COMMUNITY_*()

Use INTEL_COMMUNITY_*() common macro instead custom SPT_COMMUNITY().

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>

diff --git a/drivers/pinctrl/intel/pinctrl-sunrisepoint.c b/drivers/pinctrl/intel/pinctrl-sunrisepoint.c
index 292b660..f91e27f 100644 (file)
--- a/drivers/pinctrl/intel/pinctrl-sunrisepoint.c
+++ b/drivers/pinctrl/intel/pinctrl-sunrisepoint.c
@@ -15,31 +15,17 @@
 
 #include "pinctrl-intel.h"
 
-#define SPT_PAD_OWN            0x020
+#define SPT_H_PAD_OWN          0x020
 #define SPT_H_PADCFGLOCK       0x090
-#define SPT_LP_PADCFGLOCK      0x0a0
-#define SPT_HOSTSW_OWN         0x0d0
-#define SPT_GPI_IS             0x100
-#define SPT_GPI_IE             0x120
-
-#define SPT_COMMUNITY(b, s, e, g, n, v, gs, gn)                        \
-       {                                                       \
-               .barno = (b),                                   \
-               .padown_offset = SPT_PAD_OWN,                   \
-               .padcfglock_offset = SPT_##v##_PADCFGLOCK,      \
-               .hostown_offset = SPT_HOSTSW_OWN,               \
-               .is_offset = SPT_GPI_IS,                        \
-               .ie_offset = SPT_GPI_IE,                        \
-               .gpp_size = (gs),                               \
-               .gpp_num_padown_regs = (gn),                    \
-               .pin_base = (s),                                \
-               .npins = ((e) - (s) + 1),                       \
-               .gpps = (g),                                    \
-               .ngpps = (n),                                   \
-       }
+#define SPT_H_HOSTSW_OWN       0x0d0
+#define SPT_H_GPI_IS           0x100
+#define SPT_H_GPI_IE           0x120
 
-#define SPT_LP_COMMUNITY(b, s, e)                      \
-       SPT_COMMUNITY(b, s, e, NULL, 0, LP, 24, 4)
+#define SPT_LP_PAD_OWN         0x020
+#define SPT_LP_PADCFGLOCK      0x0a0
+#define SPT_LP_HOSTSW_OWN      0x0d0
+#define SPT_LP_GPI_IS          0x100
+#define SPT_LP_GPI_IE          0x120
 
 #define SPT_H_GPP(r, s, e, g)                          \
        {                                               \
@@ -50,7 +36,10 @@
        }
 
 #define SPT_H_COMMUNITY(b, s, e, g)                    \
-       SPT_COMMUNITY(b, s, e, g, ARRAY_SIZE(g), H, 0, 0)
+       INTEL_COMMUNITY_GPPS(b, s, e, g, SPT_H)
+
+#define SPT_LP_COMMUNITY(b, s, e)                      \
+       INTEL_COMMUNITY_SIZE(b, s, e, 24, 4, SPT_LP)
 
 /* Sunrisepoint-LP */
 static const struct pinctrl_pin_desc sptlp_pins[] = {