Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Andy Shevchenko and committed by
Linus Walleij
701372c7 cb8cc185

+11 -11
+11 -11
drivers/pinctrl/intel/pinctrl-cannonlake.c
··· 30 30 .gpio_base = (g), \ 31 31 } 32 32 33 - #define CNL_COMMUNITY(b, s, e, o, g) \ 33 + #define CNL_COMMUNITY(b, s, e, ho, g) \ 34 34 { \ 35 35 .barno = (b), \ 36 36 .padown_offset = CNL_PAD_OWN, \ 37 37 .padcfglock_offset = CNL_PADCFGLOCK, \ 38 - .hostown_offset = (o), \ 38 + .hostown_offset = (ho), \ 39 39 .is_offset = CNL_GPI_IS, \ 40 40 .ie_offset = CNL_GPI_IE, \ 41 41 .pin_base = (s), \ ··· 44 44 .ngpps = ARRAY_SIZE(g), \ 45 45 } 46 46 47 - #define CNLLP_COMMUNITY(b, s, e, g) \ 47 + #define CNL_LP_COMMUNITY(b, s, e, g) \ 48 48 CNL_COMMUNITY(b, s, e, CNL_LP_HOSTSW_OWN, g) 49 49 50 - #define CNLH_COMMUNITY(b, s, e, g) \ 50 + #define CNL_H_COMMUNITY(b, s, e, g) \ 51 51 CNL_COMMUNITY(b, s, e, CNL_H_HOSTSW_OWN, g) 52 52 53 53 /* Cannon Lake-H */ ··· 449 449 }; 450 450 451 451 static const struct intel_community cnlh_communities[] = { 452 - CNLH_COMMUNITY(0, 0, 50, cnlh_community0_gpps), 453 - CNLH_COMMUNITY(1, 51, 154, cnlh_community1_gpps), 454 - CNLH_COMMUNITY(2, 155, 248, cnlh_community3_gpps), 455 - CNLH_COMMUNITY(3, 249, 298, cnlh_community4_gpps), 452 + CNL_H_COMMUNITY(0, 0, 50, cnlh_community0_gpps), 453 + CNL_H_COMMUNITY(1, 51, 154, cnlh_community1_gpps), 454 + CNL_H_COMMUNITY(2, 155, 248, cnlh_community3_gpps), 455 + CNL_H_COMMUNITY(3, 249, 298, cnlh_community4_gpps), 456 456 }; 457 457 458 458 static const struct intel_pinctrl_soc_data cnlh_soc_data = { ··· 810 810 }; 811 811 812 812 static const struct intel_community cnllp_communities[] = { 813 - CNLLP_COMMUNITY(0, 0, 67, cnllp_community0_gpps), 814 - CNLLP_COMMUNITY(1, 68, 180, cnllp_community1_gpps), 815 - CNLLP_COMMUNITY(2, 181, 243, cnllp_community4_gpps), 813 + CNL_LP_COMMUNITY(0, 0, 67, cnllp_community0_gpps), 814 + CNL_LP_COMMUNITY(1, 68, 180, cnllp_community1_gpps), 815 + CNL_LP_COMMUNITY(2, 181, 243, cnllp_community4_gpps), 816 816 }; 817 817 818 818 static const struct intel_pinctrl_soc_data cnllp_soc_data = {