diff options
author | Olof Johansson <olof@lixom.net> | 2018-07-14 14:20:03 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2018-07-14 14:20:03 -0700 |
commit | 8291ca5d2a7f70cb541f596142849fee4e6566f0 (patch) | |
tree | 70ee5e252f9af028c48e70e17a0c8b079d7b1b47 /Documentation | |
parent | 260cfb9ff88313054ab7586438724b3c5cf9816b (diff) | |
parent | 0adbe832f21ac8478f33aa64627c92fd3225b944 (diff) | |
download | linux-stable-8291ca5d2a7f70cb541f596142849fee4e6566f0.tar.gz linux-stable-8291ca5d2a7f70cb541f596142849fee4e6566f0.tar.bz2 linux-stable-8291ca5d2a7f70cb541f596142849fee4e6566f0.zip |
Merge tag 'omap-for-v4.19/dt-mcan-v2-signed-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt
dts changes for mcan for omaps for v4.19 merge window
These changes configure the mcan clock, interconnect target
module and mcan device. These changes depend on the ti-sysc
related driver changes and are based on those.
Notably this is the first new driver that probes with ti-sysc
driver with no legacy hwmod platform data for the interconnect
target module.
* tag 'omap-for-v4.19/dt-mcan-v2-signed-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: dts: dra76x: Add MCAN node
ARM: dts: Add generic interconnect target module node for MCAN
ARM: dts: dra762: Add MCAN clock support
bus: ti-sysc: Add support for software reset
bus: ti-sysc: Add support for using ti-sysc for MCAN on dra76x
clk: ti: dra7: Add clkctrl clock data for the mcan clocks
bus: ti-sysc: Use 2-factor allocator arguments
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/devicetree/bindings/bus/ti-sysc.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/bus/ti-sysc.txt b/Documentation/devicetree/bindings/bus/ti-sysc.txt index d8ed5b780ed9..91dc2333af01 100644 --- a/Documentation/devicetree/bindings/bus/ti-sysc.txt +++ b/Documentation/devicetree/bindings/bus/ti-sysc.txt @@ -36,6 +36,7 @@ Required standard properties: "ti,sysc-omap-aes" "ti,sysc-mcasp" "ti,sysc-usb-host-fs" + "ti,sysc-dra7-mcan" - reg shall have register areas implemented for the interconnect target module in question such as revision, sysc and syss |