| From 4dadea572c47f6dd74f4319290d9c75009975fba Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 1 Apr 2020 11:53:00 +0300 |
| Subject: pinctrl: sunrisepoint: Fix PAD lock register offset for SPT-H |
| |
| From: Andy Shevchenko <andriy.shevchenko@linux.intel.com> |
| |
| [ 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 | 15 ++++++++------- |
| 1 file changed, 8 insertions(+), 7 deletions(-) |
| |
| diff --git a/drivers/pinctrl/intel/pinctrl-sunrisepoint.c b/drivers/pinctrl/intel/pinctrl-sunrisepoint.c |
| index 330c8f077b73a..4d7a86a5a37b0 100644 |
| --- a/drivers/pinctrl/intel/pinctrl-sunrisepoint.c |
| +++ b/drivers/pinctrl/intel/pinctrl-sunrisepoint.c |
| @@ -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, \ |
| -- |
| 2.20.1 |
| |
