From patchwork Tue Jun 3 22:33:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 4291531 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A7611BEEA7 for ; Tue, 3 Jun 2014 22:31:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id ADCF3201E4 for ; Tue, 3 Jun 2014 22:31:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DEA00201DE for ; Tue, 3 Jun 2014 22:31:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754074AbaFCWbE (ORCPT ); Tue, 3 Jun 2014 18:31:04 -0400 Received: from mail-pd0-f176.google.com ([209.85.192.176]:62226 "EHLO mail-pd0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750941AbaFCWbD (ORCPT ); Tue, 3 Jun 2014 18:31:03 -0400 Received: by mail-pd0-f176.google.com with SMTP id p10so5209912pdj.21 for ; Tue, 03 Jun 2014 15:31:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:date:message-id:in-reply-to:references:subject; bh=xi3+NSqjOBpmIawdaKcjdrbIyRxtu60lsIoz43A8PEc=; b=fRv+3rcvfT1wQhlYu05M8mTgRuRKE+v+zZzG8eCjSZk+GMxIMnQgud/q1kRWWbvr/M i+6TCNEZYwA2sn/i3cTYE2VxGqJ5czrzotgIPPpoSNOZqbhUqhGHXZhYRwVsKxfdGTIK y5f0LXzZn/AbK0BzmVhpRoiJZHHqNFeH8h5OJdXPDp+O9Rve+ASwNHKU02SL3QfUPMdt A4NoReb5LboP+xAsipEAIfJupvACrE9t2tXOkld1A7lYu7TcRsVvIOFRsZOuXrB+Nnaz A+ilnEYzWLKqdxaUfg9w4Gnffg0fZN3gB1i5p++wPKZWnmvK+CjdLGGK2mgGHcj1xd7o vXmQ== X-Received: by 10.68.178.194 with SMTP id da2mr55361047pbc.151.1401834662515; Tue, 03 Jun 2014 15:31:02 -0700 (PDT) Received: from [127.0.0.1] (s214090.ppp.asahi-net.or.jp. [220.157.214.90]) by mx.google.com with ESMTPSA id qv3sm1673372pbb.87.2014.06.03.15.30.59 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Jun 2014 15:31:01 -0700 (PDT) From: Magnus Damm To: linux-sh@vger.kernel.org Cc: Magnus Damm Date: Wed, 04 Jun 2014 07:33:04 +0900 Message-Id: <20140603223304.2193.1096.sendpatchset@w520> In-Reply-To: <20140603223255.2193.42153.sendpatchset@w520> References: <20140603223255.2193.42153.sendpatchset@w520> Subject: [PATCH 01/03] ARM: shmobile: r8a7790: SYS-DMAC prototype 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.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, 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: Magnus Damm Prototype code to enable part of the SYS-DMAC on r8a7790. Written to exercise the SYS-DMAC - Not for upstream merge. Based on the following patch by Kuninori Morimoto-san: "Local: ARM: shmobile: r8a7790: add SYS-DMAC support" This patch enables SYS-DMAC0 (= Low), it doesn't support SYS-DMAC1 (= HI) today. Because, SYS-DMAC HI/Low interrupt mapping is not good match to SH-DMAC driver. Signed-off-by: Kuninori Morimoto [horms+renesas@verge.net.au: Do not call r8a7790_register_sys_dmac() in r8a7790_add_standard_devices() as it is already called via r8a7790_add_dt_devices()] Signed-off-by: Simon Horman [damm+renesas@opensource.se: Remove SDHI bits, also remove legacy code path to make sure to cover only the DT reference case] Signed-off-by: Magnus Damm --- Applies to renesas-devel-v3.15-rc7-20140530 arch/arm/mach-shmobile/setup-r8a7790.c | 89 ++++++++++++++++++++++++++++---- 1 file changed, 80 insertions(+), 9 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- 0001/arch/arm/mach-shmobile/setup-r8a7790.c +++ work/arch/arm/mach-shmobile/setup-r8a7790.c 2014-06-03 21:24:37.000000000 +0900 @@ -32,6 +32,84 @@ #include #include +#define DMAE_CHANNEL(a, b) \ +{ \ + .offset = (a) - 0x20, \ + .dmars = (a) - 0x20 + 0x40, \ + .chclr_bit = (b), \ + .chclr_offset = 0x80 - 0x20, \ +} + +/* Sys-DMAC */ +#define SYS_DMAC_SLAVE(_id, _bit, _addr, toffset, roffset, t, r) \ +{ \ + .slave_id = SYS_DMAC_SLAVE_## _id ##_TX, \ + .addr = _addr + toffset, \ + .chcr = CHCR_TX(XMIT_SZ_## _bit ##BIT), \ + .mid_rid = t, \ +}, { \ + .slave_id = SYS_DMAC_SLAVE_## _id ##_RX, \ + .addr = _addr + roffset, \ + .chcr = CHCR_RX(XMIT_SZ_## _bit ##BIT), \ + .mid_rid = r, \ +} + +static const struct sh_dmae_slave_config r8a7790_sys_dmac_slaves[] = { +}; + +static const struct sh_dmae_channel r8a7790_sys_dmac_channels[] = { + DMAE_CHANNEL(0x8000, 0), + DMAE_CHANNEL(0x8080, 1), + DMAE_CHANNEL(0x8100, 2), + DMAE_CHANNEL(0x8180, 3), + DMAE_CHANNEL(0x8200, 4), + DMAE_CHANNEL(0x8280, 5), + DMAE_CHANNEL(0x8300, 6), + DMAE_CHANNEL(0x8380, 7), + DMAE_CHANNEL(0x8400, 8), + DMAE_CHANNEL(0x8480, 9), + DMAE_CHANNEL(0x8500, 10), + DMAE_CHANNEL(0x8580, 11), + DMAE_CHANNEL(0x8600, 12), + DMAE_CHANNEL(0x8680, 13), + DMAE_CHANNEL(0x8700, 14), +}; + +static struct sh_dmae_pdata r8a7790_sys_dmac_platform_data = { + .slave = r8a7790_sys_dmac_slaves, + .slave_num = ARRAY_SIZE(r8a7790_sys_dmac_slaves), + .channel = r8a7790_sys_dmac_channels, + .channel_num = ARRAY_SIZE(r8a7790_sys_dmac_channels), + .ts_low_shift = TS_LOW_SHIFT, + .ts_low_mask = TS_LOW_BIT << TS_LOW_SHIFT, + .ts_high_shift = TS_HI_SHIFT, + .ts_high_mask = TS_HI_BIT << TS_HI_SHIFT, + .ts_shift = dma_ts_shift, + .ts_shift_num = ARRAY_SIZE(dma_ts_shift), + .dmaor_init = DMAOR_DME, + .chclr_present = 1, + .chclr_bitwise = 1, +}; + +static struct resource r8a7790_sys_dmac_resources[] = { + /* Channel registers and DMAOR for low */ + DEFINE_RES_MEM(0xe6700020, 0x8763 - 0x20), + DEFINE_RES_IRQ(gic_spi(197)), + DEFINE_RES_NAMED(gic_spi(200), 15, NULL, IORESOURCE_IRQ), + + /* + * HI is not supported + * since IRQ has strange mapping + */ +}; + +#define r8a7790_register_sys_dmac(id) \ + platform_device_register_resndata( \ + &platform_bus, "sh-dma-engine", 2 + id, \ + &r8a7790_sys_dmac_resources[id * 3], 3, \ + &r8a7790_sys_dmac_platform_data, \ + sizeof(r8a7790_sys_dmac_platform_data)) + /* Audio-DMAC */ #define AUDIO_DMAC_SLAVE(_id, _addr, t, r) \ { \ @@ -59,14 +137,6 @@ static const struct sh_dmae_slave_config AUDIO_DMAC_SLAVE(SSI9, 0xec241240, 0x13, 0x14), }; -#define DMAE_CHANNEL(a, b) \ -{ \ - .offset = (a) - 0x20, \ - .dmars = (a) - 0x20 + 0x40, \ - .chclr_bit = (b), \ - .chclr_offset = 0x80 - 0x20, \ -} - static const struct sh_dmae_channel r8a7790_audio_dmac_channels[] = { DMAE_CHANNEL(0x8000, 0), DMAE_CHANNEL(0x8080, 1), @@ -282,6 +352,7 @@ static struct resource cmt0_resources[] void __init r8a7790_add_dt_devices(void) { r8a7790_register_cmt(0); + r8a7790_register_sys_dmac(0); } void __init r8a7790_add_standard_devices(void) @@ -296,7 +367,7 @@ void __init r8a7790_add_standard_devices r8a7790_register_scif(7); r8a7790_register_scif(8); r8a7790_register_scif(9); - r8a7790_add_dt_devices(); + r8a7790_register_cmt(0); r8a7790_register_irqc(0); r8a7790_register_thermal(); r8a7790_register_i2c(0);