diff options
| author | Olof Johansson <olof@lixom.net> | 2018-07-15 00:39:28 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-07-15 00:39:28 +0300 |
| commit | 20d87a5114e7ab39d92798c680f034f9dcaa71db (patch) | |
| tree | a12ffb34416f058c5ed30dbe80615fa50d975c58 /Documentation/devicetree/bindings | |
| parent | e541454a8f1c0273809622c8cd4f5b3435bd8087 (diff) | |
| parent | 596e7955692b5d8b042fca500b7a83c25dfcf936 (diff) | |
| download | linux-20d87a5114e7ab39d92798c680f034f9dcaa71db.tar.xz | |
Merge tag 'omap-for-v4.19/ti-sysc-v2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/drivers
ti-sysc driver changes for v4.19 merge window
These changes add support for mcan controller found
on dra7 to probe it with only dts changes with no
need for legacy hwmod platform data. As it depends
on the related clock change, the clock change is
included here and acked by Stephen Boyd.
* tag 'omap-for-v4.19/ti-sysc-v2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
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/devicetree/bindings')
| -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 |