Re: [PATCH 3/4] omap4: pandaboard: Adding card detect support for MMC1

2010-10-06 Thread Tony Lindgren
* David Anders  [101006 14:06]:
> Adding card detect callback function and card detect configuration
> function for MMC1 Controller.

This one would be best merged into this patch from Kishore:

https://patchwork.kernel.org/patch/189952/

Kishore, care to update your patch with this one and then send
the updated version to Samuel? I think there may have been some
other pending comments too.

The other three look OK to me to queue.

Regards,

Tony

> 
> Signed-off-by: David Anders 
> Signed-off-by: Anand Gadiyar 
> ---
> 
> patch depends on https://patchwork.kernel.org/patch/189952/
> 
>  arch/arm/mach-omap2/board-omap4panda.c |7 ++-
>  1 files changed, 6 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/board-omap4panda.c 
> b/arch/arm/mach-omap2/board-omap4panda.c
> index 697c0bd..94e819c 100644
> --- a/arch/arm/mach-omap2/board-omap4panda.c
> +++ b/arch/arm/mach-omap2/board-omap4panda.c
> @@ -77,9 +77,14 @@ static int omap4_twl6030_hsmmc_late_init(struct device 
> *dev)
>   struct omap_mmc_platform_data *pdata = dev->platform_data;
>  
>   /* Setting MMC1 Card detect Irq */
> - if (pdev->id == 0)
> + if (pdev->id == 0) {
> + ret = twl6030_mmc_card_detect_config();
> + if (ret)
> + pr_err("Failed configuring MMC1 card detect\n");
>   pdata->slots[0].card_detect_irq = TWL6030_IRQ_BASE +
>   MMCDETECT_INTR_OFFSET;
> + pdata->slots[0].card_detect = twl6030_mmc_card_detect;
> + }
>   return ret;
>  }
>  
> -- 
> 1.7.0.4
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majord...@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH 3/4] omap4: pandaboard: Adding card detect support for MMC1

2010-10-06 Thread Kevin Hilman
David Anders  writes:

> Adding card detect callback function and card detect configuration
> function for MMC1 Controller.
>
> Signed-off-by: David Anders 
> Signed-off-by: Anand Gadiyar 
> ---
>
> patch depends on https://patchwork.kernel.org/patch/189952/

This link is for v2 of that patch, and the latest was v4.  Has this been
tested with v4?

Kevin

>  arch/arm/mach-omap2/board-omap4panda.c |7 ++-
>  1 files changed, 6 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/board-omap4panda.c 
> b/arch/arm/mach-omap2/board-omap4panda.c
> index 697c0bd..94e819c 100644
> --- a/arch/arm/mach-omap2/board-omap4panda.c
> +++ b/arch/arm/mach-omap2/board-omap4panda.c
> @@ -77,9 +77,14 @@ static int omap4_twl6030_hsmmc_late_init(struct device 
> *dev)
>   struct omap_mmc_platform_data *pdata = dev->platform_data;
>  
>   /* Setting MMC1 Card detect Irq */
> - if (pdev->id == 0)
> + if (pdev->id == 0) {
> + ret = twl6030_mmc_card_detect_config();
> + if (ret)
> + pr_err("Failed configuring MMC1 card detect\n");
>   pdata->slots[0].card_detect_irq = TWL6030_IRQ_BASE +
>   MMCDETECT_INTR_OFFSET;
> + pdata->slots[0].card_detect = twl6030_mmc_card_detect;
> + }
>   return ret;
>  }
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH 3/4] omap4: pandaboard: Adding card detect support for MMC1

2010-10-06 Thread David Anders
Adding card detect callback function and card detect configuration
function for MMC1 Controller.

Signed-off-by: David Anders 
Signed-off-by: Anand Gadiyar 
---

patch depends on https://patchwork.kernel.org/patch/189952/

 arch/arm/mach-omap2/board-omap4panda.c |7 ++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-omap2/board-omap4panda.c 
b/arch/arm/mach-omap2/board-omap4panda.c
index 697c0bd..94e819c 100644
--- a/arch/arm/mach-omap2/board-omap4panda.c
+++ b/arch/arm/mach-omap2/board-omap4panda.c
@@ -77,9 +77,14 @@ static int omap4_twl6030_hsmmc_late_init(struct device *dev)
struct omap_mmc_platform_data *pdata = dev->platform_data;
 
