From patchwork Fri Mar 15 10:14:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 10854433 X-Patchwork-Delegate: horms@verge.net.au 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 7569414DE for ; Fri, 15 Mar 2019 10:14:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5D5632A83A for ; Fri, 15 Mar 2019 10:14:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 50A972A83D; Fri, 15 Mar 2019 10:14:44 +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=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8A4992A83A for ; Fri, 15 Mar 2019 10:14:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727354AbfCOKOn (ORCPT ); Fri, 15 Mar 2019 06:14:43 -0400 Received: from kirsty.vergenet.net ([202.4.237.240]:34793 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727398AbfCOKOn (ORCPT ); Fri, 15 Mar 2019 06:14:43 -0400 Received: from reginn.horms.nl (watermunt.horms.nl [80.127.179.77]) by kirsty.vergenet.net (Postfix) with ESMTPA id 9BA8425B80E; Fri, 15 Mar 2019 21:14:40 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=verge.net.au; s=mail; t=1552644880; bh=EDaTraQUe/nxV27Y0SzK6cfhk2gyoaPY4a0/02AhxkU=; h=From:To:Cc:Subject:Date:From; b=EhIVbzL7A0meyrKtFGGuRv0Yaa6tbyuuqcwrstmQ4rB7ySfXoM87KAvz1VqRBoYnX pDhipeEQ5R19i/nbxK7sC63C/kzHVwLX1JZ/lnCmy9ThedFVsGQ4u4RnkG2wnp1Xl4 EV51Q8NoM/g49mjT9UpDrhCOXRuHQbFYC+Mf4hyo= Received: by reginn.horms.nl (Postfix, from userid 7100) id 6ACF89402F1; Fri, 15 Mar 2019 11:14:38 +0100 (CET) From: Simon Horman To: arm@kernel.org Cc: linux-renesas-soc@vger.kernel.org, Olof Johansson , Kevin Hilman , Arnd Bergmann , linux-arm-kernel@lists.infradead.org, Magnus Damm , Simon Horman Subject: [GIT PULL] Renesas ARM Based SoC Fixes for v5.1 Date: Fri, 15 Mar 2019 11:14:35 +0100 Message-Id: X-Mailer: git-send-email 2.11.0 Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Hi Olof, Hi Kevin, Hi Arnd, Please consider these Renesas ARM based SoC fixes for v5.1. This pull request is based on "[GIT PULL] Second Round of Renesas ARM64 Based SoC DT Updates for v5.1", which was taged as renesas-arm64-dt-for-v5.1 and you have already pulled. The reason for this base is that the fix for RZ/G2E (r8a774c0) resolves a problem introduced in ARM64 Based SoC DT Updates for v5.1. The fix for E3 (r8a77990) resolves a problem introduced in v5.0. The following changes since commit 3e279a1d44d73aea9ce428ae68e76bf85117031a: arm64: dts: renesas: r8a77990: ebisu: Enable HS400 of SDHI3 (2019-01-23 09:45:41 +0100) are available in the git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-fixes-for-v5.1 for you to fetch changes up to c21cd4ae82e169b394139243684aaacf31bfcdf8: arm64: dts: renesas: r8a774c0: Fix SCIF5 DMA channels (2019-02-25 10:37:55 +0100) ---------------------------------------------------------------- Renesas ARM Based SoC Fixes for v5.1 R-Car Gen3 E3 (r8a77990) and RZ/G2E (r8a774c0) SoCs: * Correct SCIF5 DMA channels ---------------------------------------------------------------- Geert Uytterhoeven (1): arm64: dts: renesas: r8a774c0: Fix SCIF5 DMA channels Takeshi Kihara (1): arm64: dts: renesas: r8a77990: Fix SCIF5 DMA channels arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 7 +++---- arch/arm64/boot/dts/renesas/r8a77990.dtsi | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) From patchwork Fri Mar 15 10:14:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 10854435 X-Patchwork-Delegate: horms@verge.net.au 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 4889C14DE for ; Fri, 15 Mar 2019 10:14:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 301462A83A for ; Fri, 15 Mar 2019 10:14:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 21A1C2A83D; Fri, 15 Mar 2019 10:14:45 +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=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9B9342A83A for ; Fri, 15 Mar 2019 10:14:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727432AbfCOKOo (ORCPT ); Fri, 15 Mar 2019 06:14:44 -0400 Received: from kirsty.vergenet.net ([202.4.237.240]:34804 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727398AbfCOKOo (ORCPT ); Fri, 15 Mar 2019 06:14:44 -0400 Received: from reginn.horms.nl (watermunt.horms.nl [80.127.179.77]) by kirsty.vergenet.net (Postfix) with ESMTPA id 04B3525BE0A; Fri, 15 Mar 2019 21:14:42 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=verge.net.au; s=mail; t=1552644882; bh=pfBJZom56U4xu1vNEtX5DClaSClxOlY1fPlOzSAF/IY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=G1C8CD/F6IZVqkH29muGU2PWl1F0uRppm/tWotpliswRvMxFQA7dFBq1K8DBB+pmK ElKWaZ3x2ErOMAQaqcEv8JoZeuXsEWhcZqES5DgmKrY8TCdMxVUzx/zkN6qMrePM/1 sr1lyUX3MEC4O6Tab2gjZPydCWsz4bJzFjoh7WAE= Received: by reginn.horms.nl (Postfix, from userid 7100) id 3E5F99401EF; Fri, 15 Mar 2019 11:14:40 +0100 (CET) From: Simon Horman To: linux-renesas-soc@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Magnus Damm , Geert Uytterhoeven , Takeshi Kihara , Simon Horman Subject: [PATCH 2/2] arm64: dts: renesas: r8a774c0: Fix SCIF5 DMA channels Date: Fri, 15 Mar 2019 11:14:38 +0100 Message-Id: X-Mailer: git-send-email 2.11.0 In-Reply-To: References: Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Geert Uytterhoeven Correct the DMA channels for SCIF5 from 16..47 to 0..15, as was done for R-Car E3. Signed-off-by: Takeshi Kihara Fixes: 2660a6af690ebbb4 ("arm64: dts: renesas: r8a774c0: Add SCIF and HSCIF nodes") Signed-off-by: Geert Uytterhoeven Reviewed-by: Fabrizio Castro Signed-off-by: Simon Horman --- arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/renesas/r8a774c0.dtsi b/arch/arm64/boot/dts/renesas/r8a774c0.dtsi index f2e390f7f1d5..6590b63268b0 100644 --- a/arch/arm64/boot/dts/renesas/r8a774c0.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a774c0.dtsi @@ -2,7 +2,7 @@ /* * Device Tree Source for the RZ/G2E (R8A774C0) SoC * - * Copyright (C) 2018 Renesas Electronics Corp. + * Copyright (C) 2018-2019 Renesas Electronics Corp. */ #include @@ -990,9 +990,8 @@ <&cpg CPG_CORE R8A774C0_CLK_S3D1C>, <&scif_clk>; clock-names = "fck", "brg_int", "scif_clk"; - dmas = <&dmac1 0x5b>, <&dmac1 0x5a>, - <&dmac2 0x5b>, <&dmac2 0x5a>; - dma-names = "tx", "rx", "tx", "rx"; + dmas = <&dmac0 0x5b>, <&dmac0 0x5a>; + dma-names = "tx", "rx"; power-domains = <&sysc R8A774C0_PD_ALWAYS_ON>; resets = <&cpg 202>; status = "disabled";