pinctrl: geminilake: Replace GLK_COMMUNITY() by INTEL_COMMUNITY_SIZE()

Use INTEL_COMMUNITY_SIZE() common macro instead custom GLK_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-geminilake.c b/drivers/pinctrl/intel/pinctrl-geminilake.c
index df02028b40f3d5938869d66fb69c4014d25b9c49..918cc9f261cf1a5775339fe9b64c10da4a0dc897 100644 (file)
--- a/drivers/pinctrl/intel/pinctrl-geminilake.c
+++ b/drivers/pinctrl/intel/pinctrl-geminilake.c
@@ -20,17 +20,8 @@
 #define GLK_GPI_IS     0x100
 #define GLK_GPI_IE     0x110
 
-#define GLK_COMMUNITY(s, e)                            \
-       {                                               \
-               .padown_offset = GLK_PAD_OWN,           \
-               .padcfglock_offset = GLK_PADCFGLOCK,    \
-               .hostown_offset = GLK_HOSTSW_OWN,       \
-               .is_offset = GLK_GPI_IS,                \
-               .ie_offset = GLK_GPI_IE,                \
-               .gpp_size = 32,                         \
-               .pin_base = (s),                        \
-               .npins = ((e) - (s) + 1),               \
-       }
+#define GLK_COMMUNITY(b, s, e)                         \
+       INTEL_COMMUNITY_SIZE(b, s, e, 32, 4, GLK)
 
 /* GLK */
 static const struct pinctrl_pin_desc glk_northwest_pins[] = {
@@ -173,7 +164,7 @@ static const struct intel_function glk_northwest_functions[] = {
 };
 
 static const struct intel_community glk_northwest_communities[] = {
-       GLK_COMMUNITY(0, 79),
+       GLK_COMMUNITY(0, 0, 79),
 };
 
 static const struct intel_pinctrl_soc_data glk_northwest_soc_data = {
@@ -306,7 +297,7 @@ static const struct intel_function glk_north_functions[] = {
 };
 
 static const struct intel_community glk_north_communities[] = {
-       GLK_COMMUNITY(0, 79),
+       GLK_COMMUNITY(0, 0, 79),
 };
 
 static const struct intel_pinctrl_soc_data glk_north_soc_data = {
@@ -345,7 +336,7 @@ static const struct pinctrl_pin_desc glk_audio_pins[] = {
 };
 
 static const struct intel_community glk_audio_communities[] = {
-       GLK_COMMUNITY(0, 19),
+       GLK_COMMUNITY(0, 0, 19),
 };
 
 static const struct intel_pinctrl_soc_data glk_audio_soc_data = {
@@ -427,7 +418,7 @@ static const struct intel_function glk_scc_functions[] = {
 };
 
 static const struct intel_community glk_scc_communities[] = {
-       GLK_COMMUNITY(0, 34),
+       GLK_COMMUNITY(0, 0, 34),
 };
 
 static const struct intel_pinctrl_soc_data glk_scc_soc_data = {