/* Setting MMC1 Card detect Irq */
-   if (pdev->id == 0)
+   if (pdev->id == 0) {
+   ret = twl6030_mmc_card_detect_config();
+   if (ret)
+   pr_err("Failed configuring MMC1 card detect\n");
pdata->slots[0].card_detect_irq = TWL6030_IRQ_BASE +
MMCDETECT_INTR_OFFSET;
+   pdata->slots[0].card_detect = twl6030_mmc_card_detect;
+   }
return ret;
 }
 
-- 
1.7.0.4

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


[PATCH 3/4] omap4: pandaboard: Adding card detect support for MMC1

2010-10-06 Thread David Anders
Adding card detect callback function and card detect configuration
function for MMC1 Controller.

Signed-off-by: David Anders 
Signed-off-by: Anand Gadiyar 
---

patch depends on https://patchwork.kernel.org/patch/189952/

 arch/arm/mach-omap2/board-omap4panda.c |7 ++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-omap2/board-omap4panda.c 
b/arch/arm/mach-omap2/board-omap4panda.c
index 697c0bd..94e819c 100644
--- a/arch/arm/mach-omap2/board-omap4panda.c
+++ b/arch/arm/mach-omap2/board-omap4panda.c
@@ -77,9 +77,14 @@ static int omap4_twl6030_hsmmc_late_init(struct device *dev)
struct omap_mmc_platform_data *pdata = dev->platform_data;
 
/* Setting MMC1 Card detect Irq */
-   if (pdev->id == 0)
+   if (pdev->id == 0) {
+   ret = twl6030_mmc_card_detect_config();
+   if (ret)
+   pr_err("Failed configuring MMC1 card detect\n");
pdata->slots[0].card_detect_irq = TWL6030_IRQ_BASE +
MMCDETECT_INTR_OFFSET;
+   pdata->slots[0].card_detect = twl6030_mmc_card_detect;
+   }
return ret;
 }
 
-- 
1.7.0.4

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


Re: [PATCH 3/4] omap4: pandaboard: Adding card detect support for MMC1

2010-09-22 Thread David Anders

On 09/22/2010 03:43 AM, Gadiyar, Anand wrote:

On Wed, Sep 22, 2010 at 12:58 PM, Bryan Wu  wrote:
   

On Wed, Sep 22, 2010 at 5:24 AM, David Anders  wrote:
 

Adding card detect callback function and card detect configuration
function for MMC1 Controller.

Signed-off-by: David Anders
Signed-off-by: Anand Gadiyar
---

patch depends on https://patchwork.kernel.org/patch/189952/

  arch/arm/mach-omap2/board-omap4panda.c |7 ++-
  1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-omap2/board-omap4panda.c 
b/arch/arm/mach-omap2/board-omap4panda.c
index 697c0bd..94e819c 100644
--- a/arch/arm/mach-omap2/board-omap4panda.c
+++ b/arch/arm/mach-omap2/board-omap4panda.c
@@ -77,9 +77,14 @@ static int omap4_twl6030_hsmmc_late_init(struct device *dev)
struct omap_mmc_platform_data *pdata = dev->platform_data;

