Commit 0e26cbdf authored by Olof Johansson's avatar Olof Johansson

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

Reset controller fixes for v5.6

Fix the intel,rcu-gw binding schema for the intel,global-reset
property, fix whitespace in the MAINTAINERS keyword entry, and
add missing CONFIG_HAS_IOMEM dependency to CONFIG_RESET_INTEL_GW
and CONFIG_RESET_BRCMSTB_RESCAL.

* tag 'reset-fixes-for-v5.6' of git://git.pengutronix.de/git/pza/linux:
  reset: intel: add unspecified HAS_IOMEM dependency
  reset: brcmstb-rescal: add unspecified HAS_IOMEM dependency
  MAINTAINERS: fix style in RESET CONTROLLER FRAMEWORK
  dt-bindings: reset: intel,rcu-gw: Fix intel,global-reset schema

Link: https://lore.kernel.org/r/e6eaa409883cbae8d1e818b732b98c3362635712.camel@pengutronix.deSigned-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 3bf3c974 b460e0a9
...@@ -23,7 +23,11 @@ properties: ...@@ -23,7 +23,11 @@ properties:
description: Global reset register offset and bit offset. description: Global reset register offset and bit offset.
allOf: allOf:
- $ref: /schemas/types.yaml#/definitions/uint32-array - $ref: /schemas/types.yaml#/definitions/uint32-array
- maxItems: 2 items:
- description: Register offset
- description: Register bit offset
minimum: 0
maximum: 31
"#reset-cells": "#reset-cells":
minimum: 2 minimum: 2
......
...@@ -14228,7 +14228,7 @@ F: include/dt-bindings/reset/ ...@@ -14228,7 +14228,7 @@ F: include/dt-bindings/reset/
F: include/linux/reset.h F: include/linux/reset.h
F: include/linux/reset/ F: include/linux/reset/
F: include/linux/reset-controller.h F: include/linux/reset-controller.h
K: \b(?:devm_|of_)?reset_control(?:ler_[a-z]+|_[a-z_]+)?\b K: \b(?:devm_|of_)?reset_control(?:ler_[a-z]+|_[a-z_]+)?\b
RESTARTABLE SEQUENCES SUPPORT RESTARTABLE SEQUENCES SUPPORT
M: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> M: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
......
...@@ -51,6 +51,7 @@ config RESET_BRCMSTB ...@@ -51,6 +51,7 @@ config RESET_BRCMSTB
config RESET_BRCMSTB_RESCAL config RESET_BRCMSTB_RESCAL
bool "Broadcom STB RESCAL reset controller" bool "Broadcom STB RESCAL reset controller"
depends on HAS_IOMEM
default ARCH_BRCMSTB || COMPILE_TEST default ARCH_BRCMSTB || COMPILE_TEST
help help
This enables the RESCAL reset controller for SATA, PCIe0, or PCIe1 on This enables the RESCAL reset controller for SATA, PCIe0, or PCIe1 on
...@@ -73,7 +74,7 @@ config RESET_IMX7 ...@@ -73,7 +74,7 @@ config RESET_IMX7
config RESET_INTEL_GW config RESET_INTEL_GW
bool "Intel Reset Controller Driver" bool "Intel Reset Controller Driver"
depends on OF depends on OF && HAS_IOMEM
select REGMAP_MMIO select REGMAP_MMIO
help help
This enables the reset controller driver for Intel Gateway SoCs. This enables the reset controller driver for Intel Gateway SoCs.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment