[PATCH master] power: reset: nvmem-reboot-mode: disable device tree fixup

[PATCH master] power: reset: nvmem-reboot-mode: disable device tree fixup

[Ahmad Fatoum]

Fixing up the nvmem reboot device tree node is problematic, because it
contains a phandle to another node. Take the easy way out for now and
expect user to provide matching reboot-mode nodes in both kernel and
barebox device tree manually.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 drivers/power/reset/nvmem-reboot-mode.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/drivers/power/reset/nvmem-reboot-mode.c b/drivers/power/reset/nvmem-reboot-mode.c
index b82b37d642e7..2086e96400bb 100644
--- a/drivers/power/reset/nvmem-reboot-mode.c
+++ b/drivers/power/reset/nvmem-reboot-mode.c
@@ -57,6 +57,14 @@ static int nvmem_reboot_mode_probe(struct device_d *dev)
 	nvmem_rbm->reboot.write = nvmem_reboot_mode_write;
 	nvmem_rbm->reboot.priority = 200;
 
+	/*
+	 * Fixing up the nvmem reboot device tree node is problematic, because it
+	 * contains a phandle to another node. Take the easy way out for now and
+	 * expect user to provide matching reboot-mode nodes in both kernel and
+	 * barebox device tree manually.
+	 */
+	nvmem_rbm->reboot.no_fixup = true;
+
 	magicbuf = nvmem_cell_read(nvmem_rbm->cell, &len);
 	if (IS_ERR(magicbuf) || len != 4) {
 		dev_err(dev, "error reading reboot mode: %pe\n", magicbuf);
-- 
2.30.2


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH master] power: reset: nvmem-reboot-mode: disable device tree fixup

[Sascha Hauer]

On Wed, Sep 22, 2021 at 11:09:40AM +0200, Ahmad Fatoum wrote:
> Fixing up the nvmem reboot device tree node is problematic, because it
> contains a phandle to another node. Take the easy way out for now and
> expect user to provide matching reboot-mode nodes in both kernel and
> barebox device tree manually.
> 
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> ---
>  drivers/power/reset/nvmem-reboot-mode.c | 8 ++++++++
>  1 file changed, 8 insertions(+)

Applied, thanks

Sascha

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox