1 files changed, 55 insertions, 61 deletions

diff --git a/drivers/mfd/mc13xxx-core.c b/drivers/mfd/mc13xxx-core.c
index 7e4d44bf92ab..e9619acc0237 100644
--- a/drivers/mfd/mc13xxx-core.c
+++ b/drivers/mfd/mc13xxx-core.c
@@ -26,20 +26,10 @@ struct mc13xxx {
 
         irq_handler_t irqhandler[MC13XXX_NUM_IRQ];
         void *irqdata[MC13XXX_NUM_IRQ];
-};
-
-struct mc13783 {
-        struct mc13xxx mc13xxx;
 
         int adcflags;
 };
 
-struct mc13xxx *mc13783_to_mc13xxx(struct mc13783 *mc13783)
-{
-        return &mc13783->mc13xxx;
-}
-EXPORT_SYMBOL(mc13783_to_mc13xxx);
-
 #define MC13XXX_IRQSTAT0        0
 #define MC13XXX_IRQSTAT0_ADCDONEI       (1 << 0)
 #define MC13XXX_IRQSTAT0_ADCBISDONEI    (1 << 1)
@@ -136,14 +126,14 @@ EXPORT_SYMBOL(mc13783_to_mc13xxx);
 #define MC13XXX_REVISION_FAB            (0x03 << 11)
 #define MC13XXX_REVISION_ICIDCODE       (0x3f << 13)
 
-#define MC13783_ADC1            44
-#define MC13783_ADC1_ADEN               (1 << 0)
-#define MC13783_ADC1_RAND               (1 << 1)
-#define MC13783_ADC1_ADSEL              (1 << 3)
-#define MC13783_ADC1_ASC                (1 << 20)
-#define MC13783_ADC1_ADTRIGIGN          (1 << 21)
+#define MC13XXX_ADC1            44
+#define MC13XXX_ADC1_ADEN               (1 << 0)
+#define MC13XXX_ADC1_RAND               (1 << 1)
+#define MC13XXX_ADC1_ADSEL              (1 << 3)
+#define MC13XXX_ADC1_ASC                (1 << 20)
+#define MC13XXX_ADC1_ADTRIGIGN          (1 << 21)
 
-#define MC13783_ADC2            45
+#define MC13XXX_ADC2            45
 
 #define MC13XXX_NUMREGS 0x3f
 
@@ -487,7 +477,7 @@ enum mc13xxx_id {
         MC13XXX_ID_INVALID,
 };
 
-const char *mc13xxx_chipname[] = {
+static const char *mc13xxx_chipname[] = {
         [MC13XXX_ID_MC13783] = "mc13783",
         [MC13XXX_ID_MC13892] = "mc13892",
 };
@@ -558,8 +548,6 @@ static const char *mc13xxx_get_chipname(struct mc13xxx *mc13xxx)
         return mc13xxx_chipname[devid->driver_data];
 }
 
-#include <linux/mfd/mc13783.h>
-
 int mc13xxx_get_flags(struct mc13xxx *mc13xxx)
 {
         struct mc13xxx_platform_data *pdata =
@@ -569,15 +557,15 @@ int mc13xxx_get_flags(struct mc13xxx *mc13xxx)
 }
 EXPORT_SYMBOL(mc13xxx_get_flags);
 
-#define MC13783_ADC1_CHAN0_SHIFT        5
-#define MC13783_ADC1_CHAN1_SHIFT        8
+#define MC13XXX_ADC1_CHAN0_SHIFT        5
+#define MC13XXX_ADC1_CHAN1_SHIFT        8
 
 struct mc13xxx_adcdone_data {
         struct mc13xxx *mc13xxx;
         struct completion done;
 };
 
-static irqreturn_t mc13783_handler_adcdone(int irq, void *data)
+static irqreturn_t mc13xxx_handler_adcdone(int irq, void *data)
 {
         struct mc13xxx_adcdone_data *adcdone_data = data;
 
@@ -588,12 +576,11 @@ static irqreturn_t mc13783_handler_adcdone(int irq, void *data)
         return IRQ_HANDLED;
 }
 
-#define MC13783_ADC_WORKING (1 << 0)
+#define MC13XXX_ADC_WORKING (1 << 0)
 
