Skip to content

Commit 6c7a997

Browse files
committed
pinctrl: emmitsburg: 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>
1 parent d772897 commit 6c7a997

1 file changed

Lines changed: 13 additions & 20 deletions

File tree

drivers/pinctrl/intel/pinctrl-emmitsburg.c

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,6 @@
2121
#define EBG_GPI_IS 0x200
2222
#define EBG_GPI_IE 0x210
2323

24-
#define EBG_GPP(r, s, e) \
25-
{ \
26-
.reg_num = (r), \
27-
.base = (s), \
28-
.size = ((e) - (s) + 1), \
29-
}
30-
3124
#define EBG_COMMUNITY(b, s, e, g) \
3225
INTEL_COMMUNITY_GPPS(b, s, e, g, EBG)
3326

@@ -311,31 +304,31 @@ static const struct pinctrl_pin_desc ebg_pins[] = {
311304
};
312305

313306
static const struct intel_padgroup ebg_community0_gpps[] = {
314-
EBG_GPP(0, 0, 20), /* GPP_A */
315-
EBG_GPP(1, 21, 44), /* GPP_B */
316-
EBG_GPP(2, 45, 65), /* SPI */
307+
INTEL_GPP(0, 0, 20, 0), /* GPP_A */
308+
INTEL_GPP(1, 21, 44, 21), /* GPP_B */
309+
INTEL_GPP(2, 45, 65, 45), /* SPI */
317310
};
318311

319312
static const struct intel_padgroup ebg_community1_gpps[] = {
320-
EBG_GPP(0, 66, 87), /* GPP_C */
321-
EBG_GPP(1, 88, 111), /* GPP_D */
313+
INTEL_GPP(0, 66, 87, 66), /* GPP_C */
314+
INTEL_GPP(1, 88, 111, 88), /* GPP_D */
322315
};
323316

324317
static const struct intel_padgroup ebg_community3_gpps[] = {
325-
EBG_GPP(0, 112, 135), /* GPP_E */
326-
EBG_GPP(1, 136, 145), /* JTAG */
318+
INTEL_GPP(0, 112, 135, 112), /* GPP_E */
319+
INTEL_GPP(1, 136, 145, 136), /* JTAG */
327320
};
328321

329322
static const struct intel_padgroup ebg_community4_gpps[] = {
330-
EBG_GPP(0, 146, 165), /* GPP_H */
331-
EBG_GPP(1, 166, 183), /* GPP_J */
323+
INTEL_GPP(0, 146, 165, 146), /* GPP_H */
324+
INTEL_GPP(1, 166, 183, 166), /* GPP_J */
332325
};
333326

334327
static const struct intel_padgroup ebg_community5_gpps[] = {
335-
EBG_GPP(0, 184, 207), /* GPP_I */
336-
EBG_GPP(1, 208, 225), /* GPP_L */
337-
EBG_GPP(2, 226, 243), /* GPP_M */
338-
EBG_GPP(3, 244, 261), /* GPP_N */
328+
INTEL_GPP(0, 184, 207, 184), /* GPP_I */
329+
INTEL_GPP(1, 208, 225, 208), /* GPP_L */
330+
INTEL_GPP(2, 226, 243, 226), /* GPP_M */
331+
INTEL_GPP(3, 244, 261, 244), /* GPP_N */
339332
};
340333

341334
static const struct intel_community ebg_communities[] = {

0 commit comments

Comments
 (0)