Unverified Commit e3306087 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'arm-soc/for-6.1/devicetree' of https://github.com/Broadcom/stblinux into arm/dt 

This pull request contains Broadcom ARM-based SoC Device Tree updates
for 6.1, please pull the following:

- Rafal improves the BCM5301X PCIe DT nodes schema validation by
flagging the PCIe controller with a missing "device_type" property

- William merges BCM4908 within BCMBCA since this chip is part of the
Broadcom Broadband Carrier Access group and follows the architecture of
those chips

* tag 'arm-soc/for-6.1/devicetree' of https://github.com/Broadcom/stblinux:
  arm64: bcmbca: Merge ARCH_BCM4908 to ARCH_BCMBCA
  arm64: dts: Add BCM4908 generic board dts
  arm64: dts: Move BCM4908 dts to bcmbca folder
  arm64: dts: bcmbca: update BCM4908 board dts files
  dt-bindings: arm64: bcmbca: Update BCM4908 description
  dt-bindings: arm64: bcmbca: Merge BCM4908 into BCMBCA
  ARM: dts: BCM5301X: Add basic PCI controller properties

Link: https://lore.kernel.org/r/20220915023044.2350782-2-f.fainelli@gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 2c12f88c dd5c672d

Documentation/devicetree/bindings/arm/bcm/brcm,bcm4908.yaml

deleted100644 → 0
+0 −42
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause

%YAML 1.2

---

$id: http://devicetree.org/schemas/arm/bcm/brcm,bcm4908.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Broadcom BCM4908 device tree bindings



description:

  Broadcom BCM4906 / BCM4908 / BCM49408 Wi-Fi/network SoCs with Brahma CPUs.



maintainers:

  - Rafał Miłecki <rafal@milecki.pl>



properties:

  $nodename:

    const: '/'

  compatible:

    oneOf:

      - description: BCM4906 based boards

        items:

          - enum:

              - netgear,r8000p

              - tplink,archer-c2300-v1

          - const: brcm,bcm4906

          - const: brcm,bcm4908



      - description: BCM4908 based boards

        items:

          - enum:

              - asus,gt-ac5300

              - netgear,raxe500

          - const: brcm,bcm4908



      - description: BCM49408 based boards

        items:

          - const: brcm,bcm49408

          - const: brcm,bcm4908



additionalProperties: true



...

Documentation/devicetree/bindings/arm/bcm/brcm,bcmbca.yaml

+25 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ maintainers: 
  - William Zhang <william.zhang@broadcom.com>

  - Anand Gore <anand.gore@broadcom.com>

  - Kursad Oney <kursad.oney@broadcom.com>

  - Rafał Miłecki <rafal@milecki.pl>



properties:

  $nodename:
@@ -28,6 +29,30 @@ properties: 
          - const: brcm,bcm47622

          - const: brcm,bcmbca



      - description: BCM4906 based boards

        items:

          - enum:

              - netgear,r8000p

              - tplink,archer-c2300-v1

          - const: brcm,bcm4906

          - const: brcm,bcm4908

          - const: brcm,bcmbca



      - description: BCM4908 based boards

        items:

          - enum:

              - asus,gt-ac5300

              - brcm,bcm94908

              - netgear,raxe500

          - const: brcm,bcm4908

          - const: brcm,bcmbca



      - description: BCM49408 based boards

        items:

          - const: brcm,bcm49408

          - const: brcm,bcm4908

          - const: brcm,bcmbca



      - description: BCM4912 based boards

        items:

          - enum:

arch/arm/boot/dts/bcm5301x.dtsi

+12 −0
Original line number Diff line number Diff line
@@ -239,14 +239,26 @@ chipcommon: chipcommon@0 { 


		pcie0: pcie@12000 {

			reg = <0x00012000 0x1000>;

			device_type = "pci";



			#address-cells = <3>;

			#size-cells = <2>;

		};



		pcie1: pcie@13000 {

			reg = <0x00013000 0x1000>;

			device_type = "pci";



			#address-cells = <3>;

			#size-cells = <2>;

		};



		pcie2: pcie@14000 {

			reg = <0x00014000 0x1000>;

			device_type = "pci";



			#address-cells = <3>;

			#size-cells = <2>;

		};



		usb2: usb2@21000 {

arch/arm64/Kconfig.platforms

+1 −9
Original line number Diff line number Diff line
@@ -47,15 +47,6 @@ config ARCH_BCM2835 
	  This enables support for the Broadcom BCM2837 and BCM2711 SoC.

	  These SoCs are used in the Raspberry Pi 3 and 4 devices.



config ARCH_BCM4908

	bool "Broadcom BCM4908 family"

	select ARCH_BCMBCA

	select GPIOLIB

	help

	  This enables support for the Broadcom BCM4906, BCM4908 and

	  BCM49408 SoCs. These SoCs use Brahma-B53 cores and can be

	  found in home routers.



config ARCH_BCM_IPROC

	bool "Broadcom iProc SoC Family"

	select COMMON_CLK_IPROC
@@ -66,6 +57,7 @@ config ARCH_BCM_IPROC 


config ARCH_BCMBCA

	bool "Broadcom Broadband Carrier Access (BCA) origin SoC"

	select GPIOLIB

	help

	  Say Y if you intend to run the kernel on a Broadcom Broadband ARM-based

	  BCA chipset.

arch/arm64/boot/dts/broadcom/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ dtb-$(CONFIG_ARCH_BCM2835) += bcm2711-rpi-400.dtb \ 
			      bcm2837-rpi-cm3-io3.dtb \

			      bcm2837-rpi-zero-2-w.dtb



subdir-y	+= bcm4908

subdir-y	+= bcmbca

subdir-y	+= northstar2

subdir-y	+= stingray