pinctrl: cedarfork: Switch to INTEL_GPP() macro

Replace custom macro with the recently defined INTEL_GPP().

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

diff --git a/drivers/pinctrl/intel/pinctrl-cedarfork.c b/drivers/pinctrl/intel/pinctrl-cedarfork.c
index 2ce97abeb0e411450506bc87a8bbf0d002d55861..2916f7d900903ee5b9d6f078fb0ab43f5ab2aaea 100644 (file)
--- a/drivers/pinctrl/intel/pinctrl-cedarfork.c
+++ b/drivers/pinctrl/intel/pinctrl-cedarfork.c
@@ -21,13 +21,6 @@
 #define CDF_GPI_IS     0x200
 #define CDF_GPI_IE     0x230
 
-#define CDF_GPP(r, s, e)                               \
-       {                                               \
-               .reg_num = (r),                         \
-               .base = (s),                            \
-               .size = ((e) - (s) + 1),                \
-       }
-
 #define CDF_COMMUNITY(b, s, e, g)                      \
        INTEL_COMMUNITY_GPPS(b, s, e, g, CDF)
 
@@ -288,24 +281,24 @@ static const struct pinctrl_pin_desc cdf_pins[] = {
 };
 
 static const struct intel_padgroup cdf_community0_gpps[] = {
-       CDF_GPP(0, 0, 23),      /* WEST2 */
-       CDF_GPP(1, 24, 47),     /* WEST3 */
-       CDF_GPP(2, 48, 70),     /* WEST01 */
-       CDF_GPP(3, 71, 90),     /* WEST5 */
-       CDF_GPP(4, 91, 96),     /* WESTC */
-       CDF_GPP(5, 97, 101),    /* WESTC_DFX */
-       CDF_GPP(6, 102, 111),   /* WESTA */
-       CDF_GPP(7, 112, 123),   /* WESTB */
-       CDF_GPP(8, 124, 143),   /* WESTD */
-       CDF_GPP(9, 144, 144),   /* WESTD_PECI */
-       CDF_GPP(10, 145, 167),  /* WESTF */
+       INTEL_GPP(0, 0, 23, 0),         /* WEST2 */
+       INTEL_GPP(1, 24, 47, 24),       /* WEST3 */
+       INTEL_GPP(2, 48, 70, 48),       /* WEST01 */
+       INTEL_GPP(3, 71, 90, 71),       /* WEST5 */
+       INTEL_GPP(4, 91, 96, 91),       /* WESTC */
+       INTEL_GPP(5, 97, 101, 97),      /* WESTC_DFX */
+       INTEL_GPP(6, 102, 111, 102),    /* WESTA */
+       INTEL_GPP(7, 112, 123, 112),    /* WESTB */
+       INTEL_GPP(8, 124, 143, 124),    /* WESTD */
+       INTEL_GPP(9, 144, 144, 144),    /* WESTD_PECI */
+       INTEL_GPP(10, 145, 167, 145),   /* WESTF */
 };
 
 static const struct intel_padgroup cdf_community1_gpps[] = {
-       CDF_GPP(0, 168, 191),   /* EAST2 */
-       CDF_GPP(1, 192, 202),   /* EAST3 */
-       CDF_GPP(2, 203, 225),   /* EAST0 */
-       CDF_GPP(3, 226, 236),   /* EMMC */
+       INTEL_GPP(0, 168, 191, 168),    /* EAST2 */
+       INTEL_GPP(1, 192, 202, 192),    /* EAST3 */
+       INTEL_GPP(2, 203, 225, 203),    /* EAST0 */
+       INTEL_GPP(3, 226, 236, 226),    /* EMMC */
 };
 
 static const struct intel_community cdf_communities[] = {