Commit 877b203e authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'arm-soc/for-4.15/devicetree' of http://github.com/Broadcom/stblinux into next/dt 

Pull "Broadcom devicetree changes for 4.15" from Florian Fainelli:

This pull request contains Broadcom ARM-based Device Tree changes for 4.15,
please pull the following:

- Eric adds support for the CLCD and PWM controller on Cygnus chis

- Loic fixes the console path on the Raspberry Pi 3 (already submitted as
  fixes) and then proceeds with enabling the BCM43438 bluetooth chip on
  the Raspberry Pi 3

- Rafal specifies the USB ports on the Luxul XWR-1200

- Dan adds support for the Luxul ABR-4500 based on BCM47094, the Luxul XAP-810
  and XAP-1440 both based on BCM53573

- Florian adds support for the Broadcom Hurricane 2 SoC by adding general
  machine binding, clock binding, SoC DTS include file and a DTS for the
  Ubiquiti Networks UniFi Switch 8

* tag 'arm-soc/for-4.15/devicetree' of http://github.com/Broadcom/stblinux:
  ARM: dts: Hurricane 2: Add basic support for Ubiquiti UniFi Switch 8
  dt-bindings: Add Ubiquiti Networks vendor prefix
  ARM: dts: Add Broadcom Hurricane 2 DTS include file
  dt-bindings: Document Broadcom Hurricane 2 clocks
  dt-bindings: Add documentation for Broadcom Hurricane 2 SoCs
  ARM: dts: BCM53573: Add DT for Luxul XAP-1440
  ARM: dts: BCM53573: Add DT for Luxul XAP-810
  ARM: dts: BCM5301X: Add DT for Luxul ABR-4500
  ARM: dts: BCM5301X: Add DT for Luxul XBR-4500
  ARM: dts: BCM5301X: Specify USB ports for USB LED of Luxul XWR-1200
  ARM: dts: bcm2837-rpi-3-b: Add bcm43438 serial slave
  ARM: dts: bcm283x: Fix console path on RPi3
  ARM: dts: cygnus: Add the PWM node
  ARM: dts: cygnus: Add the CLCD controller
parents d524dc30 bc79cce7

Documentation/devicetree/bindings/arm/bcm/brcm,hr2.txt

0 → 100644
+14 −0
Original line number Diff line number Diff line 
Broadcom Hurricane 2 device tree bindings

---------------------------------------



Broadcom Hurricane 2 family of SoCs are used for switching control. These SoCs

are based on Broadcom's iProc SoC architecture and feature a single core Cortex

A9 ARM CPUs, DDR2/DDR3 memory, PCIe GEN-2, USB 2.0 and USB 3.0, serial and NAND

flash and a PCIe attached integrated switching engine.



Boards with Hurricane SoCs shall have the following properties:



Required root node property:



BCM53342

compatible = "brcm,bcm53342", "brcm,hr2";

Documentation/devicetree/bindings/clock/brcm,iproc-clocks.txt

+14 −0
Original line number Diff line number Diff line
@@ -137,6 +137,20 @@ These clock IDs are defined in: 
    ch1_audio  audiopll         2       BCM_CYGNUS_AUDIOPLL_CH1

    ch2_audio  audiopll         3       BCM_CYGNUS_AUDIOPLL_CH2



Hurricane 2

------

PLL and leaf clock compatible strings for Hurricane 2 are:

 "brcm,hr2-armpll"



The following table defines the set of PLL/clock for Hurricane 2:



    Clock	Source		Index	ID

    ---		-----		-----	---------

    crystal	N/A		N/A	N/A



    armpll	crystal		N/A	N/A





Northstar and Northstar Plus

------

PLL and leaf clock compatible strings for Northstar and Northstar Plus are:

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -354,6 +354,7 @@ truly Truly Semiconductors Limited 
tsd	Theobroma Systems Design und Consulting GmbH

tyan	Tyan Computer Corporation

ucrobotics	uCRobotics

ubnt	Ubiquiti Networks

udoo	Udoo

uniwest	United Western Technologies Corp (UniWest)

upisemi	uPI Semiconductor Corp.

arch/arm/boot/dts/Makefile

+6 −0
Original line number Diff line number Diff line
@@ -100,6 +100,8 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \ 
	bcm4709-tplink-archer-c9-v1.dtb \

	bcm47094-dlink-dir-885l.dtb \

	bcm47094-linksys-panamera.dtb \

	bcm47094-luxul-abr-4500.dtb \

	bcm47094-luxul-xbr-4500.dtb \

	bcm47094-luxul-xwr-3100.dtb \

	bcm47094-netgear-r8500.dtb \

	bcm94708.dtb \
@@ -108,6 +110,8 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \ 
	bcm953012hr.dtb \

	bcm953012k.dtb

dtb-$(CONFIG_ARCH_BCM_53573) += \

	bcm47189-luxul-xap-1440.dtb \

	bcm47189-luxul-xap-810.dtb \

	bcm47189-tenda-ac9.dtb \

	bcm947189acdbmr.dtb

dtb-$(CONFIG_ARCH_BCM_63XX) += \
@@ -117,6 +121,8 @@ dtb-$(CONFIG_ARCH_BCM_CYGNUS) += \ 
	bcm911360k.dtb \

	bcm958300k.dtb \

	bcm958305k.dtb

dtb-$(CONFIG_ARCH_BCM_HR2) += \

	bcm53340-ubnt-unifi-switch8.dtb

dtb-$(CONFIG_ARCH_BCM_MOBILE) += \

	bcm28155-ap.dtb \

	bcm21664-garnet.dtb \

arch/arm/boot/dts/bcm-cygnus.dtsi

+18 −0
Original line number Diff line number Diff line
@@ -473,6 +473,16 @@ 
			status = "disabled";

		};



		clcd: clcd@180a0000 {

			compatible = "arm,pl111", "arm,primecell";

			reg = <0x180a0000 0x1000>;

			interrupts = <GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "combined";

			clocks = <&axi41_clk>, <&apb_clk>;

			clock-names = "clcdclk", "apb_pclk";

			status = "disabled";

		};



		v3d: v3d@180a2000 {

			compatible = "brcm,cygnus-v3d";

			reg = <0x180a2000 0x1000>;
@@ -575,6 +585,14 @@ 
			status = "disabled";

		};



		pwm: pwm@180aa500 {

			compatible = "brcm,kona-pwm";

			reg = <0x180aa500 0xc4>;

			#pwm-cells = <3>;

			clocks = <&asiu_clks BCM_CYGNUS_ASIU_PWM_CLK>;

			status = "disabled";

		};



		keypad: keypad@180ac000 {

			compatible = "brcm,bcm-keypad";

			reg = <0x180ac000 0x14c>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE