From: marek.vasut@gmail.com (Marek Vasut)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: colibri-pxa300: use correct SD detect pin
Date: Thu, 23 Dec 2010 17:15:36 +0100 [thread overview]
Message-ID: <201012231715.36442.marek.vasut@gmail.com> (raw)
In-Reply-To: <1293116462-10189-1-git-send-email-bjorn.forsman@gmail.com>
On Thursday 23 December 2010 16:01:02 Bj?rn Forsman wrote:
> The use of wrong SD detect pin was introduced by this commit:
>
> ARM: pxa: Push Colibri evalboard MFP into module files
>
> This fixes it.
Ah, one more thing -- CC linux-arm-kernel (done)
> ---
> arch/arm/mach-pxa/colibri-evalboard.c | 2 +-
> arch/arm/mach-pxa/colibri-pxa300.c | 2 +-
> arch/arm/mach-pxa/include/mach/colibri.h | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/mach-pxa/colibri-evalboard.c
> b/arch/arm/mach-pxa/colibri-evalboard.c index 6b2c800..28f667e 100644
> --- a/arch/arm/mach-pxa/colibri-evalboard.c
> +++ b/arch/arm/mach-pxa/colibri-evalboard.c
> @@ -50,7 +50,7 @@ static void __init colibri_mmc_init(void)
> GPIO0_COLIBRI_PXA270_SD_DETECT;
> if (machine_is_colibri300()) /* PXA300 Colibri */
> colibri_mci_platform_data.gpio_card_detect =
> - GPIO39_COLIBRI_PXA300_SD_DETECT;
> + GPIO13_COLIBRI_PXA300_SD_DETECT;
> else /* PXA320 Colibri */
> colibri_mci_platform_data.gpio_card_detect =
> GPIO28_COLIBRI_PXA320_SD_DETECT;
> diff --git a/arch/arm/mach-pxa/colibri-pxa300.c
> b/arch/arm/mach-pxa/colibri-pxa300.c index fddb16d..66dd81c 100644
> --- a/arch/arm/mach-pxa/colibri-pxa300.c
> +++ b/arch/arm/mach-pxa/colibri-pxa300.c
> @@ -41,7 +41,7 @@ static mfp_cfg_t colibri_pxa300_evalboard_pin_config[]
> __initdata = { GPIO4_MMC1_DAT1,
> GPIO5_MMC1_DAT2,
> GPIO6_MMC1_DAT3,
> - GPIO39_GPIO, /* SD detect */
> + GPIO13_GPIO, /* GPIO13_COLIBRI_PXA300_SD_DETECT */
>
> /* UHC */
> GPIO0_2_USBH_PEN,
> diff --git a/arch/arm/mach-pxa/include/mach/colibri.h
> b/arch/arm/mach-pxa/include/mach/colibri.h index 388a96f..cb4236e 100644
> --- a/arch/arm/mach-pxa/include/mach/colibri.h
> +++ b/arch/arm/mach-pxa/include/mach/colibri.h
> @@ -60,7 +60,7 @@ static inline void colibri_pxa3xx_init_nand(void) {}
> #define GPIO113_COLIBRI_PXA270_TS_IRQ 113
>
> /* GPIO definitions for Colibri PXA300/310 */
> -#define GPIO39_COLIBRI_PXA300_SD_DETECT 39
> +#define GPIO13_COLIBRI_PXA300_SD_DETECT 13
>
> /* GPIO definitions for Colibri PXA320 */
> #define GPIO28_COLIBRI_PXA320_SD_DETECT 28
next parent reply other threads:[~2010-12-23 16:15 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1293116462-10189-1-git-send-email-bjorn.forsman@gmail.com>
2010-12-23 16:15 ` Marek Vasut [this message]
2010-12-23 16:59 ` [PATCH] ARM: colibri-pxa300: use correct SD detect pin Bjørn Forsman
2010-12-23 20:57 ` Marek Vasut
2010-12-23 22:13 ` Bjørn Forsman
2010-12-24 14:27 ` Igor Grinberg
2010-12-24 18:41 ` Bjørn Forsman
2011-01-15 18:15 ` Bjørn Forsman
2011-01-17 17:38 ` Eric Miao
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201012231715.36442.marek.vasut@gmail.com \
--to=marek.vasut@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).