From patchwork Wed Aug 28 07:56:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tero Kristo X-Patchwork-Id: 172348 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp396577ily; Wed, 28 Aug 2019 00:57:16 -0700 (PDT) X-Google-Smtp-Source: APXvYqwPrlzga1+8w7xJ5uld5e2wY0sxBkhcyoFM905vE3lEkLAYsiL5Oh+8+F168HaW+UntbJt8 X-Received: by 2002:aa7:8acb:: with SMTP id b11mr3019522pfd.109.1566979036734; Wed, 28 Aug 2019 00:57:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566979036; cv=none; d=google.com; s=arc-20160816; b=hLaRsIJSdlaJtgzT+mdBwG7SEO9Abqj+bkIp0sWPxLHGmyBVX8hnN2UjuqMOZjf7DD 9v0tR9vIghY4VCXY5e1civ0ykft35RszfVpETsyGeyQAVlNW5ce+wZ23rC1/0F/xh8EU Indl6k+A62+onLtRnUuDf05rCUAhpR/EUgtEzT9keji+hL9C/6I/n+cWexPi5ILZPBvH twXsnWzR3kgLwEj15ahO27+izFuuATbqZkOg7NMdH+ddmqSczWvrN8AL2RvpNnWuEAYm lvRWxVWErmBTMrqJfXBPTwRkwrwPJMsr9X2t/L8AHOVbJr3GHdKlfwsINEGw9+JZ8ALD XSGA== 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=5yW8fV2aU6cp78IZNk82SS1ovC+9UqCNq1P3T0ks24o=; b=SHtW/eK8Kpmp9rF67k7U+vpy1EHNhXGdjO6WO/AJOc1GXn22uwltZJAoQMC2mkiN2E OThytg8D7AgFqL5PgnFwH+zAg8XuyNU526iUEriJE6XpZOoIMwOSH7dOWUaOLFdW32dr QUdPoCdabgUvvsIi0hYM5JvbzZrmD33Lqw6gm6e3YswIWMPzEPmymJ77C+eU+nC377AH fNn2//jNSN6g18X6adq+wHD/XlTsgoL847+v9k9OcFFownNOBiW5T3AJwFnWV68OZZqt lAOtGrtCDR/kvEAnEV7/4u6444uLIALpQwtp5kUL8suTHn3sIjafrXaod3t7uPt0UlMV UP4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=WTjatuQZ; 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.16; Wed, 28 Aug 2019 00:57:16 -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=WTjatuQZ; 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 S1726437AbfH1H5Q (ORCPT + 5 others); Wed, 28 Aug 2019 03:57:16 -0400 Received: from lelv0143.ext.ti.com ([198.47.23.248]:37178 "EHLO lelv0143.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726432AbfH1H5P (ORCPT ); Wed, 28 Aug 2019 03:57:15 -0400 Received: from fllv0035.itg.ti.com ([10.64.41.0]) by lelv0143.ext.ti.com (8.15.2/8.15.2) with ESMTP id x7S7vBIU127680; Wed, 28 Aug 2019 02:57:11 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1566979031; bh=5yW8fV2aU6cp78IZNk82SS1ovC+9UqCNq1P3T0ks24o=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=WTjatuQZFbOkDItcdVs8lF25JbP8N1+tRMJ0V1iSmb6dMu8b5PF5JUBFbzr5SwWDB sZMMKI0lNVEhjXUSjP2UxuUQfE457FWBOWoHZG9PHsYcX06nc/mU/WI3KfV8qSrVFb GM3G0WskhfwnnrFeJNr0WyDZMAZ7hvOlZEY7LIKY= Received: from DFLE109.ent.ti.com (dfle109.ent.ti.com [10.64.6.30]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id x7S7vA9I124390 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 28 Aug 2019 02:57:10 -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:10 -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:10 -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 x7S7uuFs107124; Wed, 28 Aug 2019 02:57:09 -0500 From: Tero Kristo To: , CC: , Subject: [PATCH 09/10] ARM: dts: omap4: convert IOMMUs to use ti-sysc Date: Wed, 28 Aug 2019 10:56:43 +0300 Message-ID: <20190828075644.4493-10-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 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 --- arch/arm/boot/dts/omap4-l4.dtsi | 11 ++++++--- arch/arm/boot/dts/omap4.dtsi | 43 +++++++++++++++++++++------------ 2 files changed, 36 insertions(+), 18 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/omap4-l4.dtsi b/arch/arm/boot/dts/omap4-l4.dtsi index 0977bc39955b..7eca6cdbbdd9 100644 --- a/arch/arm/boot/dts/omap4-l4.dtsi +++ b/arch/arm/boot/dts/omap4-l4.dtsi @@ -321,7 +321,6 @@ target-module@66000 { /* 0x4a066000, ap 25 26.0 */ compatible = "ti,sysc-omap2", "ti,sysc"; - ti,hwmods = "mmu_dsp"; reg = <0x66000 0x4>, <0x66010 0x4>, <0x66014 0x4>; @@ -335,12 +334,18 @@ /* Domains (V, P, C): iva, tesla_pwrdm, tesla_clkdm */ clocks = <&tesla_clkctrl OMAP4_DSP_CLKCTRL 0>; clock-names = "fck"; + resets = <&prm_tesla 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 = ; + #iommu-cells = <0>; + }; }; }; diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi index e377f66fc322..f28fe1c36b0c 100644 --- a/arch/arm/boot/dts/omap4.dtsi +++ b/arch/arm/boot/dts/omap4.dtsi @@ -173,14 +173,6 @@ #gpio-cells = <2>; }; - mmu_dsp: mmu@4a066000 { - compatible = "ti,omap4-iommu"; - reg = <0x4a066000 0x100>; - interrupts = ; - ti,hwmods = "mmu_dsp"; - #iommu-cells = <0>; - }; - target-module@52000000 { compatible = "ti,sysc-omap4", "ti,sysc"; ti,hwmods = "iss"; @@ -206,14 +198,35 @@ /* No child device binding, driver in staging */ }; - mmu_ipu: mmu@55082000 { - compatible = "ti,omap4-iommu"; - reg = <0x55082000 0x100>; - interrupts = ; - ti,hwmods = "mmu_ipu"; - #iommu-cells = <0>; - ti,iommu-bus-err-back; + target-module@55082000 { + compatible = "ti,sysc-omap2", "ti,sysc"; + reg = <0x55082000 0x4>, + <0x55082010 0x4>, + <0x55082014 0x4>; + reg-names = "rev", "sysc", "syss"; + ti,sysc-sidle = , + , + ; + 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 = ; + #iommu-cells = <0>; + ti,iommu-bus-err-back; + }; }; + target-module@4012c000 { compatible = "ti,sysc-omap4", "ti,sysc"; ti,hwmods = "slimbus1";