-int mc13783_adc_do_conversion(struct mc13783 *mc13783, unsigned int mode,
+int mc13xxx_adc_do_conversion(struct mc13xxx *mc13xxx, unsigned int mode,
                 unsigned int channel, unsigned int *sample)
 {
-        struct mc13xxx *mc13xxx = &mc13783->mc13xxx;
         u32 adc0, adc1, old_adc0;
         int i, ret;
         struct mc13xxx_adcdone_data adcdone_data = {
@@ -605,51 +592,51 @@ int mc13783_adc_do_conversion(struct mc13783 *mc13783, unsigned int mode,
 
         mc13xxx_lock(mc13xxx);
 
-        if (mc13783->adcflags & MC13783_ADC_WORKING) {
+        if (mc13xxx->adcflags & MC13XXX_ADC_WORKING) {
                 ret = -EBUSY;
                 goto out;
         }
 
-        mc13783->adcflags |= MC13783_ADC_WORKING;
+        mc13xxx->adcflags |= MC13XXX_ADC_WORKING;
 
-        mc13xxx_reg_read(mc13xxx, MC13783_ADC0, &old_adc0);
+        mc13xxx_reg_read(mc13xxx, MC13XXX_ADC0, &old_adc0);
 
-        adc0 = MC13783_ADC0_ADINC1 | MC13783_ADC0_ADINC2;
-        adc1 = MC13783_ADC1_ADEN | MC13783_ADC1_ADTRIGIGN | MC13783_ADC1_ASC;
+        adc0 = MC13XXX_ADC0_ADINC1 | MC13XXX_ADC0_ADINC2;
+        adc1 = MC13XXX_ADC1_ADEN | MC13XXX_ADC1_ADTRIGIGN | MC13XXX_ADC1_ASC;
 
         if (channel > 7)
-                adc1 |= MC13783_ADC1_ADSEL;
+                adc1 |= MC13XXX_ADC1_ADSEL;
 
         switch (mode) {
-        case MC13783_ADC_MODE_TS:
-                adc0 |= MC13783_ADC0_ADREFEN | MC13783_ADC0_TSMOD0 |
-                        MC13783_ADC0_TSMOD1;
-                adc1 |= 4 << MC13783_ADC1_CHAN1_SHIFT;
+        case MC13XXX_ADC_MODE_TS:
+                adc0 |= MC13XXX_ADC0_ADREFEN | MC13XXX_ADC0_TSMOD0 |
+                        MC13XXX_ADC0_TSMOD1;
+                adc1 |= 4 << MC13XXX_ADC1_CHAN1_SHIFT;
                 break;
 
-        case MC13783_ADC_MODE_SINGLE_CHAN:
-                adc0 |= old_adc0 & MC13783_ADC0_TSMOD_MASK;
-                adc1 |= (channel & 0x7) << MC13783_ADC1_CHAN0_SHIFT;
-                adc1 |= MC13783_ADC1_RAND;
+        case MC13XXX_ADC_MODE_SINGLE_CHAN:
+                adc0 |= old_adc0 & MC13XXX_ADC0_TSMOD_MASK;
+                adc1 |= (channel & 0x7) << MC13XXX_ADC1_CHAN0_SHIFT;
+                adc1 |= MC13XXX_ADC1_RAND;
                 break;
 
-        case MC13783_ADC_MODE_MULT_CHAN:
-                adc0 |= old_adc0 & MC13783_ADC0_TSMOD_MASK;
-                adc1 |= 4 << MC13783_ADC1_CHAN1_SHIFT;
+        case MC13XXX_ADC_MODE_MULT_CHAN:
+                adc0 |= old_adc0 & MC13XXX_ADC0_TSMOD_MASK;
+                adc1 |= 4 << MC13XXX_ADC1_CHAN1_SHIFT;
                 break;
 
         default:
-                mc13783_unlock(mc13783);
+                mc13xxx_unlock(mc13xxx);
                 return -EINVAL;
         }
 
-        dev_dbg(&mc13783->mc13xxx.spidev->dev, "%s: request irq\n", __func__);
-        mc13xxx_irq_request(mc13xxx, MC13783_IRQ_ADCDONE,
-                        mc13783_handler_adcdone, __func__, &adcdone_data);
-        mc13xxx_irq_ack(mc13xxx, MC13783_IRQ_ADCDONE);
+        dev_dbg(&mc13xxx->spidev->dev, "%s: request irq\n", __func__);
+        mc13xxx_irq_request(mc13xxx, MC13XXX_IRQ_ADCDONE,
+                        mc13xxx_handler_adcdone, __func__, &adcdone_data);
+        mc13xxx_irq_ack(mc13xxx, MC13XXX_IRQ_ADCDONE);
 
-        mc13xxx_reg_write(mc13xxx, MC13783_ADC0, adc0);
-        mc13xxx_reg_write(mc13xxx, MC13783_ADC1, adc1);
+        mc13xxx_reg_write(mc13xxx, MC13XXX_ADC0, adc0);
+        mc13xxx_reg_write(mc13xxx, MC13XXX_ADC1, adc1);
 
         mc13xxx_unlock(mc13xxx);
 
@@ -660,27 +647,27 @@ int mc13783_adc_do_conversion(struct mc13783 *mc13783, unsigned int mode,
 
         mc13xxx_lock(mc13xxx);
 
-        mc13xxx_irq_free(mc13xxx, MC13783_IRQ_ADCDONE, &adcdone_data);
+        mc13xxx_irq_free(mc13xxx, MC13XXX_IRQ_ADCDONE, &adcdone_data);
 
         if (ret > 0)
                 for (i = 0; i < 4; ++i) {
                         ret = mc13xxx_reg_read(mc13xxx,
-                                        MC13783_ADC2, &sample[i]);
+                                        MC13XXX_ADC2, &sample[i]);
                         if (ret)
                                 break;
                 }
 
-        if (mode == MC13783_ADC_MODE_TS)
+        if (mode == MC13XXX_ADC_MODE_TS)
                 /* restore TSMOD */
-                mc13xxx_reg_write(mc13xxx, MC13783_ADC0, old_adc0);
+                mc13xxx_reg_write(mc13xxx, MC13XXX_ADC0, old_adc0);
 
-        mc13783->adcflags &= ~MC13783_ADC_WORKING;
+        mc13xxx->adcflags &= ~MC13XXX_ADC_WORKING;
 out:
         mc13xxx_unlock(mc13xxx);
 
         return ret;
 }
-EXPORT_SYMBOL_GPL(mc13783_adc_do_conversion);
+EXPORT_SYMBOL_GPL(mc13xxx_adc_do_conversion);
 
 static int mc13xxx_add_subdevice_pdata(struct mc13xxx *mc13xxx,
                 const char *format, void *pdata, size_t pdata_size)
@@ -716,6 +703,11 @@ static int mc13xxx_probe(struct spi_device *spi)
         enum mc13xxx_id id;
         int ret;
 
+        if (!pdata) {
+                dev_err(&spi->dev, "invalid platform data\n");
+                return -EINVAL;
+        }
+
         mc13xxx = kzalloc(sizeof(*mc13xxx), GFP_KERNEL);
         if (!mc13xxx)
                 return -ENOMEM;
@@ -763,10 +755,8 @@ err_revision:
         if (pdata->flags & MC13XXX_USE_CODEC)
                 mc13xxx_add_subdevice(mc13xxx, "%s-codec");
 
-        if (pdata->flags & MC13XXX_USE_REGULATOR) {
-                mc13xxx_add_subdevice_pdata(mc13xxx, "%s-regulator",
-                                &pdata->regulators, sizeof(pdata->regulators));
-        }
+        mc13xxx_add_subdevice_pdata(mc13xxx, "%s-regulator",
+                &pdata->regulators, sizeof(pdata->regulators));
 
         if (pdata->flags & MC13XXX_USE_RTC)
                 mc13xxx_add_subdevice(mc13xxx, "%s-rtc");
@@ -774,10 +764,14 @@ err_revision:
         if (pdata->flags & MC13XXX_USE_TOUCHSCREEN)
                 mc13xxx_add_subdevice(mc13xxx, "%s-ts");
 
-        if (pdata->flags & MC13XXX_USE_LED)
+        if (pdata->leds)
                 mc13xxx_add_subdevice_pdata(mc13xxx, "%s-led",
                                 pdata->leds, sizeof(*pdata->leds));
 
+        if (pdata->buttons)
+                mc13xxx_add_subdevice_pdata(mc13xxx, "%s-pwrbutton",
+                                pdata->buttons, sizeof(*pdata->buttons));
+
         return 0;
 }