mbox

[GIT,PULL] Nomadik improvements and cleanups for v4.3

Message ID CACRpkdbN6ZDhH56PSUmPD5_uYJhk_o+mCqAvi5GVEtys=AftNg@mail.gmail.com
State New
Headers show

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git

Message

Linus Walleij Aug. 6, 2015, 2:50 p.m. UTC
Hi ARM SoC folks,

these are a four patches of Nomadik cleanups and improvements
targeted for v4.2.

Since there is a cross-dependency between the board files and the
device tree files I just kept them all on the same branch. Also it seems
a bit overzealous to split patches for this small platform.

Please pull it in as cleanup/development for v4.3.

Yours,
Linus Walleij

The following changes since commit 74d33293e467df61de1b1d8b2fbe29e550dec33b:

  Linux 4.2-rc5 (2015-08-02 18:34:55 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git
tags/nmk-for-4.3-asoc

for you to fetch changes up to 8c6870b07dd20be91fa4f15fbfcbde75a4dccd28:

  ARM: nomadik: push accelerometer down to boards (2015-08-06 11:24:55 +0200)

----------------------------------------------------------------
Nomadik improvements and cleanups for v4.3:
- Get rid of some custom code and device tree oddities
  that were just placeholders for our now in-kernel
  GPIO hogs.
- Enable UART0 (connected to bluetooth on NHK15)
  selectively on the board, according to reference design
  specs.
- Do the cache AUX register setup in the device tree so
  we understand what is going on.
- Push registration of accelerometers down to the board
  files.

----------------------------------------------------------------
Linus Walleij (4):
      ARM: nomadik: move hog code to use DT hogs
      ARM: nomadik: selectively enable UART0 on boards
      ARM: nomadik: move l2x0 setup to device tree
      ARM: nomadik: push accelerometer down to boards

 arch/arm/boot/dts/ste-nomadik-nhk15.dts    | 39 ++++++++++++++++++++------
 arch/arm/boot/dts/ste-nomadik-s8815.dts    | 44 ++++++++++++++++++++++++------
 arch/arm/boot/dts/ste-nomadik-stn8815.dtsi | 22 +++++----------
 arch/arm/mach-nomadik/cpu-8815.c           | 41 ++--------------------------
 4 files changed, 75 insertions(+), 71 deletions(-)

Comments

Olof Johansson Aug. 11, 2015, 1:31 p.m. UTC | #1
Hi Linus,

On Thu, Aug 06, 2015 at 04:50:13PM +0200, Linus Walleij wrote:
> Hi ARM SoC folks,
> 
> these are a four patches of Nomadik cleanups and improvements
> targeted for v4.2.
> 
> Since there is a cross-dependency between the board files and the
> device tree files I just kept them all on the same branch. Also it seems
> a bit overzealous to split patches for this small platform.
> 
> Please pull it in as cleanup/development for v4.3.
> 
> Yours,
> Linus Walleij
> 
> The following changes since commit 74d33293e467df61de1b1d8b2fbe29e550dec33b:
> 
>   Linux 4.2-rc5 (2015-08-02 18:34:55 -0700)

This is 3 -rcs newer than we have our tree based on to date (-rc2).

I don't see any conflict with -rc2 though, so I've cherry-picked these over
instead of merging the branch.


Thanks!

-Olof
Linus Walleij Aug. 12, 2015, 12:39 p.m. UTC | #2
On Tue, Aug 11, 2015 at 3:31 PM, Olof Johansson <olof@lixom.net> wrote:

>> The following changes since commit 74d33293e467df61de1b1d8b2fbe29e550dec33b:
>>
>>   Linux 4.2-rc5 (2015-08-02 18:34:55 -0700)
>
> This is 3 -rcs newer than we have our tree based on to date (-rc2).

Sorry, I did it like this because I wanted to avoid possible collisions
with the Nomadik fix that was merged in -rc5.

> I don't see any conflict with -rc2 though, so I've cherry-picked these over
> instead of merging the branch.

If that works, thanks and go ahead!

Yours,
Linus Walleij