ENGR00141395-2 PMIC: porting mc13892 driver to 2.6.38

Add pmic13892

Signed-off-by: Zhou Jingyu <Jingyu.Zhou@freescale.com>

diff --git a/drivers/mxc/pmic/core/pmic_core_i2c.c b/drivers/mxc/pmic/core/pmic_core_i2c.c
index 40d029acbab714f2beaa93a4f091c24c007b52da..09172b387b0eef01f16c23bd2dddc572d8a06ac4 100644 (file)
--- a/drivers/mxc/pmic/core/pmic_core_i2c.c
+++ b/drivers/mxc/pmic/core/pmic_core_i2c.c
@@ -226,9 +226,6 @@ static int __devinit pmic_probe(struct i2c_client *client,
        /* Initialize the PMIC event handling */
        pmic_event_list_init();
 
-       /* Initialize GPIO for PMIC Interrupt */
-       gpio_pmic_active();
-
        /* Get the PMIC Version */
        pmic_get_revision(&mxc_pmic_version);
        if (mxc_pmic_version.revision < 0) {

diff --git a/drivers/mxc/pmic/core/pmic_core_spi.c b/drivers/mxc/pmic/core/pmic_core_spi.c
index df0a895491c7395be436d1a4b5fc1d5817f4b0cb..f02b42749791fbe1511813a8155d01e779576ff0 100644 (file)
--- a/drivers/mxc/pmic/core/pmic_core_spi.c
+++ b/drivers/mxc/pmic/core/pmic_core_spi.c
@@ -166,9 +166,6 @@ static int __devinit pmic_probe(struct spi_device *spi)
        /* Initialize the PMIC event handling */
        pmic_event_list_init();
 
-       /* Initialize GPIO for PMIC Interrupt */
-       gpio_pmic_active();
-
        /* Get the PMIC Version */
        pmic_get_revision(&mxc_pmic_version);
        if (mxc_pmic_version.revision < 0) {

diff --git a/drivers/mxc/pmic/mc13892/pmic_adc.c b/drivers/mxc/pmic/mc13892/pmic_adc.c
index cc74078da00247ecf48bb895807f8c8b7e6af091..fb6eb506d56f3565f8bb2d15a1bdd4b56c9d3bbb 100644 (file)
--- a/drivers/mxc/pmic/mc13892/pmic_adc.c
+++ b/drivers/mxc/pmic/mc13892/pmic_adc.c
@@ -195,7 +195,7 @@ static bool adc_ts;
 static bool wait_ts;
 static bool monitor_en;
 static bool monitor_adc;
-static DECLARE_MUTEX(convert_mutex);
+static DEFINE_SEMAPHORE(convert_mutex);
 
 static DECLARE_WAIT_QUEUE_HEAD(queue_adc_busy);
 static t_adc_state adc_dev[2];