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.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEm+Rq3+YGJdiR9yuFh9CWnEQHBwQFAl8EAJUACgkQh9CWnEQH
 BwR13BAAsujw+MtlaXOqwzZpALGcIWdffhNHolTz3Qx0gTz3Q5Jmm8KEz//PIuoO
 4NEBDMwbJPpHFewst1sQxINZx3f+FqO7SP3A2eKCYKcDStxasuYJHgXKylDLSGgG
 GDLDjQBXHzOqawzXejicn3flTwNMdsBg6l6hvFjA6NQbn4RcT+BgONOZaXqIQyof
 +TKqSZAkB5xu5V0axAq2A8VYtKvZy0sT8+4l/0x4/npgLAPluXJiXP4yPcfaWi5D
 vle5IUSEP0VbLF2pRTDzZHdbRC9+v2IiM2XSFSm8YlFLFu5LcqmQHexVQl/Ezqai
 n7apo7zyElk4dUwYYa99mTBrSq8VVN5+/7gsFqKed61zVnrR0aC/7ytOpXbLyeTP
 1oG9s6CwUY6S2vUw6wCEEg77q9VtYFBn3uN9UdrVQ5EUeKlIv4vp8rMhMdxhYko9
 cgdFy9CcSNAJUI5iWZ1A704hm1OBwXAktFrSIDXXru/9qIoZYlX5zrlYVPPknGiy
 dt0jTX38cYMPVXFl9EbOJcpjZZi9vN0iDyuX0034hFCDCoJHnaTxEV5cXOwLX4Wu
 2PbdCvMNwy/JNtYcaDiWQeNBBwZhM8fQR1V7hkKh9kHM+t9NSUQDwQDXzbgUGXiq
 dS3h1PeBSgUL7qtaSl27K2VavDabJYavOwspB3Bsb9U3iIyhFMU=
 =/iqx
 -----END PGP SIGNATURE-----

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: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2020-07-13 15:23:07 +02:00
Родитель 67b2563855 aee13efe44
Коммит 42027dfe59
14 изменённых файлов: 254 добавлений и 4 удалений

Просмотреть файл

@ -91,7 +91,7 @@
<0x20100 0x100>;
};
L2: l2-cache@22000 {
L2: cache-controller@22000 {
compatible = "arm,pl310-cache";
reg = <0x22000 0x1000>;
cache-unified;

Просмотреть файл

@ -104,7 +104,7 @@
<0x20100 0x100>;
};
L2: l2-cache@22000 {
L2: cache-controller@22000 {
compatible = "arm,pl310-cache";
reg = <0x22000 0x1000>;
cache-unified;

Просмотреть файл

@ -122,7 +122,7 @@
<0x20100 0x100>;
};
L2: l2-cache@22000 {
L2: cache-controller@22000 {
compatible = "arm,pl310-cache";
reg = <0x22000 0x1000>;
cache-unified;

Просмотреть файл

@ -90,7 +90,7 @@
reg-io-width = <4>;
};
L2: l2-cache@3ff20000 {
L2: cache-controller@3ff20000 {
compatible = "arm,pl310-cache";
reg = <0x3ff20000 0x1000>;
cache-unified;

Просмотреть файл

@ -69,6 +69,11 @@
};
&firmware {
firmware_clocks: clocks {
compatible = "raspberrypi,firmware-clocks";
#clock-cells = <1>;
};
expgpio: gpio {
compatible = "raspberrypi,firmware-gpio";
gpio-controller;

Просмотреть файл

@ -12,6 +12,13 @@
interrupt-parent = <&gicv2>;
clk_108MHz: clk-108M {
#clock-cells = <0>;
compatible = "fixed-clock";
clock-frequency = <108000000>;
clock-output-names = "108MHz-clock";
};
soc {
/*
* Defined ranges:
@ -244,6 +251,14 @@
hvs@7e400000 {
interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
};
dvp: clock@7ef00000 {
compatible = "brcm,brcm2711-dvp";
reg = <0x7ef00000 0x10>;
clocks = <&clk_108MHz>;
#clock-cells = <1>;
#reset-cells = <1>;
};
};
/*

Просмотреть файл

@ -60,3 +60,28 @@
&usb3_phy {
status = "okay";
};
&srab {
status = "okay";
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
label = "poe";
};
port@4 {
reg = <4>;
label = "lan";
};
port@5 {
reg = <5>;
label = "cpu";
ethernet = <&gmac0>;
};
};
};

Просмотреть файл

@ -67,3 +67,23 @@
&usb3_phy {
status = "okay";
};
&srab {
status = "okay";
ports {
#address-cells = <1>;
#size-cells = <0>;
port@4 {
reg = <4>;
label = "lan";
};
port@5 {
reg = <5>;
label = "cpu";
ethernet = <&gmac0>;
};
};
};

Просмотреть файл

@ -60,3 +60,23 @@
&usb3_phy {
status = "okay";
};
&srab {
status = "okay";
ports {
#address-cells = <1>;
#size-cells = <0>;
port@4 {
reg = <4>;
label = "poe";
};
port@5 {
reg = <5>;
label = "cpu";
ethernet = <&gmac0>;
};
};
};

Просмотреть файл

@ -108,3 +108,43 @@
&usb3_phy {
status = "okay";
};
&srab {
status = "okay";
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
label = "lan4";
};
port@1 {
reg = <1>;
label = "lan3";
};
port@2 {
reg = <2>;
label = "lan2";
};
port@3 {
reg = <3>;
label = "lan1";
};
port@4 {
reg = <4>;
label = "wan";
};
port@5 {
reg = <5>;
label = "cpu";
ethernet = <&gmac0>;
};
};
};

Просмотреть файл

@ -54,3 +54,28 @@
&spi_nor {
status = "okay";
};
&srab {
status = "okay";
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
label = "poe";
};
port@1 {
reg = <1>;
label = "lan";
};
port@5 {
reg = <5>;
label = "cpu";
ethernet = <&gmac0>;
};
};
};

Просмотреть файл

@ -51,3 +51,23 @@
&spi_nor {
status = "okay";
};
&srab {
status = "okay";
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
label = "lan";
};
port@5 {
reg = <5>;
label = "cpu";
ethernet = <&gmac0>;
};
};
};

Просмотреть файл

@ -103,3 +103,43 @@
&usb3_phy {
status = "okay";
};
&srab {
status = "okay";
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
label = "lan4";
};
port@1 {
reg = <1>;
label = "lan3";
};
port@2 {
reg = <2>;
label = "lan2";
};
port@3 {
reg = <3>;
label = "lan1";
};
port@4 {
reg = <4>;
label = "wan";
};
port@5 {
reg = <5>;
label = "cpu";
ethernet = <&gmac0>;
};
};
};

Просмотреть файл

@ -74,3 +74,43 @@
&spi_nor {
status = "okay";
};
&srab {
status = "okay";
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
label = "lan4";
};
port@1 {
reg = <1>;
label = "lan3";
};
port@2 {
reg = <2>;
label = "lan2";
};
port@3 {
reg = <3>;
label = "lan1";
};
port@4 {
reg = <4>;
label = "wan";
};
port@5 {
reg = <5>;
label = "cpu";
ethernet = <&gmac0>;
};
};
};