pinctrl: sunrisepoint: Fix PAD lock register offset for SPT-H
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Wed, 1 Apr 2020 08:53:00 +0000 (11:53 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 20 May 2020 06:20:18 +0000 (08:20 +0200)
[ Upstream commit 6b7275c87717652daace4c0b8131eb184c7d7516 ]

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 <andriy.shevchenko@linux.intel.com>
Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/pinctrl/intel/pinctrl-sunrisepoint.c

index d936e7a..7b7736a 100644 (file)
 
 #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,                \