Skip to content

Commit b90a6e6

Browse files
committed
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>
2 parents a4cb906 + ef17b51 commit b90a6e6

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/pmdomain/amlogic/meson-secure-pwrc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ static const struct meson_secure_pwrc_domain_desc t7_pwrc_domains[] = {
221221
SEC_PD(T7_VI_CLK2, 0),
222222
/* ETH is for ethernet online wakeup, and should be always on */
223223
SEC_PD(T7_ETH, GENPD_FLAG_ALWAYS_ON),
224-
SEC_PD(T7_ISP, 0),
224+
TOP_PD(T7_ISP, 0, PWRC_T7_MIPI_ISP_ID),
225225
SEC_PD(T7_MIPI_ISP, 0),
226226
TOP_PD(T7_GDC, 0, PWRC_T7_NIC3_ID),
227227
TOP_PD(T7_DEWARP, 0, PWRC_T7_NIC3_ID),

0 commit comments

Comments
 (0)