Commit 31044d8e authored by Andy Shevchenko's avatar Andy Shevchenko
Browse files

pinctrl: cannonlake: Replace CNL_COMMUNITY() by INTEL_COMMUNITY_GPPS() 



Use INTEL_COMMUNITY_GPPS() common macro instead custom CNL_COMMUNITY().

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
parent 74662144

drivers/pinctrl/intel/pinctrl-cannonlake.c

+11 −20
Original line number Diff line number Diff line
@@ -15,12 +15,17 @@ 


#include "pinctrl-intel.h"



#define CNL_PAD_OWN		0x020

#define CNL_PADCFGLOCK		0x080

#define CNL_LP_PAD_OWN		0x020

#define CNL_LP_PADCFGLOCK	0x080

#define CNL_LP_HOSTSW_OWN	0x0b0

#define CNL_LP_GPI_IS		0x100

#define CNL_LP_GPI_IE		0x120



#define CNL_H_PAD_OWN		0x020

#define CNL_H_PADCFGLOCK	0x080

#define CNL_H_HOSTSW_OWN	0x0c0

#define CNL_GPI_IS		0x100

#define CNL_GPI_IE		0x120

#define CNL_H_GPI_IS		0x100

#define CNL_H_GPI_IE		0x120



#define CNL_GPP(r, s, e, g)				\

	{						\
@@ -30,25 +35,11 @@ 
		.gpio_base = (g),			\

	}



#define CNL_COMMUNITY(b, s, e, g, v)			\

	{						\

		.barno = (b),				\

		.padown_offset = CNL_PAD_OWN,		\

		.padcfglock_offset = CNL_PADCFGLOCK,	\

		.hostown_offset = CNL_##v##_HOSTSW_OWN,	\

		.is_offset = CNL_GPI_IS,		\

		.ie_offset = CNL_GPI_IE,		\

		.pin_base = (s),			\

		.npins = ((e) - (s) + 1),		\

		.gpps = (g),				\

		.ngpps = ARRAY_SIZE(g),			\

	}



#define CNL_LP_COMMUNITY(b, s, e, g)			\

	CNL_COMMUNITY(b, s, e, g, LP)

	INTEL_COMMUNITY_GPPS(b, s, e, g, CNL_LP)



#define CNL_H_COMMUNITY(b, s, e, g)			\

	CNL_COMMUNITY(b, s, e, g, H)

	INTEL_COMMUNITY_GPPS(b, s, e, g, CNL_H)



/* Cannon Lake-H */

static const struct pinctrl_pin_desc cnlh_pins[] = {