Commit 345dfaaf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pmdomain-v7.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm 

Pull pmdomain fixes from Ulf Hansson:

 - rockchip: Fix PD_VCODEC for RK3588

 - bcm: Fix broken reset status read for bcm2835

* tag 'pmdomain-v7.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm:
  pmdomain: rockchip: Fix PD_VCODEC for RK3588
  pmdomain: bcm: bcm2835-power: Fix broken reset status read
parents 0b2758f4 0fb59eac

drivers/pmdomain/bcm/bcm2835-power.c

+3 −3
Original line number Diff line number Diff line
@@ -580,11 +580,11 @@ static int bcm2835_reset_status(struct reset_controller_dev *rcdev, 


	switch (id) {

	case BCM2835_RESET_V3D:

		return !PM_READ(PM_GRAFX & PM_V3DRSTN);

		return !(PM_READ(PM_GRAFX) & PM_V3DRSTN);

	case BCM2835_RESET_H264:

		return !PM_READ(PM_IMAGE & PM_H264RSTN);

		return !(PM_READ(PM_IMAGE) & PM_H264RSTN);

	case BCM2835_RESET_ISP:

		return !PM_READ(PM_IMAGE & PM_ISPRSTN);

		return !(PM_READ(PM_IMAGE) & PM_ISPRSTN);

	default:

		return -EINVAL;

	}

drivers/pmdomain/rockchip/pm-domains.c

+1 −1
Original line number Diff line number Diff line
@@ -1311,7 +1311,7 @@ static const struct rockchip_domain_info rk3576_pm_domains[] = { 
static const struct rockchip_domain_info rk3588_pm_domains[] = {

	[RK3588_PD_GPU]		= DOMAIN_RK3588("gpu",     0x0, BIT(0),  0,       0x0, 0,       BIT(1),  0x0, BIT(0),  BIT(0),  false, true),

	[RK3588_PD_NPU]		= DOMAIN_RK3588("npu",     0x0, BIT(1),  BIT(1),  0x0, 0,       0,       0x0, 0,       0,       false, true),

	[RK3588_PD_VCODEC]	= DOMAIN_RK3588("vcodec",  0x0, BIT(2),  BIT(2),  0x0, 0,       0,       0x0, 0,       0,       false, false),

	[RK3588_PD_VCODEC]	= DOMAIN_RK3588("vcodec",  0x0, BIT(2),  BIT(2),  0x0, 0,       0,       0x0, 0,       0,       false, true),

	[RK3588_PD_NPUTOP]	= DOMAIN_RK3588("nputop",  0x0, BIT(3),  0,       0x0, BIT(11), BIT(2),  0x0, BIT(1),  BIT(1),  false, false),

	[RK3588_PD_NPU1]	= DOMAIN_RK3588("npu1",    0x0, BIT(4),  0,       0x0, BIT(12), BIT(3),  0x0, BIT(2),  BIT(2),  false, false),

	[RK3588_PD_NPU2]	= DOMAIN_RK3588("npu2",    0x0, BIT(5),  0,       0x0, BIT(13), BIT(4),  0x0, BIT(3),  BIT(3),  false, false),