diff options
author | Tony Lindgren <tony@atomide.com> | 2019-12-17 09:34:14 -0800 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2019-12-17 09:34:14 -0800 |
commit | 54a751f623f54af53cfbb154b9c3a8bdcc43c9e2 (patch) | |
tree | 169b36d04edaac3720795bf231861cdff94f69d0 /arch/arm/boot/dts/omap5-l4.dtsi | |
parent | ARM: OMAP2+: Drop legacy platform data for omap4 fdif (diff) | |
parent | ARM: dts: omap5: convert IOMMUs to use ti-sysc (diff) | |
download | linux-dev-54a751f623f54af53cfbb154b9c3a8bdcc43c9e2.tar.xz linux-dev-54a751f623f54af53cfbb154b9c3a8bdcc43c9e2.zip |
Merge branch 'omap-for-v5.6/ti-sysc-dt' into omap-for-v5.6/ti-sysc-drop-pdata
Diffstat (limited to 'arch/arm/boot/dts/omap5-l4.dtsi')
-rw-r--r-- | arch/arm/boot/dts/omap5-l4.dtsi | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/omap5-l4.dtsi b/arch/arm/boot/dts/omap5-l4.dtsi index 5487ba2c2a17..b9d1f9c84588 100644 --- a/arch/arm/boot/dts/omap5-l4.dtsi +++ b/arch/arm/boot/dts/omap5-l4.dtsi @@ -349,7 +349,6 @@ target-module@66000 { /* 0x4a066000, ap 23 0a.0 */ compatible = "ti,sysc-omap2", "ti,sysc"; - ti,hwmods = "mmu_dsp"; reg = <0x66000 0x4>, <0x66010 0x4>, <0x66014 0x4>; @@ -364,12 +363,18 @@ /* Domains (V, P, C): mm, dsp_pwrdm, dsp_clkdm */ clocks = <&dsp_clkctrl OMAP5_MMU_DSP_CLKCTRL 0>; clock-names = "fck"; + resets = <&prm_dsp 1>; + reset-names = "rstctrl"; #address-cells = <1>; #size-cells = <1>; ranges = <0x0 0x66000 0x1000>; - /* mmu_dsp cannot be moved before reset driver */ - status = "disabled"; + mmu_dsp: mmu@0 { + 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 */ |