From patchwork Thu Sep 24 07:19:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 7254201 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 4A992BEEC1 for ; Thu, 24 Sep 2015 07:19:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4F1BC20872 for ; Thu, 24 Sep 2015 07:19:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3868B20852 for ; Thu, 24 Sep 2015 07:19:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754415AbbIXHTt (ORCPT ); Thu, 24 Sep 2015 03:19:49 -0400 Received: from relmlor2.renesas.com ([210.160.252.172]:34388 "EHLO relmlie1.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752978AbbIXHTs (ORCPT ); Thu, 24 Sep 2015 03:19:48 -0400 Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie1.idc.renesas.com with ESMTP; 24 Sep 2015 16:19:47 +0900 Received: from relmlac2.idc.renesas.com (relmlac2.idc.renesas.com [10.200.69.22]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id 9F68C4979C; Thu, 24 Sep 2015 16:19:47 +0900 (JST) Received: by relmlac2.idc.renesas.com (Postfix, from userid 0) id 99EB72806E; Thu, 24 Sep 2015 16:19:47 +0900 (JST) Received: from relmlac2.idc.renesas.com (localhost [127.0.0.1]) by relmlac2.idc.renesas.com (Postfix) with ESMTP id 90BD62806D; Thu, 24 Sep 2015 16:19:47 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac2.idc.renesas.com with ESMTP id SAM30737; Thu, 24 Sep 2015 16:19:47 +0900 X-IronPort-AV: E=Sophos;i="5.17,579,1437404400"; d="scan'";a="195030587" Received: from mail-sg2apc01lp0241.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.241]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 24 Sep 2015 16:19:46 +0900 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 HKXPR06MB0600.apcprd06.prod.outlook.com (10.161.181.149) with Microsoft SMTP Server (TLS) id 15.1.274.16; Thu, 24 Sep 2015 07:19:43 +0000 Message-ID: <874mikuw3e.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v4] arm64: renesas: r8a7795: add AUDIO_DMAC support User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 To: Simon Horman CC: Geert Uytterhoeven , Magnus , Linux-sh list In-Reply-To: <876130uw53.wl%kuninori.morimoto.gx@renesas.com> References: <87twqs1osz.wl%kuninori.morimoto.gx@renesas.com> <87d1xg1oc7.wl%kuninori.morimoto.gx@renesas.com> <878u841o94.wl%kuninori.morimoto.gx@renesas.com> <87twqkvg9d.wl%kuninori.morimoto.gx@renesas.com> <20150924051417.GB3822@verge.net.au> <878u7wuwkg.wl%kuninori.morimoto.gx@renesas.com> <876130uw53.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Thu, 24 Sep 2015 07:19:43 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: KAWPR01CA0013.jpnprd01.prod.outlook.com (25.161.24.23) To HKXPR06MB0600.apcprd06.prod.outlook.com (25.161.181.149) X-Microsoft-Exchange-Diagnostics: 1; HKXPR06MB0600; 2:LjFLk6cEKoQHJnWqzMOU33s4nN8YIJjSrK4FGf6WTwKVh2v4IEun7excD61QVAswFObvHN1foKmGSGbTrP9sxXgpXExRAf2kIBQ22pK96NX/DmihP1mWN2+DEbLanBsuGkyVWmNjIOXG9+fCK6h5fzanwBr7ZgMFtwnOjs/MKfM=; 3:s3nno3j5cnxj93Ug3ZV3vnVNQdEXZoAc8PN3jGj9cWWrnU+Csx3C7dbIAAb3Wp4D1tsS1eU4YTZRiXvAZcvJCcEOsfMRfl8ulchAy7iHHZuk0R6RWIzCCYl9XS78q07ICd27VvYVpjU+UiCbVphVSQ==; 25:maWZzjoyXxOxsyT9tphS4US38fnk88H195f77zyXbn+J9Mc6365NRvIR33Lw654zv3MXcTPCgy5uiItAdbF2RWhdn0HqztAQ5KswBeV2zod+tiao+eiCi3bKpvE/mtVhWsymLgXdCeKDm5rASn6gWgO+7v9vuzB2+GiN/3+qJffT6txio99FJHmmo+gqCaP6S+KFd7IoMytH7QMEUq3Aim504E3cf/VKbxLzBCcckGAUIiWGjjeb7WEeA4sJZ9mV9r8NL/l22MN/mweqdHcI7Q== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HKXPR06MB0600; X-Microsoft-Exchange-Diagnostics: 1; HKXPR06MB0600; 20:nQIl7GWzvSN0tDiqQ4pUSI7sgZgu3/c+q+7YxthVTS5ZnBnNJDMBkMexLZqBpyV3n408HoxJFO8cgO9J47Q61WWtNTZKE2UMN9hh11acxOZdIjtdxaLAxmPZ+9qKYz4ych2Z57YgpOviGUEJrNzMGANOUqCIh56WkD+2GjVotMxIXp5QbEF+pkeDrNHwkLy3tTkMvwVp7HFAkGN2yxHNN3EslsY8vKc6OdhtnMG/OFT35/o8T1mKb01GG4SwMZRRTO6aVmfYCZzBjIB+SEFADZ+pydOBD/jUYffhSv26EJRyT0k5K9wjF7GZMt5pAQs/sITlz6ud0t6tVUDhh/rd/LvHWfmfya9JJRhjDnQATyOBX/5xO82fUNSzA4qunlw70y6kjSC5N7WMXgw2SQgByOvpGgarjy2tI6gmbw940j7t1gNF1YcCJSaRayEThqf6ZjCjTrb1/LrKGI7LMb+5uiyC+ysOUaGuGBfXrCTwv/Jn0NtPn1EPTsnVp0vmvN++; 4:BWuTTh5w0PD1iXHHwoQZNs9hiNd5sUswgDDTFtCqZaKR0Br7U5eS5GqOE9ShIsNiGwRAdkHu8cABowcVy8m10i3OoT/rVA6xiINRbnTgCE5xQe14NlQKNs3h0ueKQmIT3WCSWDoxUTenbbVkP+RAHcWy8fLm3s+04iP+o0sqHFo/pGDtBf1g6Zrwgnphm0ijPS9MbOtIwwLGLUuxlXO/4svXjPRb26g8xrFB5+7V7IEatfxxzZSzeVHB86ffp6Fj48JVKA9bgQEH8amzKhdxntZCnG8buMAyvz3P2oj5gJE69H/yHnCBK+bt9mteEGNQB1yWnwvkuD/jnH8vRfecgJDSmbOHQdPNx1BQJY8ad+E= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(8121501046)(520078)(5005006)(3002001); SRVR:HKXPR06MB0600; BCL:0; PCL:0; RULEID:; SRVR:HKXPR06MB0600; X-Forefront-PRVS: 070912876F X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(199003)(189002)(92566002)(19580405001)(23726002)(106356001)(19580395003)(50986999)(5004730100002)(66066001)(69596002)(40100003)(50466002)(122386002)(42186005)(76176999)(54356999)(105586002)(47776003)(36756003)(77096005)(46406003)(33646002)(110136002)(46102003)(2950100001)(5001920100001)(5007970100001)(5001830100001)(62966003)(77156002)(64706001)(4001540100001)(93886004)(229853001)(53416004)(86362001)(83506001)(87976001)(5001960100002)(81156007)(189998001)(97736004)(4001350100001)(68736005)(5001860100001)(101416001); DIR:OUT; SFP:1102; SCL:1; SRVR:HKXPR06MB0600; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HKXPR06MB0600; 23:RCKLVsgF5gyxeIoj54op+XIl0EXYc5Onw/opRfFpF?= =?us-ascii?Q?42N5nqtwkx8p9x1YDZshVEAvec5GhElYmUCaYHv6ahseo5jB5vIHQUNzPoW1?= =?us-ascii?Q?hOmxARbPoRrYclU+OG14N+NozAIxIzcG/RLlOSPCykNzI6RCpbiKzALl3QVP?= =?us-ascii?Q?3o/FA/DTi768hw/4r5cv+JkAXgf5DSswwGKp8OAaz8m40bIx1guqUKOjENUI?= =?us-ascii?Q?OKR+Dn7xbrxjvEWg/S/WlNlf44x7tOyqL7ahZRwMhsmkpu6HMp4oyO8Dwfm8?= =?us-ascii?Q?IzjmnWwhfnftmJZwjRTJaRn/8MEjXe/9G9GhHJlWIXBpQv8l3FkApTa+Rnzv?= =?us-ascii?Q?4W/ya/p8EOY9FWhBxCOa+HO+ZghPOcstAOfKj08kxcmHlCmuahNyxxjnSexH?= =?us-ascii?Q?5OtiLp1/9lMBcULmlD3eSwSa5Ni6lLy5c8RAT9A46paXVwtT02i7Com1EGsn?= =?us-ascii?Q?1lqpeNPIsshuPLpb9nVBkh4I1Cym+/LmfngfRmG0kvJgycj3IwcYw9xtYlXG?= =?us-ascii?Q?edR1jtmjSAoNrs9ZMQsHCH4cixmb1gbJZBeQtNQMHcehciM15iOazflex4vM?= =?us-ascii?Q?F9mJ9/B0GrYFNfoTIcJzMSRKyAORTg8SzxSzatxSFmmKwWYXvRYum7N+SgQK?= =?us-ascii?Q?83Fjo9dqwzeX3f/ZGwmV2+boEoIlt9q7FJ32YdgnoiOnNr8iFozGNDJtnDnb?= =?us-ascii?Q?F4KxGreyC5Qc4zh1bKv9XZ5QGdckRirteYkFWBpNgAkC0/QIHtuA29740htq?= =?us-ascii?Q?lUfMseqZz6/zNzo3CScxNP8E/72RggNzVeB+37pSdv+yhFRaNhZxvrpKsZJ5?= =?us-ascii?Q?96YoknrFDfK1oxd4N8VbBt9es48ZbTTrD2rxCVL7dYa+vrY75TLc9mHupIu6?= =?us-ascii?Q?DsbQRSeYxA33q24+5vJ74zfR2aba7N37Ccqi/mOmWsPpr+OHx6lSeoXxqiJn?= =?us-ascii?Q?+Diu4KorWCQI8LOMxwmQsZ1TwFzbXjyAv2dl4c3eKA65LRdo5CqwK4EipnsP?= =?us-ascii?Q?0OJ9o7mJMPSa7hAuAW1EvDvzmBntHo7OoB4T7WPYa+XveMnjotdkSOou6G7w?= =?us-ascii?Q?tGMWzYOgFBhheCFBhp7KwdU0xTNMBwZRNkQ9DZQhQzeceV30gCWemydQSFCD?= =?us-ascii?Q?3eytAp0vE/SxPvJOhUov89M1aJ7i0kuDMJonwF32YFu7r0IPqET1alQghiRJ?= =?us-ascii?Q?yhP1NW8P3W7J43kDn/q6t3Km/jRrgxkE+2aHJoeeVarzxtk+erTIK+0xY7vm?= =?us-ascii?Q?6UIikQYDVt4BCZah8fUdpgx63S408L8/k9NTyZQCNk+SlfDeQGA5O/3bqhuH?= =?us-ascii?B?UT09?= X-Microsoft-Exchange-Diagnostics: 1; HKXPR06MB0600; 5:VEnMln1noupMDMkYcj96vfYE8h9mRYWs+cIzdV+r9HCbLMpFFBh/eDTjqM8vFaq843s3RFddHAg6Zg/ts5gouVRl2wjVnmuo5U2zLXU3wMcDT4JmlQSn3F4+TA9Lj8fWHJzn/RMg59EKlD9e2loI5A==; 24:V3ED8wShTX+8m+46PGKosyGQzyiXuLpQyVbYF0aQ9jMn2+tpPFb2st4LGSaaKgj6M+EcccAvNBj3Qgh7vpZgxH7rqmfU4vLMDNTwme3GGBs=; 20:4ElLVwTLcHrWOneiz5L9bEWz2AUtM4/3kbS7Dw1PC7iwSWyGYE2XzRBsOFdQuhiSQm5oqfZCMKdwQkpHrxBhMrV0emSEA0n+pU8tgcdeaMVsB/1mbvDj+z46RoIJhItNy5fVdTUlbSkaCR4WbhWwaQlNn6LX/1W2FFQChQ44uF8= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Sep 2015 07:19:43.8844 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HKXPR06MB0600 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-6.9 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 Signed-off-by: Kuninori Morimoto Reviewed-by: Geert Uytterhoeven --- v3 -> v4 - tidyup MSTP5 definition order arch/arm64/boot/dts/renesas/r8a7795.dtsi | 75 +++++++++++++++++++++++++++++++ include/dt-bindings/clock/r8a7795-clock.h | 2 + 2 files changed, 77 insertions(+) diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi index 81bf555..97e93c4 100644 --- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi @@ -415,6 +415,17 @@ clock-indices = ; }; + mstp5_clks: mstp5_clks@e6150144 { + compatible = "renesas,r8a7795-mstp-clocks", + "renesas,cpg-mstp-clocks"; + reg = <0 0xe6150144 0 4>, <0 0xe615003c 0 4>; + clocks = <&s3d4_clk>, <&s3d4_clk>; + #clock-cells = <1>; + clock-indices = < + R8A7795_CLK_AUDIO_DMAC0 R8A7795_CLK_AUDIO_DMAC1 + >; + }; + mstp9_clks: mstp9_clks@e6150994 { compatible = "renesas,r8a7795-mstp-clocks", "renesas,cpg-mstp-clocks"; @@ -470,6 +481,70 @@ }; }; + audma0: dma-controller@ec700000 { + compatible = "renesas,rcar-dmac"; + reg = <0 0xec700000 0 0x10000>; + interrupts = <0 350 IRQ_TYPE_LEVEL_HIGH + 0 320 IRQ_TYPE_LEVEL_HIGH + 0 321 IRQ_TYPE_LEVEL_HIGH + 0 322 IRQ_TYPE_LEVEL_HIGH + 0 323 IRQ_TYPE_LEVEL_HIGH + 0 324 IRQ_TYPE_LEVEL_HIGH + 0 325 IRQ_TYPE_LEVEL_HIGH + 0 326 IRQ_TYPE_LEVEL_HIGH + 0 327 IRQ_TYPE_LEVEL_HIGH + 0 328 IRQ_TYPE_LEVEL_HIGH + 0 329 IRQ_TYPE_LEVEL_HIGH + 0 330 IRQ_TYPE_LEVEL_HIGH + 0 331 IRQ_TYPE_LEVEL_HIGH + 0 332 IRQ_TYPE_LEVEL_HIGH + 0 333 IRQ_TYPE_LEVEL_HIGH + 0 334 IRQ_TYPE_LEVEL_HIGH + 0 335 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "error", + "ch0", "ch1", "ch2", "ch3", + "ch4", "ch5", "ch6", "ch7", + "ch8", "ch9", "ch10", "ch11", + "ch12", "ch13", "ch14", "ch15"; + clocks = <&mstp5_clks R8A7795_CLK_AUDIO_DMAC0>; + power-domains = <&cpg_clocks>; + clock-names = "fck"; + #dma-cells = <1>; + dma-channels = <16>; + }; + + audma1: dma-controller@ec720000 { + compatible = "renesas,rcar-dmac"; + reg = <0 0xec720000 0 0x10000>; + interrupts = <0 351 IRQ_TYPE_LEVEL_HIGH + 0 336 IRQ_TYPE_LEVEL_HIGH + 0 337 IRQ_TYPE_LEVEL_HIGH + 0 338 IRQ_TYPE_LEVEL_HIGH + 0 339 IRQ_TYPE_LEVEL_HIGH + 0 340 IRQ_TYPE_LEVEL_HIGH + 0 341 IRQ_TYPE_LEVEL_HIGH + 0 342 IRQ_TYPE_LEVEL_HIGH + 0 343 IRQ_TYPE_LEVEL_HIGH + 0 344 IRQ_TYPE_LEVEL_HIGH + 0 345 IRQ_TYPE_LEVEL_HIGH + 0 346 IRQ_TYPE_LEVEL_HIGH + 0 347 IRQ_TYPE_LEVEL_HIGH + 0 348 IRQ_TYPE_LEVEL_HIGH + 0 349 IRQ_TYPE_LEVEL_HIGH + 0 382 IRQ_TYPE_LEVEL_HIGH + 0 383 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "error", + "ch0", "ch1", "ch2", "ch3", + "ch4", "ch5", "ch6", "ch7", + "ch8", "ch9", "ch10", "ch11", + "ch12", "ch13", "ch14", "ch15"; + clocks = <&mstp5_clks R8A7795_CLK_AUDIO_DMAC1>; + power-domains = <&cpg_clocks>; + clock-names = "fck"; + #dma-cells = <1>; + dma-channels = <16>; + }; + pfc: pfc@e6060000 { compatible = "renesas,pfc-r8a7795"; reg = <0 0xe6060000 0 0x50c>; diff --git a/include/dt-bindings/clock/r8a7795-clock.h b/include/dt-bindings/clock/r8a7795-clock.h index 6c523bb..c17cf56 100644 --- a/include/dt-bindings/clock/r8a7795-clock.h +++ b/include/dt-bindings/clock/r8a7795-clock.h @@ -32,6 +32,8 @@ #define R8A7795_CLK_SCIF2 10 /* MSTP5 */ +#define R8A7795_CLK_AUDIO_DMAC1 1 +#define R8A7795_CLK_AUDIO_DMAC0 2 /* MSTP7 */