mfd: arizona: Add device tree binding to specify mono outputs

Add device tree bindings to support specifying outputs from the chip as
mono outputs. Whilst we are doing it change the out_mono pdata from a
bool to an int, because Sparse gets upset about using ARRAY_SIZE on
bools.

Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
index b9489a0d7fabeede13d474c35d171a5867826907..4bb486679110f4ae6f2f853c5faf3863eba74c04 100644 (file)
--- a/drivers/mfd/arizona-core.c
+++ b/drivers/mfd/arizona-core.c
@@ -861,6 +861,16 @@ static int arizona_of_get_core_pdata(struct arizona *arizona)
                count++;
        }
 
+       count = 0;
+       of_property_for_each_u32(arizona->dev->of_node, "wlf,out-mono", prop,
+                                cur, val) {
+               if (count == ARRAY_SIZE(pdata->out_mono))
+                       break;
+
+               pdata->out_mono[count] = !!val;
+               count++;
+       }
+
        return 0;
 }
 

diff --git a/include/linux/mfd/arizona/pdata.h b/include/linux/mfd/arizona/pdata.h
index 57b45caaea80fe2fb5ca4a20ce2748030b69c0d4..64faeeff698c2275bab11c9680f4665126a50494 100644 (file)
--- a/include/linux/mfd/arizona/pdata.h
+++ b/include/linux/mfd/arizona/pdata.h
@@ -171,7 +171,7 @@ struct arizona_pdata {
        int inmode[ARIZONA_MAX_INPUT];
 
        /** Mode for outputs */
-       bool out_mono[ARIZONA_MAX_OUTPUT];
+       int out_mono[ARIZONA_MAX_OUTPUT];
 
        /** PDM speaker mute setting */
        unsigned int spk_mute[ARIZONA_MAX_PDM_SPK];