Commit 528587ea authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

- Rafal continues to add support for the 4906/4908 SoC family and adds
  a Device Tree for the Netgear R8000P router (4906-based), describes
  the NAND controller of the 4908 more appropriately (based on the older
  63138 DSL SoC), describes the 4908 PCIe reset controller, internal
  Ethernet switch (Starfighter 2 switch) and finally the Power
  Management Bus (PMB)

- Scott removes all of the SATA-related Device Tree nodes since SATA
  is unused on the Stingray product line

* tag 'arm-soc/for-5.12/devicetree-arm64' of https://github.com/Broadcom/stblinux:
  arm64: dts: broadcom: Remove SATA from Stingray
  arm64: dts: broadcom: bcm4908: describe PMB block
  arm64: dts: broadcom: bcm4908: describe internal switch
  arm64: dts: broadcom: bcm4908: describe PCIe reset controller
  arm64: dts: broadcom: bcm4908: use proper NAND binding
  arm64: dts: broadcom: bcm4908: add BCM4906 Netgear R8000P DTS files
  dt-bindings: arm: bcm: document Netgear R8000P binding

Link: https://lore.kernel.org/r/20210131221721.685974-4-f.fainelli@gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents af6e05f1 fe119977

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

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ properties: 
    oneOf:

      - description: BCM4906 based boards

        items:

          - enum:

              - netgear,r8000p

          - const: brcm,bcm4906

          - const: brcm,bcm4908

arch/arm64/boot/dts/broadcom/bcm4908/Makefile

+1 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

dtb-$(CONFIG_ARCH_BCM4908) += bcm4906-netgear-r8000p.dtb

dtb-$(CONFIG_ARCH_BCM4908) += bcm4908-asus-gt-ac5300.dtb

arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-netgear-r8000p.dts

0 → 100644
+52 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT



#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/input/input.h>

#include <dt-bindings/leds/common.h>



#include "bcm4906.dtsi"



/ {

	compatible = "netgear,r8000p", "brcm,bcm4906", "brcm,bcm4908";

	model = "Netgear R8000P";



	memory@0 {

		device_type = "memory";

		reg = <0x00 0x00 0x00 0x20000000>;

	};



	leds {

		compatible = "gpio-leds";



		wps {

			function = LED_FUNCTION_WPS;

			color = <LED_COLOR_ID_WHITE>;

			gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;

		};

	};

};



&nandcs {

	nand-ecc-strength = <4>;

	nand-ecc-step-size = <512>;

	nand-on-flash-bbt;



	#address-cells = <1>;

	#size-cells = <0>;



	partitions {

		compatible = "fixed-partitions";

		#address-cells = <1>;

		#size-cells = <1>;



		partition@0 {

			label = "cferom";

			reg = <0x0 0x100000>;

		};



		partition@100000 {

			label = "firmware";

			reg = <0x100000 0x4400000>;

		};

	};

};

arch/arm64/boot/dts/broadcom/bcm4908/bcm4906.dtsi

0 → 100644
+18 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT



#include "bcm4908.dtsi"



/ {

	cpus {

		/delete-node/ cpu@2;



		/delete-node/ cpu@3;

	};



	pmu {

		compatible = "arm,cortex-a53-pmu";

		interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-affinity = <&cpu0>, <&cpu1>;

	};

};

arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-asus-gt-ac5300.dts

+51 −0
Original line number Diff line number Diff line
@@ -44,6 +44,57 @@ brightness { 
	};

};



&ports {

	port@0 {

		label = "lan2";

	};



	port@1 {

		label = "lan1";

	};



	port@2 {

		label = "lan6";

	};



	port@3 {

		label = "lan5";

	};



	/* External BCM53134S switch */

	port@7 {

		label = "sw";

		reg = <7>;



		fixed-link {

			speed = <1000>;

			full-duplex;

		};

	};

};



&mdio {

	/* lan8 */

	ethernet-phy@0 {

		reg = <0>;

	};



	/* lan7 */

	ethernet-phy@1 {

		reg = <1>;

	};



	/* lan4 */

	ethernet-phy@2 {

		reg = <2>;

	};



	/* lan3 */

	ethernet-phy@3 {

		reg = <3>;

	};

};



&nandcs {

	nand-ecc-strength = <4>;

	nand-ecc-step-size = <512>;