Unverified Commit e6cedaa9 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'reset-for-v6.6' of git://git.pengutronix.de/pza/linux into soc/drivers 

Reset controller updates for v6.6

Clean up DT includes and remove unneeded platform_set_drvdata() calls
across reset drivers, add support for the Versal NET platform to the
zynqmp driver, and let the hisilicon driver use dev_err_probe().

* tag 'reset-for-v6.6' of git://git.pengutronix.de/pza/linux:
  reset: ti: syscon: remove unneeded call to platform_set_drvdata()
  reset: zynqmp: removed unneeded call to platform_set_drvdata()
  reset: zynq: remove unneeded call to platfrom_set_drvdata()
  reset: uniphier-glue: remove unneeded call to platform_set_drvdata()
  reset: npcm: remove unneeded call to platform_set_drvdata()
  reset: meson: remove unneeded call to platform_set_drvdata()
  reset: lpc18xx: remove unneeded call to platform_set_drvdata()
  reset: lantiq: remove unneeded call to platform_set_drvdata()
  reset: bcm6345: remove unneeded call to platform_set_drvdata()
  reset: ath79: remove unneeded call to platform_set_drvdata()
  reset: hisilicon: Use dev_err_probe instead of dev_err
  reset: reset-zynqmp: add support for Versal NET platform
  dt-bindings: reset: Updated binding for Versal-NET reset driver
  reset: Explicitly include correct DT includes

Link: https://lore.kernel.org/r/20230808145950.3057250-1-p.zabel@pengutronix.de


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 347cdfc8 417a3a5a

Documentation/devicetree/bindings/reset/xlnx,zynqmp-reset.yaml

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ properties: 
    enum:

      - xlnx,zynqmp-reset

      - xlnx,versal-reset

      - xlnx,versal-net-reset



  "#reset-cells":

    const: 1

drivers/reset/hisilicon/hi6220_reset.c

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
#include <linux/module.h>

#include <linux/bitops.h>

#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/regmap.h>

#include <linux/mfd/syscon.h>

#include <linux/reset-controller.h>

drivers/reset/hisilicon/reset-hi3660.c

+3 −3
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
#include <linux/kernel.h>

#include <linux/mfd/syscon.h>

#include <linux/module.h>

#include <linux/of_device.h>

#include <linux/of.h>

#include <linux/platform_device.h>

#include <linux/regmap.h>

#include <linux/reset-controller.h>
@@ -90,8 +90,8 @@ static int hi3660_reset_probe(struct platform_device *pdev) 
							  "hisi,rst-syscon");

	}

	if (IS_ERR(rc->map)) {

		dev_err(dev, "failed to get hisilicon,rst-syscon\n");

		return PTR_ERR(rc->map);

		return dev_err_probe(dev, PTR_ERR(rc->map),

			"failed to get hisilicon,rst-syscon\n");

	}



	rc->rst.ops = &hi3660_reset_ops,

drivers/reset/reset-ath79.c

+0 −2
Original line number Diff line number Diff line
@@ -93,8 +93,6 @@ static int ath79_reset_probe(struct platform_device *pdev) 
	if (!ath79_reset)

		return -ENOMEM;



	platform_set_drvdata(pdev, ath79_reset);



	ath79_reset->base = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(ath79_reset->base))

		return PTR_ERR(ath79_reset->base);

drivers/reset/reset-bcm6345.c

+0 −2
Original line number Diff line number Diff line
@@ -102,8 +102,6 @@ static int bcm6345_reset_probe(struct platform_device *pdev) 
	if (!bcm6345_reset)

		return -ENOMEM;



	platform_set_drvdata(pdev, bcm6345_reset);



	bcm6345_reset->base = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(bcm6345_reset->base))

		return PTR_ERR(bcm6345_reset->base);