Unverified Commit 311ef883 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

Reset controller updates for v6.12

Use get_device()/put_device() to keep reset controller devices alive
while their reset controls are acquired.
Enable support for the Amlogic T7 SoC reset controller.
Remove unused EyeQ reset bindings and add a reset controller driver
to be instantiated as auxiliary device by the EyeQ clock driver.
Fix OF node leaks in the k210 and berlin probe() error paths.
Add some simplifications and cleanup in the core, lcp18xx driver, and
uniphier bindings.

* tag 'reset-for-v6.12' of git://git.pengutronix.de/pza/linux:
  reset: eyeq: add platform driver
  Revert "dt-bindings: reset: mobileye,eyeq5-reset: add bindings"
  reset: reset-meson: Add support for Amlogic T7 SoC reset controller
  dt-bindings: reset: Add Amlogic T7 reset controller
  reset: core: add get_device()/put_device on rcdev
  reset: lpc18xx: simplify with devm_clk_get_enabled()
  reset: lpc18xx: simplify with dev_err_probe()
  reset: simplify locking with guard()
  reset: k210: fix OF node leak in probe() error path
  reset: berlin: fix OF node leak in probe() error path
  dt-bindings: reset: socionext,uniphier-glue-reset: add top-level constraints

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 639d5f6d 487b1b32

Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ properties: 
      - amlogic,meson-a1-reset # Reset Controller on A1 and compatible SoCs

      - amlogic,meson-s4-reset # Reset Controller on S4 and compatible SoCs

      - amlogic,c3-reset # Reset Controller on C3 and compatible SoCs

      - amlogic,t7-reset



  reg:

    maxItems: 1

Documentation/devicetree/bindings/reset/mobileye,eyeq5-reset.yaml

deleted100644 → 0
+0 −43
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/reset/mobileye,eyeq5-reset.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Mobileye EyeQ5 reset controller



description:

  The EyeQ5 reset driver handles three reset domains. Its registers live in a

  shared region called OLB.



maintainers:

  - Grégory Clement <gregory.clement@bootlin.com>

  - Théo Lebrun <theo.lebrun@bootlin.com>

  - Vladimir Kondratiev <vladimir.kondratiev@mobileye.com>



properties:

  compatible:

    const: mobileye,eyeq5-reset



  reg:

    maxItems: 3



  reg-names:

    items:

      - const: d0

      - const: d1

      - const: d2



  "#reset-cells":

    const: 2

    description:

      The first cell is the domain (0 to 2 inclusive) and the second one is the

      reset index inside that domain.



required:

  - compatible

  - reg

  - reg-names

  - "#reset-cells"



additionalProperties: false

Documentation/devicetree/bindings/reset/socionext,uniphier-glue-reset.yaml

+6 −2
Original line number Diff line number Diff line
@@ -38,13 +38,17 @@ properties: 
    minItems: 1

    maxItems: 2



  clock-names: true

  clock-names:

    minItems: 1

    maxItems: 2



  resets:

    minItems: 1

    maxItems: 2



  reset-names: true

  reset-names:

    minItems: 1

    maxItems: 2



allOf:

  - if:

drivers/reset/Kconfig

+13 −0
Original line number Diff line number Diff line
@@ -66,6 +66,19 @@ config RESET_BRCMSTB_RESCAL 
	  This enables the RESCAL reset controller for SATA, PCIe0, or PCIe1 on

	  BCM7216.



config RESET_EYEQ

	bool "Mobileye EyeQ reset controller"

	depends on MACH_EYEQ5 || MACH_EYEQ6H || COMPILE_TEST

	select AUXILIARY_BUS

	default MACH_EYEQ5 || MACH_EYEQ6H

	help

	  This enables the Mobileye EyeQ reset controller, used in EyeQ5, EyeQ6L

	  and EyeQ6H SoCs.



	  It has one or more domains, with a varying number of resets in each.

	  Registers are located in a shared register region called OLB. EyeQ6H

	  has multiple reset instances.



config RESET_GPIO

	tristate "GPIO reset controller"

	depends on GPIOLIB

drivers/reset/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ obj-$(CONFIG_RESET_BCM6345) += reset-bcm6345.o 
obj-$(CONFIG_RESET_BERLIN) += reset-berlin.o

obj-$(CONFIG_RESET_BRCMSTB) += reset-brcmstb.o

obj-$(CONFIG_RESET_BRCMSTB_RESCAL) += reset-brcmstb-rescal.o

obj-$(CONFIG_RESET_EYEQ) += reset-eyeq.o

obj-$(CONFIG_RESET_GPIO) += reset-gpio.o

obj-$(CONFIG_RESET_HSDK) += reset-hsdk.o

obj-$(CONFIG_RESET_IMX7) += reset-imx7.o