diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2023-10-27 11:02:11 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2023-10-27 11:02:11 +0200 |
| commit | 9e0cceadb7a5099c637e787191a9adbf9ec424cd (patch) | |
| tree | b9d16c3351f284a1ad21337f7a78f10e17325070 /drivers/pmdomain | |
| parent | 2050c9bc4f7bbdd7d1dc0b6bf7749ec4f7b6f407 (diff) | |
| parent | b131329b9bfbd1b4c0c5e088cb0c6ec03a12930f (diff) | |
pmdomain: Merge branch fixes into next
Merge the pmdomain fixes for v6.6-rc[n] into the next branch, to allow them to
get tested together with the new pmdomain changes that are targeted for v6.7.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/pmdomain')
| -rw-r--r-- | drivers/pmdomain/amlogic/meson-ee-pwrc.c | 2 |
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) \ |