From patchwork Tue Jul 23 10:50:01 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 2831932 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 522FDC0319 for ; Tue, 23 Jul 2013 10:54:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 02AED201D5 for ; Tue, 23 Jul 2013 10:54:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 47F452018E for ; Tue, 23 Jul 2013 10:54:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756904Ab3GWKux (ORCPT ); Tue, 23 Jul 2013 06:50:53 -0400 Received: from moutng.kundenserver.de ([212.227.126.187]:55316 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753743Ab3GWKuQ (ORCPT ); Tue, 23 Jul 2013 06:50:16 -0400 Received: from axis700.grange (dslb-094-220-153-077.pools.arcor-ip.net [94.220.153.77]) by mrelayeu.kundenserver.de (node=mreu4) with ESMTP (Nemesis) id 0LZYWu-1UGRZf3gPE-00lUGA; Tue, 23 Jul 2013 12:50:12 +0200 Received: from 6a.grange (6a.grange [192.168.1.11]) by axis700.grange (Postfix) with ESMTPS id BCF9540BB8; Tue, 23 Jul 2013 12:50:10 +0200 (CEST) Received: from lyakh by 6a.grange with local (Exim 4.72) (envelope-from ) id 1V1aAU-0007EJ-E8; Tue, 23 Jul 2013 12:50:10 +0200 From: Guennadi Liakhovetski To: linux-kernel@vger.kernel.org Cc: Magnus Damm , Simon Horman , Laurent Pinchart , Vinod Koul , linux-sh@vger.kernel.org, Sergei Shtylyov , Guennadi Liakhovetski Subject: [PATCH v4 07/15] DMA: shdma: add sh73a0 DMAC data to the device ID table Date: Tue, 23 Jul 2013 12:50:01 +0200 Message-Id: <1374576609-27748-8-git-send-email-g.liakhovetski@gmx.de> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1374576609-27748-1-git-send-email-g.liakhovetski@gmx.de> References: <1374576609-27748-1-git-send-email-g.liakhovetski@gmx.de> X-Provags-ID: V02:K0:2UlaGR0yxD8rggMl1Ffwd2RE4YiuYHTqwli4dC9UES1 f7CLMXIxkHH4WgFhO+yOe1jR1gVhGiEYCbjsJQ15wfUDbr4bBn 8OrWKtlPMdfYv8rR+HGJzjPp51b4NofWjaR7UJjatiWUhga5Qa HO69MgwklHF9mIO4nciawOj88WruhkgBqctGAbez1ofuLdVBzp zWQnqMpVWiuCZX3uYvEbqkXsMigJwSu9/lpHe/FBfTQaVS4DNC VXmftBaHNNnb7wJ5gP+Pt3+DEH/BSyGJBlYJ+gDYowbyJdavwn gkUW07bQxSv5ch5tec3UjcPpFKDvfdcEoZNqNkHpvfmqHs3pNT MlgBHECG48561BW+kaxp+QcJ6wvnvMa1YoIqNSDe237+sQOcun T82bffyAYpzIQ== 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,FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, 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 This configuration data will be re-used, when DMAC DT support is added to sh73a0, DMAC platform data in setup-sh73a0.c will be removed. Signed-off-by: Guennadi Liakhovetski --- v4: add documentation Documentation/devicetree/bindings/dma/shdma.txt | 1 + drivers/dma/sh/Kconfig | 4 + drivers/dma/sh/Makefile | 1 + drivers/dma/sh/shdma-sh73a0.c | 181 +++++++++++++++++++++++ drivers/dma/sh/shdma.h | 7 + drivers/dma/sh/shdmac.c | 2 + 6 files changed, 196 insertions(+), 0 deletions(-) create mode 100644 drivers/dma/sh/shdma-sh73a0.c diff --git a/Documentation/devicetree/bindings/dma/shdma.txt b/Documentation/devicetree/bindings/dma/shdma.txt index be0f82b..6b015d6 100644 --- a/Documentation/devicetree/bindings/dma/shdma.txt +++ b/Documentation/devicetree/bindings/dma/shdma.txt @@ -25,6 +25,7 @@ Required properties: - compatible: should be one of "renesas,shdma-r8a73a4" for the system DMAC on r8a73a4 SoC "renesas,shdma-r8a7740" for the DMACs (not RTDMAC) on r8a7740 + "renesas,shdma-sh73a0" for the DMACs on sh73a0 Example: dmac: dma-mux0 { diff --git a/drivers/dma/sh/Kconfig b/drivers/dma/sh/Kconfig index 6921ba2..040d780 100644 --- a/drivers/dma/sh/Kconfig +++ b/drivers/dma/sh/Kconfig @@ -30,3 +30,7 @@ config SHDMA_R8A73A4 config SHDMA_R8A7740 def_bool y depends on ARCH_R8A7740 && SH_DMAE != n + +config SHDMA_SH73A0 + def_bool y + depends on ARCH_SH73A0 && SH_DMAE != n diff --git a/drivers/dma/sh/Makefile b/drivers/dma/sh/Makefile index 8352bfb..4facc1f 100644 --- a/drivers/dma/sh/Makefile +++ b/drivers/dma/sh/Makefile @@ -3,5 +3,6 @@ obj-$(CONFIG_SH_DMAE) += shdma.o shdma-y := shdmac.o shdma-$(CONFIG_SHDMA_R8A73A4) += shdma-r8a73a4.o shdma-$(CONFIG_SHDMA_R8A7740) += shdma-r8a7740.o +shdma-$(CONFIG_SHDMA_SH73A0) += shdma-sh73a0.o shdma-objs := $(shdma-y) obj-$(CONFIG_SUDMAC) += sudmac.o diff --git a/drivers/dma/sh/shdma-sh73a0.c b/drivers/dma/sh/shdma-sh73a0.c new file mode 100644 index 0000000..59b311e --- /dev/null +++ b/drivers/dma/sh/shdma-sh73a0.c @@ -0,0 +1,181 @@ +#include + +#include +#include + +static const struct sh_dmae_slave_config sh73a0_dmae_slaves[] = { + { + .slave_id = SHDMA_SLAVE_SCIF0_TX, + .addr = 0xe6c40020, + .chcr = CHCR_TX(XMIT_SZ_8BIT), + .mid_rid = 0x21, + }, { + .slave_id = SHDMA_SLAVE_SCIF0_RX, + .addr = 0xe6c40024, + .chcr = CHCR_RX(XMIT_SZ_8BIT), + .mid_rid = 0x22, + }, { + .slave_id = SHDMA_SLAVE_SCIF1_TX, + .addr = 0xe6c50020, + .chcr = CHCR_TX(XMIT_SZ_8BIT), + .mid_rid = 0x25, + }, { + .slave_id = SHDMA_SLAVE_SCIF1_RX, + .addr = 0xe6c50024, + .chcr = CHCR_RX(XMIT_SZ_8BIT), + .mid_rid = 0x26, + }, { + .slave_id = SHDMA_SLAVE_SCIF2_TX, + .addr = 0xe6c60020, + .chcr = CHCR_TX(XMIT_SZ_8BIT), + .mid_rid = 0x29, + }, { + .slave_id = SHDMA_SLAVE_SCIF2_RX, + .addr = 0xe6c60024, + .chcr = CHCR_RX(XMIT_SZ_8BIT), + .mid_rid = 0x2a, + }, { + .slave_id = SHDMA_SLAVE_SCIF3_TX, + .addr = 0xe6c70020, + .chcr = CHCR_TX(XMIT_SZ_8BIT), + .mid_rid = 0x2d, + }, { + .slave_id = SHDMA_SLAVE_SCIF3_RX, + .addr = 0xe6c70024, + .chcr = CHCR_RX(XMIT_SZ_8BIT), + .mid_rid = 0x2e, + }, { + .slave_id = SHDMA_SLAVE_SCIF4_TX, + .addr = 0xe6c80020, + .chcr = CHCR_TX(XMIT_SZ_8BIT), + .mid_rid = 0x39, + }, { + .slave_id = SHDMA_SLAVE_SCIF4_RX, + .addr = 0xe6c80024, + .chcr = CHCR_RX(XMIT_SZ_8BIT), + .mid_rid = 0x3a, + }, { + .slave_id = SHDMA_SLAVE_SCIF5_TX, + .addr = 0xe6cb0020, + .chcr = CHCR_TX(XMIT_SZ_8BIT), + .mid_rid = 0x35, + }, { + .slave_id = SHDMA_SLAVE_SCIF5_RX, + .addr = 0xe6cb0024, + .chcr = CHCR_RX(XMIT_SZ_8BIT), + .mid_rid = 0x36, + }, { + .slave_id = SHDMA_SLAVE_SCIF6_TX, + .addr = 0xe6cc0020, + .chcr = CHCR_TX(XMIT_SZ_8BIT), + .mid_rid = 0x1d, + }, { + .slave_id = SHDMA_SLAVE_SCIF6_RX, + .addr = 0xe6cc0024, + .chcr = CHCR_RX(XMIT_SZ_8BIT), + .mid_rid = 0x1e, + }, { + .slave_id = SHDMA_SLAVE_SCIF7_TX, + .addr = 0xe6cd0020, + .chcr = CHCR_TX(XMIT_SZ_8BIT), + .mid_rid = 0x19, + }, { + .slave_id = SHDMA_SLAVE_SCIF7_RX, + .addr = 0xe6cd0024, + .chcr = CHCR_RX(XMIT_SZ_8BIT), + .mid_rid = 0x1a, + }, { + .slave_id = SHDMA_SLAVE_SCIF8_TX, + .addr = 0xe6c30040, + .chcr = CHCR_TX(XMIT_SZ_8BIT), + .mid_rid = 0x3d, + }, { + .slave_id = SHDMA_SLAVE_SCIF8_RX, + .addr = 0xe6c30060, + .chcr = CHCR_RX(XMIT_SZ_8BIT), + .mid_rid = 0x3e, + }, { + .slave_id = SHDMA_SLAVE_SDHI0_TX, + .addr = 0xee100030, + .chcr = CHCR_TX(XMIT_SZ_16BIT), + .mid_rid = 0xc1, + }, { + .slave_id = SHDMA_SLAVE_SDHI0_RX, + .addr = 0xee100030, + .chcr = CHCR_RX(XMIT_SZ_16BIT), + .mid_rid = 0xc2, + }, { + .slave_id = SHDMA_SLAVE_SDHI1_TX, + .addr = 0xee120030, + .chcr = CHCR_TX(XMIT_SZ_16BIT), + .mid_rid = 0xc9, + }, { + .slave_id = SHDMA_SLAVE_SDHI1_RX, + .addr = 0xee120030, + .chcr = CHCR_RX(XMIT_SZ_16BIT), + .mid_rid = 0xca, + }, { + .slave_id = SHDMA_SLAVE_SDHI2_TX, + .addr = 0xee140030, + .chcr = CHCR_TX(XMIT_SZ_16BIT), + .mid_rid = 0xcd, + }, { + .slave_id = SHDMA_SLAVE_SDHI2_RX, + .addr = 0xee140030, + .chcr = CHCR_RX(XMIT_SZ_16BIT), + .mid_rid = 0xce, + }, { + .slave_id = SHDMA_SLAVE_MMCIF_TX, + .addr = 0xe6bd0034, + .chcr = CHCR_TX(XMIT_SZ_32BIT), + .mid_rid = 0xd1, + }, { + .slave_id = SHDMA_SLAVE_MMCIF_RX, + .addr = 0xe6bd0034, + .chcr = CHCR_RX(XMIT_SZ_32BIT), + .mid_rid = 0xd2, + }, +}; + +#define DMAE_CHANNEL(_offset) \ + { \ + .offset = _offset - 0x20, \ + .dmars = _offset - 0x20 + 0x40, \ + } + +static const struct sh_dmae_channel sh73a0_dmae_channels[] = { + DMAE_CHANNEL(0x8000), + DMAE_CHANNEL(0x8080), + DMAE_CHANNEL(0x8100), + DMAE_CHANNEL(0x8180), + DMAE_CHANNEL(0x8200), + DMAE_CHANNEL(0x8280), + DMAE_CHANNEL(0x8300), + DMAE_CHANNEL(0x8380), + DMAE_CHANNEL(0x8400), + DMAE_CHANNEL(0x8480), + DMAE_CHANNEL(0x8500), + DMAE_CHANNEL(0x8580), + DMAE_CHANNEL(0x8600), + DMAE_CHANNEL(0x8680), + DMAE_CHANNEL(0x8700), + DMAE_CHANNEL(0x8780), + DMAE_CHANNEL(0x8800), + DMAE_CHANNEL(0x8880), + DMAE_CHANNEL(0x8900), + DMAE_CHANNEL(0x8980), +}; + +const struct sh_dmae_pdata sh73a0_dma_pdata = { + .slave = sh73a0_dmae_slaves, + .slave_num = ARRAY_SIZE(sh73a0_dmae_slaves), + .channel = sh73a0_dmae_channels, + .channel_num = ARRAY_SIZE(sh73a0_dmae_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, +}; diff --git a/drivers/dma/sh/shdma.h b/drivers/dma/sh/shdma.h index ae0c65f..8394424 100644 --- a/drivers/dma/sh/shdma.h +++ b/drivers/dma/sh/shdma.h @@ -75,4 +75,11 @@ extern struct sh_dmae_pdata r8a7740_dma_pdata; #define r8a7740_shdma_devid NULL #endif +#ifdef CONFIG_SHDMA_SH73A0 +extern const struct sh_dmae_pdata sh73a0_dma_pdata; +#define sh73a0_shdma_devid &sh73a0_dma_pdata +#else +#define sh73a0_shdma_devid NULL +#endif + #endif /* __DMA_SHDMA_H */ diff --git a/drivers/dma/sh/shdmac.c b/drivers/dma/sh/shdmac.c index aa90ea2..9ee3c28 100644 --- a/drivers/dma/sh/shdmac.c +++ b/drivers/dma/sh/shdmac.c @@ -668,6 +668,7 @@ static const struct shdma_ops sh_dmae_shdma_ops = { static const struct of_device_id sh_dmae_of_match[] = { {.compatible = "renesas,shdma-r8a73a4", .data = r8a73a4_shdma_devid,}, {.compatible = "renesas,shdma-r8a7740", .data = r8a7740_shdma_devid,}, + {.compatible = "renesas,shdma-sh73a0", .data = sh73a0_shdma_devid,}, {} }; MODULE_DEVICE_TABLE(of, sh_dmae_of_match); @@ -916,6 +917,7 @@ const struct platform_device_id sh_dmae_id_table[] = { {.name = SH_DMAE_DRV_NAME,}, {.name = "shdma-r8a73a4", .driver_data = (kernel_ulong_t)r8a73a4_shdma_devid,}, {.name = "shdma-r8a7740", .driver_data = (kernel_ulong_t)r8a7740_shdma_devid,}, + {.name = "shdma-sh73a0", .driver_data = (kernel_ulong_t)sh73a0_shdma_devid,}, {} }; MODULE_DEVICE_TABLE(platform, sh_dmae_id_table);