/* Setting MMC1 Card detect Irq */
-   if (pdev->id == 0)
+   if (pdev->id == 0) {
+   ret = twl6030_mmc_card_detect_config();
   

It looks like we need this function from twl6030 driver, otherwise we
will get this compiling error:


In file included from arch/arm/mach-omap2/board-omap4panda.c:38:
arch/arm/plat-omap/include/plat/usb.h:109: warning: return type
defaults to 'int'
arch/arm/mach-omap2/board-omap4panda.c: In function
'omap4_twl6030_hsmmc_late_init':
arch/arm/mach-omap2/board-omap4panda.c:81: error: implicit declaration
of function 'twl6030_mmc_card_detect_config'
arch/arm/mach-omap2/board-omap4panda.c:86: error:
'twl6030_mmc_card_detect' undeclared (first use in this function)
arch/arm/mach-omap2/board-omap4panda.c:86: error: (Each undeclared
identifier is reported only once
arch/arm/mach-omap2/board-omap4panda.c:86: error: for each function it
appears in.)
arch/arm/mach-omap2/board-omap4panda.c: In function 'omap4_panda_init':
arch/arm/mach-omap2/board-omap4panda.c:285: warning: unused variable 'status'


Thanks,
-Bryan
 

I thought the dependent patch [1] took care of this in the header file?
(Haven't actually tried this out - will take a look in a bit)

[1] https://patchwork.kernel.org/patch/189952/
   


correct! this patch depends on the reference patch being applied.

   


 

+   if (ret)
+   pr_err("Failed configuring MMC1 card detect\n");
pdata->slots[0].card_detect_irq = TWL6030_IRQ_BASE +
MMCDETECT_INTR_OFFSET;
+   pdata->slots[0].card_detect = twl6030_mmc_card_detect;
+   }
return ret;
  }

   

\
   


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


Re: [PATCH 3/4] omap4: pandaboard: Adding card detect support for MMC1

2010-09-22 Thread Gadiyar, Anand
On Wed, Sep 22, 2010 at 12:58 PM, Bryan Wu  wrote:
> On Wed, Sep 22, 2010 at 5:24 AM, David Anders  wrote:
>> Adding card detect callback function and card detect configuration
>> function for MMC1 Controller.
>>
>> Signed-off-by: David Anders 
>> Signed-off-by: Anand Gadiyar 
>> ---
>>
>> patch depends on https://patchwork.kernel.org/patch/189952/
>>
>>  arch/arm/mach-omap2/board-omap4panda.c |    7 ++-
>>  1 files changed, 6 insertions(+), 1 deletions(-)
>>
>> diff --git a/arch/arm/mach-omap2/board-omap4panda.c 
>> b/arch/arm/mach-omap2/board-omap4panda.c
>> index 697c0bd..94e819c 100644
>> --- a/arch/arm/mach-omap2/board-omap4panda.c
>> +++ b/arch/arm/mach-omap2/board-omap4panda.c
>> @@ -77,9 +77,14 @@ static int omap4_twl6030_hsmmc_late_init(struct device 
>> *dev)
>>        struct omap_mmc_platform_data *pdata = dev->platform_data;
>>
>>        /* Setting MMC1 Card detect Irq */
>> -       if (pdev->id == 0)
>> +       if (pdev->id == 0) {
>> +               ret = twl6030_mmc_card_detect_config();
>
> It looks like we need this function from twl6030 driver, otherwise we
> will get this compiling error:
>
> 
> In file included from arch/arm/mach-omap2/board-omap4panda.c:38:
> arch/arm/plat-omap/include/plat/usb.h:109: warning: return type
> defaults to 'int'
> arch/arm/mach-omap2/board-omap4panda.c: In function
> 'omap4_twl6030_hsmmc_late_init':
> arch/arm/mach-omap2/board-omap4panda.c:81: error: implicit declaration
> of function 'twl6030_mmc_card_detect_config'
> arch/arm/mach-omap2/board-omap4panda.c:86: error:
> 'twl6030_mmc_card_detect' undeclared (first use in this function)
> arch/arm/mach-omap2/board-omap4panda.c:86: error: (Each undeclared
> identifier is reported only once
> arch/arm/mach-omap2/board-omap4panda.c:86: error: for each function it
> appears in.)
> arch/arm/mach-omap2/board-omap4panda.c: In function 'omap4_panda_init':
> arch/arm/mach-omap2/board-omap4panda.c:285: warning: unused variable 'status'
> 
>
> Thanks,
> -Bryan

I thought the dependent patch [1] took care of this in the header file?
(Haven't actually tried this out - will take a look in a bit)

[1] https://patchwork.kernel.org/patch/189952/

>
>
>> +               if (ret)
>> +                       pr_err("Failed configuring MMC1 card detect\n");
>>                pdata->slots[0].card_detect_irq = TWL6030_IRQ_BASE +
>>                                                MMCDETECT_INTR_OFFSET;
>> +               pdata->slots[0].card_detect = twl6030_mmc_card_detect;
>> +       }
>>        return ret;
>>  }
>>
\
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH 3/4] omap4: pandaboard: Adding card detect support for MMC1

2010-09-22 Thread Bryan Wu
On Wed, Sep 22, 2010 at 5:24 AM, David Anders  wrote:
> Adding card detect callback function and card detect configuration
> function for MMC1 Controller.
>
> Signed-off-by: David Anders 
> Signed-off-by: Anand Gadiyar 
> ---
>
> patch depends on https://patchwork.kernel.org/patch/189952/
>
>  arch/arm/mach-omap2/board-omap4panda.c |    7 ++-
>  1 files changed, 6 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/board-omap4panda.c 
> b/arch/arm/mach-omap2/board-omap4panda.c
> index 697c0bd..94e819c 100644
> --- a/arch/arm/mach-omap2/board-omap4panda.c
> +++ b/arch/arm/mach-omap2/board-omap4panda.c
> @@ -77,9 +77,14 @@ static int omap4_twl6030_hsmmc_late_init(struct device 
> *dev)
>        struct omap_mmc_platform_data *pdata = dev->platform_data;
>
>        /* Setting MMC1 Card detect Irq */
> -       if (pdev->id == 0)
> +       if (pdev->id == 0) {
> +               ret = twl6030_mmc_card_detect_config();

It looks like we need this function from twl6030 driver, otherwise we
will get this compiling error:


In file included from arch/arm/mach-omap2/board-omap4panda.c:38:
arch/arm/plat-omap/include/plat/usb.h:109: warning: return type
defaults to 'int'
arch/arm/mach-omap2/board-omap4panda.c: In function
'omap4_twl6030_hsmmc_late_init':
arch/arm/mach-omap2/board-omap4panda.c:81: error: implicit declaration
of function 'twl6030_mmc_card_detect_config'
arch/arm/mach-omap2/board-omap4panda.c:86: error:
'twl6030_mmc_card_detect' undeclared (first use in this function)
arch/arm/mach-omap2/board-omap4panda.c:86: error: (Each undeclared
identifier is reported only once
arch/arm/mach-omap2/board-omap4panda.c:86: error: for each function it
appears in.)
arch/arm/mach-omap2/board-omap4panda.c: In function 'omap4_panda_init':
arch/arm/mach-omap2/board-omap4panda.c:285: warning: unused variable 'status'


Thanks,
-Bryan


> +               if (ret)
> +                       pr_err("Failed configuring MMC1 card detect\n");
>                pdata->slots[0].card_detect_irq = TWL6030_IRQ_BASE +
>                                                MMCDETECT_INTR_OFFSET;
> +               pdata->slots[0].card_detect = twl6030_mmc_card_detect;
> +       }
>        return ret;
>  }
>
> --
> 1.7.0.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majord...@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH 3/4] omap4: pandaboard: Adding card detect support for MMC1

2010-09-21 Thread David Anders
Adding card detect callback function and card detect configuration
function for MMC1 Controller.

Signed-off-by: David Anders 
Signed-off-by: Anand Gadiyar 
---

patch depends on https://patchwork.kernel.org/patch/189952/

 arch/arm/mach-omap2/board-omap4panda.c |7 ++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-omap2/board-omap4panda.c 
b/arch/arm/mach-omap2/board-omap4panda.c
index 697c0bd..94e819c 100644
--- a/arch/arm/mach-omap2/board-omap4panda.c
+++ b/arch/arm/mach-omap2/board-omap4panda.c
@@ -77,9 +77,14 @@ static int omap4_twl6030_hsmmc_late_init(struct device *dev)
struct omap_mmc_platform_data *pdata = dev->platform_data;
 
/* Setting MMC1 Card detect Irq */
-   if (pdev->id == 0)
+   if (pdev->id == 0) {
+   ret = twl6030_mmc_card_detect_config();
+   if (ret)
+   pr_err("Failed configuring MMC1 card detect\n");
pdata->slots[0].card_detect_irq = TWL6030_IRQ_BASE +
MMCDETECT_INTR_OFFSET;
+   pdata->slots[0].card_detect = twl6030_mmc_card_detect;
+   }
return ret;
 }
 
-- 
1.7.0.4

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