github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-01 02:53:36 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Reset controller fixes for v6.14

Browse Source 
* Fix lan966x boot with internal CPU by stopping reset-microchip-sparx5
   from indirectly calling devm_request_mem_region() on a memory region
   shared with other devices.
 -----BEGIN PGP SIGNATURE-----
 
 iI0EABYIADUWIQRRO6F6WdpH1R0vGibVhaclGDdiwAUCZ9RakhcccC56YWJlbEBw
 ZW5ndXRyb25peC5kZQAKCRDVhaclGDdiwPnVAQCGYzOCh0I3PuJ1gu6aOOQE2U9+
 kXY8q/vjAvODZVXvQAD8D/tpmvz/LhmWQx0DNDPQMBxzgbYZUO8B8I53DnGpJQY=
 =FS6A
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmfUYm4ACgkQYKtH/8kJ
 UiesTw/7BsZI3LNazGxZdGJ2XUgltKDdLDbTiicVttXFbDR03JZJDgzAo/CPVRrK
 buW1DSPg2N6U7QANj0DA7R+U6pLDclWWPjOAvZ1X37QE8b3rjB9eagDfmSDZZMxR
 EZc0cE/lG116GwbgayJRgaqkZAOENnmt18Z5Iz0a94nkll/w5oGrxemqiGEzBNe7
 L73xWtplosSkGRi8vhGEWHjFMxoeNPe4vdec7VzczeuHIhwLfSoRMMHZhMY6x6y/
 Du7ACQkN8sz1XJmROg+rpikt8i0QUO4QMP+II6lV6PQyX67gSLfsnaGlesQgeAIq
 b5CQy6iA8nhl5XU2lUs65DeqREoSiomgO+uBYkpqkq8hCNoMyvX7ud/epYh5UpSS
 LwoDbkXNv9AfIDeJUEPokvBOWwBq+U9bZuucsm2oly0MsidU/mKBEK5ghBzl1DDl
 hFl2A/bcNbk2Rmu0xnPUb2UEbMKnyomFlgPBFUFWL50S//u6yRFk0XN8/ePRbwkU
 lJe0DINydkZkad6YS3THJ/QH8e987kzMQ6wc5sb1LvfOjWvfjgt75cbZZrOHEyNO
 FgrsP5LkXAK+CN0E8fKE42bLx+vArrnviGdQXJp+Ojpclk9U4rupjo2wG86wMejI
 SUgoXA+OOgLrv+Na3tPVT+V9aKsDqqfNw6rlmgkvMp88dwfEjy8=
 =noiy
 -----END PGP SIGNATURE-----

Merge tag 'reset-fixes-for-v6.14' of git://git.pengutronix.de/pza/linux into arm/fixes

Reset controller fixes for v6.14

* Fix lan966x boot with internal CPU by stopping reset-microchip-sparx5
  from indirectly calling devm_request_mem_region() on a memory region
  shared with other devices.

* tag 'reset-fixes-for-v6.14' of git://git.pengutronix.de/pza/linux:
  reset: mchp: sparx5: Fix for lan966x

Link: https://lore.kernel.org/r/20250314164401.743984-1-p.zabel@pengutronix.de
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2025-03-14 18:07:58 +01:00
commit 5c81649d70
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/reset/reset-microchip-sparx5.c
View File

@ -8,6 +8,7 @@
*/
#include <linux/mfd/syscon.h>
#include <linux/of.h>
#include <linux/of_address.h>
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/property.h>
@ -72,14 +73,22 @@ static struct regmap *mchp_lan966x_syscon_to_regmap(struct device *dev,
struct device_node *syscon_np)
{
struct regmap_config regmap_config = mchp_lan966x_syscon_regmap_config;
resource_size_t size;
struct resource res;
void __iomem *base;
int err;
base = devm_of_iomap(dev, syscon_np, 0, &size);
if (IS_ERR(base))
return ERR_CAST(base);
err = of_address_to_resource(syscon_np, 0, &res);
if (err)
return ERR_PTR(err);
regmap_config.max_register = size - 4;
/* It is not possible to use devm_of_iomap because this resource is
* shared with other drivers.
*/
base = devm_ioremap(dev, res.start, resource_size(&res));
if (!base)
return ERR_PTR(-ENOMEM);
regmap_config.max_register = resource_size(&res) - 4;
return devm_regmap_init_mmio(dev, base, &regmap_config);
}