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 -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEm+Rq3+YGJdiR9yuFh9CWnEQHBwQFAmAXK2UACgkQh9CWnEQH BwTv+A/+MnlGGlEi+WiyttD2MPuTyxq8ZB6m/3kmwIaA+SkupYfB80WvQ63SB1+A F8L+iEbDEKkXSR7zyfGuYdnE3k51uPM1KOUW2vePrtGvuc1DiO/aSzBb6j55uJKD bkoOP2hgLZHUB4zEjgVKYTdZqBvGMlMCW6DeaA6D2OC7RsMgPVCC4/3TuU5KX6k5 n5mSc337oFhXZIz/Ly/mCqjxrxmvSgAI8TOLM/Hnadhe4MphzBoNIttRNpL92N9C qEVJQZSP/v9Nn/4HAdoR6yuNodqh0K7s1MKSc1nOyO33lhpxGIHzeBJWswD5B9og Pm6n/TUsR+mhuLk8BcI9T397h7yta2ztICXbBiUEAkd0V+XEEwacxLLFFlsFqOm7 HjCYu06hzaikNlHgd4+rRvXLQxZx6UQDMsYm4ab8D5mGlJ65KbV65/z4kouGrVpL Dhx3X0HI/vZuDE5Stxml6Lw7biIVwx0q7OZfSB/vuHHDT5S0gSFixNtXsUpnQHWu U/K++VRqgWwGb2KyaT8EYPwEL6hjCnkKkFiGj0LXXiHC7dvebJ+WxcUmgcQ4Rj0f ezZil+v75K23Ktq2XTrkc3/ho1Kz9643w0zrfzy6hucCSERDUWB59rX/XFEmtRSt SXyfODoi4SM0eHHg7TSLeVrLe+w2LxPvz0DJbF1agWppJ6uay9I= =VFVR -----END PGP SIGNATURE----- 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: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
commit
af6e05f171
|
|
@ -27,7 +27,7 @@
|
|||
bootargs = "console=ttyS0,115200n8";
|
||||
};
|
||||
|
||||
cpus {
|
||||
cpus {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
|
||||
|
|
|
|||
|
|
@ -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>;
|
||||
|
|
|
|||
|
|
@ -308,6 +308,22 @@
|
|||
#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 @@
|
|||
"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 @@
|
|||
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 @@
|
|||
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 @@
|
|||
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 @@
|
|||
|
||||
&dsi1 {
|
||||
interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
|
||||
compatible = "brcm,bcm2711-dsi1";
|
||||
};
|
||||
|
||||
&gpio {
|
||||
|
|
|
|||
Loading…
Reference in New Issue