summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomeu Vizoso <tomeu@tomeuvizoso.net>2023-10-16 10:02:04 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-11-28 17:20:00 +0000
commitfc14784cc5ba069f41aa16023dc10cab929935a2 (patch)
tree3aa1fd555c535cb84139a1c3837ff5f8cdaa1402
parentb99a36afa2d93327cc3d7b8df6e99145ee234ae6 (diff)
downloadlinux-stable-fc14784cc5ba069f41aa16023dc10cab929935a2.tar.gz
linux-stable-fc14784cc5ba069f41aa16023dc10cab929935a2.tar.bz2
linux-stable-fc14784cc5ba069f41aa16023dc10cab929935a2.zip
pmdomain: amlogic: Fix mask for the second NNA mem PD domain
commit b131329b9bfbd1b4c0c5e088cb0c6ec03a12930f upstream. Without this change, the NPU hangs when the 8th NN core is used. It matches what the out-of-tree driver does. Signed-off-by: Tomeu Vizoso <tomeu@tomeuvizoso.net> Fixes: 9a217b7e8953 ("soc: amlogic: meson-pwrc: Add NNA power domain for A311D") Acked-by: Neil Armstrong <neil.armstrong@linaro.org> Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20231016080205.41982-2-tomeu@tomeuvizoso.net Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/pmdomain/amlogic/meson-ee-pwrc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pmdomain/amlogic/meson-ee-pwrc.c b/drivers/pmdomain/amlogic/meson-ee-pwrc.c
index cfb796d40d9d..0dd71cd814c5 100644
--- a/drivers/pmdomain/amlogic/meson-ee-pwrc.c
+++ b/drivers/pmdomain/amlogic/meson-ee-pwrc.c
@@ -228,7 +228,7 @@ static struct meson_ee_pwrc_mem_domain sm1_pwrc_mem_audio[] = {
static struct meson_ee_pwrc_mem_domain g12a_pwrc_mem_nna[] = {
{ G12A_HHI_NANOQ_MEM_PD_REG0, GENMASK(31, 0) },
- { G12A_HHI_NANOQ_MEM_PD_REG1, GENMASK(23, 0) },
+ { G12A_HHI_NANOQ_MEM_PD_REG1, GENMASK(31, 0) },
};
#define VPU_PD(__name, __top_pd, __mem, __is_pwr_off, __resets, __clks) \