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: 10854439 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 4211D14DE for ; Fri, 15 Mar 2019 10:14:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 261F52A83A for ; Fri, 15 Mar 2019 10:14:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 196C92A83D; Fri, 15 Mar 2019 10:14:53 +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 BF26C2A83A for ; Fri, 15 Mar 2019 10:14:52 +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: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:In-Reply-To: References:List-Owner; bh=IvAqVPYswcD/JJKyWOP+rBtW8rkZOiFH4zdYShUxaKQ=; b=eLK 3By2caXNmYRwOwX1ure0cK5ioLA8ChOzV7ZxgjK4LsmX8RiN0v4XX1U7BALQ2pG63svZIrqN8gq/X hkhy5nGD7F0lg+Lr+3yv5/YQieQeQyAj+jOOZ6wm6XpTq5GgZWqXYxhY37Z0/U4w/vITFugseUHer wklIvS9XNN2hebVjVPO3VsbYT+PFez02lVWmN6f5l6jHa4V1RE16Ytg4w3FYh8I9c7NjtKX/jX5i/ rTJV2eByvMxZt6QGhsmn/obApIEeCvcDw56yUEG46cXGP/GavQ+kwkqe8C6YbSwyjZd+TRMae9zD8 dQVZQqihdv2LsV/iBYOVJlrWfJujc6w==; 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 1h4jrR-0005bp-TS; Fri, 15 Mar 2019 10:14:45 +0000 Received: from kirsty.vergenet.net ([202.4.237.240]) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h4jrP-0005bH-5Z for linux-arm-kernel@lists.infradead.org; Fri, 15 Mar 2019 10:14:44 +0000 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 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190315_031443_448874_578BB0BF X-CRM114-Status: UNSURE ( 9.47 ) X-CRM114-Notice: Please train this message. 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: Arnd Bergmann , Kevin Hilman , Magnus Damm , linux-renesas-soc@vger.kernel.org, Olof Johansson , Simon Horman , 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 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: 10854441 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 D13DA1515 for ; Fri, 15 Mar 2019 10:14:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B470E2A83A for ; Fri, 15 Mar 2019 10:14:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A88EA2A83D; Fri, 15 Mar 2019 10:14:54 +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 5AD212A83A for ; Fri, 15 Mar 2019 10:14:54 +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=S6sbFTjrhJ1tL0+bcCHymB6Z41CYxI6/aIGO0YatJIk=; b=SG1Ej/cZhhIH9wggGKhRZt5gT/ 59p4P3L3vGltrsw1TtTUfK7+VvA9mmLRQs0Mr4//UzhwXrOMjd9gnhBFEg0+vTE2q+Tf+1bV0uQoR D1zllky8ZnTnm0ZwZKMoe2rE1du+PlcT+/8UI10C6JyTR7E0T5grP2cBt4Bq7mEUER5LxhA58JhIk 2G/7DqiMIGEJ9tcPbW8LgrAG333BxepYhBbcSpcX2vNCke2qpsa8rR80idGpbg4dw1TWh2/99Vqtz xzAtzmhnZxH6UcsBTkwgQiLpd8uehzN3EZpRbNV9u8w6NCeQxOj9lMsLCsYacEISKaLJ39QAnrV86 47rLGXpw==; 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 1h4jrZ-0005lQ-Lc; Fri, 15 Mar 2019 10:14:53 +0000 Received: from kirsty.vergenet.net ([202.4.237.240]) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h4jrR-0005bb-1d for linux-arm-kernel@lists.infradead.org; Fri, 15 Mar 2019 10:14:46 +0000 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 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: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190315_031445_238682_6C2A0299 X-CRM114-Status: GOOD ( 10.81 ) 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: Simon Horman , Takeshi Kihara , Magnus Damm , Geert Uytterhoeven , 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 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";