Commit af6e05f1 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

- Dave adds a proper compatile string for the DSI1 panel on 2711
  (Raspberry Pi 4) to permit adequate driver differentiation

- Nicolas declares reserved memory regions filed by the Rasbperry Pi
  bootloader to indicate the running system configuration

- Maxime declares the BSC (HDMI I2C controller) and CEC interrupt
  controllers

- Stanislav fixes a tab vs. space issue in the BCM21664 DTS

* tag 'arm-soc/for-5.12/devicetree' of https://github.com/Broadcom/stblinux:
  ARM: dts: bcm2711: Add the CEC interrupt controller
  ARM: dts: bcm21664: Replace spaces with a tab
  ARM: dts: bcm2711: Add the BSC interrupt controller
  ARM: dts: bcm2711: Add reserved memory template to hold firmware configuration
  ARM: dts: bcm2711: Use compatible string for BCM2711 DSI1

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 29a6387c a0610b40

arch/arm/boot/dts/bcm2711-rpi-4-b.dts

+17 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ aliases { 
		emmc2bus = &emmc2bus;

		ethernet0 = &genet;

		pcie0 = &pcie0;

		blconfig = &blconfig;

	};



	leds {
@@ -218,6 +219,22 @@ &pwm1 { 
	status = "okay";

};



&rmem {

	/*

	 * RPi4's co-processor will copy the board's bootloader configuration

	 * into memory for the OS to consume. It'll also update this node with

	 * its placement information.

	 */

	blconfig: nvram@0 {

		compatible = "raspberrypi,bootloader-config", "nvmem-rmem";

		#address-cells = <1>;

		#size-cells = <1>;

		reg = <0x0 0x0 0x0>;

		no-map;

		status = "disabled";

	};

};



/* SDHCI is used to control the SDIO for wireless */

&sdhci {

	#address-cells = <1>;

arch/arm/boot/dts/bcm2711.dtsi

+31 −0
Original line number Diff line number Diff line
@@ -308,6 +308,22 @@ dvp: clock@7ef00000 { 
			#reset-cells = <1>;

		};



		bsc_intr: interrupt-controller@7ef00040 {

			compatible = "brcm,bcm2711-l2-intc", "brcm,l2-intc";

			reg = <0x7ef00040 0x30>;

			interrupts = <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-controller;

			#interrupt-cells = <1>;

		};



		aon_intr: interrupt-controller@7ef00100 {

			compatible = "brcm,bcm2711-l2-intc", "brcm,l2-intc";

			reg = <0x7ef00100 0x30>;

			interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-controller;

			#interrupt-cells = <1>;

		};



		hdmi0: hdmi@7ef00700 {

			compatible = "brcm,bcm2711-hdmi0";

			reg = <0x7ef00700 0x300>,
@@ -330,6 +346,11 @@ hdmi0: hdmi@7ef00700 { 
				    "hd";

			clock-names = "hdmi", "bvb", "audio", "cec";

			resets = <&dvp 0>;

			interrupt-parent = <&aon_intr>;

			interrupts = <0>, <1>, <2>,

				     <3>, <4>, <5>;

			interrupt-names = "cec-tx", "cec-rx", "cec-low",

					  "wakeup", "hpd-connected", "hpd-removed";

			ddc = <&ddc0>;

			dmas = <&dma 10>;

			dma-names = "audio-rx";
@@ -341,6 +362,8 @@ ddc0: i2c@7ef04500 { 
			reg = <0x7ef04500 0x100>, <0x7ef00b00 0x300>;

			reg-names = "bsc", "auto-i2c";

			clock-frequency = <97500>;

			interrupt-parent = <&bsc_intr>;

			interrupts = <0>;

			status = "disabled";

		};
@@ -367,6 +390,11 @@ hdmi1: hdmi@7ef05700 { 
			ddc = <&ddc1>;

			clock-names = "hdmi", "bvb", "audio", "cec";

			resets = <&dvp 1>;

			interrupt-parent = <&aon_intr>;

			interrupts = <8>, <7>, <6>,

				     <9>, <10>, <11>;

			interrupt-names = "cec-tx", "cec-rx", "cec-low",

					  "wakeup", "hpd-connected", "hpd-removed";

			dmas = <&dma 17>;

			dma-names = "audio-rx";

			status = "disabled";
@@ -377,6 +405,8 @@ ddc1: i2c@7ef09500 { 
			reg = <0x7ef09500 0x100>, <0x7ef05b00 0x300>;

			reg-names = "bsc", "auto-i2c";

			clock-frequency = <97500>;

			interrupt-parent = <&bsc_intr>;

			interrupts = <1>;

			status = "disabled";

		};

	};
@@ -540,6 +570,7 @@ &dsi0 { 


&dsi1 {

	interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;

	compatible = "brcm,bcm2711-dsi1";

};



&gpio {

arch/arm/boot/dts/bcm21664.dtsi

+1 −1

File changed.

Contains only whitespace changes.