[GIT PULL] BCM2835/6 changes for 4.5 (I hope)

[GIT PULL] BCM2835/6 changes for 4.5 (I hope)

[Eric Anholt]

Apparently this is really late in the process (sorry!  I still haven't
figured out the timelines.), but I'm hoping we could merge these
changes for 4.5.  This includes the Raspberry Pi 2 port, with just two
minor fixes from the last submission.

The reason I've been pushing hard to get pi2 in is:

1) It's a lot of conflict resolution every version since it requires
splitting the 2835 DT file.

2) People are generally using pi2 these days, so it means people are
more likely to upstream 2835 driver code if we have an upstream port
they can run.

Testing status: kbuild test robot builds passed.  Boot tested each
branch head on pi1.  Boot tested the merge of all 4 branches on pi1.
Boot tested the merge of all 4 branches on pi2, with and without the
irqchip fixes.

[GIT PULL 1/4] BCM2835 SOC changes for 4.5

[Eric Anholt]

The following changes since commit f74875dc36135ebae82a8e005f4b7f52289d2c40:

  usb: dwc2: fix kernel oops during driver probe (2015-11-20 09:29:47 -0600)

are available in the git repository at:

  http://github.com/anholt/linux tags/bcm2835-soc-next-2015-12-28

for you to fetch changes up to 5234c34e4cd7695647ccc1cabb50c3e7720dd3fb:

  ARM: bcm2835: Add Kconfig support for bcm2836 (2015-12-26 14:34:03 -0800)

----------------------------------------------------------------
This pull request includes the bcm2835 changes for 4.5 targeting the
arm-soc next/soc branch.

----------------------------------------------------------------
Eric Anholt (3):
      dt-bindings: Add root properties for Raspberry Pi 2
      ARM: bcm2835: Add a compat string for bcm2836 machine probe
      ARM: bcm2835: Add Kconfig support for bcm2836

 Documentation/devicetree/bindings/arm/bcm/brcm,bcm2835.txt |  4 ++++
 arch/arm/Kconfig.debug                                     | 10 ++++++++--
 arch/arm/mach-bcm/Kconfig                                  |  9 +++++----
 arch/arm/mach-bcm/board_bcm2835.c                          |  5 +++++
 4 files changed, 22 insertions(+), 6 deletions(-)

[GIT PULL 2/4] BCM2835 drivers changes for 4.5

[Eric Anholt]

The following changes since commit f74875dc36135ebae82a8e005f4b7f52289d2c40:

  usb: dwc2: fix kernel oops during driver probe (2015-11-20 09:29:47 -0600)

are available in the git repository at:

  http://github.com/anholt/linux tags/bcm2835-drivers-next-2015-12-28

for you to fetch changes up to a09cd356586d33f64cbe64ee4f5c1a7c4a6abee5:

  ARM: bcm2835: add rpi power domain driver (2015-12-21 20:00:41 -0800)

----------------------------------------------------------------
This pull request includes the bcm2835 changes for 4.5 targeting the
arm-soc next/drivers branch.

----------------------------------------------------------------
Alexander Aring (2):
      dt-bindings: add rpi power domain driver bindings
      ARM: bcm2835: add rpi power domain driver

Eric Anholt (1):
      ARM: bcm2835: Define two new packets from the latest firmware.

 .../bindings/soc/bcm/raspberrypi,bcm2835-power.txt |  47 ++++
 drivers/soc/Kconfig                                |   1 +
 drivers/soc/Makefile                               |   1 +
 drivers/soc/bcm/Kconfig                            |   9 +
 drivers/soc/bcm/Makefile                           |   1 +
 drivers/soc/bcm/raspberrypi-power.c                | 247 +++++++++++++++++++++
 include/dt-bindings/power/raspberrypi-power.h      |  41 ++++
 include/soc/bcm2835/raspberrypi-firmware.h         |   2 +
 8 files changed, 349 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/soc/bcm/raspberrypi,bcm2835-power.txt
 create mode 100644 drivers/soc/bcm/Kconfig
 create mode 100644 drivers/soc/bcm/Makefile
 create mode 100644 drivers/soc/bcm/raspberrypi-power.c
 create mode 100644 include/dt-bindings/power/raspberrypi-power.h

