Commit b90a6e60 authored by Ulf Hansson's avatar Ulf Hansson
Browse files

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: default avatarUlf Hansson <ulf.hansson@linaro.org>
parents a4cb9066 ef17b519

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

+1 −1
Original line number Diff line number Diff line
@@ -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),