Skip to contentSkip to conversation

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

PATCH Applied Charles Keepax 3 participants 5 messages Dec 14, 2015 – Jan 11, 2016

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/2 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.

---

No changes since v1.

Thanks,
Charles

 drivers/mfd/arizona-core.c        | 10 ++++++++++
 include/linux/mfd/arizona/pdata.h |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)
drivers/mfd/arizona-core.c +10 -0
index b9489a0..4bb4866 100644
@@ -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;
 }
 
include/linux/mfd/arizona/pdata.h +1 -1
index 57b45ca..64faeef 100644
@@ -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];
Signature · 1 line
2.1.4
#1 lore raw

PATCH v2 2/2 mfd: arizona: Update binding docs for selecting mono/stereo outputs

Update the device tree binding documentation to include the wlf,out-mono property that is used to specify whether each output is a mono or stereo output.

---

Changes since v1:
- Clarify which outputs correspond to which entry in the out-mono list.

Thanks,
Charles

 Documentation/devicetree/bindings/mfd/arizona.txt | 6 ++++++
 1 file changed, 6 insertions(+)
Documentation/devicetree/bindings/mfd/arizona.txt +6 -0
index 2b6ccdb..069e31d 100644
@@ -65,6 +65,12 @@ Optional properties:
     that have not been specified are set to 0 by default. Entries are:
     <IN1, IN2, IN3, IN4> (wm5102, wm5110, wm8280, wm8997)
     <IN1A, IN2A, IN1B, IN2B> (wm8998, wm1814)
+  - wlf,out-mono : A list of boolean values indicating whether each output is
+    mono or stereo. Position within the list indicates the output affected
+    (eg. First entry in the list corresponds to output 1). A non-zero value
+    indicates a mono output. If present, the number of values should be less
+    than or equal to the number of outputs, if less values are supplied the
+    additional outputs will be treated as stereo.
 
   - wlf,dmic-ref : DMIC reference voltage source for each input, can be
     selected from either MICVDD or one of the MICBIAS's, defines
Signature · 6 lines
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
maintainer Acked-by on v2 2/2
#2 lore raw

Re: [PATCH v2 2/2] mfd: arizona: Update binding docs for selecting mono/stereo outputs

Quoted 7 lines · Charles Keepax

Update the device tree binding documentation to include the wlf,out-mono property that is used to specify whether each output is a mono or stereo output.

---

Quoted 8 lines

Changes since v1:
- Clarify which outputs correspond to which entry in the out-mono list.

Thanks,
Charles

 Documentation/devicetree/bindings/mfd/arizona.txt | 6 ++++++
 1 file changed, 6 insertions(+)
Applied
#3 lore raw

Re: [PATCH v2 2/2] mfd: arizona: Update binding docs for selecting mono/stereo outputs

In reply to Charles Keepax
Quoted 7 lines · Charles Keepax

Update the device tree binding documentation to include the wlf,out-mono property that is used to specify whether each output is a mono or stereo output.

---

Quoted 8 lines

Changes since v1:
- Clarify which outputs correspond to which entry in the out-mono list.

Thanks,
Charles

 Documentation/devicetree/bindings/mfd/arizona.txt | 6 ++++++
 1 file changed, 6 insertions(+)

Applied, thanks.

Quoted 17 lines
Documentation/devicetree/bindings/mfd/arizona.txt +6 -0
index 2b6ccdb..069e31d 100644
@@ -65,6 +65,12 @@ Optional properties:
     that have not been specified are set to 0 by default. Entries are:
     <IN1, IN2, IN3, IN4> (wm5102, wm5110, wm8280, wm8997)
     <IN1A, IN2A, IN1B, IN2B> (wm8998, wm1814)
+  - wlf,out-mono : A list of boolean values indicating whether each output is
+    mono or stereo. Position within the list indicates the output affected
+    (eg. First entry in the list corresponds to output 1). A non-zero value
+    indicates a mono output. If present, the number of values should be less
+    than or equal to the number of outputs, if less values are supplied the
+    additional outputs will be treated as stereo.
 
   - wlf,dmic-ref : DMIC reference voltage source for each input, can be
     selected from either MICVDD or one of the MICBIAS's, defines
Signature · 4 lines
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
Applied
#4 lore raw
In reply to Charles Keepax
Quoted 8 lines · Charles Keepax

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.

---

Quoted 8 lines

No changes since v1.

Thanks,
Charles

 drivers/mfd/arizona-core.c        | 10 ++++++++++
 include/linux/mfd/arizona/pdata.h |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

Applied, thanks.

Quoted 34 lines
drivers/mfd/arizona-core.c +10 -0
index b9489a0..4bb4866 100644
@@ -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;
 }
 
include/linux/mfd/arizona/pdata.h +1 -1
index 57b45ca..64faeef 100644
@@ -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];
Signature · 8 lines
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html