linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [GIT PULL 1/6] Broadcom devicetree changes for 5.3
@ 2019-06-12  2:50 Florian Fainelli
  2019-06-12  2:50 ` [GIT PULL 2/6] Broadcom devicetree-arm64 " Florian Fainelli
                   ` (6 more replies)
  0 siblings, 7 replies; 16+ messages in thread
From: Florian Fainelli @ 2019-06-12  2:50 UTC (permalink / raw)
  To: arm
  Cc: linux-arm-kernel, Florian Fainelli, arnd, Kevin Hilman,
	Eric Anholt, Lukas Wunner, bcm-kernel-feedback-list,
	Stefan Wahren, olof, Martin Sperl, Nicolas Saenz Julienne

The following changes since commit a188339ca5a396acc588e5851ed7e19f66b0ebd9:

  Linux 5.2-rc1 (2019-05-19 15:47:09 -0700)

are available in the Git repository at:

  https://github.com/Broadcom/stblinux.git tags/arm-soc/for-5.3/devicetree

for you to fetch changes up to 34b1441452e550169b4d3647a4f851d9332d4b76:

  ARM: dts: BCM5301X: Fix most DTC W=1 warnings (2019-06-11 15:07:56 -0700)

----------------------------------------------------------------
This pull request contain Broadcom ARM-based SoCs Device Tree changes
for 5.3 please pull the following:

- Lukas enables DMA support for the BCM2835 (Raspberry Pi) SPI
  controller

- Florian fixes a number of dtc W=1 warnings in the Broadcom DTS files
  and provides a fix for devices failing to boot after the removal of
  skelton.dtsi (that commit has been submitted as a separate fix)

----------------------------------------------------------------
Florian Fainelli (9):
      Merge tag 'tags/bcm2835-dt-next-2019-06-01' into devicetree/next
      ARM: dts: bcm: Add missing device_type = "memory" property
      ARM: dts: Fix BCM7445 DTC warnings
      ARM: dts: Cygnus: Fix most DTC W=1 warnings
      ARM: dts: bcm-mobile: Fix most DTC W=1 warnings
      ARM: dts: BCM53573: Fix DTC W=1 warnings
      ARM: dts: BCM63xx: Fix DTC W=1 warnings
      ARM: dts: NSP: Fix the bulk of W=1 DTC warnings
      ARM: dts: BCM5301X: Fix most DTC W=1 warnings

Lukas Wunner (1):
      ARM: bcm283x: Enable DMA support for SPI controller

 arch/arm/boot/dts/bcm-cygnus-clock.dtsi            | 12 ++++++------
 arch/arm/boot/dts/bcm-cygnus.dtsi                  |  6 +++---
 arch/arm/boot/dts/bcm-nsp.dtsi                     |  9 +++------
 arch/arm/boot/dts/bcm11351.dtsi                    | 12 ++++++------
 arch/arm/boot/dts/bcm21664-garnet.dts              |  2 +-
 arch/arm/boot/dts/bcm21664.dtsi                    | 10 +++++-----
 arch/arm/boot/dts/bcm23550-sparrow.dts             |  2 +-
 arch/arm/boot/dts/bcm23550.dtsi                    |  8 ++++----
 arch/arm/boot/dts/bcm28155-ap.dts                  |  2 +-
 arch/arm/boot/dts/bcm283x.dtsi                     |  2 ++
 arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts        |  5 ++---
 arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts        |  5 ++---
 arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts  |  5 ++---
 arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts    |  5 ++---
 arch/arm/boot/dts/bcm4708-linksys-ea6500-v2.dts    |  5 ++---
 arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts       |  5 ++---
 arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts       |  5 ++---
 arch/arm/boot/dts/bcm4708-netgear-r6250.dts        |  3 +--
 arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts     |  5 ++---
 arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts      |  5 ++---
 arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts        |  4 +---
 arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts |  4 +---
 arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts  |  4 +---
 arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts      |  4 +---
 arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts      |  4 +---
 arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts |  4 +---
 arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts        |  1 +
 arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts  |  1 +
 arch/arm/boot/dts/bcm4709-linksys-ea9200.dts       |  1 +
 arch/arm/boot/dts/bcm4709-netgear-r7000.dts        |  1 +
 arch/arm/boot/dts/bcm4709-netgear-r8000.dts        |  1 +
 arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts  |  1 +
 arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts      |  4 +---
 arch/arm/boot/dts/bcm47094-linksys-panamera.dts    |  4 +---
 arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts      |  4 +---
 arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts      |  4 +---
 arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts      |  4 +---
 arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts      |  4 +---
 arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts   |  4 +---
 arch/arm/boot/dts/bcm47094-netgear-r8500.dts       |  4 +---
 arch/arm/boot/dts/bcm47094-phicomm-k3.dts          |  5 ++---
 arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts      |  4 +---
 arch/arm/boot/dts/bcm47189-luxul-xap-810.dts       |  4 +---
 arch/arm/boot/dts/bcm47189-tenda-ac9.dts           |  4 +---
 arch/arm/boot/dts/bcm5301x.dtsi                    | 10 ++++------
 arch/arm/boot/dts/bcm53573.dtsi                    |  2 +-
 arch/arm/boot/dts/bcm63138.dtsi                    |  9 +++------
 arch/arm/boot/dts/bcm7445-bcm97445svmb.dts         |  2 +-
 arch/arm/boot/dts/bcm7445.dtsi                     |  8 ++++----
 arch/arm/boot/dts/bcm911360_entphn.dts             |  2 --
 arch/arm/boot/dts/bcm94708.dts                     |  1 +
 arch/arm/boot/dts/bcm94709.dts                     |  1 +
 arch/arm/boot/dts/bcm947189acdbmr.dts              |  4 +---
 arch/arm/boot/dts/bcm953012er.dts                  |  4 +---
 arch/arm/boot/dts/bcm953012k.dts                   |  2 +-
 arch/arm/boot/dts/bcm958522er.dts                  |  2 +-
 arch/arm/boot/dts/bcm958525er.dts                  |  2 +-
 arch/arm/boot/dts/bcm958525xmc.dts                 |  2 +-
 arch/arm/boot/dts/bcm958622hr.dts                  |  2 +-
 arch/arm/boot/dts/bcm958623hr.dts                  |  2 +-
 arch/arm/boot/dts/bcm958625hr.dts                  |  2 +-
 arch/arm/boot/dts/bcm958625k.dts                   |  2 +-
 arch/arm/boot/dts/bcm963138dvt.dts                 |  3 ++-
 arch/arm/boot/dts/bcm988312hr.dts                  |  2 +-
 64 files changed, 104 insertions(+), 152 deletions(-)

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [GIT PULL 2/6] Broadcom devicetree-arm64 changes for 5.3
  2019-06-12  2:50 [GIT PULL 1/6] Broadcom devicetree changes for 5.3 Florian Fainelli
