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

ARM: dts: omap5: convert IOMMUs to use ti-sysc

Browse Source 
Convert omap5 IOMMUs to use ti-sysc instead of legacy omap-hwmod based
implementation. Enable the IOMMUs also while doing this.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Tero Kristo 2019-12-12 14:51:21 +02:00 committed by Tony Lindgren
parent 22f8d6649d
commit a6c8056d2f
2 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/arm/boot/dts/omap5-l4.dtsi
View File

@ -349,7 +349,6 @@
target-module@66000 { /* 0x4a066000, ap 23 0a.0 */ target-module@66000 { /* 0x4a066000, ap 23 0a.0 */
compatible = "ti,sysc-omap2", "ti,sysc"; compatible = "ti,sysc-omap2", "ti,sysc";
ti,hwmods = "mmu_dsp";
reg = <0x66000 0x4>, reg = <0x66000 0x4>,
<0x66010 0x4>, <0x66010 0x4>,
<0x66014 0x4>; <0x66014 0x4>;
@ -364,12 +363,18 @@
/* Domains (V, P, C): mm, dsp_pwrdm, dsp_clkdm */ /* Domains (V, P, C): mm, dsp_pwrdm, dsp_clkdm */
clocks = <&dsp_clkctrl OMAP5_MMU_DSP_CLKCTRL 0>; clocks = <&dsp_clkctrl OMAP5_MMU_DSP_CLKCTRL 0>;
clock-names = "fck"; clock-names = "fck";
resets = <&prm_dsp 1>;
reset-names = "rstctrl";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
ranges = <0x0 0x66000 0x1000>; ranges = <0x0 0x66000 0x1000>;
/* mmu_dsp cannot be moved before reset driver */ mmu_dsp: mmu@0 {
status = "disabled"; compatible = "ti,omap4-iommu";
reg = <0x0 0x100>;
interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
#iommu-cells = <0>;
};
}; };
target-module@70000 { /* 0x4a070000, ap 79 2e.0 */ target-module@70000 { /* 0x4a070000, ap 79 2e.0 */

40
arch/arm/boot/dts/omap5.dtsi
View File

@ -186,21 +186,33 @@
#gpio-cells = <2>; #gpio-cells = <2>;
}; };
mmu_dsp: mmu@4a066000 { target-module@55082000 {
compatible = "ti,omap4-iommu"; compatible = "ti,sysc-omap2", "ti,sysc";
reg = <0x4a066000 0x100>; reg = <0x55082000 0x4>,
interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>; <0x55082010 0x4>,
ti,hwmods = "mmu_dsp"; <0x55082014 0x4>;
#iommu-cells = <0>; reg-names = "rev", "sysc", "syss";
}; ti,sysc-sidle = <SYSC_IDLE_FORCE>,
<SYSC_IDLE_NO>,
<SYSC_IDLE_SMART>;
ti,sysc-mask = <(SYSC_OMAP2_CLOCKACTIVITY |
SYSC_OMAP2_SOFTRESET |
SYSC_OMAP2_AUTOIDLE)>;
clocks = <&ipu_clkctrl OMAP5_MMU_IPU_CLKCTRL 0>;
clock-names = "fck";
resets = <&prm_core 2>;
reset-names = "rstctrl";
ranges = <0x0 0x55082000 0x100>;
#size-cells = <1>;
#address-cells = <1>;
mmu_ipu: mmu@55082000 { mmu_ipu: mmu@0 {
compatible = "ti,omap4-iommu"; compatible = "ti,omap4-iommu";
reg = <0x55082000 0x100>; reg = <0x0 0x100>;
interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;
ti,hwmods = "mmu_ipu"; #iommu-cells = <0>;
#iommu-cells = <0>; ti,iommu-bus-err-back;
ti,iommu-bus-err-back; };
}; };
dmm@4e000000 { dmm@4e000000 {