ARM: dts: omap4: convert IOMMUs to use ti-sysc
Convert omap4 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:
parent
3e4120b9c0
commit
22f8d6649d
|
@ -321,7 +321,6 @@
|
||||||
|
|
||||||
target-module@66000 { /* 0x4a066000, ap 25 26.0 */
|
target-module@66000 { /* 0x4a066000, ap 25 26.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>;
|
||||||
|
@ -335,12 +334,18 @@
|
||||||
/* Domains (V, P, C): iva, tesla_pwrdm, tesla_clkdm */
|
/* Domains (V, P, C): iva, tesla_pwrdm, tesla_clkdm */
|
||||||
clocks = <&tesla_clkctrl OMAP4_DSP_CLKCTRL 0>;
|
clocks = <&tesla_clkctrl OMAP4_DSP_CLKCTRL 0>;
|
||||||
clock-names = "fck";
|
clock-names = "fck";
|
||||||
|
resets = <&prm_tesla 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>;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -173,14 +173,6 @@
|
||||||
#gpio-cells = <2>;
|
#gpio-cells = <2>;
|
||||||
};
|
};
|
||||||
|
|
||||||
mmu_dsp: mmu@4a066000 {
|
|
||||||
compatible = "ti,omap4-iommu";
|
|
||||||
reg = <0x4a066000 0x100>;
|
|
||||||
interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
|
|
||||||
ti,hwmods = "mmu_dsp";
|
|
||||||
#iommu-cells = <0>;
|
|
||||||
};
|
|
||||||
|
|
||||||
target-module@52000000 {
|
target-module@52000000 {
|
||||||
compatible = "ti,sysc-omap4", "ti,sysc";
|
compatible = "ti,sysc-omap4", "ti,sysc";
|
||||||
ti,hwmods = "iss";
|
ti,hwmods = "iss";
|
||||||
|
@ -206,14 +198,35 @@
|
||||||
/* No child device binding, driver in staging */
|
/* No child device binding, driver in staging */
|
||||||
};
|
};
|
||||||
|
|
||||||
mmu_ipu: mmu@55082000 {
|
target-module@55082000 {
|
||||||
compatible = "ti,omap4-iommu";
|
compatible = "ti,sysc-omap2", "ti,sysc";
|
||||||
reg = <0x55082000 0x100>;
|
reg = <0x55082000 0x4>,
|
||||||
interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;
|
<0x55082010 0x4>,
|
||||||
ti,hwmods = "mmu_ipu";
|
<0x55082014 0x4>;
|
||||||
#iommu-cells = <0>;
|
reg-names = "rev", "sysc", "syss";
|
||||||
ti,iommu-bus-err-back;
|
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 = <&ducati_clkctrl OMAP4_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@0 {
|
||||||
|
compatible = "ti,omap4-iommu";
|
||||||
|
reg = <0x0 0x100>;
|
||||||
|
interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
|
#iommu-cells = <0>;
|
||||||
|
ti,iommu-bus-err-back;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
target-module@4012c000 {
|
target-module@4012c000 {
|
||||||
compatible = "ti,sysc-omap4", "ti,sysc";
|
compatible = "ti,sysc-omap4", "ti,sysc";
|
||||||
ti,hwmods = "slimbus1";
|
ti,hwmods = "slimbus1";
|
||||||
|
|
Loading…
Reference in a new issue