@ 2019-06-12  2:50 ` Florian Fainelli
  2019-06-19 13:25   ` Olof Johansson
  2019-06-12  2:50 ` [GIT PULL 3/6] Broadcom drivers " Florian Fainelli
                   ` (5 subsequent siblings)
  6 siblings, 1 reply; 16+ messages in thread
From: Florian Fainelli @ 2019-06-12  2:50 UTC (permalink / raw)
  To: arm
  Cc: Florian Fainelli, arnd, Scott Branden, Rayagonda Kokatanur,
	khilman, Pramod Kumar, Srinath Mannam, bcm-kernel-feedback-list,
	olof, Ray Jui, linux-arm-kernel

The following changes since commit a188339ca5a396acc588e5851ed7e19f66b0ebd9:

  Linux 5.2-rc1 (2019-05-19 15:47:09 -0700)

are available in the Git repository at:

  https://github.com/Broadcom/stblinux.git tags/arm-soc/for-5.3/devicetree-arm64

for you to fetch changes up to f8526c2d99ca87ccbc0a3da00555d6d08e25d058:

  arm64: dts: Stingray: Add NIC i2c device node (2019-05-20 09:31:35 -0700)

----------------------------------------------------------------
This pull request contains Broadcom ARM64-based SoCs Device Tree changes
for 5.3, please pull the following:

- Pramod adds the Device Tree nodes for thermal support on Stingray

- Srinath adds the Device Tree nodes for both XHCI (host) and BDC
  (device) modes

- Rayagonda adds the Device Tree node for slave I2C operation when
  Stingray operates as a SmartNIC

----------------------------------------------------------------
Pramod Kumar (1):
      arm64: dts: stingray: Add Stingray Thermal DT support.

Rayagonda Kokatanur (1):
      arm64: dts: Stingray: Add NIC i2c device node

Srinath Mannam (1):
      arm64: dts: Add USB DT nodes for Stingray SoC

 .../boot/dts/broadcom/stingray/stingray-usb.dtsi   |  72 ++++++++++++++
 .../arm64/boot/dts/broadcom/stingray/stingray.dtsi | 108 +++++++++++++++++++++
 2 files changed, 180 insertions(+)
 create mode 100644 arch/arm64/boot/dts/broadcom/stingray/stingray-usb.dtsi

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [GIT PULL 3/6] Broadcom drivers changes for 5.3
  2019-06-12  2:50 [GIT PULL 1/6] Broadcom devicetree changes for 5.3 Florian Fainelli
  2019-06-12  2:50 ` [GIT PULL 2/6] Broadcom devicetree-arm64 " Florian Fainelli
@ 2019-06-12  2:50 ` Florian Fainelli
  2019-06-17 11:53   ` Olof Johansson
  2019-06-12  2:50 ` [GIT PULL 4/6] Broadcom maintainers " Florian Fainelli
                   ` (4 subsequent siblings)
  6 siblings, 1 reply; 16+ messages in thread
From: Florian Fainelli @ 2019-06-12  2:50 UTC (permalink / raw)
  To: arm
  Cc: Florian Fainelli, arnd, khilman, bcm-kernel-feedback-list,
	Markus Mayer, olof, linux-arm-kernel

The following changes since commit a188339ca5a396acc588e5851ed7e19f66b0ebd9:

  Linux 5.2-rc1 (2019-05-19 15:47:09 -0700)

are available in the Git repository at:

  https://github.com/Broadcom/stblinux.git tags/arm-soc/for-5.3/drivers

for you to fetch changes up to e3b7472362ba5ec84642e1c8d2cc8db6781afe4a:

  memory: brcmstb: dpfe: introduce DPFE API v3 (2019-05-20 09:32:35 -0700)

----------------------------------------------------------------
This pull request contains Broadcom ARM/ARM64/MIPS SoCs drivers changes
for 5.3, please pull the following:

- Markus provides a set of updates to the DPFE driver to support a new
  revision of the API to the firmware (version 3) and provides minor fixes
  about how the MR4-8 words are read for LPDDR4 devices

- Florian removes a print of a virtual address in brcmstb_gisb.c

----------------------------------------------------------------
Florian Fainelli (1):
      bus: brcmstb_gisb: Remove print of base address

Markus Mayer (9):
      memory: brcmstb: dpfe: use msleep() over udelay()
      memory: brcmstb: dpfe: optimize generic_show()
      memory: brcmstb: dpfe: use byte 3 of registers MR4-MR8
      memory: brcmstb: dpfe: remove unused code and fix formatting
      memory: brcmstb: dpfe: report firmware loading error
      memory: brcmstb: dpfe: wait for DCPU to be ready
      memory: brcmstb: dpfe: prepare support for multiple API versions
      memory: brcmstb: dpfe: prepare for API-dependent sysfs attributes
      memory: brcmstb: dpfe: introduce DPFE API v3

 drivers/bus/brcmstb_gisb.c    |   4 +-
 drivers/memory/brcmstb_dpfe.c | 317 +++++++++++++++++++++++++++++++-----------
 2 files changed, 240 insertions(+), 81 deletions(-)

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [GIT PULL 4/6] Broadcom maintainers changes for 5.3
  2019-06-12  2:50 [GIT PULL 1/6] Broadcom devicetree changes for 5.3 Florian Fainelli
  2019-06-12  2:50 ` [GIT PULL 2/6] Broadcom devicetree-arm64 " Florian Fainelli
  2019-06-12  2:50 ` [GIT PULL 3/6] Broadcom drivers " Florian Fainelli
@ 2019-06-12  2:50 ` Florian Fainelli
  2019-06-19 16:10   ` Olof Johansson
  2019-06-12  2:50 ` [GIT PULL 5/6] Broadcom soc " Florian Fainelli
                   ` (3 subsequent siblings)
  6 siblings, 1 reply; 16+ messages in thread
From: Florian Fainelli @ 2019-06-12  2:50 UTC (permalink / raw)
  To: arm
  Cc: Florian Fainelli, arnd, khilman, bcm-kernel-feedback-list, olof,
	linux-arm-kernel

The following changes since commit a188339ca5a396acc588e5851ed7e19f66b0ebd9:

  Linux 5.2-rc1 (2019-05-19 15:47:09 -0700)

are available in the Git repository at:

  https://github.com/Broadcom/stblinux.git tags/arm-soc/for-5.3/maintainers

for you to fetch changes up to 64f35709d5735ddbf8ab52d60ab3d62550b544d7:

  MAINTAINERS: BCM53573: Add internal Broadcom mailing list (2019-06-11 19:43:05 -0700)

----------------------------------------------------------------
This pull request contains MAINTAINERS file updates for Broadcom SoCs
entries for 5.3, please pull the following:

- Florian adds the Broadcom internal mailing-list which has a patchwork
  instance behind for the BCM2835 and BCM53573 SoCs entries

----------------------------------------------------------------
Florian Fainelli (2):
      MAINTAINERS: BCM2835: Add internal Broadcom mailing list
      MAINTAINERS: BCM53573: Add internal Broadcom mailing list

 MAINTAINERS | 2 ++
 1 file changed, 2 insertions(+)

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [GIT PULL 5/6] Broadcom soc changes for 5.3
  2019-06-12  2:50 [GIT PULL 1/6] Broadcom devicetree changes for 5.3 Florian Fainelli
                   ` (2 preceding siblings ...)
  2019-06-12  2:50 ` [GIT PULL 4/6] Broadcom maintainers " Florian Fainelli
@ 2019-06-12  2:50 ` Florian Fainelli
  2019-06-12  2:50 ` [GIT PULL 6/6] Broadcom soc-arm64 " Florian Fainelli
                   ` (2 subsequent siblings)
  6 siblings, 0 replies; 16+ messages in thread
