From patchwork Thu Apr 4 08:16:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 10885249 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 A34751708 for ; Thu, 4 Apr 2019 08:17:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8B28C28745 for ; Thu, 4 Apr 2019 08:17:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7FA3628A27; Thu, 4 Apr 2019 08:17:42 +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 1CE5528745 for ; Thu, 4 Apr 2019 08:17:42 +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=Okh/hUTwAShi/jcEsKIbonk2Jvw5sG2uca66a9055xo=; b=DUI6zJ1DFga/lr6aQdWpRXBvN/ 8ufbGVc8HkyYMSgyZ/mA1w13m3ewVWCZy9U0lGDIzxrCbIEneRQWj0AbR8hnd1tXDMrFky38y8/E5 ATyqNxYbgoyXaLGRlXkZunU+aloz3BQZQ7HWeGBNvcTZAKiyX++S5eskftTg4TLV1nCZzdg3Y7BXR gNRWxRd++dL8jk7dm29ccsghyKlMT5+aCtA6RZJ1Bc+o/OL/YYpKqwKBZ10y8o/KLfO/wTM5kyPeh qXxrb74ZWSWnrUoSOPKj98Rx4TFUJeCkuj6L3ksxW0clMNEDgqGjM0ZeV+HXc4FHm8ZPQQ21OxwNI JIrdV7EA==; 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 1hBxZ0-0006Vx-5x; Thu, 04 Apr 2019 08:17:34 +0000 Received: from mail-pl1-x641.google.com ([2607:f8b0:4864:20::641]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hBxYB-0005Oy-CW for linux-arm-kernel@lists.infradead.org; Thu, 04 Apr 2019 08:16:56 +0000 Received: by mail-pl1-x641.google.com with SMTP id y6so791059plt.1 for ; Thu, 04 Apr 2019 01:16:43 -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=KhgbgRH9XeCw4nvk0p0Dwx+VqDYiBCuQQlEnM4jc05A=; b=YhYzhED6uUTkU6u5uXoQT6MfOcOxtdeQW9GLsDdBais6mrTPxgTYFn94nawBmaXxFe Obxq1eTY3pi9dhxkYIKp3l9cyNO67By+aX/RWbQhVCEICXxgkpIIQn++sgtmdJSWt0Vj rvqg7QWjdM39RPu7y509kp1x7rhTNemBT0lzNYneeHW9uehGluK4Ulv2BhxuVjdUpbTW EKg2i2H+2rK8Sfw4Qa6fxaLX9dhniwmwi+byPmBz+96asrdCfLEa/S86uhy5Sq0tLNra 1NViXS+tdOM52X8KHf9IPY1egsj/8l1b2xe1Q/rmiZsyiKyLUbCLg4cO6qMRRUr3+emw Stog== 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=KhgbgRH9XeCw4nvk0p0Dwx+VqDYiBCuQQlEnM4jc05A=; b=WhmBNm7AwZ010w5h5CLt8Z3xo51YG5LSqLQqtYIUrPGmj3WiqVQXnPHGN9b678CpV6 fM9KVuK87aMahSOcH7NjA8T8Xk09NNDFHxqvMwZjyACzVyCBs9GmDp9NZBIQrPUfFQbl ZxCPVkWZuba++uZBQq9cdWQ/sQOw2EVCEC1taytAtz9udV4an6WzX74menJAskmPO5iQ Q4Cd1pXmpsATMWEeT5ucrfrw0gyXtsUWsuRWyxFe2P49VGfOcvp03tXzMX1RXCsKYo2/ YbAmHn9SC+u8j6m1eZTFpTscS1531YIiAQIibOAqEmpepcuqoq3lD+zWTsltXfQ6zeuF 8DcA== X-Gm-Message-State: APjAAAWV3e4ACh1ww6XDFRjhPO2AI3qI4xZEyQrUyVQpgDX6pGMh2QEg x04Jwo3qOoAykbfUlyh9u23DQA== X-Google-Smtp-Source: APXvYqwwZPtQ7nXCXE18CoJJUaXicMvExbJma7NjlfgZEKKuCiHkylHkUZOtjkoNXxhyRop2fE116w== X-Received: by 2002:a17:902:2aca:: with SMTP id j68mr4868134plb.233.1554365802824; Thu, 04 Apr 2019 01:16:42 -0700 (PDT) Received: from localhost.localdomain ([2601:1c2:680:1319:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id d129sm26041389pfa.142.2019.04.04.01.16.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 04 Apr 2019 01:16:41 -0700 (PDT) From: John Stultz To: lkml Subject: [RESEND][PATCH 3/3] arm64: dts: hi3660: Fixup unofficial dma-min-chan to dma-channel-mask Date: Thu, 4 Apr 2019 01:16:28 -0700 Message-Id: <1554365788-25610-4-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1554365788-25610-1-git-send-email-john.stultz@linaro.org> References: <1554365788-25610-1-git-send-email-john.stultz@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190404_011644_177245_B1AE054C X-CRM114-Status: GOOD ( 14.66 ) 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 7f92049..7a49aa9 100644 --- a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi +++ b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi @@ -566,7 +566,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;