Commit 42027dfe authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

- Rafal specifies the switch ports for various Luxul devices (XAP-1410,
  XAP-1510, XAP-1610, XWC-1000, XWC-2000, XWR-1200, XWR-3100, XWR-3150)

- Krzysztof fixes the L2 cache controller node name to conform to
  dtschema

- Maxime introduces two new clock providers for Raspberry Pi 4, one to
  support firmware based clocks and another one for the DVP block
  feeding into the two HDMI blocks.

* tag 'arm-soc/for-5.9/devicetree' of https://github.com/Broadcom/stblinux:
  ARM: dts: bcm: Align L2 cache-controller nodename with dtschema
  ARM: dts: BCM5301X: Specify switch ports for Luxul devices
  ARM: dts: bcm2711: Add HDMI DVP
  ARM: dts: bcm2711: Add firmware clocks node

Link: https://lore.kernel.org/r/20200707045759.17562-1-f.fainelli@gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 67b25638 aee13efe

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

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ gic: interrupt-controller@21000 { 
			      <0x20100 0x100>;

		};



		L2: l2-cache@22000 {

		L2: cache-controller@22000 {

			compatible = "arm,pl310-cache";

			reg = <0x22000 0x1000>;

			cache-unified;

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

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ gic: interrupt-controller@21000 { 
			      <0x20100 0x100>;

		};



		L2: l2-cache@22000 {

		L2: cache-controller@22000 {

			compatible = "arm,pl310-cache";

			reg = <0x22000 0x1000>;

			cache-unified;

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

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ gic: interrupt-controller@21000 { 
			      <0x20100 0x100>;

		};



		L2: l2-cache@22000 {

		L2: cache-controller@22000 {

			compatible = "arm,pl310-cache";

			reg = <0x22000 0x1000>;

			cache-unified;

arch/arm/boot/dts/bcm21664.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ uart@3e002000 { 
		reg-io-width = <4>;

	};



	L2: l2-cache@3ff20000 {

	L2: cache-controller@3ff20000 {

		compatible = "arm,pl310-cache";

		reg = <0x3ff20000 0x1000>;

		cache-unified;

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

+5 −0
Original line number Diff line number Diff line
@@ -69,6 +69,11 @@ sd_vcc_reg: sd_vcc_reg { 
};



&firmware {

	firmware_clocks: clocks {

		compatible = "raspberrypi,firmware-clocks";

		#clock-cells = <1>;

	};



	expgpio: gpio {

		compatible = "raspberrypi,firmware-gpio";

		gpio-controller;