From patchwork Wed Aug 28 07:56:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tero Kristo X-Patchwork-Id: 172347 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp396556ily; Wed, 28 Aug 2019 00:57:14 -0700 (PDT) X-Google-Smtp-Source: APXvYqxIpFhOB+LlFnd+DJ/YkfR1yJfsjx4FxeXGyZfjnQDIWb2tbWLNo3EQB8Q38R9/2SKHx8Fk X-Received: by 2002:a17:902:f24:: with SMTP id 33mr2938990ply.309.1566979034885; Wed, 28 Aug 2019 00:57:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566979034; cv=none; d=google.com; s=arc-20160816; b=Zz80/Xu/FNhlGgyzQSXhHngKg9Ncxainr/X8Uke/ADehYpin2pScaojVo10skUsmPX KNofKGmy7qS//cWguBatRrcEsSMWD4t5h8lVewRL842Q5gQY/1gjQjx5u90ybYxjziFY iLhCQfOc206GHMI4g8c9RvMogb3jm+Bx7UbsBhe4MXiB1ccjGz9CnLajME0YbP3gTKXb u9GSNFajxhu7nW47wOE3sN+cLt2dF21IEC+h+9HB65MhanWPJ+Iyj8P+QV6TH8SkhHCJ 0fUEYoz2gMcAUaYpcOJU6sUd/uYvZ7oG9iq0NORYT6c1c95kjCfOvF/PYU3T3IbNJGb6 bBGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=gdGNt8Bd4D3tOazg61iqzY4jL5JivnDdetottPmFFxY=; b=tF9osXyLm3H4iKWou/kGQV4QA+QCqpuv42EH9Nb7GISHiW5mo8EqlEOk15sBMczm9f 9PYMCWs/5cKovd+ALb2sDRTkHfIoQiURbJXCa0wEctBNliRaLGDDM9T5yslM3ipZkqbu VUJ/+yVjXz+vfuCtbRZfTXaDUcFFrO81pOCe8tiZaw2Smezk3b9U5x1vEoGM/T12tevx YHJtPlAv8yMt3YsWuyjOMwAGLiL6wEwghGmEjeb1bFAkErU8M4SeVgMiK4+tOdRDtY0J OF184lHFD2wmG0gAHwHPlSILPhCAgeY2ge2888SNpOEJ+6bV4pDupHXIyNv8N6WYZmiQ bkww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=yZLlUsyN; spf=pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-omap-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e8si1256163pjw.86.2019.08.28.00.57.14; Wed, 28 Aug 2019 00:57:14 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=yZLlUsyN; spf=pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-omap-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726463AbfH1H5N (ORCPT + 5 others); Wed, 28 Aug 2019 03:57:13 -0400 Received: from fllv0015.ext.ti.com ([198.47.19.141]:48498 "EHLO fllv0015.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726437AbfH1H5N (ORCPT ); Wed, 28 Aug 2019 03:57:13 -0400 Received: from fllv0034.itg.ti.com ([10.64.40.246]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id x7S7v9kS014940; Wed, 28 Aug 2019 02:57:09 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1566979029; bh=gdGNt8Bd4D3tOazg61iqzY4jL5JivnDdetottPmFFxY=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=yZLlUsyNd3RG0FDRjfy+iA7z2Wq7qFdt+gtKqMrRitq07hQJjQw+ArASwxWDLT5sM dfa59sZFk0+y/ratrTQWxmSYIjsS57RCbXY1wOqx7MlXH31wqpy087Dx1kaDmWyoZ0 zymYOGTxNHuDm7OoCUqUyqJlfpxXZEH6Ta4h3GKM= Received: from DFLE109.ent.ti.com (dfle109.ent.ti.com [10.64.6.30]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id x7S7v9rV072447 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 28 Aug 2019 02:57:09 -0500 Received: from DFLE111.ent.ti.com (10.64.6.32) by DFLE109.ent.ti.com (10.64.6.30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5; Wed, 28 Aug 2019 02:57:09 -0500 Received: from lelv0327.itg.ti.com (10.180.67.183) by DFLE111.ent.ti.com (10.64.6.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5 via Frontend Transport; Wed, 28 Aug 2019 02:57:09 -0500 Received: from sokoban.bb.dnainternet.fi (ileax41-snat.itg.ti.com [10.172.224.153]) by lelv0327.itg.ti.com (8.15.2/8.15.2) with ESMTP id x7S7uuFr107124; Wed, 28 Aug 2019 02:57:08 -0500 From: Tero Kristo To: , CC: , Subject: [PATCH 08/10] ARM: dts: dra74x: convert IOMMUs to use ti-sysc Date: Wed, 28 Aug 2019 10:56:42 +0300 Message-ID: <20190828075644.4493-9-t-kristo@ti.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190828075644.4493-1-t-kristo@ti.com> References: <20190828075644.4493-1-t-kristo@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org Convert dra74x IOMMUs to use ti-sysc instead of legacy omap-hwmod based implementation. Enable the IOMMUs also while doing this. Signed-off-by: Tero Kristo --- arch/arm/boot/dts/dra74x.dtsi | 71 +++++++++++++++++++++++++++-------- 1 file changed, 55 insertions(+), 16 deletions(-) -- 2.17.1 -- Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki diff --git a/arch/arm/boot/dts/dra74x.dtsi b/arch/arm/boot/dts/dra74x.dtsi index d1b5b76bc5a8..c5abc436ca1f 100644 --- a/arch/arm/boot/dts/dra74x.dtsi +++ b/arch/arm/boot/dts/dra74x.dtsi @@ -66,24 +66,63 @@ }; }; - mmu0_dsp2: mmu@41501000 { - compatible = "ti,dra7-dsp-iommu"; - reg = <0x41501000 0x100>; - interrupts = ; - ti,hwmods = "mmu0_dsp2"; - #iommu-cells = <0>; - ti,syscon-mmuconfig = <&dsp2_system 0x0>; - status = "disabled"; + target-module@41501000 { + compatible = "ti,sysc-omap2", "ti,sysc"; + reg = <0x41501000 0x4>, + <0x41501010 0x4>, + <0x41501014 0x4>; + reg-names = "rev", "sysc", "syss"; + ti,sysc-sidle = , + , + ; + ti,sysc-mask = <(SYSC_OMAP2_CLOCKACTIVITY | + SYSC_OMAP2_SOFTRESET | + SYSC_OMAP2_AUTOIDLE)>; + clocks = <&dsp2_clkctrl DRA7_DSP2_MMU0_DSP2_CLKCTRL 0>; + clock-names = "fck"; + resets = <&prm_dsp2 1>; + reset-names = "rstctrl"; + ranges = <0x0 0x41501000 0x1000>; + #size-cells = <1>; + #address-cells = <1>; + + mmu0_dsp2: mmu@0 { + compatible = "ti,dra7-dsp-iommu"; + reg = <0x0 0x100>; + interrupts = ; + #iommu-cells = <0>; + ti,syscon-mmuconfig = <&dsp2_system 0x0>; + }; }; - mmu1_dsp2: mmu@41502000 { - compatible = "ti,dra7-dsp-iommu"; - reg = <0x41502000 0x100>; - interrupts = ; - ti,hwmods = "mmu1_dsp2"; - #iommu-cells = <0>; - ti,syscon-mmuconfig = <&dsp2_system 0x1>; - status = "disabled"; + target-module@41502000 { + compatible = "ti,sysc-omap2", "ti,sysc"; + reg = <0x41502000 0x4>, + <0x41502010 0x4>, + <0x41502014 0x4>; + reg-names = "rev", "sysc", "syss"; + ti,sysc-sidle = , + , + ; + ti,sysc-mask = <(SYSC_OMAP2_CLOCKACTIVITY | + SYSC_OMAP2_SOFTRESET | + SYSC_OMAP2_AUTOIDLE)>; + + clocks = <&dsp2_clkctrl DRA7_DSP2_MMU0_DSP2_CLKCTRL 0>; + clock-names = "fck"; + resets = <&prm_dsp2 1>; + reset-names = "rstctrl"; + ranges = <0x0 0x41502000 0x1000>; + #size-cells = <1>; + #address-cells = <1>; + + mmu1_dsp2: mmu@0 { + compatible = "ti,dra7-dsp-iommu"; + reg = <0x0 0x100>; + interrupts = ; + #iommu-cells = <0>; + ti,syscon-mmuconfig = <&dsp2_system 0x1>; + }; }; }; };