From: Olof Johansson <olof@lixom.net>
Date: Sat, 14 Jul 2018 21:20:03 +0000 (-0700)
Subject: Merge tag 'omap-for-v4.19/dt-mcan-v2-signed-v2' of git://git.kernel.org/pub/scm/linux... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=8291ca5d2a7f70cb541f596142849fee4e6566f0;p=linux.git

Merge tag 'omap-for-v4.19/dt-mcan-v2-signed-v2' of git://git./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>
---

8291ca5d2a7f70cb541f596142849fee4e6566f0
diff --cc arch/arm/boot/dts/dra76-evm.dts
index f983cfd1cb850,0ac533784b115..5a46163d465f5
--- a/arch/arm/boot/dts/dra76-evm.dts
+++ b/arch/arm/boot/dts/dra76-evm.dts
@@@ -437,10 -437,8 +437,16 @@@
  	phy-names = "pcie-phy0", "pcie-phy1";
  };
  
 +&extcon_usb1 {
 +	vbus-gpio = <&pcf_lcd 14 GPIO_ACTIVE_HIGH>;
 +};
 +
 +&extcon_usb2 {
 +	vbus-gpio = <&pcf_lcd 15 GPIO_ACTIVE_HIGH>;
 +};
++
+ &m_can0 {
+ 	can-transceiver {
+ 		max-bitrate = <5000000>;
+ 	};
+ };