[GIT,PULL,5/5] dts changes for omap mcan for v4.19

Message ID pull-1531314878-371161@atomide.com-5
State New
Headers show
Series
  • [GIT,PULL,1/5] omap1 soc changes for v4.19
Related show

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v4.19/dt-mcan-v2-signed-v2

Message

Tony Lindgren July 11, 2018, 1:19 p.m.
From: "Tony Lindgren" <tony@atomide.com>

The following changes since commit 596e7955692b5d8b042fca500b7a83c25dfcf936:

  bus: ti-sysc: Add support for software reset (2018-07-09 22:31:38 -0700)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v4.19/dt-mcan-v2-signed-v2

for you to fetch changes up to 0adbe832f21ac8478f33aa64627c92fd3225b944:

  ARM: dts: dra76x: Add MCAN node (2018-07-10 04:05:30 -0700)

----------------------------------------------------------------
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.

----------------------------------------------------------------
Faiz Abbas (2):
      ARM: dts: Add generic interconnect target module node for MCAN
      ARM: dts: dra76x: Add MCAN node

Lokesh Vutla (1):
      ARM: dts: dra762: Add MCAN clock support

 arch/arm/boot/dts/dra76-evm.dts |  6 ++++
 arch/arm/boot/dts/dra76x.dtsi   | 64 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+)

Comments

Olof Johansson July 14, 2018, 9:19 p.m. | #1
On Wed, Jul 11, 2018 at 06:19:08AM -0700, Tony Lindgren wrote:
> From: "Tony Lindgren" <tony@atomide.com>
> 
> The following changes since commit 596e7955692b5d8b042fca500b7a83c25dfcf936:
> 
>   bus: ti-sysc: Add support for software reset (2018-07-09 22:31:38 -0700)
> 
> are available in the Git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v4.19/dt-mcan-v2-signed-v2
> 
> for you to fetch changes up to 0adbe832f21ac8478f33aa64627c92fd3225b944:
> 
>   ARM: dts: dra76x: Add MCAN node (2018-07-10 04:05:30 -0700)
> 
> ----------------------------------------------------------------
> 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.

Hi Tony,

I'm not entirely sure why you sent this as a separate pull request, but it also
conflicts with your first DT branch (add/add conflict at the end of the file).

Fixed up by keeping both sides, merged.


-Olof
Tony Lindgren July 16, 2018, 7:53 a.m. | #2
* Olof Johansson <olof@lixom.net> [180714 22:21]:
> On Wed, Jul 11, 2018 at 06:19:08AM -0700, Tony Lindgren wrote:
> > 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.
> 
> Hi Tony,
> 
> I'm not entirely sure why you sent this as a separate pull request, but it also
> conflicts with your first DT branch (add/add conflict at the end of the file).

I put them into a separate branch because they were based on
the pending ti-sysc driver changes so you could merge them to
a branch you prefer. But I forgot the merge conflict again..
The resolution is almost always in Linux next for the branches
I send pull requests for for. But I added some notes to check
those next time.

> Fixed up by keeping both sides, merged.

OK thanks!

Tony