diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2025-03-05 17:52:15 +0300 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2025-03-05 17:52:15 +0300 |
| commit | b90a6e60619fcef9f1df24eb395d4e85be70ebe8 (patch) | |
| tree | 0c5b2e6912cc65ebae23435100bbe4f1c39abc10 | |
| parent | a4cb9066283dbca2c06089766459568156670566 (diff) | |
| parent | ef17b519088ee0c167cf507820609732ec8bad1a (diff) | |
| download | linux-b90a6e60619fcef9f1df24eb395d4e85be70ebe8.tar.xz | |
pmdomain: Merge branch fixes into next
Merge the pmdomain fixes for v6.14-rc[n] into the next branch, to allow them
to get tested together with the new changes that are targeted for v6.15.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
| -rw-r--r-- | drivers/pmdomain/amlogic/meson-secure-pwrc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pmdomain/amlogic/meson-secure-pwrc.c b/drivers/pmdomain/amlogic/meson-secure-pwrc.c index 42ce41a2fe3a..ff76ea36835e 100644 --- a/drivers/pmdomain/amlogic/meson-secure-pwrc.c +++ b/drivers/pmdomain/amlogic/meson-secure-pwrc.c @@ -221,7 +221,7 @@ static const struct meson_secure_pwrc_domain_desc t7_pwrc_domains[] = { SEC_PD(T7_VI_CLK2, 0), /* ETH is for ethernet online wakeup, and should be always on */ SEC_PD(T7_ETH, GENPD_FLAG_ALWAYS_ON), - SEC_PD(T7_ISP, 0), + TOP_PD(T7_ISP, 0, PWRC_T7_MIPI_ISP_ID), SEC_PD(T7_MIPI_ISP, 0), TOP_PD(T7_GDC, 0, PWRC_T7_NIC3_ID), TOP_PD(T7_DEWARP, 0, PWRC_T7_NIC3_ID), |