From: Florian Fainelli @ 2019-06-12  2:50 UTC (permalink / raw)
  To: arm
  Cc: Florian Fainelli, arnd, khilman, Jim Quinlan, Ray Jui,
	bcm-kernel-feedback-list, olof, Doug Berger, Wen Yang,
	linux-arm-kernel

The following changes since commit a188339ca5a396acc588e5851ed7e19f66b0ebd9:

  Linux 5.2-rc1 (2019-05-19 15:47:09 -0700)

are available in the Git repository at:

  https://github.com/Broadcom/stblinux.git tags/arm-soc/for-5.3/soc

for you to fetch changes up to 885895a8eae60bfcb9fbc6b91b35c5b930834011:

  ARM: bcm: Enable PINCTRL for ARCH_BRCMSTB (2019-06-11 14:59:50 -0700)

----------------------------------------------------------------
This pull request contains Broadcom ARM-based SoC Kconfig/machine
changes for 5.3, please pull the following:

- Wen fixes a missing referenc count on the CPU device_node object
  throughout mach-bcm/

- Jim adds the ability for ARCH_BRCMSTB to use reset controllers

- Doug adds the ability for ARCH_BRCMSTB to use the PINCTRL framework

----------------------------------------------------------------
Doug Berger (1):
      ARM: bcm: Enable PINCTRL for ARCH_BRCMSTB

Jim Quinlan (1):
      ARM: bcm: Enable ARCH_HAS_RESET_CONTROLLER for ARCH_BRCMSTB

Wen Yang (1):
      ARM: bcm: fix a leaked reference by adding missing of_node_put

 arch/arm/mach-bcm/Kconfig           | 2 ++
 arch/arm/mach-bcm/bcm63xx_smp.c     | 1 +
 arch/arm/mach-bcm/board_bcm281xx.c  | 1 +
 arch/arm/mach-bcm/platsmp-brcmstb.c | 7 +++++--
 4 files changed, 9 insertions(+), 2 deletions(-)

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [GIT PULL 6/6] Broadcom soc-arm64 changes for 5.3
  2019-06-12  2:50 [GIT PULL 1/6] Broadcom devicetree changes for 5.3 Florian Fainelli
                   ` (3 preceding siblings ...)
  2019-06-12  2:50 ` [GIT PULL 5/6] Broadcom soc " Florian Fainelli
@ 2019-06-12  2:50 ` Florian Fainelli
  2019-06-17 12:16   ` Olof Johansson
  2019-06-19 13:35 ` [GIT PULL 1/6] Broadcom devicetree " Olof Johansson
  2019-06-23  3:29 ` [GIT PULL 1/6 v2] Broadcom devicetree changes for 5.2 Florian Fainelli
  6 siblings, 1 reply; 16+ messages in thread
From: Florian Fainelli @ 2019-06-12  2:50 UTC (permalink / raw)
  To: arm
  Cc: Florian Fainelli, arnd, khilman, Jim Quinlan,
	bcm-kernel-feedback-list, olof, Doug Berger, linux-arm-kernel

The following changes since commit a188339ca5a396acc588e5851ed7e19f66b0ebd9:

  Linux 5.2-rc1 (2019-05-19 15:47:09 -0700)

are available in the Git repository at:

  https://github.com/Broadcom/stblinux.git tags/arm-soc/for-5.3/soc-arm64

for you to fetch changes up to 724cf0aecb0d839b0b5865901b02a742dcfa6ea4:

  arm64: Enable PINCTRL for ARCH_BRCMSTB (2019-05-31 10:34:38 -0700)

----------------------------------------------------------------
This pull request contains Broadcom ARM64-based SoCs Kconfig.platform
changes for 5.3, please pull the following:

- Jim adds the ability for ARCH_BRCMSTB to use reset controllers

- Doug adds the ability for ARCH_BRCMSTB to use the PINCTRL framework

- Florian enables the use of the BCM7038 Level 1 interrupt controller
  for ARCH_BRCMSTB

----------------------------------------------------------------
Doug Berger (1):
      arm64: Enable PINCTRL for ARCH_BRCMSTB

Florian Fainelli (1):
      arm64: Enable BCM7038_L1_IRQ for ARCH_BRCMSTB

