Merge tag 'reset-fixes-for-v5.6' of git://git.pengutronix.de/git/pza/linux into arm/fixes (0e26cbdf) · Commits · 戴 / test

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>

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

+5 −1

Original line number	Diff line number	Diff line
		@@ -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

drivers/reset/Kconfig

+2 −1

Original line number	Diff line number	Diff line
		@@ -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.

MAINTAINERS

+1 −1

File changed.

Contains only whitespace changes.

Admin message