diff options
| author | Olof Johansson <olof@lixom.net> | 2020-02-24 18:53:00 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2020-02-24 18:53:01 +0100 |
| commit | 0e26cbdfb32ed5bb65ca4640716c62129865b59c (patch) | |
| tree | e492d3799844eca49ee33c058fe3eec8f11eff8b | |
| parent | bus: moxtet: fix potential stack buffer overflow (diff) | |
| parent | reset: intel: add unspecified HAS_IOMEM dependency (diff) | |
| download | linux-0e26cbdfb32ed5bb65ca4640716c62129865b59c.tar.xz linux-0e26cbdfb32ed5bb65ca4640716c62129865b59c.zip | |
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.de
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | Documentation/devicetree/bindings/reset/intel,rcu-gw.yaml | 6 | ||||
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | drivers/reset/Kconfig | 3 |
3 files changed, 8 insertions, 3 deletions
diff --git a/Documentation/devicetree/bindings/reset/intel,rcu-gw.yaml b/Documentation/devicetree/bindings/reset/intel,rcu-gw.yaml index 246dea8a2ec9..8ac437282659 100644 --- a/Documentation/devicetree/bindings/reset/intel,rcu-gw.yaml +++ b/Documentation/devicetree/bindings/reset/intel,rcu-gw.yaml @@ -23,7 +23,11 @@ properties: description: Global reset register offset and bit offset. allOf: - $ref: /schemas/types.yaml#/definitions/uint32-array - - maxItems: 2 + items: + - description: Register offset + - description: Register bit offset + minimum: 0 + maximum: 31 "#reset-cells": minimum: 2 diff --git a/MAINTAINERS b/MAINTAINERS index 38fe2f3f7b6f..81ebfc86f10d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -14228,7 +14228,7 @@ F: include/dt-bindings/reset/ F: include/linux/reset.h F: include/linux/reset/ 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 M: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig index 461b0e506a26..d9efbfd29646 100644 --- a/drivers/reset/Kconfig +++ b/drivers/reset/Kconfig @@ -51,6 +51,7 @@ config RESET_BRCMSTB config RESET_BRCMSTB_RESCAL bool "Broadcom STB RESCAL reset controller" + depends on HAS_IOMEM default ARCH_BRCMSTB || COMPILE_TEST help This enables the RESCAL reset controller for SATA, PCIe0, or PCIe1 on @@ -73,7 +74,7 @@ config RESET_IMX7 config RESET_INTEL_GW bool "Intel Reset Controller Driver" - depends on OF + depends on OF && HAS_IOMEM select REGMAP_MMIO help This enables the reset controller driver for Intel Gateway SoCs. |