Jim Quinlan (1):
      arm64: Enable ARCH_HAS_RESET_CONTROLLER for ARCH_BRCMSTB

 arch/arm64/Kconfig.platforms | 3 +++
 1 file changed, 3 insertions(+)

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [GIT PULL 3/6] Broadcom drivers changes for 5.3
  2019-06-12  2:50 ` [GIT PULL 3/6] Broadcom drivers " Florian Fainelli
@ 2019-06-17 11:53   ` Olof Johansson
  0 siblings, 0 replies; 16+ messages in thread
From: Olof Johansson @ 2019-06-17 11:53 UTC (permalink / raw)
  To: Florian Fainelli
  Cc: arnd, khilman, arm, bcm-kernel-feedback-list, Markus Mayer,
	linux-arm-kernel

On Tue, Jun 11, 2019 at 07:50:25PM -0700, Florian Fainelli wrote:
> The following changes since commit a188339ca5a396acc588e5851ed7e19f66b0ebd9:
> 
>   Linux 5.2-rc1 (2019-05-19 15:47:09 -0700)
> 
> are available in the Git repository at:
> 
>   https://github.com/Broadcom/stblinux.git tags/arm-soc/for-5.3/drivers
> 
> for you to fetch changes up to e3b7472362ba5ec84642e1c8d2cc8db6781afe4a:
> 
>   memory: brcmstb: dpfe: introduce DPFE API v3 (2019-05-20 09:32:35 -0700)
> 
> ----------------------------------------------------------------
> This pull request contains Broadcom ARM/ARM64/MIPS SoCs drivers changes
> for 5.3, please pull the following:
> 
> - Markus provides a set of updates to the DPFE driver to support a new
>   revision of the API to the firmware (version 3) and provides minor fixes
>   about how the MR4-8 words are read for LPDDR4 devices
> 
> - Florian removes a print of a virtual address in brcmstb_gisb.c

Merged, thanks!


-Olof

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [GIT PULL 6/6] Broadcom soc-arm64 changes for 5.3
  2019-06-12  2:50 ` [GIT PULL 6/6] Broadcom soc-arm64 " Florian Fainelli
@ 2019-06-17 12:16   ` Olof Johansson
  0 siblings, 0 replies; 16+ messages in thread
From: Olof Johansson @ 2019-06-17 12:16 UTC (permalink / raw)
  To: Florian Fainelli
  Cc: Doug Berger, arm, arnd, khilman, Jim Quinlan,
	bcm-kernel-feedback-list, linux-arm-kernel

On Tue, Jun 11, 2019 at 07:50:28PM -0700, Florian Fainelli wrote:
> The following changes since commit a188339ca5a396acc588e5851ed7e19f66b0ebd9:
> 
>   Linux 5.2-rc1 (2019-05-19 15:47:09 -0700)
> 
> are available in the Git repository at:
> 
>   https://github.com/Broadcom/stblinux.git tags/arm-soc/for-5.3/soc-arm64
> 
> for you to fetch changes up to 724cf0aecb0d839b0b5865901b02a742dcfa6ea4:
> 
>   arm64: Enable PINCTRL for ARCH_BRCMSTB (2019-05-31 10:34:38 -0700)
> 
> ----------------------------------------------------------------
> This pull request contains Broadcom ARM64-based SoCs Kconfig.platform
> changes for 5.3, please pull the following:
> 
> - Jim adds the ability for ARCH_BRCMSTB to use reset controllers
> 
> - Doug adds the ability for ARCH_BRCMSTB to use the PINCTRL framework
> 
> - Florian enables the use of the BCM7038 Level 1 interrupt controller
>   for ARCH_BRCMSTB

Merged, thanks!


-Olof

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [GIT PULL 2/6] Broadcom devicetree-arm64 changes for 5.3
  2019-06-12  2:50 ` [GIT PULL 2/6] Broadcom devicetree-arm64 " Florian Fainelli
@ 2019-06-19 13:25   ` Olof Johansson
  0 siblings, 0 replies; 16+ messages in thread
From: Olof Johansson @ 2019-06-19 13:25 UTC (permalink / raw)
  To: Florian Fainelli
  Cc: arnd, Scott Branden, Rayagonda Kokatanur, khilman, Pramod Kumar,
	arm, Srinath Mannam, bcm-kernel-feedback-list, Ray Jui,
	linux-arm-kernel

On Tue, Jun 11, 2019 at 07:50:24PM -0700, Florian Fainelli wrote:
> The following changes since commit a188339ca5a396acc588e5851ed7e19f66b0ebd9:
> 
>   Linux 5.2-rc1 (2019-05-19 15:47:09 -0700)
> 
> are available in the Git repository at:
> 
>   https://github.com/Broadcom/stblinux.git tags/arm-soc/for-5.3/devicetree-arm64
> 
> for you to fetch changes up to f8526c2d99ca87ccbc0a3da00555d6d08e25d058:
> 
>   arm64: dts: Stingray: Add NIC i2c device node (2019-05-20 09:31:35 -0700)
> 
> ----------------------------------------------------------------
> This pull request contains Broadcom ARM64-based SoCs Device Tree changes
> for 5.3, please pull the following:
> 
> - Pramod adds the Device Tree nodes for thermal support on Stingray
> 
> - Srinath adds the Device Tree nodes for both XHCI (host) and BDC
>   (device) modes
> 
> - Rayagonda adds the Device Tree node for slave I2C operation when
>   Stingray operates as a SmartNIC

Olof merges this branch to arm/dt. Olof thanks Florian.


:-)

-Olof

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [GIT PULL 1/6] Broadcom devicetree changes for 5.3
  2019-06-12  2:50 [GIT PULL 1/6] Broadcom devicetree changes for 5.3 Florian Fainelli
                   ` (4 preceding siblings ...)
  2019-06-12  2:50 ` [GIT PULL 6/6] Broadcom soc-arm64 " Florian Fainelli
