Skip to content

Commit 0e26cbd

Browse files
committed
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/[email protected] Signed-off-by: Olof Johansson <[email protected]>
2 parents 3bf3c97 + b460e0a commit 0e26cbd

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

Documentation/devicetree/bindings/reset/intel,rcu-gw.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,11 @@ properties:
2323
description: Global reset register offset and bit offset.
2424
allOf:
2525
- $ref: /schemas/types.yaml#/definitions/uint32-array
26-
- maxItems: 2
26+
items:
27+
- description: Register offset
28+
- description: Register bit offset
29+
minimum: 0
30+
maximum: 31
2731

2832
"#reset-cells":
2933
minimum: 2

MAINTAINERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14228,7 +14228,7 @@ F: include/dt-bindings/reset/
1422814228
F: include/linux/reset.h
1422914229
F: include/linux/reset/
1423014230
F: include/linux/reset-controller.h
14231-
K: \b(?:devm_|of_)?reset_control(?:ler_[a-z]+|_[a-z_]+)?\b
14231+
K: \b(?:devm_|of_)?reset_control(?:ler_[a-z]+|_[a-z_]+)?\b
1423214232

1423314233
RESTARTABLE SEQUENCES SUPPORT
1423414234
M: Mathieu Desnoyers <[email protected]>

drivers/reset/Kconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ config RESET_BRCMSTB
5151

5252
config RESET_BRCMSTB_RESCAL
5353
bool "Broadcom STB RESCAL reset controller"
54+
depends on HAS_IOMEM
5455
default ARCH_BRCMSTB || COMPILE_TEST
5556
help
5657
This enables the RESCAL reset controller for SATA, PCIe0, or PCIe1 on
@@ -73,7 +74,7 @@ config RESET_IMX7
7374

7475
config RESET_INTEL_GW
7576
bool "Intel Reset Controller Driver"
76-
depends on OF
77+
depends on OF && HAS_IOMEM
7778
select REGMAP_MMIO
7879
help
7980
This enables the reset controller driver for Intel Gateway SoCs.

0 commit comments

Comments
 (0)