From patchwork Tue Jun 10 23:04:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 4332571 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 0F085BEEAA for ; Tue, 10 Jun 2014 23:02:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 338672028D for ; Tue, 10 Jun 2014 23:02:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4A6FD2012F for ; Tue, 10 Jun 2014 23:02:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751948AbaFJXCD (ORCPT ); Tue, 10 Jun 2014 19:02:03 -0400 Received: from mail-pb0-f47.google.com ([209.85.160.47]:51456 "EHLO mail-pb0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751758AbaFJXCD (ORCPT ); Tue, 10 Jun 2014 19:02:03 -0400 Received: by mail-pb0-f47.google.com with SMTP id un15so1322354pbc.6 for ; Tue, 10 Jun 2014 16:02: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=YtTZ/TGLJ22YESygp0u/RnNCRA05686wXPYGrl8EoKU=; b=NzOPWR2EK0X31idqPtsYEqgB+F69x+oDX9I8ieD6lvAuKfwS4qEPwgkzKdVYLJAh2s UxciSygvUDekuYmMR6eWQFqJVW+oHjaIie/h1os+EWbljZ7MxPWd8mlt5uz2t/2l+5ir Fj2sWHTCwdPZL8EEPgz+B5AEL/1Lk8OPGwB2rIyE7VTFj+npktEiwKtTlnD7Pc4RR5JJ g766QlDp+8H5v0xZE8zZ7wN2H4VnNO+SRPwe47pl0HTQK04avqcDPcfJvdurcGO6CPba l8C1+ZIfk10EfhUWFqFcRoT2VQ6f+VQ6P9AZWaR+xTcpzJ8zVP6K2w4wCF5sHXzhHg/c cNMQ== X-Received: by 10.68.234.2 with SMTP id ua2mr208372pbc.81.1402441322255; Tue, 10 Jun 2014 16:02: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 tg9sm71438609pbc.29.2014.06.10.16.02.00 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Jun 2014 16:02:01 -0700 (PDT) From: Magnus Damm To: linux-sh@vger.kernel.org Cc: Magnus Damm Date: Wed, 11 Jun 2014 08:04:07 +0900 Message-Id: <20140610230407.13594.80741.sendpatchset@w520> In-Reply-To: <20140610230314.13594.91830.sendpatchset@w520> References: <20140610230314.13594.91830.sendpatchset@w520> Subject: [PATCH 07/07] ARM: shmobile: Koelsch SYS-DMAC and SDHI 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 SDHI on Koelsch. Local platform device version of SYS-DMAC and local slave IDs are used together with AUXDATA. CD and WP pins, regulators and clocks are provided via DT. Only the DT reference case is covered. Not for upstream merge. Signed-off-by: Magnus Damm --- arch/arm/mach-shmobile/board-koelsch-reference.c | 61 +++++++++++++++++++++- 1 file changed, 60 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 --- 0010/arch/arm/mach-shmobile/board-koelsch-reference.c +++ work/arch/arm/mach-shmobile/board-koelsch-reference.c 2014-06-11 06:58:45.000000000 +0900 @@ -68,10 +68,19 @@ static const struct resource du_resource #include #include +#include +#include +#include /* Local DMA slave IDs */ enum { RCAR_DMA_SLAVE_KOELSCH_INVALID = 0, + SYS_DMAC_SLAVE_SDHI0_TX, + SYS_DMAC_SLAVE_SDHI0_RX, + SYS_DMAC_SLAVE_SDHI1_TX, + SYS_DMAC_SLAVE_SDHI1_RX, + SYS_DMAC_SLAVE_SDHI2_TX, + SYS_DMAC_SLAVE_SDHI2_RX, }; #define DMAE_CHANNEL(a, b) \ @@ -97,6 +106,9 @@ enum { } static const struct sh_dmae_slave_config r8a7791_sys_dmac_slaves[] = { + SYS_DMAC_SLAVE(SDHI0, 16, 0xee100000, 0x60, 0x2060, 0xcd, 0xce), + SYS_DMAC_SLAVE(SDHI1, 16, 0xee140000, 0x30, 0x2030, 0xc1, 0xc2), + SYS_DMAC_SLAVE(SDHI2, 16, 0xee160000, 0x30, 0x2030, 0xd3, 0xd4), }; static const struct sh_dmae_channel r8a7791_sys_dmac_channels[] = { @@ -158,6 +170,52 @@ static void __init koelsch_add_dmac_prot r8a7791_register_sys_dmac(0); } +static struct sh_mobile_sdhi_info sdhi0_info __initdata = { + .dma_slave_tx = SYS_DMAC_SLAVE_SDHI0_TX, + .dma_slave_rx = SYS_DMAC_SLAVE_SDHI0_RX, + .dma_rx_offset = 0x2000, + + .tmio_caps = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ | + MMC_CAP_POWER_OFF_CARD, + .tmio_caps2 = MMC_CAP2_NO_MULTI_READ, + .tmio_flags = TMIO_MMC_HAS_IDLE_WAIT | + TMIO_MMC_WRPROTECT_DISABLE, +}; + +static struct sh_mobile_sdhi_info sdhi1_info __initdata = { + .dma_slave_tx = SYS_DMAC_SLAVE_SDHI1_TX, + .dma_slave_rx = SYS_DMAC_SLAVE_SDHI1_RX, + .dma_rx_offset = 0x2000, + + .tmio_caps = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ | + MMC_CAP_POWER_OFF_CARD, + .tmio_caps2 = MMC_CAP2_NO_MULTI_READ, + .tmio_flags = TMIO_MMC_HAS_IDLE_WAIT | + TMIO_MMC_WRPROTECT_DISABLE, +}; + +static struct sh_mobile_sdhi_info sdhi2_info __initdata = { + .dma_slave_tx = SYS_DMAC_SLAVE_SDHI2_TX, + .dma_slave_rx = SYS_DMAC_SLAVE_SDHI2_RX, + .dma_rx_offset = 0x2000, + + .tmio_caps = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ | + MMC_CAP_POWER_OFF_CARD, + .tmio_caps2 = MMC_CAP2_NO_MULTI_READ, + .tmio_flags = TMIO_MMC_HAS_IDLE_WAIT | + TMIO_MMC_WRPROTECT_DISABLE, +}; + +static struct of_dev_auxdata koelsch_auxdata_lookup[] __initdata = { + OF_DEV_AUXDATA("renesas,sdhi-r8a7791", 0xee100000, "sdhi0", + &sdhi0_info), + OF_DEV_AUXDATA("renesas,sdhi-r8a7791", 0xee140000, "sdhi1", + &sdhi1_info), + OF_DEV_AUXDATA("renesas,sdhi-r8a7791", 0xee160000, "sdhi2", + &sdhi2_info), + {}, +}; + static void __init koelsch_add_du_device(void) { struct platform_device_info info = { @@ -189,7 +247,8 @@ static void __init koelsch_add_standard_ shmobile_clk_workaround(clk_names, ARRAY_SIZE(clk_names), false); r8a7791_add_dt_devices(); koelsch_add_dmac_prototype(); - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + of_platform_populate(NULL, of_default_bus_match_table, + koelsch_auxdata_lookup, NULL); koelsch_add_du_device(); }