From patchwork Sat Apr 17 06:19:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 12209555 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 708EBC43462 for ; Sat, 17 Apr 2021 06:20:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 47788613B4 for ; Sat, 17 Apr 2021 06:20:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229989AbhDQGUZ (ORCPT ); Sat, 17 Apr 2021 02:20:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:35334 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229614AbhDQGUZ (ORCPT ); Sat, 17 Apr 2021 02:20:25 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id B24AF611C2; Sat, 17 Apr 2021 06:19:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1618640399; bh=O46rq0MKoZq2cyMcLqVrMxRGChVeYKuAf8wLUhTZnpg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sBNcOylW0jFFmHRAnbgW5Mr8ZVaDxi4yZYO/0vIZLMgQ9M/RrKk3al6M2JLQRtxZD j4vPblXNt/KVfgct0JvBFxKoIm6OKzZgs/WGdeZZ1ycoDwgE6Bn3K/XNWPwE6kooBt w+vq3krPw25Oq7FZ1/53nipBcMnaX5R2Dcq0vIVPD/F0bwNeFmBsVqoKR2xoCxFq7o RhY5X37p2DQkg67a4TAVtwK9M88iLt1TNSedyC+SzwxIYJxYJ73v2HesuvoUVSV9n7 XhXdptmdemOjSTpHvIvw3xd67n2MIgkbwB6MS1DiZP0DkcbGZr0l2EbnAjaQEH1Ce0 hZ3RKbhyu2uEg== From: Felipe Balbi To: Andy Gross , Bjorn Andersson , Vinod Koul Cc: Rob Herring , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, dmaengine@vger.kernel.org, Konrad Dybcio , Felipe Balbi Subject: [PATCH v2 1/2] DMA: qcom: gpi: add compatible for sm8150 Date: Sat, 17 Apr 2021 09:19:50 +0300 Message-Id: <20210417061951.2105530-2-balbi@kernel.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210417061951.2105530-1-balbi@kernel.org> References: <20210417061951.2105530-1-balbi@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org From: Felipe Balbi No functional changes, just adding a new compatible for a diferent SoC. Signed-off-by: Felipe Balbi --- Changes since v1: - No changes Documentation/devicetree/bindings/dma/qcom,gpi.yaml | 1 + drivers/dma/qcom/gpi.c | 1 + 2 files changed, 2 insertions(+) diff --git a/Documentation/devicetree/bindings/dma/qcom,gpi.yaml b/Documentation/devicetree/bindings/dma/qcom,gpi.yaml index f8142adf9aea..902e2e523386 100644 --- a/Documentation/devicetree/bindings/dma/qcom,gpi.yaml +++ b/Documentation/devicetree/bindings/dma/qcom,gpi.yaml @@ -20,6 +20,7 @@ properties: compatible: enum: - qcom,sdm845-gpi-dma + - qcom,sm8150-gpi-dma reg: maxItems: 1 diff --git a/drivers/dma/qcom/gpi.c b/drivers/dma/qcom/gpi.c index 57f5ee4235c7..43ac3ab23d4c 100644 --- a/drivers/dma/qcom/gpi.c +++ b/drivers/dma/qcom/gpi.c @@ -2281,6 +2281,7 @@ static int gpi_probe(struct platform_device *pdev) static const struct of_device_id gpi_of_match[] = { { .compatible = "qcom,sdm845-gpi-dma" }, + { .compatible = "qcom,sm8150-gpi-dma" }, { }, }; MODULE_DEVICE_TABLE(of, gpi_of_match); From patchwork Sat Apr 17 06:19:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 12209557 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 947B4C433ED for ; Sat, 17 Apr 2021 06:20:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6B26A611ED for ; Sat, 17 Apr 2021 06:20:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230206AbhDQGU2 (ORCPT ); Sat, 17 Apr 2021 02:20:28 -0400 Received: from mail.kernel.org ([198.145.29.99]:35384 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229614AbhDQGU1 (ORCPT ); Sat, 17 Apr 2021 02:20:27 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 1B5E7611CC; Sat, 17 Apr 2021 06:19:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1618640402; bh=VqdogCP7wTnHnRGHkbpRtPUBLzH6ZBsybgn1QsFXNnY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YTtyIo1NNPqSMaEI76IwKhhdZAz0zm12DnUQZ9PMPZPtgMV3W0icJ5nxIsThjMbes cfUEAo35uQA8V7dY6O34vqc9XqGxyiog7hgRV7j+6U7ZYIIl+PtYEE9CdterxgNHgo salzMV0BrfhGDJTNTwAUwvWppv/n7XoMMvuR9Os2dgUb6JjiGk7sfEOsCgLq0yNATj 2XWFEf+z86KNlAIVxo0CohcmmV9gEoLl25FeCQiqrrivJENWsm+rSpy9nhY4vbLRwn PdHWpEygucc+GfgKz7au/WW1erH0BQE7nWUX00fZn+eG/jXF+HUWTN+AVS6CAnCO3e UsvSPJbnWhlaA== From: Felipe Balbi To: Andy Gross , Bjorn Andersson , Vinod Koul Cc: Rob Herring , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, dmaengine@vger.kernel.org, Konrad Dybcio , Felipe Balbi Subject: [PATCH v2 2/2] arm64: boot: dts: qcom: sm8150: Add DMA nodes Date: Sat, 17 Apr 2021 09:19:51 +0300 Message-Id: <20210417061951.2105530-3-balbi@kernel.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210417061951.2105530-1-balbi@kernel.org> References: <20210417061951.2105530-1-balbi@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org From: Felipe Balbi With this patch, DMA has a chance of probing and doing something useful. Signed-off-by: Felipe Balbi Reviewed-by: Konrad Dybcio Reviewed-by: Vinod Koul --- Changes since v1: - Remove dmas property from spi0 (will be added later as a separate patch - Correct dma unit name to dma-controller - Correct binding order (compatible, reg, dma-cells at the end) arch/arm64/boot/dts/qcom/sm8150.dtsi | 70 ++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sm8150.dtsi b/arch/arm64/boot/dts/qcom/sm8150.dtsi index c563f381a138..d2324c38fd73 100644 --- a/arch/arm64/boot/dts/qcom/sm8150.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8150.dtsi @@ -4,6 +4,7 @@ * Copyright (c) 2019, Linaro Limited */ +#include #include #include #include @@ -577,6 +578,29 @@ gcc: clock-controller@100000 { <&sleep_clk>; }; + gpi_dma0: dma-controller@800000 { + compatible = "qcom,sm8150-gpi-dma"; + reg = <0 0x800000 0 0x60000>; + interrupts = , + , + , + , + , + , + , + , + , + , + , + , + ; + dma-channels = <13>; + dma-channel-mask = <0xfa>; + iommus = <&apps_smmu 0x00d6 0x0>; + #dma-cells = <3>; + status = "disabled"; + }; + qupv3_id_0: geniqup@8c0000 { compatible = "qcom,geni-se-qup"; reg = <0x0 0x008c0000 0x0 0x6000>; @@ -814,6 +838,29 @@ spi7: spi@89c000 { }; }; + gpi_dma1: dma-controller@a00000 { + compatible = "qcom,sm8150-gpi-dma"; + reg = <0 0xa00000 0 0x60000>; + interrupts = , + , + , + , + , + , + , + , + , + , + , + , + ; + dma-channels = <13>; + dma-channel-mask = <0xfa>; + iommus = <&apps_smmu 0x0616 0x0>; + #dma-cells = <3>; + status = "disabled"; + }; + qupv3_id_1: geniqup@ac0000 { compatible = "qcom,geni-se-qup"; reg = <0x0 0x00ac0000 0x0 0x6000>; @@ -1004,6 +1051,29 @@ spi16: spi@a94000 { }; }; + gpi_dma2: dma-controller@c00000 { + compatible = "qcom,sm8150-gpi-dma"; + reg = <0 0xc00000 0 0x60000>; + interrupts = , + , + , + , + , + , + , + , + , + , + , + , + ; + dma-channels = <13>; + dma-channel-mask = <0xfa>; + iommus = <&apps_smmu 0x07b6 0x0>; + #dma-cells = <3>; + status = "disabled"; + }; + qupv3_id_2: geniqup@cc0000 { compatible = "qcom,geni-se-qup"; reg = <0x0 0x00cc0000 0x0 0x6000>;