diff options
| author |   Max Filippov <jcmvbkbc@gmail.com> | 2019-11-26 11:30:27 -0800 |
|---|---|---|
| committer |   Bartosz Golaszewski <bgolaszewski@baylibre.com> | 2019-12-09 10:40:18 +0100 |
| commit | 634f0348fe336fce8f6cab1933139115e983ed2f (patch) | |
| tree | 77540d3ce83db13c823cce27bbf034074a5c5063 /drivers/gpio | |
| parent | Linux 5.5-rc1 (diff) | |
| download | linux-dev-634f0348fe336fce8f6cab1933139115e983ed2f.tar.xz linux-dev-634f0348fe336fce8f6cab1933139115e983ed2f.zip | |
gpio: xtensa: fix driver build
Commit cad6fade6e78 ("xtensa: clean up WSR*/RSR*/get_sr/set_sr") removed
{RSR,WSR}_CPENABLE from xtensa code, but did not fix up all users,
breaking gpio-xtensa driver build. Update gpio-xtensa to use
new xtensa_{get,set}_sr API.
Cc: stable@vger.kernel.org # v5.0+
Fixes: cad6fade6e78 ("xtensa: clean up WSR*/RSR*/get_sr/set_sr")
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Diffstat (limited to 'drivers/gpio')
| -rw-r--r-- | drivers/gpio/gpio-xtensa.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/gpio/gpio-xtensa.c b/drivers/gpio/gpio-xtensa.c index 08d7c3b32038..c8af34a6368f 100644 --- a/drivers/gpio/gpio-xtensa.c +++ b/drivers/gpio/gpio-xtensa.c @@ -44,15 +44,14 @@ static inline unsigned long enable_cp(unsigned long *cpenable) unsigned long flags; local_irq_save(flags); - RSR_CPENABLE(*cpenable); - WSR_CPENABLE(*cpenable | BIT(XCHAL_CP_ID_XTIOP)); - + *cpenable = xtensa_get_sr(cpenable); + xtensa_set_sr(*cpenable | BIT(XCHAL_CP_ID_XTIOP), cpenable); return flags; } static inline void disable_cp(unsigned long flags, unsigned long cpenable) { - WSR_CPENABLE(cpenable); + xtensa_set_sr(cpenable, cpenable); local_irq_restore(flags); } |