Re: [GIT PULL 2/4] BCM2835 drivers changes for 4.5

[Arnd Bergmann]

On Monday 28 December 2015 21:01:20 Eric Anholt wrote:

> ----------------------------------------------------------------
> This pull request includes the bcm2835 changes for 4.5 targeting the
> arm-soc next/drivers branch.

(sorry for the late mail, this was stuck in my outbox because of
one failed recipient address)

I've applied this one on top, following the output of the build bot.

	Arnd

>From d635e88df44c8b9860b05d4df22c90bf96e9f986 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 31 Dec 2015 23:39:14 +0100
Subject: [PATCH] ARM: bcm2835: clarify RASPBERRYPI_FIRMWARE dependency

The firmware driver can be a loadable module, but the power domain
can only be built-in, so we get a build error in an allmodconfig
kernel:

:(.text+0x17e59c): undefined reference to `rpi_firmware_property'
:(.text+0x17e51c): undefined reference to `rpi_firmware_get'
:(.text+0x17e244): undefined reference to `rpi_firmware_property'

This changes the dependency to only allow the power domain code
to be enabled when the firmware driver is built-in. Other users
of the firmware driver may still be loadable modules and not
everyone needs the power domains, so we don't change the firmware
code.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/drivers/soc/bcm/Kconfig b/drivers/soc/bcm/Kconfig
index 5ba1827fe36f..3066edea184d 100644
--- a/drivers/soc/bcm/Kconfig
+++ b/drivers/soc/bcm/Kconfig
@@ -1,7 +1,7 @@
 config RASPBERRYPI_POWER
 	bool "Raspberry Pi power domain driver"
 	depends on ARCH_BCM2835 || COMPILE_TEST
-	depends on RASPBERRYPI_FIRMWARE
+	depends on RASPBERRYPI_FIRMWARE=y
 	select PM_GENERIC_DOMAINS if PM
 	select PM_GENERIC_DOMAINS_OF if PM
 	help

[GIT PULL 3/4] BCM2835 DT changes for 4.5

[Eric Anholt]

The following changes since commit f74875dc36135ebae82a8e005f4b7f52289d2c40:

  usb: dwc2: fix kernel oops during driver probe (2015-11-20 09:29:47 -0600)

are available in the git repository at:

  http://github.com/anholt/linux tags/bcm2835-dt-next-2015-12-28

for you to fetch changes up to 53b6084357a44d7c34044504e1bf149d9156934f:

  ARM: bcm2835: Add the auxiliary clocks to the device tree. (2015-12-26 14:44:09 -0800)

----------------------------------------------------------------
This pull request includes the bcm2835 changes for 4.5 targeting the
arm-soc next/dt branch.

----------------------------------------------------------------
Eric Anholt (4):
      ARM: bcm2835: Split the DT for peripherals from the DT for the CPU
      ARM: bcm2835: Move the CPU/peripheral include out of common RPi DT.
      ARM: bcm2835: Add devicetree for bcm2836 and Raspberry Pi 2 B
      ARM: bcm2835: Add the auxiliary clocks to the device tree.

 arch/arm/boot/dts/Makefile               |   3 +-
 arch/arm/boot/dts/bcm2835-rpi-a-plus.dts |   1 +
 arch/arm/boot/dts/bcm2835-rpi-b-plus.dts |   1 +
 arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts |   1 +
 arch/arm/boot/dts/bcm2835-rpi-b.dts      |   1 +
 arch/arm/boot/dts/bcm2835-rpi.dtsi       |   2 -
 arch/arm/boot/dts/bcm2835.dtsi           | 194 +---------------------------
 arch/arm/boot/dts/bcm2836-rpi-2-b.dts    |  35 +++++
 arch/arm/boot/dts/bcm2836.dtsi           |  78 ++++++++++++
 arch/arm/boot/dts/bcm283x.dtsi           | 212 +++++++++++++++++++++++++++++++
 10 files changed, 332 insertions(+), 196 deletions(-)
 create mode 100644 arch/arm/boot/dts/bcm2836-rpi-2-b.dts
 create mode 100644 arch/arm/boot/dts/bcm2836.dtsi
 create mode 100644 arch/arm/boot/dts/bcm283x.dtsi

[GIT PULL 4/4] BCM2835 defconfig changes for 4.5

[Eric Anholt]

The following changes since commit f74875dc36135ebae82a8e005f4b7f52289d2c40:

  usb: dwc2: fix kernel oops during driver probe (2015-11-20 09:29:47 -0600)

are available in the git repository at:

  http://github.com/anholt/linux tags/bcm2835-defconfig-next-2015-12-28

for you to fetch changes up to b63074fccbeb81e46b2553a200de54ff3bfadd10:

  ARM: bcm2835: enable auxiliary spi driver in defconfig (2015-12-21 19:29:13 -0800)

----------------------------------------------------------------
This pull request includes the bcm2835 changes for 4.5 targeting the
arm-soc next/defconfig branch.

----------------------------------------------------------------
Martin Sperl (1):
      ARM: bcm2835: enable auxiliary spi driver in defconfig

Stefan Wahren (1):
      ARM: bcm2835: enable all bcm2835-relevant in defconfig

 arch/arm/configs/bcm2835_defconfig | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

Re: [GIT PULL] BCM2835/6 changes for 4.5 (I hope)

[Florian Fainelli]

Le 28/12/2015 21:01, Eric Anholt a écrit :
> Apparently this is really late in the process (sorry!  I still haven't
> figured out the timelines.), but I'm hoping we could merge these
> changes for 4.5.  This includes the Raspberry Pi 2 port, with just two
> minor fixes from the last submission.
> 
> The reason I've been pushing hard to get pi2 in is:
> 
> 1) It's a lot of conflict resolution every version since it requires
> splitting the 2835 DT file.
> 
> 2) People are generally using pi2 these days, so it means people are
> more likely to upstream 2835 driver code if we have an upstream port
> they can run.
> 
> Testing status: kbuild test robot builds passed.  Boot tested each
> branch head on pi1.  Boot tested the merge of all 4 branches on pi1.
> Boot tested the merge of all 4 branches on pi2, with and without the
> irqchip fixes.

Considering that we are fairly late for v4.5, I would prefer if Arnd,
Olof or Kevin could take these directly into their respective branches,
if this is really really too late, then I will queue these changes, and
the next ones you have for v4.6.

Thanks and happy holidays!
-- 
Florian

Re: [GIT PULL] BCM2835/6 changes for 4.5 (I hope)

[Arnd Bergmann]

On Wednesday 30 December 2015 18:58:31 Florian Fainelli wrote:
> Le 28/12/2015 21:01, Eric Anholt a écrit :
> > Apparently this is really late in the process (sorry!  I still haven't
> > figured out the timelines.), but I'm hoping we could merge these
> > changes for 4.5.  This includes the Raspberry Pi 2 port, with just two
> > minor fixes from the last submission.
> > 
> > The reason I've been pushing hard to get pi2 in is:
> > 
> > 1) It's a lot of conflict resolution every version since it requires
> > splitting the 2835 DT file.
> > 
> > 2) People are generally using pi2 these days, so it means people are
> > more likely to upstream 2835 driver code if we have an upstream port
> > they can run.
> > 
> > Testing status: kbuild test robot builds passed.  Boot tested each
> > branch head on pi1.  Boot tested the merge of all 4 branches on pi1.
> > Boot tested the merge of all 4 branches on pi2, with and without the
> > irqchip fixes.
> 
> Considering that we are fairly late for v4.5, I would prefer if Arnd,
> Olof or Kevin could take these directly into their respective branches,
> if this is really really too late, then I will queue these changes, and
> the next ones you have for v4.6.
> 
> Thanks and happy holidays!
> 

I've merged them now into the respective branches. However, I only
merged the usb-fixes branch for the first two (next/soc and next/drivers)
and decided to cherry-pick the patches from the other two branches
into next/dt and next/defconfig, to minimize the amount of backmerges
when the changes in those branches are clearly not meant to be useful
by themselves without at least the first branch merged in as well.

Please follow up with one more patch to enable bcm2836 in multi_v7_defconfig.

	Arnd