]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
reset: don't overwrite fwnode_reset_n_cells
authorBartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
Tue, 10 Mar 2026 15:15:15 +0000 (16:15 +0100)
committerPhilipp Zabel <p.zabel@pengutronix.de>
Wed, 11 Mar 2026 07:27:21 +0000 (08:27 +0100)
commit62d11b80ea5d118ba4a1b24e55ca13d77a4cf161
tree65da5f4f2b4306c98a19526986fb287af95fb0bf
parent2737dcb3c467824cd55921fba3fbd1375fc01695
reset: don't overwrite fwnode_reset_n_cells

Fix a logic bug in reset_controller_register() where we set
fwnode_reset_n_cells to 1 if fwnode is set and fwnode_xlate is not but
we do it after assigning of_fwnode_handle(of_node) to fwnode.

Modify the logic to: assign fwnode from of_node if applicable, if fwnode
is still not set, try to get it from the device and only then check
of_xlate and fwnode_xlate and either assign fwnode_reset_n_cells from OF
or default to fwnode_reset_simple_xlate and fwnode_reset_n_cells = 1.

Fixes: ba8dbbb14b7e ("reset: convert the core API to using firmware nodes")
Reported-by: Mark Brown <broonie@kernel.org>
Closes: https://lore.kernel.org/all/0b72286b-33dd-4bc9-8c0e-161c2f4baed8@sirena.org.uk/
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
Tested-by: Mark Brown <broonie@kernel.org>
Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
drivers/reset/core.c