From patchwork Thu Jun 12 09:42:40 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 4340181 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 0036BBEEAA for ; Thu, 12 Jun 2014 09:40:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1B54D20218 for ; Thu, 12 Jun 2014 09:40:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3F63F20340 for ; Thu, 12 Jun 2014 09:40:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933031AbaFLJkg (ORCPT ); Thu, 12 Jun 2014 05:40:36 -0400 Received: from mail-pa0-f44.google.com ([209.85.220.44]:50793 "EHLO mail-pa0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932845AbaFLJkf (ORCPT ); Thu, 12 Jun 2014 05:40:35 -0400 Received: by mail-pa0-f44.google.com with SMTP id bj1so831197pad.31 for ; Thu, 12 Jun 2014 02:40:34 -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=k7oBHwM/Ocb6DeiZ6wev97WNn0Qb1QJuCbEB0aNc8Pc=; b=x4YnkK6b3BO60Omnh57iYvDVm8/JRay1t6WqA0Dhp8IEMVeptt9TmTyQpmyxzUg3ed CIb+b0UZMDuCYs6LzR4POWGctl/arEZBcfTupQgbiTpIEYW3c8hqJU4RcJYeAOIuv6cP aTSOVsxkajUEHaIfSJ6RqXjjaTar7lmbJml7IB+aOfpyyzIi3PjLvY44LkDOKQZWVshf qsqkBzp9fl9hgWEJLzN/fsaW0BDgj/FV2nJRIr4SfFbuZ3moDhZlXXWVOv21vjF/5Wzy bdY7XiNhkZW2WmQqPZsA25bHIy1OqdyJKC3EHZlxvBBr453cAmF3tUPb0n8Jzj8QS5dZ 3iew== X-Received: by 10.66.242.171 with SMTP id wr11mr19457160pac.111.1402566034690; Thu, 12 Jun 2014 02:40:34 -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 fl6sm2555995pab.43.2014.06.12.02.40.33 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Jun 2014 02:40:33 -0700 (PDT) From: Magnus Damm To: linux-sh@vger.kernel.org Cc: Magnus Damm , geert+renesas@glider.be Date: Thu, 12 Jun 2014 18:42:40 +0900 Message-Id: <20140612094240.4132.99846.sendpatchset@w520> In-Reply-To: <20140612094209.4132.78270.sendpatchset@w520> References: <20140612094209.4132.78270.sendpatchset@w520> Subject: [PATCH v2 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 --- Changes since V1: - None 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(); }