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

Merge tag 'reset-for-v7.1' of https://git.pengutronix.de/git/pza/linux into soc/drivers 

Reset controller updates for v7.1

* Rework the reset core to support firmware nodes, add more fine
  grained locking, and use guard() helpers.
* Change the reset-gpio driver to use firmware nodes.
* Add support for the Cix Sky1 SoC reset controller.
* Add support for the RZ/G3E SoC to the reset-rzv2h-usb2phy driver and
  convert it to regmap. Prepare registering a VBUS mux controller.
* Replace use of the deprecated register_restart_handler() function in
  the ath79, intel-gw, lpc18xx, ma35d1, npcm, and sunplus reset drivers.
* Combine two allocations into one in the sti/reset-syscfg driver.
* Fix the reset-rzg2l-usbphy-ctrl MODULE_AUTHOR email.
* Fix the reset_control_rearm() kerneldoc comment.

The last commit is a merge of reset-fixes-for-v7.0-2 into reset/next,
to solve a merge conflict between commits a9b95ce3 ("reset: gpio: add a
devlink between reset-gpio and its consumer") and fbffb8c7 ("reset: gpio:
fix double free in reset_add_gpio_aux_device() error path").

* tag 'reset-for-v7.1' of https://git.pengutronix.de/git/pza/linux

: (35 commits)
  reset: rzv2h-usb2phy: Add support for VBUS mux controller registration
  reset: rzv2h-usb2phy: Convert to regmap API
  dt-bindings: reset: renesas,rzv2h-usb2phy: Document RZ/G3E USB2PHY reset
  dt-bindings: reset: renesas,rzv2h-usb2phy: Add '#mux-state-cells' property
  reset: core: Drop unnecessary double quote
  reset: rzv2h-usb2phy: Keep PHY clock enabled for entire device lifetime
  reset: spacemit: k3: Decouple composite reset lines
  reset: gpio: fix double free in reset_add_gpio_aux_device() error path
  reset: rzg2l-usbphy-ctrl: Fix malformed MODULE_AUTHOR string
  reset: sti: kzalloc + kcalloc to kzalloc
  reset: don't overwrite fwnode_reset_n_cells
  reset: core: Fix indentation
  reset: add Sky1 soc reset support
  dt-bindings: soc: cix: document the syscon on Sky1 SoC
  reset: gpio: make the driver fwnode-agnostic
  reset: convert reset core to using firmware nodes
  reset: convert the core API to using firmware nodes
  reset: convert of_reset_control_get_count() to using firmware nodes
  reset: protect struct reset_control with its own mutex
  reset: protect struct reset_controller_dev with its own mutex
  ...

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 62513d22 d373605c

Documentation/devicetree/bindings/reset/renesas,rzv2h-usb2phy-reset.yaml

+8 −1
Original line number Diff line number Diff line
@@ -17,7 +17,9 @@ properties: 
  compatible:

    oneOf:

      - items:

          - const: renesas,r9a09g056-usb2phy-reset # RZ/V2N

          - enum:

              - renesas,r9a09g047-usb2phy-reset # RZ/G3E

              - renesas,r9a09g056-usb2phy-reset # RZ/V2N

          - const: renesas,r9a09g057-usb2phy-reset



      - const: renesas,r9a09g057-usb2phy-reset # RZ/V2H(P)
@@ -37,6 +39,9 @@ properties: 
  '#reset-cells':

    const: 0



  '#mux-state-cells':

    const: 1



required:

  - compatible

  - reg
@@ -44,6 +49,7 @@ required: 
  - resets

  - power-domains

  - '#reset-cells'

  - '#mux-state-cells'



additionalProperties: false
@@ -58,4 +64,5 @@ examples: 
        resets = <&cpg 0xaf>;

        power-domains = <&cpg>;

        #reset-cells = <0>;

        #mux-state-cells = <1>;

    };

Documentation/devicetree/bindings/soc/cix/cix,sky1-system-control.yaml

0 → 100644
+42 −0
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/soc/cix/cix,sky1-system-control.yaml#

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



title: Cix Sky1 SoC system control register region



maintainers:

  - Gary Yang <gary.yang@cixtech.com>



description:

  An wide assortment of registers of the system controller on Sky1 SoC,

  including resets, usb, wakeup sources and so on.



properties:

  compatible:

    items:

      - enum:

          - cix,sky1-system-control

          - cix,sky1-s5-system-control

      - const: syscon



  reg:

    maxItems: 1



  '#reset-cells':

    const: 1



required:

  - compatible

  - reg



additionalProperties: false



examples:

  - |

    syscon@4160000 {

      compatible = "cix,sky1-system-control", "syscon";

      reg = <0x4160000 0x100>;

      #reset-cells = <1>;

    };

Documentation/driver-api/reset.rst

+0 −1
Original line number Diff line number Diff line
@@ -198,7 +198,6 @@ query the reset line status using reset_control_status(). 
               reset_control_rearm

               reset_control_put

               of_reset_control_get_count

               of_reset_control_array_get

               devm_reset_control_array_get

               reset_control_get_count

drivers/reset/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -257,6 +257,8 @@ config RESET_RZG2L_USBPHY_CTRL 
config RESET_RZV2H_USB2PHY

	tristate "Renesas RZ/V2H(P) (and similar SoCs) USB2PHY Reset driver"

	depends on ARCH_RENESAS || COMPILE_TEST

	select AUXILIARY_BUS

	select REGMAP_MMIO

	help

	  Support for USB2PHY Port reset Control found on the RZ/V2H(P) SoC

	  (and similar SoCs).
@@ -291,6 +293,13 @@ config RESET_SIMPLE 
	   - SiFive FU740 SoCs

	   - Sophgo SoCs



config RESET_SKY1

	bool "Cix Sky1 reset controller"

	depends on ARCH_CIX || COMPILE_TEST

	select REGMAP_MMIO

	help

	  This enables the reset controller for Cix Sky1.



config RESET_SOCFPGA

	bool "SoCFPGA Reset Driver" if COMPILE_TEST && (!ARM || !ARCH_INTEL_SOCFPGA)

	default ARM && ARCH_INTEL_SOCFPGA

drivers/reset/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ obj-$(CONFIG_RESET_RZG2L_USBPHY_CTRL) += reset-rzg2l-usbphy-ctrl.o 
obj-$(CONFIG_RESET_RZV2H_USB2PHY) += reset-rzv2h-usb2phy.o

obj-$(CONFIG_RESET_SCMI) += reset-scmi.o

obj-$(CONFIG_RESET_SIMPLE) += reset-simple.o

obj-$(CONFIG_RESET_SKY1) += reset-sky1.o

obj-$(CONFIG_RESET_SOCFPGA) += reset-socfpga.o

obj-$(CONFIG_RESET_SUNPLUS) += reset-sunplus.o

obj-$(CONFIG_RESET_SUNXI) += reset-sunxi.o