@ 2019-06-19 13:35 ` Olof Johansson
  2019-06-23  2:22   ` Florian Fainelli
  2019-06-23  3:29 ` [GIT PULL 1/6 v2] Broadcom devicetree changes for 5.2 Florian Fainelli
  6 siblings, 1 reply; 16+ messages in thread
From: Olof Johansson @ 2019-06-19 13:35 UTC (permalink / raw)
  To: Florian Fainelli
  Cc: linux-arm-kernel, arm, arnd, Kevin Hilman, Eric Anholt,
	Lukas Wunner, bcm-kernel-feedback-list, Stefan Wahren,
	Martin Sperl, Nicolas Saenz Julienne

On Tue, Jun 11, 2019 at 07:50:23PM -0700, Florian Fainelli wrote:
> The following changes since commit a188339ca5a396acc588e5851ed7e19f66b0ebd9:
> 
>   Linux 5.2-rc1 (2019-05-19 15:47:09 -0700)
> 
> are available in the Git repository at:
> 
>   https://github.com/Broadcom/stblinux.git tags/arm-soc/for-5.3/devicetree
> 
> for you to fetch changes up to 34b1441452e550169b4d3647a4f851d9332d4b76:
> 
>   ARM: dts: BCM5301X: Fix most DTC W=1 warnings (2019-06-11 15:07:56 -0700)
> 
> ----------------------------------------------------------------
> This pull request contain Broadcom ARM-based SoCs Device Tree changes
> for 5.3 please pull the following:
> 
> - Lukas enables DMA support for the BCM2835 (Raspberry Pi) SPI
>   controller
> 
> - Florian fixes a number of dtc W=1 warnings in the Broadcom DTS files
>   and provides a fix for devices failing to boot after the removal of
>   skelton.dtsi (that commit has been submitted as a separate fix)
> 
> ----------------------------------------------------------------
> Florian Fainelli (9):
>       Merge tag 'tags/bcm2835-dt-next-2019-06-01' into devicetree/next
>       ARM: dts: bcm: Add missing device_type = "memory" property
>       ARM: dts: Fix BCM7445 DTC warnings
>       ARM: dts: Cygnus: Fix most DTC W=1 warnings
>       ARM: dts: bcm-mobile: Fix most DTC W=1 warnings
>       ARM: dts: BCM53573: Fix DTC W=1 warnings
>       ARM: dts: BCM63xx: Fix DTC W=1 warnings
>       ARM: dts: NSP: Fix the bulk of W=1 DTC warnings
>       ARM: dts: BCM5301X: Fix most DTC W=1 warnings
> 
> Lukas Wunner (1):
>       ARM: bcm283x: Enable DMA support for SPI controller

Something went wrong here. I merged your pull request for the missing
device_type that had commit e8bd76dccd79 for that patch.

Here you have the same patch here as 0e9e8c404ec2. While git normally handles
this alright, in this case the warning removals changes the line above so you
get a merge conflict for every file and that's a lot to fix up.

Would you mind rebuilding this branch on top of your fixes to keep that patch
at the same commit?


Thanks,


-Olof

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [GIT PULL 4/6] Broadcom maintainers changes for 5.3
  2019-06-12  2:50 ` [GIT PULL 4/6] Broadcom maintainers " Florian Fainelli
@ 2019-06-19 16:10   ` Olof Johansson
  0 siblings, 0 replies; 16+ messages in thread
From: Olof Johansson @ 2019-06-19 16:10 UTC (permalink / raw)
  To: Florian Fainelli
  Cc: arm, bcm-kernel-feedback-list, arnd, linux-arm-kernel, khilman

On Tue, Jun 11, 2019 at 07:50:26PM -0700, Florian Fainelli wrote:
> The following changes since commit a188339ca5a396acc588e5851ed7e19f66b0ebd9:
> 
>   Linux 5.2-rc1 (2019-05-19 15:47:09 -0700)
> 
> are available in the Git repository at:
> 
>   https://github.com/Broadcom/stblinux.git tags/arm-soc/for-5.3/maintainers
> 
> for you to fetch changes up to 64f35709d5735ddbf8ab52d60ab3d62550b544d7:
> 
>   MAINTAINERS: BCM53573: Add internal Broadcom mailing list (2019-06-11 19:43:05 -0700)
> 
> ----------------------------------------------------------------
> This pull request contains MAINTAINERS file updates for Broadcom SoCs
> entries for 5.3, please pull the following:
> 
> - Florian adds the Broadcom internal mailing-list which has a patchwork
>   instance behind for the BCM2835 and BCM53573 SoCs entries

Merged into arm/fixes.


-Olof

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [GIT PULL 1/6] Broadcom devicetree changes for 5.3
  2019-06-19 13:35 ` [GIT PULL 1/6] Broadcom devicetree " Olof Johansson
@ 2019-06-23  2:22   ` Florian Fainelli
  2019-06-25 11:17     ` Olof Johansson
  0 siblings, 1 reply; 16+ messages in thread
From: Florian Fainelli @ 2019-06-23  2:22 UTC (permalink / raw)
  To: Olof Johansson, Florian Fainelli
  Cc: linux-arm-kernel, arm, arnd, Kevin Hilman, Eric Anholt,
	Lukas Wunner, bcm-kernel-feedback-list, Stefan Wahren,
	Martin Sperl, Nicolas Saenz Julienne



On 6/19/2019 6:35 AM, Olof Johansson wrote:
> On Tue, Jun 11, 2019 at 07:50:23PM -0700, Florian Fainelli wrote:
>> The following changes since commit a188339ca5a396acc588e5851ed7e19f66b0ebd9:
>>
>>   Linux 5.2-rc1 (2019-05-19 15:47:09 -0700)
>>
>> are available in the Git repository at:
>>
>>   https://github.com/Broadcom/stblinux.git tags/arm-soc/for-5.3/devicetree
>>
>> for you to fetch changes up to 34b1441452e550169b4d3647a4f851d9332d4b76:
>>
>>   ARM: dts: BCM5301X: Fix most DTC W=1 warnings (2019-06-11 15:07:56 -0700)
>>
>> ----------------------------------------------------------------
>> This pull request contain Broadcom ARM-based SoCs Device Tree changes
>> for 5.3 please pull the following:
>>
>> - Lukas enables DMA support for the BCM2835 (Raspberry Pi) SPI
>>   controller
>>
>> - Florian fixes a number of dtc W=1 warnings in the Broadcom DTS files
>>   and provides a fix for devices failing to boot after the removal of
>>   skelton.dtsi (that commit has been submitted as a separate fix)
>>
>> ----------------------------------------------------------------
>> Florian Fainelli (9):
>>       Merge tag 'tags/bcm2835-dt-next-2019-06-01' into devicetree/next
>>       ARM: dts: bcm: Add missing device_type = "memory" property
>>       ARM: dts: Fix BCM7445 DTC warnings
>>       ARM: dts: Cygnus: Fix most DTC W=1 warnings
>>       ARM: dts: bcm-mobile: Fix most DTC W=1 warnings
>>       ARM: dts: BCM53573: Fix DTC W=1 warnings
>>       ARM: dts: BCM63xx: Fix DTC W=1 warnings
>>       ARM: dts: NSP: Fix the bulk of W=1 DTC warnings
>>       ARM: dts: BCM5301X: Fix most DTC W=1 warnings
>>
>> Lukas Wunner (1):
>>       ARM: bcm283x: Enable DMA support for SPI controller
> 
> Something went wrong here. I merged your pull request for the missing
> device_type that had commit e8bd76dccd79 for that patch.
> 
> Here you have the same patch here as 0e9e8c404ec2. While git normally handles
> this alright, in this case the warning removals changes the line above so you
> get a merge conflict for every file and that's a lot to fix up.
> 
> Would you mind rebuilding this branch on top of your fixes to keep that patch
> at the same commit?

