extcon: max14577: Choose muic_irqs according to device type

This patch continues the preparation for adding support for max77836
device to existing max14577 driver.

During probe choose muic_irqs according to device type. Currently there
are only "max14577_muic_irqs" but later patch will add max77836
interrupts.

Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Acked-by: Chanwoo Choi <cw00.choi@samsung.com>
Tested-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

diff --git a/drivers/extcon/extcon-max14577.c b/drivers/extcon/extcon-max14577.c
index 6f921b7..1513013 100644 (file)
--- a/drivers/extcon/extcon-max14577.c
+++ b/drivers/extcon/extcon-max14577.c
@@ -39,6 +39,29 @@ enum max14577_muic_status {
        MAX14577_MUIC_STATUS_END,
 };
 
+/**
+ * struct max14577_muic_irq
+ * @irq: the index of irq list of MUIC device.
+ * @name: the name of irq.
+ * @virq: the virtual irq to use irq domain
+ */
+struct max14577_muic_irq {
+       unsigned int irq;
+       const char *name;
+       unsigned int virq;
+};
+
+static struct max14577_muic_irq max14577_muic_irqs[] = {
+       { MAX14577_IRQ_INT1_ADC,        "muic-ADC" },
+       { MAX14577_IRQ_INT1_ADCLOW,     "muic-ADCLOW" },
+       { MAX14577_IRQ_INT1_ADCERR,     "muic-ADCError" },
+       { MAX14577_IRQ_INT2_CHGTYP,     "muic-CHGTYP" },
+       { MAX14577_IRQ_INT2_CHGDETRUN,  "muic-CHGDETRUN" },
+       { MAX14577_IRQ_INT2_DCDTMR,     "muic-DCDTMR" },
+       { MAX14577_IRQ_INT2_DBCHG,      "muic-DBCHG" },
+       { MAX14577_IRQ_INT2_VBVOLT,     "muic-VBVOLT" },
+};
+
 struct max14577_muic_info {
        struct device *dev;
        struct max14577 *max14577;
@@ -47,6 +70,8 @@ struct max14577_muic_info {
        int prev_chg_type;
        u8 status[MAX14577_MUIC_STATUS_END];
 
+       struct max14577_muic_irq *muic_irqs;
+       unsigned int muic_irqs_num;
        bool irq_adc;
        bool irq_chg;
        struct work_struct irq_work;
@@ -73,29 +98,6 @@ enum max14577_muic_cable_group {
        MAX14577_CABLE_GROUP_CHG,
 };
 
-/**
- * struct max14577_muic_irq
- * @irq: the index of irq list of MUIC device.
- * @name: the name of irq.
- * @virq: the virtual irq to use irq domain
- */
-struct max14577_muic_irq {
-       unsigned int irq;
-       const char *name;
-       unsigned int virq;
-};
-
-static struct max14577_muic_irq max14577_muic_irqs[] = {
-       { MAX14577_IRQ_INT1_ADC,        "muic-ADC" },
-       { MAX14577_IRQ_INT1_ADCLOW,     "muic-ADCLOW" },
-       { MAX14577_IRQ_INT1_ADCERR,     "muic-ADCError" },
-       { MAX14577_IRQ_INT2_CHGTYP,     "muic-CHGTYP" },
-       { MAX14577_IRQ_INT2_CHGDETRUN,  "muic-CHGDETRUN" },
-       { MAX14577_IRQ_INT2_DCDTMR,     "muic-DCDTMR" },
-       { MAX14577_IRQ_INT2_DBCHG,      "muic-DBCHG" },
-       { MAX14577_IRQ_INT2_VBVOLT,     "muic-VBVOLT" },
-};
-
 /* Define supported accessory type */
 enum max14577_muic_acc_type {
        MAX14577_MUIC_ADC_GROUND = 0x0,
@@ -538,9 +540,9 @@ static irqreturn_t max14577_muic_irq_handler(int irq, void *data)
         * However we only need to know whether it was ADC, charger
         * or both interrupts so decode IRQ and turn on proper flags.
         */
-       for (i = 0; i < ARRAY_SIZE(max14577_muic_irqs); i++)
-               if (irq == max14577_muic_irqs[i].virq)
-                       irq_type = max14577_muic_irqs[i].irq;
+       for (i = 0; i < info->muic_irqs_num; i++)
+               if (irq == info->muic_irqs[i].virq)
+                       irq_type = info->muic_irqs[i].irq;
 
        switch (irq_type) {
        case MAX14577_IRQ_INT1_ADC:
@@ -643,9 +645,16 @@ static int max14577_muic_probe(struct platform_device *pdev)
 
        INIT_WORK(&info->irq_work, max14577_muic_irq_work);
 
+       switch (max14577->dev_type) {
+       case MAXIM_DEVICE_TYPE_MAX14577:
+       default:
+               info->muic_irqs = max14577_muic_irqs;
+               info->muic_irqs_num = ARRAY_SIZE(max14577_muic_irqs);
+       }
+
        /* Support irq domain for max14577 MUIC device */
-       for (i = 0; i < ARRAY_SIZE(max14577_muic_irqs); i++) {
-               struct max14577_muic_irq *muic_irq = &max14577_muic_irqs[i];
+       for (i = 0; i < info->muic_irqs_num; i++) {
+               struct max14577_muic_irq *muic_irq = &info->muic_irqs[i];
                unsigned int virq = 0;
 
                virq = regmap_irq_get_virq(max14577->irq_data, muic_irq->irq);