From: Juha Yrjola <juha.yrjola@solidboot.com>
Date: Fri, 30 Jun 2006 16:40:12 +0000 (+0300)
Subject: Menelaus: Add function menelaus_get_slot_pin_states
X-Git-Tag: v2.6.17-omap1^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=23b266eb5c0e1705040a65554a11216ac1ac3873;p=linux-2.6-omap-h63xx.git

Menelaus: Add function menelaus_get_slot_pin_states

Signed-off-by: Juha Yrjola <juha.yrjola@solidboot.com>
---

diff --git a/drivers/i2c/chips/menelaus.c b/drivers/i2c/chips/menelaus.c
index eebab924036..82dd2cf4b5e 100644
--- a/drivers/i2c/chips/menelaus.c
+++ b/drivers/i2c/chips/menelaus.c
@@ -594,6 +594,11 @@ int menelaus_set_vmmc(unsigned int mV)
 }
 EXPORT_SYMBOL(menelaus_set_vmmc);
 
+int menelaus_get_slot_pin_states(void)
+{
+	return menelaus_read_reg(MENELAUS_MCT_PIN_ST);
+}
+EXPORT_SYMBOL(menelaus_get_slot_pin_states);
 
 /*-----------------------------------------------------------------------*/
 
diff --git a/include/asm-arm/arch-omap/menelaus.h b/include/asm-arm/arch-omap/menelaus.h
index 614f02ccfea..1ae179da717 100644
--- a/include/asm-arm/arch-omap/menelaus.h
+++ b/include/asm-arm/arch-omap/menelaus.h
@@ -18,6 +18,7 @@ extern int menelaus_set_vio(unsigned int mV);
 extern int menelaus_set_vmmc(unsigned int mV);
 extern int menelaus_set_vdcdc(int dcdc, unsigned int mV);
 extern int menelaus_set_slot_sel(int enable);
+extern int menelaus_get_slot_pin_states(void);
 
 #if defined(CONFIG_ARCH_OMAP24XX) && defined(CONFIG_MENELAUS)
 #define omap_has_menelaus()	1