[PATCH] ARM: OMAP: Beagle: support MMC gpio_wp differences on xM

[PATCH] ARM: OMAP: Beagle: support MMC gpio_wp differences on xM

[Robert Nelson]

The omap3630 based BeagleBoard xM uses a MicroSD card slot with
no write protection.

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
 arch/arm/mach-omap2/board-omap3beagle.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
index 87969c7..15929be 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -185,7 +185,9 @@ static struct gpio_led gpio_leds[];
 static int beagle_twl_gpio_setup(struct device *dev,
 		unsigned gpio, unsigned ngpio)
 {
-	if (system_rev >= 0x20 && system_rev <= 0x34301000) {
+	if (cpu_is_omap3630()) {
+		mmc[0].gpio_wp = -EINVAL;
+	} else if (system_rev >= 0x20 && system_rev <= 0x34301000) {
 		omap_mux_init_gpio(23, OMAP_PIN_INPUT);
 		mmc[0].gpio_wp = 23;
 	} else {
-- 
1.7.0.4

RE: [PATCH] ARM: OMAP: Beagle: support MMC gpio_wp differences on xM

[Ghorai, Sukumar]

> -----Original Message-----
> From: linux-omap-owner@vger.kernel.org [mailto:linux-omap-
> owner@vger.kernel.org] On Behalf Of Robert Nelson
> Sent: Tuesday, August 10, 2010 8:10 PM
> To: tony@atomide.com
> Cc: linux-omap@vger.kernel.org; Robert Nelson
> Subject: [PATCH] ARM: OMAP: Beagle: support MMC gpio_wp differences on xM
> 
> The omap3630 based BeagleBoard xM uses a MicroSD card slot with
> no write protection.
> 
> Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
> ---
>  arch/arm/mach-omap2/board-omap3beagle.c |    4 +++-
>  1 files changed, 3 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-
> omap2/board-omap3beagle.c
> index 87969c7..15929be 100644
> --- a/arch/arm/mach-omap2/board-omap3beagle.c
> +++ b/arch/arm/mach-omap2/board-omap3beagle.c
> @@ -185,7 +185,9 @@ static struct gpio_led gpio_leds[];
>  static int beagle_twl_gpio_setup(struct device *dev,
>  		unsigned gpio, unsigned ngpio)
>  {
> -	if (system_rev >= 0x20 && system_rev <= 0x34301000) {
> +	if (cpu_is_omap3630()) {
> +		mmc[0].gpio_wp = -EINVAL;
> +	} else if (system_rev >= 0x20 && system_rev <= 0x34301000) {
[Ghorai] it's an old code. But I think we can replace the hardcode value to use omap_rev() as you are changing the same! Or default for all omap34xx?

>  		omap_mux_init_gpio(23, OMAP_PIN_INPUT);
>  		mmc[0].gpio_wp = 23;
>  	} else {
> --
> 1.7.0.4
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] ARM: OMAP: Beagle: support MMC gpio_wp differences on xM

[Robert Nelson]

>> -     if (system_rev >= 0x20 && system_rev <= 0x34301000) {
>> +     if (cpu_is_omap3630()) {
>> +             mmc[0].gpio_wp = -EINVAL;
>> +     } else if (system_rev >= 0x20 && system_rev <= 0x34301000) {
> [Ghorai] it's an old code. But I think we can replace the hardcode value to use omap_rev() as you are changing the same! Or default for all omap34xx?

It's actually broken too. ;)

My Bx board falls into that "Cx" if..  (and explains why the
write-protect lever on my sd card is ignored on that test system)

Looking at mainline u-boot, where system_rev is defined and passed to
the kernel, it is a constant 0x20...

I'm going to try using gpio pins 171/172/173 which were used to
identify what Beagle Hardware Rev (Ax/Bx, C2/C3, C4, xM)

>
>>               omap_mux_init_gpio(23, OMAP_PIN_INPUT);
>>               mmc[0].gpio_wp = 23;
>>       } else {

Regards,

-- 
Robert Nelson
http://www.rcn-ee.com/
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html