diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2019-09-04 18:20:03 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2019-09-04 18:20:04 +0300 |
| commit | bf3176b350147f277245a4692795c33afe265782 (patch) | |
| tree | fa62a9b06cdd33272463eb4a60722d3fab1f5b67 /include | |
| parent | 089cf7f6ecb266b6a4164919a2e69bd2f938374a (diff) | |
| parent | c8a738f4cfaeccce40b171aca6da5fc45433ce60 (diff) | |
| download | linux-bf3176b350147f277245a4692795c33afe265782.tar.xz | |
Merge tag 'omap-for-v5.4/ti-sysc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/late
Driver changes for ti-sysc for v5.4
Few changes to prepare for using a reset driver for PRM rstctrl mostly
to deal with the clocks for reset. Then few minor clean-up patches and
SPDX license identifier changes, and add a MAINTAINERs file entry.
* tag 'omap-for-v5.4/ti-sysc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
bus: ti-sysc: remove set but not used variable 'quirks'
bus: ti-sysc: allow reset sharing across devices
bus: ti-sysc: rework the reset handling
bus: ti-sysc: re-order the clkdm control around reset handling
bus: ti-sysc: Add missing kerneldoc comments
bus: ti-sysc: Switch to SPDX license identifier
dt-bindings: ti-sysc: Add SPDX license identifier
MAINTAINERS: Add ti-sysc files under the OMAP2+ entry
Link: https://lore.kernel.org/r/pull-1566599057-142651@atomide.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/dt-bindings/bus/ti-sysc.h | 1 | ||||
| -rw-r--r-- | include/linux/platform_data/ti-sysc.h | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/include/dt-bindings/bus/ti-sysc.h b/include/dt-bindings/bus/ti-sysc.h index 7138384e2ef9..babd08a1d226 100644 --- a/include/dt-bindings/bus/ti-sysc.h +++ b/include/dt-bindings/bus/ti-sysc.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* TI sysc interconnect target module defines */ /* Generic sysc found on omap2 and later, also known as type1 */ diff --git a/include/linux/platform_data/ti-sysc.h b/include/linux/platform_data/ti-sysc.h index 0c587d4fc718..1a0905435b32 100644 --- a/include/linux/platform_data/ti-sysc.h +++ b/include/linux/platform_data/ti-sysc.h @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + #ifndef __TI_SYSC_DATA_H__ #define __TI_SYSC_DATA_H__ @@ -70,7 +72,7 @@ struct sysc_regbits { /** * struct sysc_capabilities - capabilities for an interconnect target module - * + * @type: sysc type identifier for the module * @sysc_mask: bitmask of supported SYSCONFIG register bits * @regbits: bitmask of SYSCONFIG register bits * @mod_quirks: bitmask of module specific quirks @@ -85,8 +87,9 @@ struct sysc_capabilities { /** * struct sysc_config - configuration for an interconnect target module * @sysc_val: configured value for sysc register + * @syss_mask: configured mask value for SYSSTATUS register * @midlemodes: bitmask of supported master idle modes - * @sidlemodes: bitmask of supported master idle modes + * @sidlemodes: bitmask of supported slave idle modes * @srst_udelay: optional delay needed after OCP soft reset * @quirks: bitmask of enabled quirks */ |