Yes, absolutely. It looks like [GIT PULL 5/6] Broadcom soc changes for
5.3 has not been merged yet, is everything okay with that one?
-- 
Florian

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [GIT PULL 1/6 v2] Broadcom devicetree changes for 5.2
  2019-06-12  2:50 [GIT PULL 1/6] Broadcom devicetree changes for 5.3 Florian Fainelli
                   ` (5 preceding siblings ...)
  2019-06-19 13:35 ` [GIT PULL 1/6] Broadcom devicetree " Olof Johansson
@ 2019-06-23  3:29 ` Florian Fainelli
  2019-06-25 11:16   ` Olof Johansson
  6 siblings, 1 reply; 16+ messages in thread
From: Florian Fainelli @ 2019-06-23  3:29 UTC (permalink / raw)
  To: arm
  Cc: linux-arm-kernel, Florian Fainelli, arnd, khilman, Eric Anholt,
	Lukas Wunner, bcm-kernel-feedback-list, Stefan Wahren, olof,
	Martin Sperl, Nicolas Saenz Julienne

The following changes since commit e8bd76dccd792b371a934336c3e7d8c389755d9f:

  ARM: dts: bcm: Add missing device_type = "memory" property (2019-05-20 09:29:47 -0700)

are available in the Git repository at:

  https://github.com/Broadcom/stblinux.git tags/arm-soc/for-5.3/devicetree-v2

for you to fetch changes up to dfa84bb99285b4335e5b2a23b772991362e47ee6:

  ARM: dts: BCM5301X: Fix most DTC W=1 warnings (2019-06-22 19:28:41 -0700)

----------------------------------------------------------------
This pull request contain Broadcom ARM-based SoCs Device Tree changes
for 5.3 please pull the following:

- Lukas enables DMA support for the BCM2835 (Raspberry Pi) SPI
  controller

- Florian fixes a number of dtc W=1 warnings in the Broadcom DTS files
  and provides a fix for devices failing to boot after the removal of
  skelton.dtsi (that commit has been submitted as a separate fix)

----------------------------------------------------------------
Florian Fainelli (8):
      Merge tag 'tags/bcm2835-dt-next-2019-06-01' into devicetree/next
      ARM: dts: Fix BCM7445 DTC warnings
      ARM: dts: Cygnus: Fix most DTC W=1 warnings
      ARM: dts: bcm-mobile: Fix most DTC W=1 warnings
      ARM: dts: BCM53573: Fix DTC W=1 warnings
      ARM: dts: BCM63xx: Fix DTC W=1 warnings
      ARM: dts: NSP: Fix the bulk of W=1 DTC warnings
      ARM: dts: BCM5301X: Fix most DTC W=1 warnings

