Skip to contentSkip to conversation

pinctrl: sunrisepoint: Fix PAD lock register offset for SPT-H

PATCH In review Andy Shevchenko 2 participants 3 messages Apr 1, 2020 – Apr 13, 2020

Subsystems (3)
GPIO Pin control Pin controller - Intel
lore
Share & tools
lore

Andy Shevchenko

author
#0 lore raw

PATCH 1/1 pinctrl: sunrisepoint: Fix PAD lock register offset for SPT-H

It appears that SPT-H variant has different offset for PAD locking registers. Fix it here.

Fixes 551fa5801ef1 ("pinctrl: intel: sunrisepoint: Add Intel Sunrisepoint-H support")
Signed-off-by Andy Shevchenko <[email protected]>
---
 drivers/pinctrl/intel/pinctrl-sunrisepoint.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)
drivers/pinctrl/intel/pinctrl-sunrisepoint.c +8 -7
index 330c8f077b73..4d7a86a5a37b 100644
@@ -15,17 +15,18 @@
 
 #include "pinctrl-intel.h"
 
-#define SPT_PAD_OWN	0x020
-#define SPT_PADCFGLOCK	0x0a0
-#define SPT_HOSTSW_OWN	0x0d0
-#define SPT_GPI_IS	0x100
-#define SPT_GPI_IE	0x120
+#define SPT_PAD_OWN		0x020
+#define SPT_H_PADCFGLOCK	0x090
+#define SPT_LP_PADCFGLOCK	0x0a0
+#define SPT_HOSTSW_OWN		0x0d0
+#define SPT_GPI_IS		0x100
+#define SPT_GPI_IE		0x120
 
 #define SPT_COMMUNITY(b, s, e)				\
 	{						\
 		.barno = (b),				\
 		.padown_offset = SPT_PAD_OWN,		\
-		.padcfglock_offset = SPT_PADCFGLOCK,	\
+		.padcfglock_offset = SPT_LP_PADCFGLOCK,	\
 		.hostown_offset = SPT_HOSTSW_OWN,	\
 		.is_offset = SPT_GPI_IS,		\
 		.ie_offset = SPT_GPI_IE,		\

@@ -47,7 +48,7 @@
 	{						\
 		.barno = (b),				\
 		.padown_offset = SPT_PAD_OWN,		\
-		.padcfglock_offset = SPT_PADCFGLOCK,	\
+		.padcfglock_offset = SPT_H_PADCFGLOCK,	\
 		.hostown_offset = SPT_HOSTSW_OWN,	\
 		.is_offset = SPT_GPI_IS,		\
 		.ie_offset = SPT_GPI_IE,		\
Signature · 1 line
2.25.1
author Applied
#2 lore raw
Quoted 8 lines · Mika Westerberg
Quoted 5 lines · Andy Shevchenko

It appears that SPT-H variant has different offset for PAD locking registers. Fix it here.

Fixes 551fa5801ef1 ("pinctrl: intel: sunrisepoint: Add Intel Sunrisepoint-H support")
Signed-off-by Andy Shevchenko <[email protected]>
Acked-by Mika Westerberg <[email protected]>

Pushed to fixes, thanks!

Signature · 2 lines
With Best Regards,
Andy Shevchenko