From: Zhou Jingyu Date: Thu, 3 Mar 2011 06:16:26 +0000 (+0800) Subject: ENGR00141395-2 PMIC: porting mc13892 driver to 2.6.38 X-Git-Tag: v3.0.35-fsl_4.1.0~2625 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=37f573ba63f57162ed1712ff41033bfe897149c7;p=karo-tx-linux.git ENGR00141395-2 PMIC: porting mc13892 driver to 2.6.38 Add pmic13892 Signed-off-by: Zhou Jingyu --- diff --git a/drivers/mxc/pmic/core/pmic_core_i2c.c b/drivers/mxc/pmic/core/pmic_core_i2c.c index 40d029acbab7..09172b387b0e 100644 --- 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 df0a895491c7..f02b42749791 100644 --- 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 cc74078da002..fb6eb506d56f 100644 --- 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];