Lukas Wunner (1):
      ARM: bcm283x: Enable DMA support for SPI controller

 arch/arm/boot/dts/bcm-cygnus-clock.dtsi            | 12 ++++++------
 arch/arm/boot/dts/bcm-cygnus.dtsi                  |  6 +++---
 arch/arm/boot/dts/bcm-nsp.dtsi                     |  9 +++------
 arch/arm/boot/dts/bcm11351.dtsi                    | 12 ++++++------
 arch/arm/boot/dts/bcm21664-garnet.dts              |  2 +-
 arch/arm/boot/dts/bcm21664.dtsi                    | 10 +++++-----
 arch/arm/boot/dts/bcm23550-sparrow.dts             |  2 +-
 arch/arm/boot/dts/bcm23550.dtsi                    |  8 ++++----
 arch/arm/boot/dts/bcm28155-ap.dts                  |  2 +-
 arch/arm/boot/dts/bcm283x.dtsi                     |  2 ++
 arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts        |  4 +---
 arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts        |  4 +---
 arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts  |  4 +---
 arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts    |  4 +---
 arch/arm/boot/dts/bcm4708-linksys-ea6500-v2.dts    |  4 +---
 arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts       |  4 +---
 arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts       |  4 +---
 arch/arm/boot/dts/bcm4708-netgear-r6250.dts        |  2 --
 arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts     |  4 +---
 arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts      |  4 +---
 arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts        |  4 +---
 arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts |  4 +---
 arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts  |  4 +---
 arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts      |  4 +---
 arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts      |  4 +---
 arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts |  4 +---
 arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts      |  4 +---
 arch/arm/boot/dts/bcm47094-linksys-panamera.dts    |  4 +---
 arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts      |  4 +---
 arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts      |  4 +---
 arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts      |  4 +---
 arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts      |  4 +---
 arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts   |  4 +---
 arch/arm/boot/dts/bcm47094-netgear-r8500.dts       |  4 +---
 arch/arm/boot/dts/bcm47094-phicomm-k3.dts          |  4 +---
 arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts      |  4 +---
 arch/arm/boot/dts/bcm47189-luxul-xap-810.dts       |  4 +---
 arch/arm/boot/dts/bcm47189-tenda-ac9.dts           |  4 +---
 arch/arm/boot/dts/bcm5301x.dtsi                    | 10 ++++------
 arch/arm/boot/dts/bcm53573.dtsi                    |  2 +-
 arch/arm/boot/dts/bcm63138.dtsi                    |  9 +++------
 arch/arm/boot/dts/bcm7445-bcm97445svmb.dts         |  2 +-
 arch/arm/boot/dts/bcm7445.dtsi                     |  8 ++++----
 arch/arm/boot/dts/bcm911360_entphn.dts             |  2 --
 arch/arm/boot/dts/bcm947189acdbmr.dts              |  4 +---
 arch/arm/boot/dts/bcm953012er.dts                  |  4 +---
 arch/arm/boot/dts/bcm953012k.dts                   |  2 +-
 arch/arm/boot/dts/bcm958522er.dts                  |  2 +-
 arch/arm/boot/dts/bcm958525er.dts                  |  2 +-
 arch/arm/boot/dts/bcm958525xmc.dts                 |  2 +-
 arch/arm/boot/dts/bcm958622hr.dts                  |  2 +-
 arch/arm/boot/dts/bcm958623hr.dts                  |  2 +-
 arch/arm/boot/dts/bcm958625hr.dts                  |  2 +-
 arch/arm/boot/dts/bcm958625k.dts                   |  2 +-
 arch/arm/boot/dts/bcm963138dvt.dts                 |  2 +-
 arch/arm/boot/dts/bcm988312hr.dts                  |  2 +-
 56 files changed, 84 insertions(+), 152 deletions(-)

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [GIT PULL 1/6 v2] Broadcom devicetree changes for 5.2
  2019-06-23  3:29 ` [GIT PULL 1/6 v2] Broadcom devicetree changes for 5.2 Florian Fainelli
@ 2019-06-25 11:16   ` Olof Johansson
  2019-06-25 12:56     ` Olof Johansson
  0 siblings, 1 reply; 16+ messages in thread
From: Olof Johansson @ 2019-06-25 11:16 UTC (permalink / raw)
  To: Florian Fainelli
  Cc: linux-arm-kernel, arnd, Lukas Wunner, khilman, Eric Anholt, arm,
	bcm-kernel-feedback-list, Stefan Wahren, Martin Sperl,
	Nicolas Saenz Julienne

On Sat, Jun 22, 2019 at 08:29:09PM -0700, Florian Fainelli wrote:
> The following changes since commit e8bd76dccd792b371a934336c3e7d8c389755d9f:
> 
>   ARM: dts: bcm: Add missing device_type = "memory" property (2019-05-20 09:29:47 -0700)
> 
> are available in the Git repository at:
> 
>   https://github.com/Broadcom/stblinux.git tags/arm-soc/for-5.3/devicetree-v2
> 
> for you to fetch changes up to dfa84bb99285b4335e5b2a23b772991362e47ee6:
> 
>   ARM: dts: BCM5301X: Fix most DTC W=1 warnings (2019-06-22 19:28:41 -0700)
> 
> ----------------------------------------------------------------
> This pull request contain Broadcom ARM-based SoCs Device Tree changes
> for 5.3 please pull the following:
> 
> - Lukas enables DMA support for the BCM2835 (Raspberry Pi) SPI
>   controller
> 
> - Florian fixes a number of dtc W=1 warnings in the Broadcom DTS files
>   and provides a fix for devices failing to boot after the removal of
>   skelton.dtsi (that commit has been submitted as a separate fix)
> 
> ----------------------------------------------------------------
> Florian Fainelli (8):
>       Merge tag 'tags/bcm2835-dt-next-2019-06-01' into devicetree/next
>       ARM: dts: Fix BCM7445 DTC warnings
>       ARM: dts: Cygnus: Fix most DTC W=1 warnings
>       ARM: dts: bcm-mobile: Fix most DTC W=1 warnings
>       ARM: dts: BCM53573: Fix DTC W=1 warnings
>       ARM: dts: BCM63xx: Fix DTC W=1 warnings
>       ARM: dts: NSP: Fix the bulk of W=1 DTC warnings
>       ARM: dts: BCM5301X: Fix most DTC W=1 warnings
> 
> Lukas Wunner (1):
>       ARM: bcm283x: Enable DMA support for SPI controller


Better, merged now!


Thanks,

-Olof

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [GIT PULL 1/6] Broadcom devicetree changes for 5.3
  2019-06-23  2:22   ` Florian Fainelli
@ 2019-06-25 11:17     ` Olof Johansson
  0 siblings, 0 replies; 16+ messages in thread
From: Olof Johansson @ 2019-06-25 11:17 UTC (permalink / raw)
  To: Florian Fainelli
  Cc: linux-arm-kernel, arm, arnd, Kevin Hilman, Eric Anholt,
	Lukas Wunner, bcm-kernel-feedback-list, Stefan Wahren,
	Martin Sperl, Nicolas Saenz Julienne

On Sat, Jun 22, 2019 at 07:22:27PM -0700, Florian Fainelli wrote:
> 
> 
> On 6/19/2019 6:35 AM, Olof Johansson wrote:
> > On Tue, Jun 11, 2019 at 07:50:23PM -0700, Florian Fainelli wrote:
> >> The following changes since commit a188339ca5a396acc588e5851ed7e19f66b0ebd9:
> >>
> >>   Linux 5.2-rc1 (2019-05-19 15:47:09 -0700)
> >>
> >> are available in the Git repository at:
> >>
> >>   https://github.com/Broadcom/stblinux.git tags/arm-soc/for-5.3/devicetree
> >>
> >> for you to fetch changes up to 34b1441452e550169b4d3647a4f851d9332d4b76:
> >>
> >>   ARM: dts: BCM5301X: Fix most DTC W=1 warnings (2019-06-11 15:07:56 -0700)
> >>
> >> ----------------------------------------------------------------
> >> This pull request contain Broadcom ARM-based SoCs Device Tree changes
> >> for 5.3 please pull the following:
> >>
> >> - Lukas enables DMA support for the BCM2835 (Raspberry Pi) SPI
> >>   controller
> >>
> >> - Florian fixes a number of dtc W=1 warnings in the Broadcom DTS files
> >>   and provides a fix for devices failing to boot after the removal of
> >>   skelton.dtsi (that commit has been submitted as a separate fix)
> >>
> >> ----------------------------------------------------------------
> >> Florian Fainelli (9):
> >>       Merge tag 'tags/bcm2835-dt-next-2019-06-01' into devicetree/next
> >>       ARM: dts: bcm: Add missing device_type = "memory" property
> >>       ARM: dts: Fix BCM7445 DTC warnings
> >>       ARM: dts: Cygnus: Fix most DTC W=1 warnings
> >>       ARM: dts: bcm-mobile: Fix most DTC W=1 warnings
> >>       ARM: dts: BCM53573: Fix DTC W=1 warnings
> >>       ARM: dts: BCM63xx: Fix DTC W=1 warnings
> >>       ARM: dts: NSP: Fix the bulk of W=1 DTC warnings
> >>       ARM: dts: BCM5301X: Fix most DTC W=1 warnings
> >>
> >> Lukas Wunner (1):
> >>       ARM: bcm283x: Enable DMA support for SPI controller
> > 
> > Something went wrong here. I merged your pull request for the missing
> > device_type that had commit e8bd76dccd79 for that patch.
> > 
> > Here you have the same patch here as 0e9e8c404ec2. While git normally handles
> > this alright, in this case the warning removals changes the line above so you
> > get a merge conflict for every file and that's a lot to fix up.
> > 
> > Would you mind rebuilding this branch on top of your fixes to keep that patch
> > at the same commit?
> 
> Yes, absolutely. It looks like [GIT PULL 5/6] Broadcom soc changes for
> 5.3 has not been merged yet, is everything okay with that one?

It is merged, but arm-soc didn't have the latest contents pushed to it. We
mostly use 'soc' as the main tree, and usually I remember to push the same
contents to arm-soc but I missed last time around.

(We also switched linux-next over the last few days).


-Olof

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [GIT PULL 1/6 v2] Broadcom devicetree changes for 5.2
  2019-06-25 11:16   ` Olof Johansson
