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

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

Reset controller updates for v6.5

Use devm_platform_ioremap_resource() instead of platform_get_resource()
and devm_ioremap_resource() in various drivers, simplify the stih407
Kconfig and use regmap_field_read_poll_timeout() instead of open-coded
waiting, and use dev_err_probe() in the meson-audio-arb reset driver.
With its platform gone, remove the now obsolete oxnas reset driver.
Drop depends on the non-user-visible CONFIG_AUXILIARY_BUS symbol.

* tag 'reset-for-v6.5' of git://git.pengutronix.de/pza/linux:
  reset: mpfs: select AUXILIARY_BUS
  reset: starfive: select AUXILIARY_BUS
  reset: oxnas: remove obsolete reset driver
  reset: sti: simplify driver's config and build
  reset: meson-audio-arb: Use dev_err_probe()
  reset: sti: rely on regmap_field_read_poll_timeout for ack wait
  reset: brcmstb-rescal: Use devm_platform_ioremap_resource()
  reset: meson: Use devm_platform_ioremap_resource()
  reset: reset-hsdk: Use devm_platform_ioremap_resource()
  reset: lpc18xx: Use devm_platform_ioremap_resource()
  reset: axs10x: Use devm_platform_ioremap_resource()
  reset: ath79: Use devm_platform_ioremap_resource()

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 2336ce7f afb39e2b

Documentation/devicetree/bindings/reset/oxnas,reset.txt

deleted100644 → 0
+0 −32
Original line number Diff line number Diff line 
Oxford Semiconductor OXNAS SoC Family RESET Controller

================================================



Please also refer to reset.txt in this directory for common reset

controller binding usage.



Required properties:

- compatible: For OX810SE, should be "oxsemi,ox810se-reset"

	      For OX820, should be "oxsemi,ox820-reset"

- #reset-cells: 1, see below



Parent node should have the following properties :

- compatible: For OX810SE, should be :

			"oxsemi,ox810se-sys-ctrl", "syscon", "simple-mfd"

	      For OX820, should be :

			"oxsemi,ox820-sys-ctrl", "syscon", "simple-mfd"



Reset indices are in dt-bindings include files :

- For OX810SE: include/dt-bindings/reset/oxsemi,ox810se.h

- For OX820: include/dt-bindings/reset/oxsemi,ox820.h



example:



sys: sys-ctrl@000000 {

	compatible = "oxsemi,ox810se-sys-ctrl", "syscon", "simple-mfd";

	reg = <0x000000 0x100000>;



	reset: reset-controller {

		compatible = "oxsemi,ox810se-reset";

		#reset-cells = <1>;

	};

};

drivers/reset/Kconfig

+2 −4
Original line number Diff line number Diff line
@@ -143,9 +143,6 @@ config RESET_NPCM 
	  This enables the reset controller driver for Nuvoton NPCM

	  BMC SoCs.



config RESET_OXNAS

	bool



config RESET_PISTACHIO

	bool "Pistachio Reset Driver"

	depends on MIPS || COMPILE_TEST
@@ -154,7 +151,8 @@ config RESET_PISTACHIO 


config RESET_POLARFIRE_SOC

	bool "Microchip PolarFire SoC (MPFS) Reset Driver"

	depends on AUXILIARY_BUS && MCHP_CLK_MPFS

	depends on MCHP_CLK_MPFS

	select AUXILIARY_BUS

	default MCHP_CLK_MPFS

	help

	  This driver supports peripheral reset for the Microchip PolarFire SoC

drivers/reset/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ obj-$(CONFIG_RESET_MCHP_SPARX5) += reset-microchip-sparx5.o 
obj-$(CONFIG_RESET_MESON) += reset-meson.o

obj-$(CONFIG_RESET_MESON_AUDIO_ARB) += reset-meson-audio-arb.o

obj-$(CONFIG_RESET_NPCM) += reset-npcm.o

obj-$(CONFIG_RESET_OXNAS) += reset-oxnas.o

obj-$(CONFIG_RESET_PISTACHIO) += reset-pistachio.o

obj-$(CONFIG_RESET_POLARFIRE_SOC) += reset-mpfs.o

obj-$(CONFIG_RESET_QCOM_AOSS) += reset-qcom-aoss.o

drivers/reset/reset-ath79.c

+1 −3
Original line number Diff line number Diff line
@@ -86,7 +86,6 @@ static int ath79_reset_restart_handler(struct notifier_block *nb, 
static int ath79_reset_probe(struct platform_device *pdev)

{

	struct ath79_reset *ath79_reset;

	struct resource *res;

	int err;



	ath79_reset = devm_kzalloc(&pdev->dev,
@@ -96,8 +95,7 @@ static int ath79_reset_probe(struct platform_device *pdev) 


	platform_set_drvdata(pdev, ath79_reset);



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	ath79_reset->base = devm_ioremap_resource(&pdev->dev, res);

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

	if (IS_ERR(ath79_reset->base))

		return PTR_ERR(ath79_reset->base);

drivers/reset/reset-axs10x.c

+1 −3
Original line number Diff line number Diff line
@@ -44,14 +44,12 @@ static const struct reset_control_ops axs10x_reset_ops = { 
static int axs10x_reset_probe(struct platform_device *pdev)

{

	struct axs10x_rst *rst;

	struct resource *mem;



	rst = devm_kzalloc(&pdev->dev, sizeof(*rst), GFP_KERNEL);

	if (!rst)

		return -ENOMEM;



	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	rst->regs_rst = devm_ioremap_resource(&pdev->dev, mem);

	rst->regs_rst = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(rst->regs_rst))

		return PTR_ERR(rst->regs_rst);