mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-10 11:38:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'juno-updates-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into arm/dt

Browse Source 
ARMv8 Juno updates for v5.13

Couple of changes to describe PCI dma-ranges correctly which was
previously removed and to enable the PCIe and DMA SMMU.

* tag 'juno-updates-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux:
  arm64: dts: juno: Enable more SMMUs
  arm64: dts: juno: Describe PCI dma-ranges

Link: https://lore.kernel.org/r/20210331100410.cenuhvpqoumvsk52@bogus
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
2021-04-01 21:42:56 +02:00
parent d2adc561c9 d9df28ba58
commit 45f174d8a1
3 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm64/boot/dts/arm/juno-base.dtsi
View File

@@ -544,6 +544,10 @@ pcie_ctlr: pcie@40000000 {
ranges = <0x01000000 0x00 0x00000000 0x00 0x5f800000 0x0 0x00800000>,
<0x02000000 0x00 0x50000000 0x00 0x50000000 0x0 0x08000000>,
<0x42000000 0x40 0x00000000 0x40 0x00000000 0x1 0x00000000>;
/* Standard AXI Translation entries as programmed by EDK2 */
dma-ranges = <0x02000000 0x0 0x2c1c0000 0x0 0x2c1c0000 0x0 0x00040000>,
<0x02000000 0x0 0x80000000 0x0 0x80000000 0x0 0x80000000>,
<0x43000000 0x8 0x00000000 0x8 0x00000000 0x2 0x00000000>;
#interrupt-cells = <1>;
interrupt-map-mask = <0 0 0 7>;
interrupt-map = <0 0 0 1 &gic 0 GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>,
@@ -640,7 +644,6 @@ smmu_dma: iommu@7fb00000 {
#iommu-cells = <1>;
#global-interrupts = <1>;
dma-coherent;
status = "disabled";
};
smmu_hdlcd1: iommu@7fb10000 {

4
arch/arm64/boot/dts/arm/juno-r1.dts
View File

@@ -230,6 +230,10 @@ &pcie_ctlr {
status = "okay";
};
&smmu_pcie {
status = "okay";
};
&etm0 {
cpu = <&A57_0>;
};

4
arch/arm64/boot/dts/arm/juno-r2.dts
View File

@@ -236,6 +236,10 @@ &pcie_ctlr {
status = "okay";
};
&smmu_pcie {
status = "okay";
};
&etm0 {
cpu = <&A72_0>;
};