Unverified Commit 75c36d43 authored by Florian Fainelli's avatar Florian Fainelli
Browse files

Merge tag 'tags/bcm2835-dt-next-2021-01-25' into devicetree/next 



Add DSI compatible string for Raspberry Pi 4

Enable BSC controller used for HDMI DCC

Add reserved memory node to expose Raspberry Pi 4's bootloader configuration

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
parents 5c8fe583 5878b808

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

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

		ethernet0 = &genet;

		pcie0 = &pcie0;

		blconfig = &blconfig;

	};



	leds {
@@ -218,6 +219,22 @@ 
	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

+13 −0
Original line number Diff line number Diff line
@@ -308,6 +308,14 @@ 
			#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>;

		};



		hdmi0: hdmi@7ef00700 {

			compatible = "brcm,bcm2711-hdmi0";

			reg = <0x7ef00700 0x300>,
@@ -341,6 +349,8 @@ 
			reg = <0x7ef04500 0x100>, <0x7ef00b00 0x300>;

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

			clock-frequency = <97500>;

			interrupt-parent = <&bsc_intr>;

			interrupts = <0>;

			status = "disabled";

		};
@@ -377,6 +387,8 @@ 
			reg = <0x7ef09500 0x100>, <0x7ef05b00 0x300>;

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

			clock-frequency = <97500>;

			interrupt-parent = <&bsc_intr>;

			interrupts = <1>;

			status = "disabled";

		};

	};
@@ -540,6 +552,7 @@ 


&dsi1 {

	interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;

	compatible = "brcm,bcm2711-dsi1";

};



&gpio {