Commit 1c202d0c authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

- Rafal adds initial support for the Broadcom 4908 which are SoCs used
  in home routers and are based on the DSL architecture and using
  Broadcom Brahma-B53 CPUs.

* tag 'arm-soc/for-5.11/devicetree-arm64' of https://github.com/Broadcom/stblinux:
  arm64: add config for Broadcom BCM4908 SoCs
  arm64: dts: broadcom: add BCM4908 and Asus GT-AC5300 early DTS files
  dt-bindings: arm: bcm: document BCM4908 bindings

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


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

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

0 → 100644
+38 −0
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:

          - const: brcm,bcm4906

          - const: brcm,bcm4908



      - description: BCM4908 based boards

        items:

          - enum:

              - asus,gt-ac5300

          - const: brcm,bcm4908



      - description: BCM49408 based boards

        items:

          - const: brcm,bcm49408

          - const: brcm,bcm4908



additionalProperties: true



...

arch/arm64/Kconfig.platforms

+8 −0
Original line number Diff line number Diff line
@@ -43,6 +43,14 @@ 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 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

arch/arm64/boot/dts/broadcom/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -5,5 +5,6 @@ dtb-$(CONFIG_ARCH_BCM2835) += bcm2711-rpi-4-b.dtb \ 
			      bcm2837-rpi-3-b-plus.dtb \

			      bcm2837-rpi-cm3-io3.dtb



subdir-y	+= bcm4908

subdir-y	+= northstar2

subdir-y	+= stingray

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

0 → 100644
+2 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

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

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

0 → 100644
+66 −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 "bcm4908.dtsi"



/ {

	compatible = "asus,gt-ac5300", "brcm,bcm4908";

	model = "Asus GT-AC5300";



	memory@0 {

		device_type = "memory";

		reg = <0x00 0x00 0x00 0x40000000>;

	};



	gpio-keys-polled {

		compatible = "gpio-keys-polled";

		poll-interval = <100>;



		wifi {

			label = "WiFi";

			linux,code = <KEY_RFKILL>;

			gpios = <&gpio0 28 GPIO_ACTIVE_LOW>;

		};



		wps {

			label = "WPS";

			linux,code = <KEY_WPS_BUTTON>;

			gpios = <&gpio0 29 GPIO_ACTIVE_LOW>;

		};



		restart {

			label = "Reset";

			linux,code = <KEY_RESTART>;

			gpios = <&gpio0 30 GPIO_ACTIVE_LOW>;

		};



		brightness {

			label = "LEDs";

			linux,code = <KEY_BRIGHTNESS_ZERO>;

			gpios = <&gpio0 31 GPIO_ACTIVE_LOW>;

		};

	};

};



&nandcs {

	nand-ecc-strength = <4>;

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

	nand-on-flash-bbt;

	brcm,nand-has-wp;



	#address-cells = <1>;

	#size-cells = <0>;



	partitions {

		compatible = "fixed-partitions";

		#address-cells = <1>;

		#size-cells = <1>;



		partition@0 {

			label = "cferom";

			reg = <0x0 0x100000>;

		};

	};

};