[GIT PULL 1/2] ARM: bcm2835: consolidate into mach-bcm/

[GIT PULL 1/2] ARM: bcm2835: consolidate into mach-bcm/

[Stephen Warren]

This pull request consists of a single patch which moves files from
arch/arm/mach-bcm2835 into mach-bcm, thus consolidating them with
support for other Broadcom chips.

----------------------------------------------------------------

The following changes since commit 38dbfb59d1175ef458d006556061adeaa8751b72:

  Linus 3.14-rc1

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi.git bcm2835-for-3.15-soc

for you to fetch changes up to d30fe6272183f3cc8b9f3f111cd36271332e4cec:

  ARM: bcm2835: Move to mach-bcm directory

----------------------------------------------------------------

Markus Mayer (1):
      ARM: bcm2835: Move to mach-bcm directory

 MAINTAINERS                                         |  2 +-
 arch/arm/Kconfig                                    |  2 --
 arch/arm/Makefile                                   |  1 -
 arch/arm/configs/bcm2835_defconfig                  |  1 +
 arch/arm/mach-bcm/Kconfig                           | 16 ++++++++++++++++
 arch/arm/mach-bcm/Makefile                          |  2 ++
 .../bcm2835.c => mach-bcm/board_bcm2835.c}          |  0
 arch/arm/mach-bcm2835/Kconfig                       | 15 ---------------
 arch/arm/mach-bcm2835/Makefile                      |  1 -
 9 files changed, 20 insertions(+), 20 deletions(-)
 rename arch/arm/{mach-bcm2835/bcm2835.c => mach-bcm/board_bcm2835.c} (100%)
 delete mode 100644 arch/arm/mach-bcm2835/Kconfig
 delete mode 100644 arch/arm/mach-bcm2835/Makefile

[GIT PULL 2/2] ARM: bcm2835: DT changes for 3.15

[Stephen Warren]

A variety of features are added to the bcm2835 device trees:
- ARM PMU, for perf_event
- DMA controller
- I2S controller

A few cleanups are applied to the DTs too.

----------------------------------------------------------------

The following changes since commit 38dbfb59d1175ef458d006556061adeaa8751b72:

  Linus 3.14-rc1

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi.git bcm2835-for-3.15-dt

for you to fetch changes up to b7c6c1760685f7d3a3eecc19f4b792881bf1d907:

  ARM: bcm2835: fix clock DT node names

----------------------------------------------------------------

Florian Meier (2):
      ARM: bcm2835: add dmaengine driver to device tree
      ARM: bcm2835: add I2S driver to device tree

Stephen Warren (3):
      ARM: bcm2835: fix DT node sort order
      ARM: bcm2835: node name unit address cleanup
      ARM: bcm2835: fix clock DT node names

Vince Weaver (1):
      ARM: bcm2835: perf_event support for Raspberry-Pi

 arch/arm/boot/dts/bcm2835.dtsi | 92 ++++++++++++++++++++++++++-----------
 1 file changed, 65 insertions(+), 27 deletions(-)

[GIT PULL 1/2] ARM: bcm2835: consolidate into mach-bcm/

[Olof Johansson]

On Thu, Mar 06, 2014 at 07:44:09PM -0700, Stephen Warren wrote:
> This pull request consists of a single patch which moves files from
> arch/arm/mach-bcm2835 into mach-bcm, thus consolidating them with
> support for other Broadcom chips.
> 
> ----------------------------------------------------------------
> 
> The following changes since commit 38dbfb59d1175ef458d006556061adeaa8751b72:
> 
>   Linus 3.14-rc1
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi.git bcm2835-for-3.15-soc

Merged, thanks.

-Olof

[GIT PULL 2/2] ARM: bcm2835: DT changes for 3.15

[Olof Johansson]

On Thu, Mar 06, 2014 at 07:44:10PM -0700, Stephen Warren wrote:
> A variety of features are added to the bcm2835 device trees:
> - ARM PMU, for perf_event
> - DMA controller
> - I2S controller
> 
> A few cleanups are applied to the DTs too.
> 
> ----------------------------------------------------------------
> 
> The following changes since commit 38dbfb59d1175ef458d006556061adeaa8751b72:
> 
>   Linus 3.14-rc1
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi.git bcm2835-for-3.15-dt

Merged, thanks.


-Olof