Unverified Commit d4692f6c authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v6.6-rockchip-drivers1' of... 

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 7d661283 6f6878ec

drivers/genpd/rockchip/pm-domains.c

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

drivers/soc/rockchip/grf.c

+14 −0
Original line number Diff line number Diff line
@@ -121,6 +121,17 @@ static const struct rockchip_grf_info rk3566_pipegrf __initconst = { 
	.num_values = ARRAY_SIZE(rk3566_defaults),

};



#define RK3588_GRF_SOC_CON6		0x0318



static const struct rockchip_grf_value rk3588_defaults[] __initconst = {

	{ "jtag switching", RK3588_GRF_SOC_CON6, HIWORD_UPDATE(0, 1, 14) },

};



static const struct rockchip_grf_info rk3588_sysgrf __initconst = {

	.values = rk3588_defaults,

	.num_values = ARRAY_SIZE(rk3588_defaults),

};





static const struct of_device_id rockchip_grf_dt_match[] __initconst = {

	{
@@ -147,6 +158,9 @@ static const struct of_device_id rockchip_grf_dt_match[] __initconst = { 
	}, {

		.compatible = "rockchip,rk3566-pipe-grf",

		.data = (void *)&rk3566_pipegrf,

	}, {

		.compatible = "rockchip,rk3588-sys-grf",

		.data = (void *)&rk3588_sysgrf,

	},

	{ /* sentinel */ },

};