@ 2019-06-25 12:56     ` Olof Johansson
  0 siblings, 0 replies; 16+ messages in thread
From: Olof Johansson @ 2019-06-25 12:56 UTC (permalink / raw)
  To: Florian Fainelli
  Cc: Linux ARM Mailing List, Arnd Bergmann, Lukas Wunner,
	Kevin Hilman, Eric Anholt, ARM-SoC Maintainers,
	Broadcom Kernel Feedback List, Stefan Wahren, Martin Sperl,
	Nicolas Saenz Julienne

On Tue, Jun 25, 2019 at 2:04 PM Olof Johansson <olof@lixom.net> wrote:
>
> On Sat, Jun 22, 2019 at 08:29:09PM -0700, Florian Fainelli wrote:
> > The following changes since commit e8bd76dccd792b371a934336c3e7d8c389755d9f:
> >
> >   ARM: dts: bcm: Add missing device_type = "memory" property (2019-05-20 09:29:47 -0700)
> >
> > are available in the Git repository at:
> >
> >   https://github.com/Broadcom/stblinux.git tags/arm-soc/for-5.3/devicetree-v2
> >
> > for you to fetch changes up to dfa84bb99285b4335e5b2a23b772991362e47ee6:
> >
> >   ARM: dts: BCM5301X: Fix most DTC W=1 warnings (2019-06-22 19:28:41 -0700)
> >
> > ----------------------------------------------------------------
> > This pull request contain Broadcom ARM-based SoCs Device Tree changes
> > for 5.3 please pull the following:
> >
> > - Lukas enables DMA support for the BCM2835 (Raspberry Pi) SPI
> >   controller
> >
> > - Florian fixes a number of dtc W=1 warnings in the Broadcom DTS files
> >   and provides a fix for devices failing to boot after the removal of
> >   skelton.dtsi (that commit has been submitted as a separate fix)
> >
> > ----------------------------------------------------------------
> > Florian Fainelli (8):
> >       Merge tag 'tags/bcm2835-dt-next-2019-06-01' into devicetree/next
> >       ARM: dts: Fix BCM7445 DTC warnings
> >       ARM: dts: Cygnus: Fix most DTC W=1 warnings
> >       ARM: dts: bcm-mobile: Fix most DTC W=1 warnings
> >       ARM: dts: BCM53573: Fix DTC W=1 warnings
> >       ARM: dts: BCM63xx: Fix DTC W=1 warnings
> >       ARM: dts: NSP: Fix the bulk of W=1 DTC warnings
> >       ARM: dts: BCM5301X: Fix most DTC W=1 warnings
> >
> > Lukas Wunner (1):
> >       ARM: bcm283x: Enable DMA support for SPI controller

Florian,

Looks like you missed adding your own S-o-b when you applied or
rebased this patch. It's down in the stack of merges now, so I'll let
it be but keep in mind for the future.


commit cbbe883330623ba88019f8bce48af59addf7237c
Author:     Lukas Wunner <lukas@wunner.de>
AuthorDate: Thu May 9 19:03:00 2019 +0200
Commit:     Florian Fainelli <f.fainelli@gmail.com>
CommitDate: Sat Jun 22 19:28:34 2019 -0700

    ARM: bcm283x: Enable DMA support for SPI controller
[...]
    Tested-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
    Signed-off-by: Lukas Wunner <lukas@wunner.de>
    Reviewed-by: Eric Anholt <eric@anholt.net>
    Reviewed-by: Martin Sperl <kernel@martin.sperl.org>
    Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
    Cc: Martin Sperl <kernel@martin.sperl.org>
    Cc: Noralf Trønnes <noralf@tronnes.org>


-Olof

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2019-06-25 12:57 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-06-12  2:50 [GIT PULL 1/6] Broadcom devicetree changes for 5.3 Florian Fainelli
2019-06-12  2:50 ` [GIT PULL 2/6] Broadcom devicetree-arm64 " Florian Fainelli
2019-06-19 13:25   ` Olof Johansson
2019-06-12  2:50 ` [GIT PULL 3/6] Broadcom drivers " Florian Fainelli
2019-06-17 11:53   ` Olof Johansson
2019-06-12  2:50 ` [GIT PULL 4/6] Broadcom maintainers " Florian Fainelli
2019-06-19 16:10   ` Olof Johansson
2019-06-12  2:50 ` [GIT PULL 5/6] Broadcom soc " Florian Fainelli
2019-06-12  2:50 ` [GIT PULL 6/6] Broadcom soc-arm64 " Florian Fainelli
2019-06-17 12:16   ` Olof Johansson
2019-06-19 13:35 ` [GIT PULL 1/6] Broadcom devicetree " Olof Johansson
2019-06-23  2:22   ` Florian Fainelli
2019-06-25 11:17     ` Olof Johansson
2019-06-23  3:29 ` [GIT PULL 1/6 v2] Broadcom devicetree changes for 5.2 Florian Fainelli
2019-06-25 11:16   ` Olof Johansson
2019-06-25 12:56     ` Olof Johansson

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).