summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2025-03-18 09:58:12 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2025-03-18 09:58:12 -0700
commit81e4f8d68c66da301bb881862735bd74c6241a19 (patch)
treee1dc2750770302724bbb9e59f701b1e613081799 /drivers
parent76b6905c11fd3c6dc4562aefc3e8c4429fefae1e (diff)
parentef17b519088ee0c167cf507820609732ec8bad1a (diff)
downloadlinux-81e4f8d68c66da301bb881862735bd74c6241a19.tar.gz
linux-81e4f8d68c66da301bb881862735bd74c6241a19.tar.bz2
linux-81e4f8d68c66da301bb881862735bd74c6241a19.zip
Merge tag 'pmdomain-v6.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm
Pull pmdomain fix from Ulf Hansson: - Fix amlogic T7 ISP secpower * tag 'pmdomain-v6.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm: pmdomain: amlogic: fix T7 ISP secpower
Diffstat (limited to 'drivers')
-rw-r--r--drivers/pmdomain/amlogic/meson-secure-pwrc.c2
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),