From patchwork Fri Nov 12 22:38:53 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Victor Rodriguez X-Patchwork-Id: 321652 Received: from comal.ext.ti.com (comal.ext.ti.com [198.47.26.152]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oACMgo5Z021655 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 12 Nov 2010 22:43:12 GMT Received: from dlep36.itg.ti.com ([157.170.170.91]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id oACMfQ1J003857 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 12 Nov 2010 16:41:26 -0600 Received: from linux.omap.com (localhost [127.0.0.1]) by dlep36.itg.ti.com (8.13.8/8.13.8) with ESMTP id oACMfQBp017658; Fri, 12 Nov 2010 16:41:26 -0600 (CST) Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id 0173280632; Fri, 12 Nov 2010 16:41:23 -0600 (CST) X-Original-To: davinci-linux-open-source@linux.davincidsp.com Delivered-To: davinci-linux-open-source@linux.davincidsp.com Received: from dflp52.itg.ti.com (dflp52.itg.ti.com [128.247.22.96]) by linux.omap.com (Postfix) with ESMTP id 0F92480626 for ; Fri, 12 Nov 2010 16:39:55 -0600 (CST) Received: from red.ext.ti.com (localhost [127.0.0.1]) by dflp52.itg.ti.com (8.13.7/8.13.7) with ESMTP id oACMdsch018508 for ; Fri, 12 Nov 2010 16:39:54 -0600 (CST) Received: from psmtp.com (na3sys009amx243.postini.com [74.125.149.127]) by red.ext.ti.com (8.13.7/8.13.7) with SMTP id oACMdsAk004013 for ; Fri, 12 Nov 2010 16:39:54 -0600 Received: from source ([209.85.160.173]) by na3sys009amx243.postini.com ([74.125.148.10]) with SMTP; Fri, 12 Nov 2010 14:39:54 PST Received: by mail-gy0-f173.google.com with SMTP id 10so348142gyd.4 for ; Fri, 12 Nov 2010 14:39:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=6tRTwZiJ2uIQBxAPeRicsluy4iLLHHk8M/ZRA/272Dc=; b=oSqd69xc0452w1DVR+aK71KB2rMTKjFebVqEMkNUnxD9qTvDrmNISzONZMmqGpG0u3 OyWnVXwL2rOwLV4UeXYxWY/K3mF3rmJwXD8NNYDrJ8ZkUtHwJqlJ0xK3JQpLd5Rke0vw KRxeB+1ov9zTLLUZaWpULXyCOHNmX0u8a6XoA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=P80ULWk054FOOLC6ThU/7ck+HSfR0RItrFQollH2H3VppX/eaP+kKT0hiHw/cFm78J 8hjyBgVlCZtFASFAHApsR8doIoaxxMOhWGZ8e7ppT6hE2SClY+9OPL47MUHuLPrl9RnZ DXZPdxOFq1+0aWqEiD04ZJ/Pt2jIWxiurt1CM= Received: by 10.150.227.16 with SMTP id z16mr4729428ybg.315.1289601594098; Fri, 12 Nov 2010 14:39:54 -0800 (PST) Received: from localhost.localdomain ([200.52.114.70]) by mx.google.com with ESMTPS id v39sm1060655yba.7.2010.11.12.14.39.51 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 12 Nov 2010 14:39:53 -0800 (PST) From: To: davinci-linux-open-source@linux.davincidsp.com Subject: [PATCH v8 7/9] davinci: MMC/SD support for Omapl138-Hawkboard Date: Fri, 12 Nov 2010 16:38:53 -0600 Message-Id: <1289601535-6746-8-git-send-email-vm.rod25@gmail.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1289601535-6746-1-git-send-email-vm.rod25@gmail.com> References: <1289601535-6746-1-git-send-email-vm.rod25@gmail.com> X-pstn-neptune: 0/0/0.00/0 X-pstn-levels: (S:71.93243/99.90000 CV:99.9000 FC:95.5390 LC:95.5390 R:95.9108 P:95.9108 M:97.0282 C:98.6951 ) X-pstn-settings: 2 (0.5000:0.0750) s cv GT3 gt2 gt1 r p m c X-pstn-addresses: from [db-null] Cc: Victor Rodriguez , Russell King , linux-arm-kernel@lists.infradead.org X-BeenThere: davinci-linux-open-source@linux.davincidsp.com X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: davinci-linux-open-source-bounces@linux.davincidsp.com Errors-To: davinci-linux-open-source-bounces@linux.davincidsp.com X-Greylist: Sender succeeded STARTTLS authentication, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Fri, 12 Nov 2010 22:43:13 +0000 (UTC) diff --git a/arch/arm/mach-davinci/board-omapl138-hawk.c b/arch/arm/mach-davinci/board-omapl138-hawk.c index 115dac0..02e54fa 100644 --- a/arch/arm/mach-davinci/board-omapl138-hawk.c +++ b/arch/arm/mach-davinci/board-omapl138-hawk.c @@ -23,6 +23,8 @@ #include #define HAWKBOARD_PHY_ID "0:07" +#define DA850_HAWK_MMCSD_CD_PIN GPIO_TO_PIN(3, 12) +#define DA850_HAWK_MMCSD_WP_PIN GPIO_TO_PIN(3, 13) static short omapl138_hawk_mii_pins[] __initdata = { DA850_MII_TXEN, DA850_MII_TXCLK, DA850_MII_COL, DA850_MII_TXD_3, @@ -143,6 +145,65 @@ static struct snd_platform_data omapl138_hawk_snd_data = { .rxnumevt = 1, }; +static const short hawk_mmcsd0_pins[] = { + DA850_MMCSD0_DAT_0, DA850_MMCSD0_DAT_1, DA850_MMCSD0_DAT_2, + DA850_MMCSD0_DAT_3, DA850_MMCSD0_CLK, DA850_MMCSD0_CMD, + DA850_GPIO3_12, DA850_GPIO3_13, + -1 +}; + +static int da850_hawk_mmc_get_ro(int index) +{ + return gpio_get_value(DA850_HAWK_MMCSD_WP_PIN); +} + +static int da850_hawk_mmc_get_cd(int index) +{ + return !gpio_get_value(DA850_HAWK_MMCSD_CD_PIN); +} + +static struct davinci_mmc_config da850_mmc_config = { + .get_ro = da850_hawk_mmc_get_ro, + .get_cd = da850_hawk_mmc_get_cd, + .wires = 4, + .max_freq = 50000000, + .caps = MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED, + .version = MMC_CTLR_VERSION_2, +}; + +static __init void omapl138_hawk_mmc_init(void) +{ + int ret; + + ret = davinci_cfg_reg_list(hawk_mmcsd0_pins); + if (ret) { + pr_warning("%s: MMC/SD0 mux setup failed: %d\n", + __func__, ret); + return; + } + + ret = gpio_request_one(DA850_HAWK_MMCSD_CD_PIN, + GPIOF_DIR_IN, "MMC CD"); + if (ret < 0) { + pr_warning("%s: can not open GPIO %d\n", + __func__, DA850_HAWK_MMCSD_CD_PIN); + return; + } + + ret = gpio_request_one(DA850_HAWK_MMCSD_WP_PIN, + GPIOF_DIR_IN, "MMC WP"); + if (ret < 0) { + pr_warning("%s: can not open GPIO %d\n", + __func__, DA850_HAWK_MMCSD_WP_PIN); + return; + } + + ret = da8xx_register_mmcsd0(&da850_mmc_config); + if (ret) + pr_warning("%s: MMC/SD0 registration failed: %d\n", + __func__, ret); +} + static struct davinci_uart_config omapl138_hawk_uart_config __initdata = { .enabled_uarts = 0x7, }; @@ -173,6 +234,8 @@ static __init void omapl138_hawk_init(void) pr_warning("%s: mcasp mux setup failed: %d\n", __func__, ret); da8xx_register_mcasp(0, &omapl138_hawk_snd_data); + omapl138_hawk_mmc_init(); + ret = da8xx_register_watchdog(); if (ret) pr_warning("omapl138_hawk_init: "