From patchwork Thu Aug 6 08:06:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 6957041 X-Patchwork-Delegate: horms@verge.net.au Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 9E5189F38B for ; Thu, 6 Aug 2015 08:06:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8876720692 for ; Thu, 6 Aug 2015 08:06:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 62C262068C for ; Thu, 6 Aug 2015 08:06:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755013AbbHFIGq (ORCPT ); Thu, 6 Aug 2015 04:06:46 -0400 Received: from relmlor3.renesas.com ([210.160.252.173]:61822 "EHLO relmlie2.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754744AbbHFIGj (ORCPT ); Thu, 6 Aug 2015 04:06:39 -0400 Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie2.idc.renesas.com with ESMTP; 06 Aug 2015 17:06:38 +0900 Received: from relmlac4.idc.renesas.com (relmlac4.idc.renesas.com [10.200.69.24]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id A512C428D9; Thu, 6 Aug 2015 17:06:38 +0900 (JST) Received: by relmlac4.idc.renesas.com (Postfix, from userid 0) id A8AB3480A4; Thu, 6 Aug 2015 17:06:38 +0900 (JST) Received: from relmlac4.idc.renesas.com (localhost [127.0.0.1]) by relmlac4.idc.renesas.com (Postfix) with ESMTP id A1F24480A3; Thu, 6 Aug 2015 17:06:38 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac4.idc.renesas.com with ESMTP id TAJ05852; Thu, 6 Aug 2015 17:06:38 +0900 X-IronPort-AV: E=Sophos;i="5.15,622,1432566000"; d="scan'";a="193108421" Received: from mail-hk2apc01lp0209.outbound.protection.outlook.com (HELO APC01-HK2-obe.outbound.protection.outlook.com) ([65.55.88.209]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 06 Aug 2015 17:06:37 +0900 Received: from SIXPR06MB0605.apcprd06.prod.outlook.com (10.160.237.147) by SIXPR06MB062.apcprd06.prod.outlook.com (10.242.61.143) with Microsoft SMTP Server (TLS) id 15.1.225.19; Thu, 6 Aug 2015 08:06:38 +0000 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kuninori.morimoto.gx@renesas.com; Received: from morimoto-PC.renesas.com (211.11.155.144) by SIXPR06MB0605.apcprd06.prod.outlook.com (10.160.237.147) with Microsoft SMTP Server (TLS) id 15.1.225.19; Thu, 6 Aug 2015 08:06:35 +0000 Message-ID: <87pp30yhby.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 05/13 v4][RFC] arm64: renesas: Add SCIF2 support on r8a7795 User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") To: Simon , Geert Uytterhoeven CC: YOSHIYUKI ITO , Magnus , Linux-SH , Gaku Inami , shimoda , munakata , komatsu , goda In-Reply-To: <87wpx8yhhm.wl%kuninori.morimoto.gx@renesas.com> References: <87wpx8yhhm.wl%kuninori.morimoto.gx@renesas.com> Date: Thu, 6 Aug 2015 08:06:35 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: KAWPR01CA0042.jpnprd01.prod.outlook.com (25.165.48.152) To SIXPR06MB0605.apcprd06.prod.outlook.com (25.160.237.147) X-Microsoft-Exchange-Diagnostics: 1; SIXPR06MB0605; 2:IQQe/B4oDA8AFpC6RWWvgYOp9AMx/XiWl/Gu3lR3amFMgq7Mdq4CJm1KBONWCAsUSQqyKxIbfA5NrgrUuXqf+AlqOpcc8CodafXYHgqdJx3oSRpYrlDpH/gbnh3HciTz5D59bcrr8n3F/6VG3y0kaetFM3AkUrG65zAoeKC18r4=; 3:3TXRzg9BIiobAGg/iOUABeJEemboxl2LD6Wk5s9aGywpQ73SnbMn92l298/jxoWB62bX0JySnx24mJfoA55xb1/FLxAy957COxixlVDBMyw3Qmyfn6XG8QR7hOPc5hzfY0ew/pluaRnbm/DNe6u8QA==; 25:KZZ1BFmbIRVms83PsjclvGQ1AGj8mFMNYhmOTF7rVKcE8cxyRrSlNJV21Ln2/DXlPK/nxQwOq+jnAgh3ZPf2gW1sH/CSz7MARBxPceK70UFx3x+tBLC3+PDQpxaU+DKTvu0SWGM5lYJTAH51WaikCyKL5mLU0e4rTaST7IpuitpaavPjTzvBmLKIhFK1osJAzUBIZKWK67FKiNQyvCHEtRnUBOUrh3M1LYPx2ULZ+ajbqM7iH8g/D1rPhWGGcPGYMlCCkjIWftyuDhHz7e07dg== X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:; SRVR:SIXPR06MB0605; UriScan:; BCL:0; PCL:0; RULEID:; SRVR:SIXPR06MB062; X-Microsoft-Exchange-Diagnostics: 1; SIXPR06MB0605; 20:IjTCyCFrEsTWpoaRQz5hNvN9yGV3YZmsHfo+fDYWBcbM5kJXgZ1c3vgZwGjaU6tvdHth4uIBDsVK/FUN13SmR5ZVFpw/4U0EpMLYfMwMzNCeTvGZ5Z5Wp6OZC0jEMtyLl5SGUhyIYWvTlm2hAvOV+218ILTrH25wEX8lbnbm673/RUVtfvN7Sbmkrv8FBjIz6J5tZzrfgq5cHDPXwk9SaLm7oY+KeoTkWPBGR1UnWQAcJHvfC3GdMcHrGgU4M25aBL0ff8vOOTYco4hQJ+XoNuXVca27ZnGv9kdYdDMjfrPIYevb+SoUvg3El8OCzCBXkAyDaZyX02gTWgc2yg0Z9nunxZ4VlNASSXO8Ajcl2/fPUJUMG2yoJQkp1rB0zl8vKCI7LdvJwaUE89U2Agp1TLsel0SU+/nKqBfX3GTd+qPN9Yj3aWSKYtTzxHDsUOIGmfs47MMS89K8dZW9XCDab6dcoGTL++kZbCHEWljU0W7YeiLWM9VK3T4+EcgHWR4e; 4:jJUFhcfqNzSBG6eaqM7AtXB7Lq9JIPXR6M9W1H8CdkCc6395rWyELKw/s9K9u4NjHMLTejihYQe5kuMRBKu0Y7AWdlWh9nq7SDpd8d2s+qpfsigClaT7ekUnhpe5h9ZEgbooDkYSSDekKMOrBWIMB24h7eTTWyW+ZJZAybHZqCIaIK5T4DjXg1fGusgqF4Ex4GHdIb0TX39R5UZGJObtDUc5cVjox6AUPhDtmpcozYUzra2MpvIzI1ogOPbzN8Y6PLSOvF8BbJ2HG7mvB1h20T4GtCxEIebIDqsgfx33U0M= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(3002001); SRVR:SIXPR06MB0605; BCL:0; PCL:0; RULEID:; SRVR:SIXPR06MB0605; X-Forefront-PRVS: 06607E485E X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(199003)(189002)(69596002)(54356999)(83506001)(77096005)(76176999)(36756003)(189998001)(101416001)(50986999)(68736005)(46406003)(2950100001)(4001350100001)(50466002)(86362001)(46102003)(47776003)(4001540100001)(5001860100001)(66066001)(64706001)(575784001)(19580405001)(106356001)(42186005)(92566002)(5001960100002)(5001920100001)(62966003)(81156007)(53416004)(5001830100001)(77156002)(97736004)(107886002)(19580395003)(5001770100001)(87976001)(122386002)(40100003)(23726002)(105586002)(33646002)(229853001)(4001430100001); DIR:OUT; SFP:1102; SCL:1; SRVR:SIXPR06MB0605; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SIXPR06MB0605; 23:B3TuLv1rs5Z5zAdAMcxwA9Zc3NLja+UIB8q7SMpjd?= =?us-ascii?Q?rmKs1H/gQAGbSH+k9gOpkuB0ZwDSdC2N6TAkW60cRzHh3sNBIvRt8AImj8ao?= =?us-ascii?Q?JwYgPsSjm3oP4I9SU1jZfpS7G1PaQHp4B/+6eZlGuN4fQ+Sk8gUQym+cjjIs?= =?us-ascii?Q?Ge5gZGBckszpCWnn58tEbTsZStY4cKulRPzS+De5IzW55ePQ/oUKmy7ZO1Wv?= =?us-ascii?Q?68ATIQDF8FV2JaGpkj2Vi95rw/6h+jaSQNfiRtoNN1b3K/hgOXTA//2EdT00?= =?us-ascii?Q?nnhnNJbzduG1VHKIwm4sBYlfj3qlwtSSbJ1qvT1QOTgKvD7E4sTyhFBMpLpB?= =?us-ascii?Q?Kq/AhHYqJcm6WgyAH0nc9VkEXRIHaEACSlJkhUH54OdUZsFuc/Qw5pcyaF7g?= =?us-ascii?Q?+WPFDwoyvwVtd8ROAy60W565z5MUJINwJcOoGZ3rXPLaSdz5+/3WhG3715bB?= =?us-ascii?Q?0V9wTe/oPis8c3wYPwPpfbc4LQHG9+cVoUP2tP05s50Ey15XzxS4F+WWUmc5?= =?us-ascii?Q?TV/xTaojfo2R89f7ACQhUhqRZeguafxObJiC0oFBUoVaEJKldF2w1Up5akvY?= =?us-ascii?Q?LtEcVDCfP3iig4+C+cy9sF3zPJFhKtUo7WuAbhl/GxnoU//VZQpN+L/2Q/DD?= =?us-ascii?Q?3ezwmA0I6Rrp8hqNuRMeghPziSJK2hAYx5EJSBXjhDtxxp7E4JrjcTKSq6jU?= =?us-ascii?Q?VR/LGGG/vCRuZTPwVMFJ5VpLcNCdRVjyd7QNdQw3uQ/5rOFikvALFpfuT/ao?= =?us-ascii?Q?6vG7PpRjk3rIWrAk9u9am1s5pxvEukGxGonxdn8OGjxUIcsNTI720Gi5yw8I?= =?us-ascii?Q?0nZ/ke3Ds4UttQXA8VSj2XLs/aqr3VW0eFXxRv0ESvKLj1bAOPASo4RxFRJp?= =?us-ascii?Q?HuWS2MsSSPT+H2Bb0uPujgi3WoU7UOqqcJSXgXpB0C07O7OdojT4rauYVPRV?= =?us-ascii?Q?TCtW5/8ctwGI8LZdM7ZsK5mCRQMR6a/FvbHUu8Qx3jJLPll7bW8V3HwWuNtq?= =?us-ascii?Q?5E9STtikXaKoCDvDYYS0czLBGcFv4QRKvTc2ESuxIK5LrvVbZ0U+Q625uWvg?= =?us-ascii?Q?r9ArFVFpPycoKPv0avC7UcqKURMCSrWwJgvxE401IjIMDhAwlhqIkUMoBAjx?= =?us-ascii?Q?sn+VF67ZHr+7rOgWK9O3rY4AEw7viIaaZdZ9wSARzMEt4rR2/khFUvPE62+K?= =?us-ascii?Q?IqNUYetzeJA6pXYSp5CJnHGTyrLqCxMzGW2SX8yc/V8Ulkyv2sjHxPkfoMw4?= =?us-ascii?Q?X31B1xheGEM9IV3bdXjBXUk/WzEGQJ3NZGhvES0?= X-Microsoft-Exchange-Diagnostics: 1; SIXPR06MB0605; 5:Zms8XQSNYn0WrFV2FE+PIkTuKQIzuVLMarzWvA+4PW8MhPKcz5MZkqDRMEGJ5eh9kof+8u4ggNgAJB+XmAtcyrxp168uHv/KGDWezoz6INettQBkcFwudd4GxbytLEzpqwv9rtK9sUikavx+V5c6cQ==; 24:y0+GYRyJz8uUoOwegZ9MzuCr17z5fwmZtwxG5zX63/4Yf5+mH37VDQf6CjVtNs0G4Dec91rSSDbCFt1471aezfHAcgvi4fldgDPaXLx8bbw=; 20:R3w79S7ye30kSRP0WtOerSC4gVsTSUtDrjGwFNocmdNBf5RRc5KlVUp9SK4oWUUCJt8pbEvWKZHaVLNCx+Y+8X9ppDG/7CeoUY+H1bUoxjZkA6IMr7FW+c3YHZ5iUBBGB6VO1kFXYDxW95FwahQISD20KxHvIH9tsrsbqMcbKq8= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Aug 2015 08:06:35.2223 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SIXPR06MB0605 X-Microsoft-Exchange-Diagnostics: 1; SIXPR06MB062; 2:awSzQ5a+1foicORsXqxsj4GBXCYIoRT9FbDHOADr8c0H/PhdvAHwPxMQNYPYsuLnGls1LRDnhgTX0M8Hf/JynCQk0/7eucxyvJhXRBDZAh2gZAKIcSRrzREaEEx2LJ3qomodt2O4JbNwcE3uytLzerTd4o0RCcWAnXQElIk0wPs=; 3:DVwTCBjH64x2RiPau32hgSaFpcn+eaV8yEYfrwD8bQrs5MyaYsfkz1iWoaKycMJdCr0dftCjzKm7+8WYSZJCtipqeLpCCDWD8pLmFrBrqr6qw7M0s5q+UXUmmI3BDh1PAPGCnkagAPytjGh8xrhWoA==; 25:S9lShcTXVJlVi0Q5kIekD64nNvvIua4zgKXAypeTYgZUcVh4rgKda+AY1ft+Pn/8L3+GAcNNmibJdik/qxIKdrK1N9meTHwdfF+RE22vg2ZPL95WNkgWteOzG6YclGG0OxMBVLWPiLFYrZQjplluwMaPwmMMD2PJDZS8JHUmFz0b4TlXLljshLOUOWLcAPtwKkbUfwzklyeiCwgIRh7FsWYl5vGgHLttxB2k72p58wFElbql/6+nsZqZUibWlzCoJN62CaNh95IOom3/WOryWA==; 23:fXMV19fItluVrd3igp/W8c9MEIkIslISdtnLGLue86+3wmS3+q50guVNatZ+L7d+/aBXvdu6Kk1r54Q3FD9SD9zeHRSRPP8Shom9ek/2X1GuiTrgDvO+djFDjqvWlsDH2aVng5UjJdaIztk/IA3hnxUxdQpmPqNTdl/ZduLIZMZ/KKy6AC1CEOChjeSpnx1pLieBXinzhHQV9cn2NmyNY2edhfKa6KSdH91xUco59N6hNVO6UYmE/CbyuNUA/A8k X-OriginatorOrg: renesas.com 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.0 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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: Kuninori Morimoto This patch enables SCIF2 Signed-off-by: Kuninori Morimoto --- v3 -> v4 - new patch .../bindings/serial/renesas,sci-serial.txt | 4 ++++ arch/arm64/boot/dts/renesas/r8a7795.dtsi | 21 +++++++++++++++++++++ include/dt-bindings/clock/r8a7795-clock.h | 1 + 3 files changed, 26 insertions(+) diff --git a/Documentation/devicetree/bindings/serial/renesas,sci-serial.txt b/Documentation/devicetree/bindings/serial/renesas,sci-serial.txt index e84b13a..8c97599 100644 --- a/Documentation/devicetree/bindings/serial/renesas,sci-serial.txt +++ b/Documentation/devicetree/bindings/serial/renesas,sci-serial.txt @@ -23,6 +23,10 @@ Required properties: - "renesas,scifa-r8a7794" for R8A7794 (R-Car E2) SCIFA compatible UART. - "renesas,scifb-r8a7794" for R8A7794 (R-Car E2) SCIFB compatible UART. - "renesas,hscif-r8a7794" for R8A7794 (R-Car E2) HSCIF compatible UART. + - "renesas,scif-r8a7795" for R8A7795 (R-Car H3) SCIF compatible UART. + - "renesas,scifa-r8a7795" for R8A7795 (R-Car H3) SCIFA compatible UART. + - "renesas,scifb-r8a7795" for R8A7795 (R-Car H3) SCIFB compatible UART. + - "renesas,hscif-r8a7795" for R8A7795 (R-Car H3) HSCIF compatible UART. - "renesas,scifa-sh73a0" for SH73A0 (SH-Mobile AG5) SCIFA compatible UART. - "renesas,scifb-sh73a0" for SH73A0 (SH-Mobile AG5) SCIFB compatible UART. - "renesas,scif" for generic SCIF compatible UART. diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi index 2375b2d..db0828a 100644 --- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi @@ -80,6 +80,10 @@ }; cpg_clocks: cpg_clocks@e6150000 { + #address-cells = <2>; + #size-cells = <2>; + ranges; + compatible = "renesas,r8a7795-cpg-clocks", "renesas,rcar-gen3-cpg-clocks"; reg = <0 0xe6150000 0 0x1000>; @@ -87,7 +91,24 @@ #clock-cells = <1>; clock-output-names = "main", "pll0", "pll1","pll2", "pll3", "pll4"; + + mstp3_clks: mstp3_clks@e615013c { + compatible = "renesas,r8a7795-mstp-clocks", + "renesas,cpg-mstp-clocks"; + reg = <0 0xe615013c 0 4>, <0 0xe6150048 0 4>; + clocks = <&p_clk>; + #clock-cells = <1>; + renesas,clock-indices = ; + clock-output-names = "scif2"; + }; }; }; + scif2: serial@e6e88000 { + compatible = "renesas,scif-r8a7795", "renesas,scif"; + reg = <0 0xe6e88000 0 64>; + interrupts = ; + clocks = <&mstp3_clks RCAR_R8A7795_CLK_SCIF2>; + clock-names = "sci_ick"; + }; }; }; diff --git a/include/dt-bindings/clock/r8a7795-clock.h b/include/dt-bindings/clock/r8a7795-clock.h index 4097b0b..43e942a 100644 --- a/include/dt-bindings/clock/r8a7795-clock.h +++ b/include/dt-bindings/clock/r8a7795-clock.h @@ -16,6 +16,7 @@ /* MSTP2 */ /* MSTP3 */ +#define RCAR_R8A7795_CLK_SCIF2 10 /* MSTP5 */