Patchwork [GIT,PULL,2/5] Tegra devicetree updates for 3.3

login
register
mail settings
Submitter Olof Johansson
Date Dec. 21, 2011, 7:14 p.m.
Message ID <CAOesGMhSEbpcKXv87_cv+1b-wB7g8zmtFR2wMygByuTBv_bmvA@mail.gmail.com>
Download mbox
Permalink /patch/132716/
State New
Headers show

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra.git for-3.3/dt

Comments

Olof Johansson - Dec. 21, 2011, 7:14 p.m.
Hi Arnd,

Please pull the following device tree-related updates for tegra for 3.3. Thanks!


The following changes since commit 5611cc4572e889b62a7b4c72a413536bf6a9c416:

  Linux 3.2-rc4 (2011-12-01 14:56:01 -0800)

are available in the git repository at:
  git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra.git for-3.3/dt

Marc Dietrich (1):
      arm/dt: tegra: add dts file for paz00

Olof Johansson (3):
      arm/tegra: fix variable formatting in makefile
      arm/dt: add basic usb nodes to tegra device trees
      USB: ehci-tegra: add probing through device tree

Peter De Schrijver (1):
      arm/tegra: initial device tree for tegra30

Stephen Warren (12):
      arm/dt: tegra: Clean up I2S and DAS nodes
      arm/tegra: Add device-tree support for TrimSlice board
      arm/tegra: board-dt: Fix AUXDATA typo
      arm/tegra: board-dt: Enable audio-related clocks
      arm/dt: tegra: Remove /memreserve/ from device-tree files
      arm/dt: tegra: Remove /chosen node
      arm/dt: tegra: Fix I2C nodes to match board files
      arm/dt: tegra: Fix serial nodes to match board files
      arm/dt: tegra: Fix SDHCI nodes to match board files
      arm/dt: tegra: Use new compatible value for DVC I2C controller
      arm/dt: Add ADT7461 to Seaboard
      arm/tegra: Seaboard: Add GPIO key device tree nodes

pdeschrijver@nvidia.com (1):
      arm/tegra: convert tegra20 to GIC devicetree binding

 Documentation/devicetree/bindings/arm/tegra.txt    |   14 ++
 .../devicetree/bindings/usb/tegra-usb.txt          |   13 ++
 arch/arm/boot/dts/tegra-harmony.dts                |   29 ++++-
 arch/arm/boot/dts/tegra-paz00.dts                  |   77 ++++++++++++
 arch/arm/boot/dts/tegra-seaboard.dts               |   74 +++++++++++-
 arch/arm/boot/dts/tegra-trimslice.dts              |   65 ++++++++++
 arch/arm/boot/dts/tegra-ventana.dts                |   45 ++++++-
 arch/arm/boot/dts/tegra20.dtsi                     |   71 +++++++----
 arch/arm/boot/dts/tegra30.dtsi                     |  127 ++++++++++++++++++++
 arch/arm/mach-tegra/Makefile                       |   28 +++--
 arch/arm/mach-tegra/Makefile.boot                  |    2 +
 arch/arm/mach-tegra/board-dt.c                     |   49 ++++++--
 arch/arm/mach-tegra/irq.c                          |   10 ++-
 drivers/usb/host/ehci-tegra.c                      |   71 +++++++++++
 14 files changed, 606 insertions(+), 69 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/arm/tegra.txt
 create mode 100644 Documentation/devicetree/bindings/usb/tegra-usb.txt
 create mode 100644 arch/arm/boot/dts/tegra-paz00.dts
 create mode 100644 arch/arm/boot/dts/tegra-trimslice.dts
 create mode 100644 arch/arm/boot/dts/tegra30.dtsi
Arnd Bergmann - Dec. 27, 2011, 10:43 p.m.
On Wednesday 21 December 2011, Olof Johansson wrote:
> Hi Arnd,
> 
> Please pull the following device tree-related updates for tegra for 3.3. Thanks!
> 
> 
> The following changes since commit 5611cc4572e889b62a7b4c72a413536bf6a9c416:
> 
>   Linux 3.2-rc4 (2011-12-01 14:56:01 -0800)
> 
> are available in the git repository at:
>   git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra.git for-3.3/dt
> 

Pulled into a new next/dt branch, thanks!

There is a bogus conflict in arch/arm/mach-tegra/Makefile from merging
two different versions of "arm/tegra: fix variable formatting in makefile".
The patches are identical, but 317d5330 made it into tegra/dt and
584634e3 into tegra/cleanup.

Trivial to fix, but something to watch out for in the future.

Another conflict in arch/arm/mach-tegra/board-dt.c with the "ARM:
tegra2: convert to CONFIG_MULTI_IRQ_HANDLER", also trivial.

	Arnd
Olof Johansson - Dec. 27, 2011, 11:25 p.m.
Hi,

On Tue, Dec 27, 2011 at 2:43 PM, Arnd Bergmann <arnd@arndb.de> wrote:
> On Wednesday 21 December 2011, Olof Johansson wrote:
>> Hi Arnd,
>>
>> Please pull the following device tree-related updates for tegra for 3.3. Thanks!
>>
>>
>> The following changes since commit 5611cc4572e889b62a7b4c72a413536bf6a9c416:
>>
>>   Linux 3.2-rc4 (2011-12-01 14:56:01 -0800)
>>
>> are available in the git repository at:
>>   git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra.git for-3.3/dt
>>
>
> Pulled into a new next/dt branch, thanks!

Thanks!

> There is a bogus conflict in arch/arm/mach-tegra/Makefile from merging
> two different versions of "arm/tegra: fix variable formatting in makefile".
> The patches are identical, but 317d5330 made it into tegra/dt and
> 584634e3 into tegra/cleanup.
>
> Trivial to fix, but something to watch out for in the future.

Thanks, I just realized how that must have happened -- I had to rebase
to a newer -rc a while back, and must have rebased each branch from
scratch instead of rebasing dt on top of the new rebased cleanup.


-Olof