From patchwork Wed Oct 21 11:47:07 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 55380 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f197.google.com (mail-wi0-f197.google.com [209.85.212.197]) by patches.linaro.org (Postfix) with ESMTPS id 11E6523024 for ; Wed, 21 Oct 2015 11:49:37 +0000 (UTC) Received: by wikv3 with SMTP id v3sf19697597wik.1 for ; Wed, 21 Oct 2015 04:49:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=xVo+tBNgjVElw8SDxVxrZF8mJ71RpwlyPzfjqpDlgqw=; b=OA/bPD30VJKYkQOZEgsuxqwMQgAJj4e6QXXgdd0YmG7FJPFyBAXTBiNn3L2chVly5P uFBQhRahivUmix4TYPw32HWRYlohUrRN/WUFUqO0FQCvGsqSqUYl21b8T3XkXpmxtGIN C1lzRsHUjORvQiEWWKQqHlAXjCGsUC0bbkzn0wPnkSmcORPLQwnYy2grLTgFpuBkE3e9 UBw5UVXTD2eYu5SIXy1T/VBFPatLeAQetfYa1ELBF42wAIorb+RqNISWIiEfSzJ5MvCB 1YurpjVEXXquKtwv94y8wtWJkEIWjyIL8nYoZePoqIw7uXhtSacEx9Y08eygFTZITHCN T52g== X-Gm-Message-State: ALoCoQmCS66727bHWmug6QKragMpX3t7kOTFm7/jEE5pV25jdJ/DHbkaBPx+4q5OYtQ5nz7FHoXO X-Received: by 10.112.198.33 with SMTP id iz1mr2047817lbc.8.1445428175986; Wed, 21 Oct 2015 04:49:35 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.18.90 with SMTP id h87ls216823lfi.9.gmail; Wed, 21 Oct 2015 04:49:35 -0700 (PDT) X-Received: by 10.25.160.133 with SMTP id j127mr3190880lfe.85.1445428175823; Wed, 21 Oct 2015 04:49:35 -0700 (PDT) Received: from mail-lf0-f44.google.com (mail-lf0-f44.google.com. [209.85.215.44]) by mx.google.com with ESMTPS id j184si2081296lfg.116.2015.10.21.04.49.35 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Oct 2015 04:49:35 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) client-ip=209.85.215.44; Received: by lffz202 with SMTP id z202so19677794lff.3 for ; Wed, 21 Oct 2015 04:49:35 -0700 (PDT) X-Received: by 10.25.77.17 with SMTP id a17mr233345lfb.19.1445428175703; Wed, 21 Oct 2015 04:49:35 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.59.35 with SMTP id w3csp2645691lbq; Wed, 21 Oct 2015 04:49:34 -0700 (PDT) X-Received: by 10.66.122.98 with SMTP id lr2mr10136243pab.146.1445428174682; Wed, 21 Oct 2015 04:49:34 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q1si12808929par.200.2015.10.21.04.49.34; Wed, 21 Oct 2015 04:49:34 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754793AbbJULtX (ORCPT + 28 others); Wed, 21 Oct 2015 07:49:23 -0400 Received: from mail-wi0-f179.google.com ([209.85.212.179]:34366 "EHLO mail-wi0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754687AbbJULtU (ORCPT ); Wed, 21 Oct 2015 07:49:20 -0400 Received: by wikq8 with SMTP id q8so89585150wik.1 for ; Wed, 21 Oct 2015 04:49:19 -0700 (PDT) X-Received: by 10.194.209.240 with SMTP id mp16mr10450581wjc.100.1445428159765; Wed, 21 Oct 2015 04:49:19 -0700 (PDT) Received: from localhost.localdomain (host81-129-170-218.range81-129.btcentralplus.com. [81.129.170.218]) by smtp.gmail.com with ESMTPSA id uq5sm9928570wjc.3.2015.10.21.04.49.17 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 21 Oct 2015 04:49:19 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: kernel@stlinux.com, maxime.coquelin@st.com, ohad@wizery.com, devicetree@vger.kernel.org, Nathan_Lynch@mentor.com, f.fainelli@gmail.com, ludovic.barre@st.com, s-anna@ti.com, Lee Jones Subject: [PATCH v4 6/6] ARM: STiH407: Move over to using the 'reserved-memory' API for obtaining DMA memory Date: Wed, 21 Oct 2015 12:47:07 +0100 Message-Id: <1445428027-26174-7-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1445428027-26174-1-git-send-email-lee.jones@linaro.org> References: <1445428027-26174-1-git-send-email-lee.jones@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: lee.jones@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Doing so saves quite a bit of code in the driver. For more information on the 'reserved-memory' bindings see: Documentation/devicetree/bindings/reserved-memory/reserved-memory.txt Suggested-by: Suman Anna Signed-off-by: Lee Jones --- arch/arm/boot/dts/stih407-family.dtsi | 46 +++++++++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 8 deletions(-) diff --git a/arch/arm/boot/dts/stih407-family.dtsi b/arch/arm/boot/dts/stih407-family.dtsi index 15c20b6..27b8efc 100644 --- a/arch/arm/boot/dts/stih407-family.dtsi +++ b/arch/arm/boot/dts/stih407-family.dtsi @@ -15,6 +15,36 @@ #address-cells = <1>; #size-cells = <1>; + reserved-memory { + #address-cells = <1>; + #size-cells = <1>; + ranges; + + gp0_reserved: rproc@40000000 { + compatible = "shared-dma-pool"; + reg = <0x40000000 0x01000000>; + no-map; + }; + + gp1_reserved: rproc@41000000 { + compatible = "shared-dma-pool"; + reg = <0x41000000 0x01000000>; + no-map; + }; + + audio_reserved: rproc@42000000 { + compatible = "shared-dma-pool"; + reg = <0x42000000 0x01000000>; + no-map; + }; + + dmu_reserved: rproc@43000000 { + compatible = "shared-dma-pool"; + reg = <0x43000000 0x01000000>; + no-map; + }; + }; + cpus { #address-cells = <1>; #size-cells = <0>; @@ -651,9 +681,9 @@ status = "okay"; }; - st231_gp0: st231-gp0@40000000 { + st231_gp0: st231-gp0 { compatible = "st,st231-rproc"; - reg = <0x40000000 0x01000000>; + memory-region = <&gp0_reserved>; resets = <&softreset STIH407_ST231_GP0_SOFTRESET>; reset-names = "sw_reset"; clocks = <&clk_s_c0_flexgen CLK_ST231_GP_0>; @@ -661,9 +691,9 @@ st,syscfg = <&syscfg_core 0x22c>; }; - st231_gp1: st231-gp1@41000000 { + st231_gp1: st231-gp1 { compatible = "st,st231-rproc"; - reg = <0x41000000 0x01000000>; + memory-region = <&gp1_reserved>; resets = <&softreset STIH407_ST231_GP1_SOFTRESET>; reset-names = "sw_reset"; clocks = <&clk_s_c0_flexgen CLK_ST231_GP_1>; @@ -671,9 +701,9 @@ st,syscfg = <&syscfg_core 0x220>; }; - st231_audio: st231-audio@42000000 { + st231_audio: st231-audio { compatible = "st,st231-rproc"; - reg = <0x42000000 0x01000000>; + memory-region = <&audio_reserved>; resets = <&softreset STIH407_ST231_AUD_SOFTRESET>; reset-names = "sw_reset"; clocks = <&clk_s_c0_flexgen CLK_ST231_AUD_0>; @@ -681,9 +711,9 @@ st,syscfg = <&syscfg_core 0x228>; }; - st231_dmu: st231-dmu@43000000 { + st231_dmu: st231-dmu { compatible = "st,st231-rproc"; - reg = <0x43000000 0x01000000>; + memory-region = <&dmu_reserved>; resets = <&softreset STIH407_ST231_DMU_SOFTRESET>; reset-names = "sw_reset"; clocks = <&clk_s_c0_flexgen CLK_ST231_DMU>;