leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
ARMv8 Juno update for v5.5

Single patch to add support for Mali GPU on all versions of Juno.
Though it's disabled by default, it is very useful to test panfrost
drivers.

* tag 'juno-update-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux:
  arm64: dts: juno: add GPU subsystem

Link: https://lore.kernel.org/r/20191028040022.GC20568@e107533-lin.cambridge.arm.com
Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson
2019-10-28 08:52:40 -07:00
parent 960a02765a 577dd5de09
commit 49067a8a6f
2 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/devicetree/bindings/gpu/arm,mali-midgard.yaml
View File

@@ -22,6 +22,10 @@ properties:
- enum: - enum:
- amlogic,meson-gxm-mali - amlogic,meson-gxm-mali
- const: arm,mali-t820 - const: arm,mali-t820
- items:
- enum:
- arm,juno-mali
- const: arm,mali-t624
- items: - items:
- enum: - enum:
- rockchip,rk3288-mali - rockchip,rk3288-mali
@@ -39,7 +43,6 @@ properties:
- samsung,exynos5433-mali - samsung,exynos5433-mali
- const: arm,mali-t760 - const: arm,mali-t760
# "arm,mali-t624"
# "arm,mali-t628" # "arm,mali-t628"
# "arm,mali-t830" # "arm,mali-t830"
# "arm,mali-t880" # "arm,mali-t880"

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

@@ -35,6 +35,18 @@
clock-names = "apb_pclk"; clock-names = "apb_pclk";
}; };
smmu_gpu: iommu@2b400000 {
compatible = "arm,mmu-400", "arm,smmu-v1";
reg = <0x0 0x2b400000 0x0 0x10000>;
interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>;
#iommu-cells = <1>;
#global-interrupts = <1>;
power-domains = <&scpi_devpd 1>;
dma-coherent;
status = "disabled";
};
smmu_pcie: iommu@2b500000 { smmu_pcie: iommu@2b500000 {
compatible = "arm,mmu-401", "arm,smmu-v1"; compatible = "arm,mmu-401", "arm,smmu-v1";
reg = <0x0 0x2b500000 0x0 0x10000>; reg = <0x0 0x2b500000 0x0 0x10000>;
@@ -487,6 +499,21 @@
}; };
}; };
gpu: gpu@2d000000 {
compatible = "arm,juno-mali", "arm,mali-t624";
reg = <0 0x2d000000 0 0x10000>;
interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "gpu", "job", "mmu";
clocks = <&scpi_dvfs 2>;
power-domains = <&scpi_devpd 1>;
dma-coherent;
/* The SMMU is only really of interest to bare-metal hypervisors */
/* iommus = <&smmu_gpu 0>; */
status = "disabled";
};
sram: sram@2e000000 { sram: sram@2e000000 {
compatible = "arm,juno-sram-ns", "mmio-sram"; compatible = "arm,juno-sram-ns", "mmio-sram";
reg = <0x0 0x2e000000 0x0 0x8000>; reg = <0x0 0x2e000000 0x0 0x8000>;