Commit 1df91d85 authored Oct 26, 2023 by Ulf Hansson

pmdomain: Merge branch fixes into next

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 <ulf.hansson@linaro.org>

parents fad5bf2e 374de39d

drivers/pmdomain/bcm/bcm2835-power.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

drivers/pmdomain/imx/gpc.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -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) {