pmdomain: Merge branch fixes into next

Ulf Hansson · Ulf Hansson · commit 1df91d85f29f · 2023-10-26T16:01:03.000+02:00
Merge the pmdomain fixes for v6.6-rc[n] into the next branch, to allow them to
get tested together with the new pmdomain changes that are targeted for v6.7.

Signed-off-by: Ulf Hansson &lt;ulf.hansson@linaro.org&gt;
diff --git a/drivers/pmdomain/bcm/bcm2835-power.c b/drivers/pmdomain/bcm/bcm2835-power.c
@@ -175,7 +175,7 @@ static int bcm2835_asb_control(struct bcm2835_power *power, u32 reg, bool enable
 	}
 	writel(PM_PASSWORD | val, base + reg);
 
-	while (readl(base + reg) & ASB_ACK) {
+	while (!!(readl(base + reg) & ASB_ACK) == enable) {
 		cpu_relax();
 		if (ktime_get_ns() - start >= 1000)
 			return -ETIMEDOUT;
diff --git a/drivers/pmdomain/imx/gpc.c b/drivers/pmdomain/imx/gpc.c
@@ -497,6 +497,7 @@ static int imx_gpc_probe(struct platform_device *pdev)
 
 			pd_pdev->dev.parent = &pdev->dev;
 			pd_pdev->dev.of_node = np;
+			pd_pdev->dev.fwnode = of_fwnode_handle(np);
 
 			ret = platform_device_add(pd_pdev);
 			if (ret) {

Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ static int bcm2835_asb_control(struct bcm2835_power *power, u32 reg, bool enable`
`175`	`175`	`}`
`176`	`176`	`writel(PM_PASSWORD \| val, base + reg);`
`177`	`177`
`178`		`- while (readl(base + reg) & ASB_ACK) {`
	`178`	`+ while (!!(readl(base + reg) & ASB_ACK) == enable) {`
`179`	`179`	`cpu_relax();`
`180`	`180`	`if (ktime_get_ns() - start >= 1000)`
`181`	`181`	`return -ETIMEDOUT;`