From patchwork Wed Mar 20 20:25:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 10862605 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C285C1575 for ; Wed, 20 Mar 2019 20:26:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A006C29EAB for ; Wed, 20 Mar 2019 20:26:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9446C29EAF; Wed, 20 Mar 2019 20:26:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 422DF29EAD for ; Wed, 20 Mar 2019 20:26:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=kPlM88FfDNgI02Y+Q2KGPy9VAhsk8yHd6q1BtizbAdA=; b=T4O7MRfR1vpMq27GPmbGsl0ZCr iSvvzYlAt1BM40zPEf+G9pfg1J9icEMvBtGOGzUkJtArWoQDezW2GacUtkuxQp5fkaswUQTdkPNsg bA36BQwHZrEaf/vulw1BoGubZYKOIKe5CFN7HmOlbOstvTShJ3TkrupeUeQfHER/VS5pqait1jLDW qg1jfw+jc9xIbponMwC/zdhJFUBZrqzN31kaLAqvhy7S0SuVkgOGmel3ItpApmsEWq6RtpxYWgSx8 +e55Lm45+tt4NppZfwCbZmDPEsP6uSnBaOy+cae51J9vnK0LpILQaPYXpbQjexzp2Herv7LX6Xw2T NPQ37+5g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h6hn4-0006Ji-Te; Wed, 20 Mar 2019 20:26:22 +0000 Received: from mail-pg1-x542.google.com ([2607:f8b0:4864:20::542]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h6hmY-0005ZH-Ko for linux-arm-kernel@lists.infradead.org; Wed, 20 Mar 2019 20:25:53 +0000 Received: by mail-pg1-x542.google.com with SMTP id a22so2575482pgg.13 for ; Wed, 20 Mar 2019 13:25:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=DuSiKoPWJiqg1hj1t8kPtVcU/YwHIsgZLXBJh+g7glI=; b=dvoZbYfdHCSu3bqwnHUvI4PQz1/AgCXtQ+RvuNo3d8mGJGLO92JpGmcdoU8hEeJD0r 2oSalPEVqq5dLmZrMFBNpcgGQPh7sFTREDlpRNE/O6VGtplkZjEjy+NDBKTWykOYXGdI AuVMCZ0XjSHOCN91QBRcAEdLBJRorxrwzw5YQCrWer9ai5/CANwknd7fR9VodeotK4Z+ cjw/s99pbPHIZyIQNisBs+lWkM9XBSbv0xQk/nn/NlYABvrl6gkb6f8TTufeOKJqYcBv 3LhCzNMTLH4EGwxIIUvHdS4KBa+jLIo1xlcafL8GIM4OcR9ocyXjP4R2F25RboGMeTBT uURg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=DuSiKoPWJiqg1hj1t8kPtVcU/YwHIsgZLXBJh+g7glI=; b=djQgD2KMjF5rzyRP/eGbE1/R53yuDlKugn7UCJWxkRjHDB9goKdTnCtKLyDbvtHLZr gaIytggQlhppy8foBC5ldewtW//6weoXhoE4PzzXKxLcdxVAfGvAo8nXMAVD4SmJoaRT uLou/SvxuLdIVPa8/OYl+mZqGURFCLviTG+5/lZmNSmrRLcvUGTdT918/b4HWoizfkGJ 5YuA7OoUTfd02Ad/7Jrav4B3S9MIDh4VuDL6Mqu8o0NB8fgGjL2KWtVcbcN8vYU/x9BE GJdd2EoccHCDewgT4FoGcMHY/7hmeqLWmjN0ut4XHJpYoSRK3Kg9xm2KvWCqag5zKbwC SvgQ== X-Gm-Message-State: APjAAAXB0OD947KBO4FsJcolGvatZ93F5N+BwXOSbk1VPyPslum3p9z3 OTYvPW41J1ceyK8lNAqloTR6oQ== X-Google-Smtp-Source: APXvYqzwQ6RZFvdYwgHTYaQHBtoqC2EKxmLBefxD53Cv05EQPzqEcun6sRJErq/a41B9TQw4wbBc7Q== X-Received: by 2002:aa7:8117:: with SMTP id b23mr10275844pfi.2.1553113549912; Wed, 20 Mar 2019 13:25:49 -0700 (PDT) Received: from localhost.localdomain ([2601:1c2:680:1319:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id u187sm866338pfu.113.2019.03.20.13.25.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 20 Mar 2019 13:25:49 -0700 (PDT) From: John Stultz To: lkml Subject: [PATCH 3/3] arm64: dts: hi3660: Fixup unofficial dma-min-chan to dma-channel-mask Date: Wed, 20 Mar 2019 13:25:40 -0700 Message-Id: <1553113540-28726-4-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1553113540-28726-1-git-send-email-john.stultz@linaro.org> References: <1553113540-28726-1-git-send-email-john.stultz@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190320_132550_900378_681EFFBF X-CRM114-Status: GOOD ( 14.46 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, Ryan Grachek , Zhuangluan Su , Tanglei Han , Wei Xu , Rob Herring , John Stultz , Manivannan Sadhasivam , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP A undocumented and unimplemented binding got into the hi3660 dtsi, and this switches that binding to the now documented one. Cc: Tanglei Han Cc: Zhuangluan Su Cc: Ryan Grachek Cc: Manivannan Sadhasivam Cc: Wei Xu Cc: Rob Herring Cc: Mark Rutland Cc: linux-arm-kernel@lists.infradead.org Cc: devicetree@vger.kernel.org Signed-off-by: John Stultz --- v3: Renamed to hisi-dma-avail-chan v4: Renamed to dma-channel-mask --- arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi index fb5498d..aa6a8ad 100644 --- a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi +++ b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi @@ -560,7 +560,7 @@ #dma-cells = <1>; dma-channels = <16>; dma-requests = <32>; - dma-min-chan = <1>; + dma-channel-mask = <0xfffe>; interrupts = ; clocks = <&crg_ctrl HI3660_CLK_GATE_DMAC>; dma-no-cci;