From: "Rafał Miłecki" <zajec5@gmail.com>
To: Sebastian Reichel <sre@kernel.org>, Rob Herring <robh+dt@kernel.org>
Cc: linux-pm@vger.kernel.org, devicetree@vger.kernel.org,
"Lee Jones" <lee.jones@linaro.org>,
"Wim Van Sebroeck" <wim@linux-watchdog.org>,
"Guenter Roeck" <linux@roeck-us.net>,
"Florian Fainelli" <f.fainelli@gmail.com>,
bcm-kernel-feedback-list@broadcom.com,
"Rafał Miłecki" <rafal@milecki.pl>
Subject: [PATCH RFC 3/3] power: reset: syscon-reboot: support "reg" property
Date: Tue, 2 Nov 2021 16:22:07 +0100 [thread overview]
Message-ID: <20211102152207.11891-4-zajec5@gmail.com> (raw)
In-Reply-To: <20211102152207.11891-1-zajec5@gmail.com>
From: Rafał Miłecki <rafal@milecki.pl>
This follows binding update to use "reg" for reading regmap offset.
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
---
drivers/power/reset/syscon-reboot.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/power/reset/syscon-reboot.c b/drivers/power/reset/syscon-reboot.c
index 510e363381ca..a0999bac503e 100644
--- a/drivers/power/reset/syscon-reboot.c
+++ b/drivers/power/reset/syscon-reboot.c
@@ -44,6 +44,7 @@ static int syscon_reboot_probe(struct platform_device *pdev)
struct syscon_reboot_context *ctx;
struct device *dev = &pdev->dev;
int mask_err, value_err;
+ bool is_child = false;
int err;
ctx = devm_kzalloc(&pdev->dev, sizeof(*ctx), GFP_KERNEL);
@@ -55,10 +56,14 @@ static int syscon_reboot_probe(struct platform_device *pdev)
ctx->map = syscon_node_to_regmap(dev->parent->of_node);
if (IS_ERR(ctx->map))
return PTR_ERR(ctx->map);
+ is_child = true;
}
- if (of_property_read_u32(pdev->dev.of_node, "offset", &ctx->offset))
- return -EINVAL;
+ if (!is_child ||
+ of_property_read_u32(dev->of_node, "reg", &ctx->offset)) {
+ if (of_property_read_u32(dev->of_node, "offset", &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);
--
2.31.1
next prev parent reply other threads:[~2021-11-02 15:22 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-02 15:22 [PATCH RFC 0/3] reset: syscon-reboot: add "reg" property support Rafał Miłecki
2021-11-02 15:22 ` [PATCH RFC 1/3] dt-bindings: power: reset: syscon-reboot: use non-deprecated example Rafał Miłecki
2021-11-12 19:33 ` Rob Herring
2021-11-02 15:22 ` [PATCH RFC 2/3] dt-bindings: power: reset: syscon-reboot: add "reg" property Rafał Miłecki
2021-11-12 19:34 ` Rob Herring
2021-11-02 15:22 ` Rafał Miłecki [this message]
2021-11-02 15:26 ` [PATCH RFC 0/3] reset: syscon-reboot: add "reg" property support Rafał Miłecki
2021-11-12 22:18 ` Rob Herring
2021-11-12 22:23 ` Rafał Miłecki
2021-11-12 22:32 ` Rob Herring
2021-12-02 17:21 ` Sebastian Reichel
2021-12-02 17:23 ` Rafał Miłecki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211102152207.11891-4-zajec5@gmail.com \
--to=zajec5@gmail.com \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=devicetree@vger.kernel.org \
--cc=f.fainelli@gmail.com \
--cc=lee.jones@linaro.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=rafal@milecki.pl \
--cc=robh+dt@kernel.org \
--cc=sre@kernel.org \
--cc=wim@linux-watchdog.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).