diff options
author | Olof Johansson <olof@lixom.net> | 2018-07-15 00:20:03 +0300 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2018-07-15 00:20:03 +0300 |
commit | 8291ca5d2a7f70cb541f596142849fee4e6566f0 (patch) | |
tree | 70ee5e252f9af028c48e70e17a0c8b079d7b1b47 /arch/arm/boot/dts/dra76-evm.dts | |
parent | 260cfb9ff88313054ab7586438724b3c5cf9816b (diff) | |
parent | 0adbe832f21ac8478f33aa64627c92fd3225b944 (diff) | |
download | linux-8291ca5d2a7f70cb541f596142849fee4e6566f0.tar.xz |
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 'arch/arm/boot/dts/dra76-evm.dts')
-rw-r--r-- | arch/arm/boot/dts/dra76-evm.dts | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/dra76-evm.dts b/arch/arm/boot/dts/dra76-evm.dts index f983cfd1cb85..5a46163d465f 100644 --- a/arch/arm/boot/dts/dra76-evm.dts +++ b/arch/arm/boot/dts/dra76-evm.dts @@ -444,3 +444,9 @@ &extcon_usb2 { vbus-gpio = <&pcf_lcd 15 GPIO_ACTIVE_HIGH>; }; + +&m_can0 { + can-transceiver { + max-bitrate = <5000000>; + }; +}; |