diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2024-01-22 16:08:34 +0100 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2024-01-22 16:08:34 +0100 |
| commit | 0235c4cef0ffbfc27b3bdbd0690f1647257b8c9e (patch) | |
| tree | 9a6665550ed82eebf28314de86b1cdcd2afa0adb | |
| parent | 768c04ccb9013c0eab51dd31f63474ef8a7456db (diff) | |
| parent | f0e4a1356466ec1858ae8e5c70bea2ce5e55008b (diff) | |
pmdomain: Merge branch fixes into next
Merge the pmdomain fixes for v6.8-rc[n] into the next branch, to allow them
to get tested together with the changes that are targeted for v6.9.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
| -rw-r--r-- | drivers/pmdomain/core.c | 2 | ||||
| -rw-r--r-- | drivers/pmdomain/renesas/r8a77980-sysc.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/pmdomain/core.c b/drivers/pmdomain/core.c index 30b9be61bab1..46331e71108a 100644 --- a/drivers/pmdomain/core.c +++ b/drivers/pmdomain/core.c @@ -1140,7 +1140,7 @@ static int __init genpd_power_off_unused(void) return 0; } -late_initcall(genpd_power_off_unused); +late_initcall_sync(genpd_power_off_unused); #ifdef CONFIG_PM_SLEEP diff --git a/drivers/pmdomain/renesas/r8a77980-sysc.c b/drivers/pmdomain/renesas/r8a77980-sysc.c index 39ca84a67daa..621e411fc999 100644 --- a/drivers/pmdomain/renesas/r8a77980-sysc.c +++ b/drivers/pmdomain/renesas/r8a77980-sysc.c @@ -25,7 +25,8 @@ static const struct rcar_sysc_area r8a77980_areas[] __initconst = { PD_CPU_NOCR }, { "ca53-cpu3", 0x200, 3, R8A77980_PD_CA53_CPU3, R8A77980_PD_CA53_SCU, PD_CPU_NOCR }, - { "cr7", 0x240, 0, R8A77980_PD_CR7, R8A77980_PD_ALWAYS_ON }, + { "cr7", 0x240, 0, R8A77980_PD_CR7, R8A77980_PD_ALWAYS_ON, + PD_CPU_NOCR }, { "a3ir", 0x180, 0, R8A77980_PD_A3IR, R8A77980_PD_ALWAYS_ON }, { "a2ir0", 0x400, 0, R8A77980_PD_A2IR0, R8A77980_PD_A3IR }, { "a2ir1", 0x400, 1, R8A77980_PD_A2IR1, R8A77980_PD_A3IR }, |