From patchwork Mon Aug 6 12:31:05 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phil Edworthy X-Patchwork-Id: 1278781 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 672193FC23 for ; Mon, 6 Aug 2012 12:32:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756124Ab2HFMcB (ORCPT ); Mon, 6 Aug 2012 08:32:01 -0400 Received: from relmlor1.renesas.com ([210.160.252.171]:44504 "EHLO relmlor1.renesas.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756126Ab2HFMcA (ORCPT ); Mon, 6 Aug 2012 08:32:00 -0400 Received: from relmlir3.idc.renesas.com ([10.200.68.153]) by relmlor1.idc.renesas.com ( SJSMS) with ESMTP id <0M8C00AIT2TBIQA0@relmlor1.idc.renesas.com> for linux-sh@vger.kernel.org; Mon, 06 Aug 2012 21:31:59 +0900 (JST) Received: from relmlac1.idc.renesas.com ([10.200.69.21]) by relmlir3.idc.renesas.com ( SJSMS) with ESMTP id <0M8C00AK02TBXC80@relmlir3.idc.renesas.com> for linux-sh@vger.kernel.org; Mon, 06 Aug 2012 21:31:59 +0900 (JST) Received: by relmlac1.idc.renesas.com (Postfix, from userid 0) id 0E88C8015D; Mon, 06 Aug 2012 21:31:59 +0900 (JST) Received: from relmlac1.idc.renesas.com (localhost [127.0.0.1]) by relmlac1.idc.renesas.com (Postfix) with ESMTP id 090B78015B; Mon, 06 Aug 2012 21:31:59 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac1.idc.renesas.com with ESMTP id XAC13320; Mon, 06 Aug 2012 21:31:59 +0900 X-IronPort-AV: E=Sophos; i="4.77,720,1336316400"; d="scan'208"; a="93515320" Received: from unknown (HELO relay51.aps.necel.com) ([10.29.19.60]) by relmlii2.idc.renesas.com with ESMTP; Mon, 06 Aug 2012 21:31:58 +0900 Received: from julia (du2com5.eu.necel.com [172.29.24.35] (may be forged)) by relay51.aps.necel.com (8.14.4+Sun/8.14.4) with ESMTP id q76CVtpp021748; Mon, 06 Aug 2012 21:31:56 +0900 (JST) Received: by julia (Postfix, from userid 2) id 8A82F102F0; Mon, 06 Aug 2012 14:31:55 +0200 (CEST) Received: from du0nohub.eu.necel.com (unknown [172.29.24.70]) by julia (Postfix) with ESMTP id BE00F102EE; Mon, 06 Aug 2012 14:31:54 +0200 (CEST) Received: from duacsls.ad.ree.renesas.com ([172.29.43.47]) by du0nohub.eu.necel.com (Lotus Domino Release 8.5.3 HF466) with ESMTP id 2012080614312326-209677 ; Mon, 06 Aug 2012 14:31:23 +0200 From: Phil Edworthy To: linux-sh@vger.kernel.org, Kuninori Morimoto Cc: kuninori morimoto , Magnus Damm , "Rafael J. Wysocki" , Phil Edworthy X-Mailer: git-send-email 1.7.5.4 In-reply-to: <1344256265-9802-1-git-send-email-phil.edworthy@renesas.com> References: <1344256265-9802-1-git-send-email-phil.edworthy@renesas.com> X-TNEFEvaluated: 1 Message-id: <1344256265-9802-3-git-send-email-phil.edworthy@renesas.com> Date: Mon, 06 Aug 2012 13:31:05 +0100 Subject: [PATCH 2/2 v2] marzen: add SDHI0 support X-MIMETrack: Itemize by SMTP Server on DU0NOHUB/NECEE(Release 8.5.3 HF466|March 09, 2012) at 06.08.2012 14:31:23, Serialize by Router on DU0NOHUB/NECEE(Release 8.5.3 HF466|March 09, 2012) at 06.08.2012 14:31:55, Serialize complete at 06.08.2012 14:31:55 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org Signed-off-by: Phil Edworthy --- v2: Added SDHI to defconfig. Moved function to better match other boards. Register the fixed voltage regulator. Minor formatting change. arch/arm/configs/marzen_defconfig | 4 +- arch/arm/mach-shmobile/board-marzen.c | 52 ++++++++++++++++++++++++++++++++- 2 files changed, 53 insertions(+), 3 deletions(-) diff --git a/arch/arm/configs/marzen_defconfig b/arch/arm/configs/marzen_defconfig index 864f9a5..bf42ad2 100644 --- a/arch/arm/configs/marzen_defconfig +++ b/arch/arm/configs/marzen_defconfig @@ -71,12 +71,12 @@ CONFIG_GPIO_SYSFS=y CONFIG_SSB=y # CONFIG_HID_SUPPORT is not set # CONFIG_USB_SUPPORT is not set +CONFIG_MMC=y +CONFIG_MMC_SDHI=y CONFIG_UIO=y CONFIG_UIO_PDRV_GENIRQ=y # CONFIG_IOMMU_SUPPORT is not set # CONFIG_FILE_LOCKING is not set -# CONFIG_DNOTIFY is not set -# CONFIG_INOTIFY_USER is not set CONFIG_TMPFS=y # CONFIG_MISC_FILESYSTEMS is not set CONFIG_MAGIC_SYSRQ=y diff --git a/arch/arm/mach-shmobile/board-marzen.c b/arch/arm/mach-shmobile/board-marzen.c index 3a528cf..dec3ffc 100644 --- a/arch/arm/mach-shmobile/board-marzen.c +++ b/arch/arm/mach-shmobile/board-marzen.c @@ -30,6 +30,8 @@ #include #include #include +#include +#include #include #include #include @@ -39,6 +41,12 @@ #include #include +/* Fixed 3.3V regulator to be used by SDHI0 */ +static struct regulator_consumer_supply fixed3v3_power_consumers[] = { + REGULATOR_SUPPLY("vmmc", "sh_mobile_sdhi.0"), + REGULATOR_SUPPLY("vqmmc", "sh_mobile_sdhi.0"), +}; + /* Dummy supplies, where voltage doesn't matter */ static struct regulator_consumer_supply dummy_supplies[] = { REGULATOR_SUPPLY("vddvario", "smsc911x"), @@ -75,13 +83,45 @@ static struct platform_device eth_device = { .num_resources = ARRAY_SIZE(smsc911x_resources), }; +static struct resource sdhi0_resources[] = { + [0] = { + .name = "sdhi0", + .start = 0xffe4c000, + .end = 0xffe4c0ff, + .flags = IORESOURCE_MEM, + }, + [1] = { + .start = gic_spi(104), + .flags = IORESOURCE_IRQ, + }, +}; + +static struct sh_mobile_sdhi_info sdhi0_platform_data = { + .tmio_flags = TMIO_MMC_WRPROTECT_DISABLE | TMIO_MMC_HAS_IDLE_WAIT, + .tmio_caps = MMC_CAP_SD_HIGHSPEED, +}; + +static struct platform_device sdhi0_device = { + .name = "sh_mobile_sdhi", + .num_resources = ARRAY_SIZE(sdhi0_resources), + .resource = sdhi0_resources, + .id = 0, + .dev = { + .platform_data = &sdhi0_platform_data, + } +}; + static struct platform_device *marzen_devices[] __initdata = { ð_device, + &sdhi0_device, }; static void __init marzen_init(void) { - regulator_register_fixed(0, dummy_supplies, ARRAY_SIZE(dummy_supplies)); + regulator_register_always_on(0, "fixed-3.3V", fixed3v3_power_consumers, + ARRAY_SIZE(fixed3v3_power_consumers), 3300000); + regulator_register_fixed(0, dummy_supplies, + ARRAY_SIZE(dummy_supplies)); r8a7779_pinmux_init(); @@ -97,6 +137,16 @@ static void __init marzen_init(void) gpio_request(GPIO_FN_EX_CS0, NULL); /* nCS */ gpio_request(GPIO_FN_IRQ1_B, NULL); /* IRQ + PME */ + /* SD0 (CN20) */ + gpio_request(GPIO_FN_SD0_CLK, NULL); + gpio_request(GPIO_FN_SD0_CMD, NULL); + gpio_request(GPIO_FN_SD0_DAT0, NULL); + gpio_request(GPIO_FN_SD0_DAT1, NULL); + gpio_request(GPIO_FN_SD0_DAT2, NULL); + gpio_request(GPIO_FN_SD0_DAT3, NULL); + gpio_request(GPIO_FN_SD0_CD, NULL); + gpio_request(GPIO_FN_SD0_WP, NULL); + r8a7779_add_standard_devices(); platform_add_devices(marzen_devices, ARRAY_SIZE(marzen_devices)); }