From patchwork Tue Jun 10 23:03:45 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 4332541 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.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0381E9F314 for ; Tue, 10 Jun 2014 23:01:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2A4292028D for ; Tue, 10 Jun 2014 23:01:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 307782012F for ; Tue, 10 Jun 2014 23:01:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751948AbaFJXBk (ORCPT ); Tue, 10 Jun 2014 19:01:40 -0400 Received: from mail-pb0-f43.google.com ([209.85.160.43]:40924 "EHLO mail-pb0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751758AbaFJXBk (ORCPT ); Tue, 10 Jun 2014 19:01:40 -0400 Received: by mail-pb0-f43.google.com with SMTP id up15so6703272pbc.2 for ; Tue, 10 Jun 2014 16:01:40 -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=y2u7+mDA/rzf/+Z+U8DYMealXSub11//q/S+Kdkwcq0=; b=Cqq8/3Mh4E2m76X8JTSiEmomZavD8Oe9juMHMR32NoQv/VOrgxpQeJXlP9isVSKPWa xXGMjH0vDmVF0Mz9w5eBTrZPG9xJ58Ivl+0EtR6MTOTM1xivXlnJ/+i88tcgpHPBucuW a7NPZcQrh7gJ9SJogRDaAmdIE9t24eCj+OQX3YQartWmgnWdrTjByvfyVS4gnvx4JnVD lFWPqT49NInL47PaI5patE/ArjvRfSnB3ICSLLkwK7YSk58m6HHZE/YkBTPTzUKGsSkO AYzVFIeuG9Q5UiwPK+pKOzzL1YtLUSTV1F3+bdrZHYc+bBlnpTkGptz8qi6E0WjNIg+O MNIw== X-Received: by 10.68.254.70 with SMTP id ag6mr215762pbd.33.1402441299903; Tue, 10 Jun 2014 16:01:39 -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 iv2sm71453752pbc.19.2014.06.10.16.01.38 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Jun 2014 16:01:38 -0700 (PDT) From: Magnus Damm To: linux-sh@vger.kernel.org Cc: Magnus Damm Date: Wed, 11 Jun 2014 08:03:45 +0900 Message-Id: <20140610230345.13594.68069.sendpatchset@w520> In-Reply-To: <20140610230314.13594.91830.sendpatchset@w520> References: <20140610230314.13594.91830.sendpatchset@w520> Subject: [PATCH 04/07] ARM: shmobile: Lager SYS-DMAC and MMCIF 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 Hook up SYS-DMAC prototype support for MMCIF1 on Lager. Local platform device version of SYS-DMAC and local slave IDs are used together with AUXDATA. Only the DT reference case is covered. Not for upstream merge. Signed-off-by: Magnus Damm --- arch/arm/mach-shmobile/board-lager-reference.c | 26 +++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) -- 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 --- 0006/arch/arm/mach-shmobile/board-lager-reference.c +++ work/arch/arm/mach-shmobile/board-lager-reference.c 2014-06-10 22:29:39.000000000 +0900 @@ -72,10 +72,16 @@ static const struct resource du_resource #include #include +#include +#include /* Local DMA slave IDs */ enum { RCAR_DMA_SLAVE_LAGER_INVALID = 0, + SYS_DMAC_SLAVE_MMCIF0_TX = 64, + SYS_DMAC_SLAVE_MMCIF0_RX, + SYS_DMAC_SLAVE_MMCIF1_TX, + SYS_DMAC_SLAVE_MMCIF1_RX, }; #define DMAE_CHANNEL(a, b) \ @@ -101,6 +107,8 @@ enum { } static const struct sh_dmae_slave_config r8a7790_sys_dmac_slaves[] = { + SYS_DMAC_SLAVE(MMCIF0, 32, 0xee200000, 0x34, 0x34, 0xd1, 0xd2), + SYS_DMAC_SLAVE(MMCIF1, 32, 0xee220000, 0x34, 0x34, 0xe1, 0xe2), }; static const struct sh_dmae_channel r8a7790_sys_dmac_channels[] = { @@ -161,6 +169,21 @@ static void __init lager_add_dmac_protot r8a7790_register_sys_dmac(0); } +static struct sh_mmcif_plat_data mmcif1_pdata = { + .caps = MMC_CAP_4_BIT_DATA | + MMC_CAP_8_BIT_DATA | + MMC_CAP_NONREMOVABLE, + .ccs_unsupported = true, + .slave_id_tx = SYS_DMAC_SLAVE_MMCIF1_TX, + .slave_id_rx = SYS_DMAC_SLAVE_MMCIF1_RX, +}; + +static struct of_dev_auxdata lager_auxdata_lookup[] __initdata = { + OF_DEV_AUXDATA("renesas,mmcif-r8a7790", 0xee220000, "sh_mmcif", + &mmcif1_pdata), + {}, +}; + static void __init lager_add_du_device(void) { struct platform_device_info info = { @@ -194,7 +217,8 @@ static void __init lager_add_standard_de shmobile_clk_workaround(clk_names, ARRAY_SIZE(clk_names), false); r8a7790_add_dt_devices(); lager_add_dmac_prototype(); - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + of_platform_populate(NULL, of_default_bus_match_table, + lager_auxdata_lookup, NULL); lager_add_du_device(); }