Commit 1df91d85 authored by Ulf Hansson's avatar 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: default avatarUlf Hansson <ulf.hansson@linaro.org>
parents fad5bf2e 374de39d
...@@ -175,7 +175,7 @@ static int bcm2835_asb_control(struct bcm2835_power *power, u32 reg, bool enable ...@@ -175,7 +175,7 @@ static int bcm2835_asb_control(struct bcm2835_power *power, u32 reg, bool enable
} }
writel(PM_PASSWORD | val, base + reg); writel(PM_PASSWORD | val, base + reg);
while (readl(base + reg) & ASB_ACK) { while (!!(readl(base + reg) & ASB_ACK) == enable) {
cpu_relax(); cpu_relax();
if (ktime_get_ns() - start >= 1000) if (ktime_get_ns() - start >= 1000)
return -ETIMEDOUT; return -ETIMEDOUT;
......
...@@ -497,6 +497,7 @@ static int imx_gpc_probe(struct platform_device *pdev) ...@@ -497,6 +497,7 @@ static int imx_gpc_probe(struct platform_device *pdev)
pd_pdev->dev.parent = &pdev->dev; pd_pdev->dev.parent = &pdev->dev;
pd_pdev->dev.of_node = np; pd_pdev->dev.of_node = np;
pd_pdev->dev.fwnode = of_fwnode_handle(np);
ret = platform_device_add(pd_pdev); ret = platform_device_add(pd_pdev);
if (ret) { if (ret) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment