Re: [PATCH v5 1/2] OMAP HSMMC: Adding a Flag to determine the type of Card detect

2010-07-01 Thread Tony Lindgren 
* kishore kadiyala kishorek.kadiy...@gmail.com [100621 09:49]:
 On Fri, Jun 18, 2010 at 1:49 AM, Andrew Morton
 a...@linux-foundation.org wrote:
  On Thu, 17 Jun 2010 20:56:58 +0530 (IST)
  kishore kadiyala kishore.kadiy...@ti.com wrote:
 
  --- a/arch/arm/plat-omap/include/plat/mmc.h
  +++ b/arch/arm/plat-omap/include/plat/mmc.h
  @@ -43,6 +43,9 @@
 
   #define OMAP_MMC_MAX_SLOTS   2
 
  +#define NON_GPIO             0
  +#define GPIO                 1
 
  I'm counting about seven different definitions of GPIO in the kernel
  already.
 
  drivers/hwmon/it87.c:
  #define GPIO    0x07
 
  drivers/media/dvb/dvb-usb/ec168.h:
         GPIO                 = 0x04,
 
  drivers/net/hamachi.c:
         GPIO=0x6E
 
  drivers/staging/rtl8187se/r8180_hw.h:
  #define GPIO 0x91
 
  etcetera.  It's a crazy identifier to use in a header file, and
  the chances of a miscompile-causing collision are increasing.
 
 
  enum cd_type {
         CD_TYPE_NON_GPIO = 0,
         CD_TYPE_GPIO = 1,
  };
 
 OK , Will repost with above changes

Please also do it the other way around where you pass CD_TYPE_NON_GPIO
in the flags in the platform data. Then there's no need to patch
all the existing boards.

Tony
--
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 v5 1/2] OMAP HSMMC: Adding a Flag to determine the type of Card detect

2010-06-21 Thread kishore kadiyala 
On Fri, Jun 18, 2010 at 1:49 AM, Andrew Morton
a...@linux-foundation.org wrote:
 On Thu, 17 Jun 2010 20:56:58 +0530 (IST)
 kishore kadiyala kishore.kadiy...@ti.com wrote:

 --- a/arch/arm/plat-omap/include/plat/mmc.h
 +++ b/arch/arm/plat-omap/include/plat/mmc.h
 @@ -43,6 +43,9 @@

  #define OMAP_MMC_MAX_SLOTS   2

 +#define NON_GPIO             0
 +#define GPIO                 1

 I'm counting about seven different definitions of GPIO in the kernel
 already.

 drivers/hwmon/it87.c:
 #define GPIO    0x07

 drivers/media/dvb/dvb-usb/ec168.h:
        GPIO                 = 0x04,

 drivers/net/hamachi.c:
        GPIO=0x6E

 drivers/staging/rtl8187se/r8180_hw.h:
 #define GPIO 0x91

 etcetera.  It's a crazy identifier to use in a header file, and
 the chances of a miscompile-causing collision are increasing.


 enum cd_type {
        CD_TYPE_NON_GPIO = 0,
        CD_TYPE_GPIO = 1,
 };

OK , Will repost with above changes

Regards,
Kishore

 perhaps?
 --
 To unsubscribe from this list: send the line unsubscribe linux-mmc 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 v5 1/2] OMAP HSMMC: Adding a Flag to determine the type of Card detect

2010-06-17 Thread kishore kadiyala 
Adding a flag to determine the card detect type which can be
either GPIO or NON-GPIO. MMC1 Controller of OMAP4 have NON-GPIO
interrupt line from twl6030 for card detect.

Signed-off-by: Kishore Kadiyala kishore.kadiy...@ti.com
---
 arch/arm/mach-omap2/board-3430sdp.c  |3 +++
 arch/arm/mach-omap2/board-cm-t35.c   |2 ++
 arch/arm/mach-omap2/board-devkit8000.c   |2 ++
 arch/arm/mach-omap2/board-igep0020.c |2 ++
 arch/arm/mach-omap2/board-omap3beagle.c  |2 ++
 arch/arm/mach-omap2/board-omap3pandora.c |3 +++
 arch/arm/mach-omap2/board-omap3touchbook.c   |2 ++
 arch/arm/mach-omap2/board-rx51-peripherals.c |2 ++
 arch/arm/mach-omap2/board-zoom-peripherals.c |2 ++
 arch/arm/mach-omap2/hsmmc.h  |1 +
 arch/arm/plat-omap/include/plat/mmc.h|4 
 11 files changed, 25 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-omap2/board-3430sdp.c 
b/arch/arm/mach-omap2/board-3430sdp.c
index f474a80..bd6f81d 100644
--- a/arch/arm/mach-omap2/board-3430sdp.c
+++ b/arch/arm/mach-omap2/board-3430sdp.c
@@ -40,6 +40,7 @@

 #include plat/control.h
 #include plat/gpmc-smc91x.h
+#include plat/mmc.h

 #include mach/board-sdp.h

@@ -354,11 +355,13 @@ static struct omap2_hsmmc_info mmc[] = {
 * so the SIM card isn't used; else 4 bits.
 */
.wires  = 8,
+   .cd_type= GPIO,
.gpio_wp= 4,
},
{
.mmc= 2,
.wires  = 8,
+   .cd_type= GPIO,
.gpio_wp= 7,
},
{}  /* Terminator */
diff --git a/arch/arm/mach-omap2/board-cm-t35.c 
b/arch/arm/mach-omap2/board-cm-t35.c
index e679a2c..ddf6968 100644
--- a/arch/arm/mach-omap2/board-cm-t35.c
+++ b/arch/arm/mach-omap2/board-cm-t35.c
@@ -46,6 +46,7 @@
 #include plat/usb.h
 #include plat/display.h
 #include plat/mcspi.h
+#include plat/mmc.h

 #include mach/hardware.h

@@ -599,6 +600,7 @@ static struct omap2_hsmmc_info mmc[] = {
.mmc= 1,
.wires  = 4,
.gpio_cd= -EINVAL,
+   .cd_type= GPIO,
.gpio_wp= -EINVAL,

},
diff --git a/arch/arm/mach-omap2/board-devkit8000.c 
b/arch/arm/mach-omap2/board-devkit8000.c
index 77022b5..114820f 100644
--- a/arch/arm/mach-omap2/board-devkit8000.c
+++ b/arch/arm/mach-omap2/board-devkit8000.c
@@ -45,6 +45,7 @@
 #include plat/usb.h
 #include plat/timer-gp.h
 #include plat/display.h
+#include plat/mmc.h

 #include plat/mcspi.h
 #include linux/input/matrix_keypad.h
@@ -122,6 +123,7 @@ static struct omap2_hsmmc_info mmc[] = {
{
.mmc= 1,
.wires  = 8,
+   .cd_type= GPIO,
.gpio_wp= 29,
},
{}  /* Terminator */
diff --git a/arch/arm/mach-omap2/board-igep0020.c 
b/arch/arm/mach-omap2/board-igep0020.c
index d55c57b..bc1957f 100644
--- a/arch/arm/mach-omap2/board-igep0020.c
+++ b/arch/arm/mach-omap2/board-igep0020.c
@@ -30,6 +30,7 @@
 #include plat/usb.h
 #include plat/display.h
 #include plat/onenand.h
+#include plat/mmc.h

 #include mux.h
 #include hsmmc.h
@@ -250,6 +251,7 @@ static struct omap2_hsmmc_info mmc[] = {
.mmc= 1,
.wires  = 4,
.gpio_cd= -EINVAL,
+   .cd_type= GPIO,
.gpio_wp= -EINVAL,
},
{
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c 
b/arch/arm/mach-omap2/board-omap3beagle.c
index 69b154c..62d7fcb 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -44,6 +44,7 @@
 #include plat/nand.h
 #include plat/usb.h
 #include plat/timer-gp.h
+#include plat/mmc.h

 #include mux.h
 #include hsmmc.h
@@ -184,6 +185,7 @@ static struct omap2_hsmmc_info mmc[] = {
{
.mmc= 1,
.wires  = 8,
+   .cd_type= GPIO,
.gpio_wp= 29,
},
{}  /* Terminator */
diff --git a/arch/arm/mach-omap2/board-omap3pandora.c 
b/arch/arm/mach-omap2/board-omap3pandora.c
index db06dc9..76752bf 100644
--- a/arch/arm/mach-omap2/board-omap3pandora.c
+++ b/arch/arm/mach-omap2/board-omap3pandora.c
@@ -41,6 +41,7 @@
 #include plat/mcspi.h
 #include plat/usb.h
 #include plat/display.h
+#include plat/mmc.h

 #include mux.h
 #include sdram-micron-mt46h32m32lf-6.h
@@ -232,6 +233,7 @@ static struct omap2_hsmmc_info omap3pandora_mmc[] = {
.mmc= 1,
.wires  = 4,
.gpio_cd= -EINVAL,
+   .cd_type= GPIO,
.gpio_wp= 126,
.ext_clock  = 0,
},
@@ -239,6 +241,7 @@ static struct omap2_hsmmc_info omap3pandora_mmc[]

Re: [PATCH v5 1/2] OMAP HSMMC: Adding a Flag to determine the type of Card detect

2010-06-17 Thread Andrew Morton 
On Thu, 17 Jun 2010 20:56:58 +0530 (IST)
kishore kadiyala kishore.kadiy...@ti.com wrote:

 --- a/arch/arm/plat-omap/include/plat/mmc.h
 +++ b/arch/arm/plat-omap/include/plat/mmc.h
 @@ -43,6 +43,9 @@
 
  #define OMAP_MMC_MAX_SLOTS   2
 
 +#define NON_GPIO 0
 +#define GPIO 1

I'm counting about seven different definitions of GPIO in the kernel
already.

drivers/hwmon/it87.c:
#define GPIO0x07

drivers/media/dvb/dvb-usb/ec168.h:
GPIO = 0x04,

drivers/net/hamachi.c:
GPIO=0x6E

drivers/staging/rtl8187se/r8180_hw.h:
#define GPIO 0x91

etcetera.  It's a crazy identifier to use in a header file, and
the chances of a miscompile-causing collision are increasing.


enum cd_type {
CD_TYPE_NON_GPIO = 0,
CD_TYPE_GPIO = 1,
};

perhaps?
--
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