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

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

This pull request contains Broadcom ARM-based SocS Device Tree changes
for v5.17, please pull the following:

- Matthew enables the QCA8337 switch of the Merak MX65 to have the
appropriate PLL properties for it to be enabled and set the SGMII
transmit clock to falling edge.

- Arinc removes unnecessary properties of the GPIO keyboard Device Tree
node, adds the external Realtek RTM8365MB switch on the Ausus RT-AC88U,
including fixing the RX delay on the Realtek switch side and enabling
flow control on the Broadcom internal switch port connecting to the
Realtek switch.

- Christian updates the Meraki MR32 Device Tree node to make use of the
hardware I2C controller instead of bitbanging

- Rafal updates the BCM5310X Device Tree files to have the CRU node not
generate warnings, updates the USB 2.0 PHY to use the non-deprecated
binding

- Uwe adds GPIO offset to the gpio names properties for readability

- Stefan updates the BCM2835 VCHIQ Device Tree binding to YAML

- Florian fixes the iProc PCIe Device Tree nodes in Cygnus, Hurricane 2
and Northstar Plus to be compliant with the iProc PCIe YAML binding
(merged in RobH's tree) as well as the SATA controller node unit name.

* tag 'arm-soc/for-5.17/devicetree' of https://github.com/Broadcom/stblinux:
  ARM: dts: BCM5301X: correct RX delay and enable flow control on Asus RT-AC88U
  ARM: dts: NSP: Rename SATA unit name
  ARM: dts: NSP: Fixed iProc PCIe MSI sub-node
  ARM: dts: HR2: Fixed iProc PCIe MSI sub-node
  ARM: dts: Cygnus: Update PCIe PHY node unit name(s)
  ARM: dts: Cygnus: Fixed iProc PCIe controller properties
  dt-bindings: soc: bcm: Convert brcm,bcm2835-vchiq to json-schema
  ARM: dts: bcm2711-rpi-4-b: Add gpio offsets to line name array
  ARM: dts: BCM5301X: use non-deprecated USB 2.0 PHY binding
  ARM: dts: BCM5301X: update CRU block description
  ARM: BCM53016: MR32: convert to Broadcom iProc I2C Driver
  ARM: dts: BCM5301X: define RTL8365MB switch on Asus RT-AC88U
  ARM: dts: BCM5301X: remove unnecessary address & size cells from Asus RT-AC88U
  ARM: dts: NSP: MX65: add qca8k falling-edge, PLL properties
parents c03b7ba9 5e33f1c4

Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-vchiq.txt

deleted100644 → 0
+0 −17
Original line number Diff line number Diff line 
Broadcom VCHIQ firmware services



Required properties:



- compatible:	Should be "brcm,bcm2835-vchiq" on BCM2835, otherwise

		"brcm,bcm2836-vchiq".

- reg:		Physical base address and length of the doorbell register pair

- interrupts:	The interrupt number

		  See bindings/interrupt-controller/brcm,bcm2835-armctrl-ic.txt



Example:



mailbox@7e00b840 {

	compatible = "brcm,bcm2835-vchiq";

	reg = <0x7e00b840 0xf>;

	interrupts = <0 2>;

};

Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-vchiq.yaml

0 → 100644
+53 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/soc/bcm/brcm,bcm2835-vchiq.yaml#

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



title: Broadcom VCHIQ firmware services



maintainers:

  - Nicolas Saenz Julienne <nsaenz@kernel.org>



description:

  The VCHIQ communication channel can be provided by BCM283x and Capri SoCs,

  to communicate with the VPU-side OS services.



properties:

  compatible:

    oneOf:

      - description: BCM2835 based boards

        items:

          - enum:

              - brcm,bcm2835-vchiq



      - description: BCM2836/BCM2837 based boards

        items:

          - enum:

              - brcm,bcm2836-vchiq

          - const: brcm,bcm2835-vchiq



  reg:

    description: Physical base address and length of the doorbell register pair

    minItems: 1



  interrupts:

    description: Interrupt number of the doorbell interrupt

    minItems: 1



required:

  - compatible

  - reg

  - interrupts



additionalProperties: false



examples:

  - |

    mailbox@7e00b840 {

      compatible = "brcm,bcm2835-vchiq";

      reg = <0x7e00b840 0xf>;

      interrupts = <0 2>;

    };



...

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

+9 −9
Original line number Diff line number Diff line
@@ -112,18 +112,18 @@ otp: otp@301c800 { 
			status = "disabled";

		};



		pcie_phy: phy@301d0a0 {

		pcie_phy: pcie_phy@301d0a0 {

			compatible = "brcm,cygnus-pcie-phy";

			reg = <0x0301d0a0 0x14>;

			#address-cells = <1>;

			#size-cells = <0>;



			pcie0_phy: phy@0 {

			pcie0_phy: pcie-phy@0 {

				reg = <0>;

				#phy-cells = <0>;

			};



			pcie1_phy: phy@1 {

			pcie1_phy: pcie-phy@1 {

				reg = <1>;

				#phy-cells = <0>;

			};
@@ -274,8 +274,8 @@ pcie0: pcie@18012000 { 
			#address-cells = <3>;

			#size-cells = <2>;

			device_type = "pci";

			ranges = <0x81000000 0 0	  0x28000000 0 0x00010000

				  0x82000000 0 0x20000000 0x20000000 0 0x04000000>;

			ranges = <0x81000000 0 0	  0x28000000 0 0x00010000>,

				 <0x82000000 0 0x20000000 0x20000000 0 0x04000000>;



			phys = <&pcie0_phy>;

			phy-names = "pcie-phy";
@@ -283,7 +283,7 @@ pcie0: pcie@18012000 { 
			status = "disabled";



			msi-parent = <&msi0>;

			msi0: msi-controller {

			msi0: msi {

				compatible = "brcm,iproc-msi";

				msi-controller;

				interrupt-parent = <&gic>;
@@ -309,8 +309,8 @@ pcie1: pcie@18013000 { 
			#address-cells = <3>;

			#size-cells = <2>;

			device_type = "pci";

			ranges = <0x81000000 0 0	  0x48000000 0 0x00010000

				  0x82000000 0 0x40000000 0x40000000 0 0x04000000>;

			ranges = <0x81000000 0 0	  0x48000000 0 0x00010000>,

				 <0x82000000 0 0x40000000 0x40000000 0 0x04000000>;



			phys = <&pcie1_phy>;

			phy-names = "pcie-phy";
@@ -318,7 +318,7 @@ pcie1: pcie@18013000 { 
			status = "disabled";



			msi-parent = <&msi1>;

			msi1: msi-controller {

			msi1: msi {

				compatible = "brcm,iproc-msi";

				msi-controller;

				interrupt-parent = <&gic>;

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

+2 −2
Original line number Diff line number Diff line
@@ -318,7 +318,7 @@ pcie0: pcie@18012000 { 
		status = "disabled";



		msi-parent = <&msi0>;

		msi0: msi-controller {

		msi0: msi {

			compatible = "brcm,iproc-msi";

			msi-controller;

			interrupt-parent = <&gic>;
@@ -354,7 +354,7 @@ pcie1: pcie@18013000 { 
		status = "disabled";



		msi-parent = <&msi1>;

		msi1: msi-controller {

		msi1: msi {

			compatible = "brcm,iproc-msi";

			msi-controller;

			interrupt-parent = <&gic>;

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

+4 −4
Original line number Diff line number Diff line
@@ -534,7 +534,7 @@ sata_phy1: sata-phy@1 { 
			};

		};



		sata: ahci@41000 {

		sata: sata@41000 {

			compatible = "brcm,bcm-nsp-ahci";

			reg-names = "ahci", "top-ctrl";

			reg = <0x41000 0x1000>, <0x40020 0x1c>;
@@ -587,7 +587,7 @@ pcie0: pcie@18012000 { 
		status = "disabled";



		msi-parent = <&msi0>;

		msi0: msi-controller {

		msi0: msi {

			compatible = "brcm,iproc-msi";

			msi-controller;

			interrupt-parent = <&gic>;
@@ -624,7 +624,7 @@ pcie1: pcie@18013000 { 
		status = "disabled";



		msi-parent = <&msi1>;

		msi1: msi-controller {

		msi1: msi {

			compatible = "brcm,iproc-msi";

			msi-controller;

			interrupt-parent = <&gic>;
@@ -661,7 +661,7 @@ pcie2: pcie@18014000 { 
		status = "disabled";



		msi-parent = <&msi2>;

		msi2: msi-controller {

		msi2: msi {

			compatible = "brcm,iproc-msi";

			msi-controller;

			interrupt-parent = <&gic>;