[alsa-devel] [PATCH] ASoC: dt: Move WM8903 pin list from Tegra board binding to CODEC binding
From: Mark Brown broonie@linaro.org
The pin list is the same for any board using the CODEC.
Signed-off-by: Mark Brown broonie@linaro.org --- .../bindings/sound/nvidia,tegra-audio-wm8903.txt | 22 ++-------------------- Documentation/devicetree/bindings/sound/wm8903.txt | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8903.txt b/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8903.txt index 3bf722d..0efe58c 100644 --- a/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8903.txt +++ b/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8903.txt @@ -11,26 +11,8 @@ Required properties: - nvidia,audio-routing : A list of the connections between audio components. Each entry is a pair of strings, the first being the connection's sink, the second being the connection's source. Valid names for sources and - sinks are the WM8903's pins, and the jacks on the board: - - WM8903 pins: - - * IN1L - * IN1R - * IN2L - * IN2R - * IN3L - * IN3R - * DMICDAT - * HPOUTL - * HPOUTR - * LINEOUTL - * LINEOUTR - * LOP - * LON - * ROP - * RON - * MICBIAS + sinks are the WM8903's pins (documented in the WM8903 binding document), + and the jacks on the board:
Board connectors:
diff --git a/Documentation/devicetree/bindings/sound/wm8903.txt b/Documentation/devicetree/bindings/sound/wm8903.txt index f102cbc..94ec32c 100644 --- a/Documentation/devicetree/bindings/sound/wm8903.txt +++ b/Documentation/devicetree/bindings/sound/wm8903.txt @@ -28,6 +28,25 @@ Optional properties: performed. If any entry has the value 0xffffffff, that GPIO's configuration will not be modified.
+Pins on the device (for linking into audio routes): + + * IN1L + * IN1R + * IN2L + * IN2R + * IN3L + * IN3R + * DMICDAT + * HPOUTL + * HPOUTR + * LINEOUTL + * LINEOUTR + * LOP + * LON + * ROP + * RON + * MICBIAS + Example:
codec: wm8903@1a {
On 08/07/2013 03:16 AM, Mark Brown wrote:
From: Mark Brown broonie@linaro.org
The pin list is the same for any board using the CODEC.
diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8903.txt b/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8903.txt
the second being the connection's source. Valid names for sources and
...
sinks are the WM8903's pins (documented in the WM8903 binding document),
and the jacks on the board:
Board connectors:
Probably want to remove the line "Board connectors:" ?
diff --git a/Documentation/devicetree/bindings/sound/wm8903.txt b/Documentation/devicetree/bindings/sound/wm8903.txt
+Pins on the device (for linking into audio routes):
- IN1L
- IN1R
I thought all the pins were going to be assigned numbers too so that bindings could use either?
On Wed, Aug 07, 2013 at 10:02:12AM -0600, Stephen Warren wrote:
On 08/07/2013 03:16 AM, Mark Brown wrote:
From: Mark Brown broonie@linaro.org
diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8903.txt b/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8903.txt
the second being the connection's source. Valid names for sources and
...
- sinks are the WM8903's pins (documented in the WM8903 binding document),
- and the jacks on the board:
Board connectors:
Probably want to remove the line "Board connectors:" ?
The board is still defining some jacks.
diff --git a/Documentation/devicetree/bindings/sound/wm8903.txt b/Documentation/devicetree/bindings/sound/wm8903.txt
+Pins on the device (for linking into audio routes):
- IN1L
- IN1R
I thought all the pins were going to be assigned numbers too so that bindings could use either?
I think someone who wants to start using those should get to pick numbers they find pleasing :) More to the point it's more effort and I'd like to see it in action to see the nicest way to write it up - create a header and refer to it or just put it in the docs and have the numbers assigned with new DAPM widget types embedding the numbers for example?
On 08/07/2013 10:30 AM, Mark Brown wrote:
On Wed, Aug 07, 2013 at 10:02:12AM -0600, Stephen Warren wrote:
On 08/07/2013 03:16 AM, Mark Brown wrote:
From: Mark Brown broonie@linaro.org
diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8903.txt b/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8903.txt
the second being the connection's source. Valid names for sources and
...
- sinks are the WM8903's pins (documented in the WM8903
binding document), + and the jacks on the board:
Board connectors:
Probably want to remove the line "Board connectors:" ?
What I mean is that there's only 1 list of the jacks now, and that's already introduced by the trailing colon you added in the line "+ and the jacks on the board:".
The board is still defining some jacks.
diff --git a/Documentation/devicetree/bindings/sound/wm8903.txt b/Documentation/devicetree/bindings/sound/wm8903.txt
+Pins on the device (for linking into audio routes): + + * IN1L + * IN1R
I thought all the pins were going to be assigned numbers too so that bindings could use either?
I think someone who wants to start using those should get to pick numbers they find pleasing :) More to the point it's more effort and I'd like to see it in action to see the nicest way to write it up - create a header and refer to it or just put it in the docs and have the numbers assigned with new DAPM widget types embedding the numbers for example?
I suppose it's fine to add that later. That rather encourages people to think that only strings are acceptable for identifying the pins though, which I'd rather avoid, but I guess it's fine.
On Wed, Aug 07, 2013 at 11:02:55AM -0600, Stephen Warren wrote:
On 08/07/2013 10:30 AM, Mark Brown wrote:
Probably want to remove the line "Board connectors:" ?
What I mean is that there's only 1 list of the jacks now, and that's already introduced by the trailing colon you added in the line "+ and the jacks on the board:".
Hrm, I guess.
I suppose it's fine to add that later. That rather encourages people to think that only strings are acceptable for identifying the pins though, which I'd rather avoid, but I guess it's fine.
Practically speaking that's the only option right now, actually doing a numbers based binding isn't sensible without infrastructure work to look things up and it's not particularly reasonable to insist that people do so.
participants (2)
-
Mark Brown -
Stephen Warren