tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds 345dfaaf 0b2758f4

+4 -4
unified split
+3 -3
drivers/pmdomain/bcm/bcm2835-power.c
··· 580 580 581 581 switch (id) { 582 582 case BCM2835_RESET_V3D: 583 - return !PM_READ(PM_GRAFX & PM_V3DRSTN); 583 + return !(PM_READ(PM_GRAFX) & PM_V3DRSTN); 584 584 case BCM2835_RESET_H264: 585 - return !PM_READ(PM_IMAGE & PM_H264RSTN); 585 + return !(PM_READ(PM_IMAGE) & PM_H264RSTN); 586 586 case BCM2835_RESET_ISP: 587 - return !PM_READ(PM_IMAGE & PM_ISPRSTN); 587 + return !(PM_READ(PM_IMAGE) & PM_ISPRSTN); 588 588 default: 589 589 return -EINVAL; 590 590 }
+1 -1
drivers/pmdomain/rockchip/pm-domains.c
··· 1311 1311 static const struct rockchip_domain_info rk3588_pm_domains[] = { 1312 1312 [RK3588_PD_GPU] = DOMAIN_RK3588("gpu", 0x0, BIT(0), 0, 0x0, 0, BIT(1), 0x0, BIT(0), BIT(0), false, true), 1313 1313 [RK3588_PD_NPU] = DOMAIN_RK3588("npu", 0x0, BIT(1), BIT(1), 0x0, 0, 0, 0x0, 0, 0, false, true), 1314 - [RK3588_PD_VCODEC] = DOMAIN_RK3588("vcodec", 0x0, BIT(2), BIT(2), 0x0, 0, 0, 0x0, 0, 0, false, false), 1314 + [RK3588_PD_VCODEC] = DOMAIN_RK3588("vcodec", 0x0, BIT(2), BIT(2), 0x0, 0, 0, 0x0, 0, 0, false, true), 1315 1315 [RK3588_PD_NPUTOP] = DOMAIN_RK3588("nputop", 0x0, BIT(3), 0, 0x0, BIT(11), BIT(2), 0x0, BIT(1), BIT(1), false, false), 1316 1316 [RK3588_PD_NPU1] = DOMAIN_RK3588("npu1", 0x0, BIT(4), 0, 0x0, BIT(12), BIT(3), 0x0, BIT(2), BIT(2), false, false), 1317 1317 [RK3588_PD_NPU2] = DOMAIN_RK3588("npu2", 0x0, BIT(5), 0, 0x0, BIT(13), BIT(4), 0x0, BIT(3), BIT(3), false, false),