From 23fb854af9751d6d34f38f3300f049f0e6bba299 Mon Sep 17 00:00:00 2001 From: Nicolin Chen Date: Tue, 3 Sep 2013 12:45:05 +0800 Subject: MLK-11479-06 ASoC: fsl: Add WM8962 jack detecting support cherry-pick below patch from v3.14.y: ENGR00277715-3 ASoC: fsl: Add WM8962 jack detecting support There're two GPIOs connected to the headphone jack and microphone jack, thus add the states detection. Reviewed-by: Wang Shengjiu Signed-off-by: Nicolin Chen (cherry picked from commit f85ca1dd664178328bd813651e91d612787b6926) --- Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt | 8 ++++++++ Documentation/devicetree/bindings/sound/wm8962.txt | 8 ++++++++ 2 files changed, 16 insertions(+) (limited to 'Documentation/devicetree/bindings/sound') diff --git a/Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt b/Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt index acea71bee34f..5006de2b230d 100644 --- a/Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt +++ b/Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt @@ -31,6 +31,12 @@ Required properties: Note: The AUDMUX port numbering should start at 1, which is consistent with hardware manual. +Optional properties: +- hp-det-gpios : The gpio pin to detect plug in/out event that happens to + Headphone jack. +- mic-det-gpios: The gpio pin to detect plug in/out event that happens to + Microphone jack. + Example: sound { @@ -50,4 +56,6 @@ sound { "DMICDAT", "DMIC"; mux-int-port = <2>; mux-ext-port = <3>; + hp-det-gpios = <&gpio7 8 1>; + mic-det-gpios = <&gpio1 9 1>; }; diff --git a/Documentation/devicetree/bindings/sound/wm8962.txt b/Documentation/devicetree/bindings/sound/wm8962.txt index 7f82b59ec8f9..d15b9c82fd15 100644 --- a/Documentation/devicetree/bindings/sound/wm8962.txt +++ b/Documentation/devicetree/bindings/sound/wm8962.txt @@ -13,6 +13,14 @@ Optional properties: of R51 (Class D Control 2) gets set, indicating that the speaker is in mono mode. + - amic-mono: This is a boolean property. If present, indicating that the + analog micphone is hardware mono input, the driver would enable monomix + for it. + + - dmic-mono: This is a boolean property. If present, indicating that the + digital micphone is hardware mono input, the driver would enable monomix + for it. + - mic-cfg : Default register value for R48 (Additional Control 4). If absent, the default should be the register default. -- cgit v1.2.3