From patchwork Fri Nov 13 10:10:21 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 7610631 X-Patchwork-Delegate: horms@verge.net.au Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id DD31CBF90C for ; Fri, 13 Nov 2015 10:54:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D76BC207A5 for ; Fri, 13 Nov 2015 10:54:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C709F2061C for ; Fri, 13 Nov 2015 10:54:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754329AbbKMKyd (ORCPT ); Fri, 13 Nov 2015 05:54:33 -0500 Received: from kirsty.vergenet.net ([202.4.237.240]:53023 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932447AbbKMKLC (ORCPT ); Fri, 13 Nov 2015 05:11:02 -0500 Received: from penelope.kanocho.kobe.vergenet.net (g1-27-253-251-9.bmobile.ne.jp [27.253.251.9]) by kirsty.vergenet.net (Postfix) with ESMTPSA id B5BEF25B832; Fri, 13 Nov 2015 21:10:47 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=verge.net.au; s=mail; t=1447409451; bh=hnS4Kw4lfT//BV2MQC3W1I1+VEogwZgFqJNvjjsLw5s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qaCnaTpWMyISbcx10yxSZYaUs2uAls8zF9h5R+13LfOD1leRb4QJ7eBHNXkKzOei3 omeftlqt6lmYsZAWM+1usHsoJKRYpBGQ2RTHuqNcrwAMrnQnPeddagzzSXF+7JA0Lt 7puPb1CH6swuzSY7i24ZXsEruWRFrfFqt/DzvHVk= Received: by penelope.kanocho.kobe.vergenet.net (Postfix, from userid 7100) id 00958668BB; Fri, 13 Nov 2015 19:10:33 +0900 (JST) From: Simon Horman To: linux-sh@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Magnus Damm Subject: [PATCH v13 3/7] arm64: renesas: r8a7795 dtsi: Add all SCIF nodes Date: Fri, 13 Nov 2015 19:10:21 +0900 Message-Id: <1447409425-14831-4-git-send-email-horms+renesas@verge.net.au> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1447409425-14831-1-git-send-email-horms+renesas@verge.net.au> References: <1447409425-14831-1-git-send-email-horms+renesas@verge.net.au> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Geert Uytterhoeven Add the device nodes for all R-Car H3 SCIF serial ports, incl. clocks, clock domain, and dma properties. Signed-off-by: Geert Uytterhoeven Signed-off-by: Kuninori Morimoto Signed-off-by: Gaku Inami Acked-by: Laurent Pinchart Signed-off-by: Magnus Damm Signed-off-by: Simon Horman --- Changes since V11 (Simon Horman ) - Update for new CPG/MSSR bindings via Geert Uytterhoeven Changes since V10 (Simon Horman ) - As suggested by Geert Uyterhoven + R8A7795_CLK_SCIF2 is 310 not 210 Changes since V10 (Simon Horman ) - As suggested by Geert Uyterhoven + R8A7795_CLK_SCIF2 is 310 not 210 Changes since V9: (Magnus Damm ) - Added SCIF2 DMA bits again - Converted DT nodes for MSTP to MSSR, adjusted r8a7795-clock.h - Include clock-output-names Changes since V8: (Magnus Damm ) - Dropped SCIF2 DMA bits - thanks Laurent! - Changed name of mstp2 and mstp3 nodes - thanks Geert! - Added Acked-by from Laurent Changes since V7: (Magnus Damm ) - Folded together above SCIF2 patches - Added SCIF2 DMA bits - Got rid of clock-output-names - Replaced renesas,clock-indices with clock-indices Based on: [PATCH 9/25] arm64: renesas: r8a7795: Add SCIF2 support [PATCH 1/6] arm64: renesas: r8a7795 dtsi: Mark scif2 disabled [PATCH 3/6] arm64: renesas: r8a7795 dtsi: Add all SCIF nodes --- arch/arm64/boot/dts/renesas/r8a7795.dtsi | 73 ++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi index 9e1de4d6615c..002b828e8230 100644 --- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi @@ -8,6 +8,7 @@ * kind, whether express or implied. */ +#include #include / { @@ -91,5 +92,77 @@ dmac2: dma-controller@e7310000 { /* Empty node for now */ }; + + scif0: serial@e6e60000 { + compatible = "renesas,scif-r8a7795", "renesas,scif"; + reg = <0 0xe6e60000 0 64>; + interrupts = ; + clocks = <&cpg CPG_MOD 207>; + clock-names = "sci_ick"; + dmas = <&dmac1 0x51>, <&dmac1 0x50>; + dma-names = "tx", "rx"; + power-domains = <&cpg>; + status = "disabled"; + }; + + scif1: serial@e6e68000 { + compatible = "renesas,scif-r8a7795", "renesas,scif"; + reg = <0 0xe6e68000 0 64>; + interrupts = ; + clocks = <&cpg CPG_MOD 206>; + clock-names = "sci_ick"; + dmas = <&dmac1 0x53>, <&dmac1 0x52>; + dma-names = "tx", "rx"; + power-domains = <&cpg>; + status = "disabled"; + }; + + scif2: serial@e6e88000 { + compatible = "renesas,scif-r8a7795", "renesas,scif"; + reg = <0 0xe6e88000 0 64>; + interrupts = ; + clocks = <&cpg CPG_MOD 310>; + clock-names = "sci_ick"; + dmas = <&dmac1 0x13>, <&dmac1 0x12>; + dma-names = "tx", "rx"; + power-domains = <&cpg>; + status = "disabled"; + }; + + scif3: serial@e6c50000 { + compatible = "renesas,scif-r8a7795", "renesas,scif"; + reg = <0 0xe6c50000 0 64>; + interrupts = ; + clocks = <&cpg CPG_MOD 204>; + clock-names = "sci_ick"; + dmas = <&dmac0 0x57>, <&dmac0 0x56>; + dma-names = "tx", "rx"; + power-domains = <&cpg>; + status = "disabled"; + }; + + scif4: serial@e6c40000 { + compatible = "renesas,scif-r8a7795", "renesas,scif"; + reg = <0 0xe6c40000 0 64>; + interrupts = ; + clocks = <&cpg CPG_MOD 203>; + clock-names = "sci_ick"; + dmas = <&dmac0 0x59>, <&dmac0 0x58>; + dma-names = "tx", "rx"; + power-domains = <&cpg>; + status = "disabled"; + }; + + scif5: serial@e6f30000 { + compatible = "renesas,scif-r8a7795", "renesas,scif"; + reg = <0 0xe6f30000 0 64>; + interrupts = ; + clocks = <&cpg CPG_MOD 202>; + clock-names = "sci_ick"; + dmas = <&dmac1 0x5b>, <&dmac1 0x5a>; + dma-names = "tx", "rx"; + power-domains = <&cpg>; + status = "disabled"; + }; }; };