]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
power: reset: syscon-reboot: Accept reg property
authorChris Packham <chris.packham@alliedtelesis.co.nz>
Tue, 15 Oct 2024 22:59:44 +0000 (11:59 +1300)
committerSebastian Reichel <sebastian.reichel@collabora.com>
Wed, 16 Oct 2024 20:26:20 +0000 (22:26 +0200)
For historical reasons syscon-reboot has used an 'offset' property. As a
child on a MMIO bus having a 'reg' property is more appropriate. Accept
'reg' as an alternative to 'offset'.

Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20241015225948.3971924-3-chris.packham@alliedtelesis.co.nz
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
drivers/power/reset/syscon-reboot.c

index 4d622c19bc486ffa090cd8efbe19d9df4541a6bc..d623d77e657e4c233d8ae88bb099bee13c48a9ef 100644 (file)
@@ -61,7 +61,8 @@ static int syscon_reboot_probe(struct platform_device *pdev)
                priority = 192;
 
        if (of_property_read_u32(pdev->dev.of_node, "offset", &ctx->offset))
-               return -EINVAL;
+               if (of_property_read_u32(pdev->dev.of_node, "reg", &ctx->offset))
+                       return -EINVAL;
 
        value_err = of_property_read_u32(pdev->dev.of_node, "value", &ctx->value);
        mask_err = of_property_read_u32(pdev->dev.of_node, "mask", &ctx->mask);