This pull request contains Broadcom ARM-based SoCs Device Tree fixes for
5.8, please pull the following: - Rafal adds a missing 'device_type' property to the Luxul XWC-2000 required for the memory nodes to be correctly parsed by Linux - Matthew provides two fixes for the NSP SoCs, one to disable the PL330 DMA controller by default since it can be left in reset by the bootloader and the second to correct the flow accelerator mailbox node -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEm+Rq3+YGJdiR9yuFh9CWnEQHBwQFAl7tHWoACgkQh9CWnEQH BwRDchAA2hFRfyOVO/HZR4g30bUBDAQ4jBfHGHHdMsH3EiGWwLJvxmMjc/1Bu41M 0lJgtr1D+CESY9CopV42l4c0tckPVyBpbmVAhlBKadkCOLfk6tuvZ3cKAxx6FA2g BMRvxx/dKQ5rhQu2AN43bw7izeLMvU0Pz3Tgtshd84A8ntXnP3ElaNqhtiAHsu83 OjpVpLebaK6eQxoeByZn/zoqmlKCHd3+8n/OTid5VWr4TdmlowK+ziJle7bAmaGi r5Cqqsfl03s0vca3NaDhQbmD05gQIkVzVSg64ujSFPG8GgqFscG4Zti8lRv4BJUZ 7HT+3bwiymx06czW1tG3kjDTz4ae5WyzgEabhfKGn4fcJUI49wtB4hdVZD3pjQXh sb8u4Pqy+CTGkrxX6U+8UNuav5JCqU52MtLBTFz98xuZsMnjFADxohx2pcKhgLpR eOkrUbz/jtesCbuT4UnhxE2mBsjQHrB8UB1/iknOO+7BA1ulRhpCjpHgkOdNeDvM dpOYIpj0p/YZaQaTztepyecdT7z9GwaOJ9Y+AQotSz8unhiEJpBLWK2Hz2j+PB1D oxnYtlG8fPObJmaw0dAfmsS2CXCsi+d88AmDOjaJNFbnfxXaVKyCHf8Ud3bxR0CV qitQkZlEr30NWxvP1s0jR+HHy3Q9phYMaf+KsRdBuTdCukePR9Y= =SUaO -----END PGP SIGNATURE----- Merge tag 'arm-soc/for-5.8/devicetree-fixes' of https://github.com/Broadcom/stblinux into arm/fixes This pull request contains Broadcom ARM-based SoCs Device Tree fixes for 5.8, please pull the following: - Rafal adds a missing 'device_type' property to the Luxul XWC-2000 required for the memory nodes to be correctly parsed by Linux - Matthew provides two fixes for the NSP SoCs, one to disable the PL330 DMA controller by default since it can be left in reset by the bootloader and the second to correct the flow accelerator mailbox node * tag 'arm-soc/for-5.8/devicetree-fixes' of https://github.com/Broadcom/stblinux: ARM: dts: NSP: Correct FA2 mailbox node ARM: dts: NSP: Disable PL330 by default, add dma-coherent property ARM: dts: BCM5301X: Add missing memory "device_type" for Luxul XWC-2000 Link: https://lore.kernel.org/r/20200619202250.19029-1-f.fainelli@gmail.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Коммит
275087fc3e
|
@ -200,7 +200,7 @@
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
};
|
};
|
||||||
|
|
||||||
dma@20000 {
|
dma: dma@20000 {
|
||||||
compatible = "arm,pl330", "arm,primecell";
|
compatible = "arm,pl330", "arm,primecell";
|
||||||
reg = <0x20000 0x1000>;
|
reg = <0x20000 0x1000>;
|
||||||
interrupts = <GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>,
|
interrupts = <GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
@ -215,6 +215,8 @@
|
||||||
clocks = <&iprocslow>;
|
clocks = <&iprocslow>;
|
||||||
clock-names = "apb_pclk";
|
clock-names = "apb_pclk";
|
||||||
#dma-cells = <1>;
|
#dma-cells = <1>;
|
||||||
|
dma-coherent;
|
||||||
|
status = "disabled";
|
||||||
};
|
};
|
||||||
|
|
||||||
sdio: sdhci@21000 {
|
sdio: sdhci@21000 {
|
||||||
|
@ -257,10 +259,10 @@
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
};
|
};
|
||||||
|
|
||||||
mailbox: mailbox@25000 {
|
mailbox: mailbox@25c00 {
|
||||||
compatible = "brcm,iproc-fa2-mbox";
|
compatible = "brcm,iproc-fa2-mbox";
|
||||||
reg = <0x25000 0x445>;
|
reg = <0x25c00 0x400>;
|
||||||
interrupts = <GIC_SPI 150 IRQ_TYPE_LEVEL_HIGH>;
|
interrupts = <GIC_SPI 151 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
#mbox-cells = <1>;
|
#mbox-cells = <1>;
|
||||||
brcm,rx-status-len = <32>;
|
brcm,rx-status-len = <32>;
|
||||||
brcm,use-bcm-hdr;
|
brcm,use-bcm-hdr;
|
||||||
|
|
|
@ -17,6 +17,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
memory {
|
memory {
|
||||||
|
device_type = "memory";
|
||||||
reg = <0x00000000 0x08000000
|
reg = <0x00000000 0x08000000
|
||||||
0x88000000 0x18000000>;
|
0x88000000 0x18000000>;
|
||||||
};
|
};
|
||||||
|
|
|
@ -58,6 +58,10 @@
|
||||||
|
|
||||||
/* USB 3 support needed to be complete */
|
/* USB 3 support needed to be complete */
|
||||||
|
|
||||||
|
&dma {
|
||||||
|
status = "okay";
|
||||||
|
};
|
||||||
|
|
||||||
&amac0 {
|
&amac0 {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
};
|
};
|
||||||
|
|
|
@ -58,6 +58,10 @@
|
||||||
|
|
||||||
/* USB 3 support needed to be complete */
|
/* USB 3 support needed to be complete */
|
||||||
|
|
||||||
|
&dma {
|
||||||
|
status = "okay";
|
||||||
|
};
|
||||||
|
|
||||||
&amac0 {
|
&amac0 {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
};
|
};
|
||||||
|
|
|
@ -58,6 +58,10 @@
|
||||||
|
|
||||||
/* XHCI support needed to be complete */
|
/* XHCI support needed to be complete */
|
||||||
|
|
||||||
|
&dma {
|
||||||
|
status = "okay";
|
||||||
|
};
|
||||||
|
|
||||||
&amac0 {
|
&amac0 {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
};
|
};
|
||||||
|
|
|
@ -58,6 +58,10 @@
|
||||||
|
|
||||||
/* USB 3 and SLIC support needed to be complete */
|
/* USB 3 and SLIC support needed to be complete */
|
||||||
|
|
||||||
|
&dma {
|
||||||
|
status = "okay";
|
||||||
|
};
|
||||||
|
|
||||||
&amac0 {
|
&amac0 {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
};
|
};
|
||||||
|
|
|
@ -58,6 +58,10 @@
|
||||||
|
|
||||||
/* USB 3 and SLIC support needed to be complete */
|
/* USB 3 and SLIC support needed to be complete */
|
||||||
|
|
||||||
|
&dma {
|
||||||
|
status = "okay";
|
||||||
|
};
|
||||||
|
|
||||||
&amac0 {
|
&amac0 {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
};
|
};
|
||||||
|
|
|
@ -69,6 +69,10 @@
|
||||||
status = "okay";
|
status = "okay";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
&dma {
|
||||||
|
status = "okay";
|
||||||
|
};
|
||||||
|
|
||||||
&amac0 {
|
&amac0 {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
};
|
};
|
||||||
|
|
|
@ -48,6 +48,10 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
&dma {
|
||||||
|
status = "okay";
|
||||||
|
};
|
||||||
|
|
||||||
&amac0 {
|
&amac0 {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
};
|
};
|
||||||
|
|
Загрузка…
Ссылка в новой задаче