diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2023-08-22 03:07:04 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2023-08-22 03:07:09 +0200 |
| commit | d4692f6c2732481a0bc05c0418c21ab3ab56ccdf (patch) | |
| tree | 11f12930b42b80727fc478eba5f85b6e79963811 /drivers/genpd | |
| parent | soc: kunpeng_hccs: fix some sparse warnings about incorrect type (diff) | |
| parent | soc: rockchip: grf: Fix SDMMC not working on RK3588 with bus-width > 1 (diff) | |
| download | linux-d4692f6c2732481a0bc05c0418c21ab3ab56ccdf.tar.xz linux-d4692f6c2732481a0bc05c0418c21ab3ab56ccdf.zip | |
Merge tag 'v6.6-rockchip-drivers1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into soc/drivers
PD_VO powerdomain for rv1126 and disabling of the automatic switch between
sdmmc and jtag for rk3588 (makes sdmmc unreliable).
This includes the shared genpd-v6.5-rc1-1 tag from Ulf Hansson, which moves
the powerdomain drivers into a new genpd subsystem.
* tag 'v6.6-rockchip-drivers1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
soc: rockchip: grf: Fix SDMMC not working on RK3588 with bus-width > 1
genpd: rockchip: Add PD_VO entry for rv1126
Link: https://lore.kernel.org/r/40318909.XM6RcZxFsP@phil
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/genpd')
| -rw-r--r-- | drivers/genpd/rockchip/pm-domains.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/genpd/rockchip/pm-domains.c b/drivers/genpd/rockchip/pm-domains.c index e3de49e671dc..d5d3ecb38283 100644 --- a/drivers/genpd/rockchip/pm-domains.c +++ b/drivers/genpd/rockchip/pm-domains.c @@ -976,6 +976,7 @@ static const struct rockchip_domain_info px30_pm_domains[] = { static const struct rockchip_domain_info rv1126_pm_domains[] = { [RV1126_PD_VEPU] = DOMAIN_RV1126("vepu", BIT(2), BIT(9), BIT(9), false), [RV1126_PD_VI] = DOMAIN_RV1126("vi", BIT(4), BIT(6), BIT(6), false), + [RV1126_PD_VO] = DOMAIN_RV1126("vo", BIT(5), BIT(7), BIT(7), false), [RV1126_PD_ISPP] = DOMAIN_RV1126("ispp", BIT(1), BIT(8), BIT(8), false), [RV1126_PD_VDPU] = DOMAIN_RV1126("vdpu", BIT(3), BIT(10), BIT(10), false), [RV1126_PD_NVM] = DOMAIN_RV1126("nvm", BIT(7), BIT(11), BIT(11), false), |