Unverified Commit 85746643 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: da7219: Add jack insertion detection polarity 

Merge series from David Rau <David.Rau.opensource@dm.renesas.com>:

This patchset adds the support of DA7219 Jack insertion detection
polarity selection.

The first patch replaces the old txt binding with a new schema binding.

The second patch adds `dlg,jack-ins-det-pty` property for Jack
insertion detection polarity selection.

The last patch adds the driver support for this topic.

The series has been verified on the DA7219 development kit.
parents abd35adf dc0ff0fa

Documentation/devicetree/bindings/sound/da7219.txt

deleted100644 → 0
+0 −112
Original line number Diff line number Diff line 
Dialog Semiconductor DA7219 Audio Codec bindings



DA7219 is an audio codec with advanced accessory detect features.



======



Required properties:

- compatible : Should be "dlg,da7219"

- reg: Specifies the I2C slave address



- interrupts : IRQ line info for DA7219.

  (See Documentation/devicetree/bindings/interrupt-controller/interrupts.txt for

   further information relating to interrupt properties)



- VDD-supply: VDD power supply for the device

- VDDMIC-supply: VDDMIC power supply for the device

- VDDIO-supply: VDDIO power supply for the device

  (See Documentation/devicetree/bindings/regulator/regulator.txt for further

   information relating to regulators)



Optional properties:

- interrupt-names : Name associated with interrupt line. Should be "wakeup" if

  interrupt is to be used to wake system, otherwise "irq" should be used.

- wakeup-source: Flag to indicate this device can wake system (suspend/resume).



- #clock-cells :  Should be set to '<1>', two clock sources provided;

- clock-output-names : Names given for DAI clock outputs (WCLK & BCLK);



- clocks : phandle and clock specifier for codec MCLK.

- clock-names : Clock name string for 'clocks' attribute, should be "mclk".



- dlg,micbias-lvl : Voltage (mV) for Mic Bias

	[<1600>, <1800>, <2000>, <2200>, <2400>, <2600>]

- dlg,mic-amp-in-sel : Mic input source type

	["diff", "se_p", "se_n"]



Deprecated properties:

- dlg,ldo-lvl : Required internal LDO voltage (mV) level for digital engine

  (LDO unavailable in production HW so property no longer required).



======



Child node - 'da7219_aad':



Optional properties:

- dlg,micbias-pulse-lvl : Mic bias higher voltage pulse level (mV).

	[<2800>, <2900>]

- dlg,micbias-pulse-time : Mic bias higher voltage pulse duration (ms)

- dlg,btn-cfg : Periodic button press measurements for 4-pole jack (ms)

	[<2>, <5>, <10>, <50>, <100>, <200>, <500>]

- dlg,mic-det-thr : Impedance threshold for mic detection measurement (Ohms)

	[<200>, <500>, <750>, <1000>]

- dlg,jack-ins-deb : Debounce time for jack insertion (ms)

	[<5>, <10>, <20>, <50>, <100>, <200>, <500>, <1000>]

- dlg,jack-det-rate: Jack type detection latency (3/4 pole)

	["32ms_64ms", "64ms_128ms", "128ms_256ms", "256ms_512ms"]

- dlg,jack-rem-deb : Debounce time for jack removal (ms)

	[<1>, <5>, <10>, <20>]

- dlg,a-d-btn-thr : Impedance threshold between buttons A and D

	[0x0 - 0xFF]

- dlg,d-b-btn-thr : Impedance threshold between buttons D and B

	[0x0 - 0xFF]

- dlg,b-c-btn-thr : Impedance threshold between buttons B and C

	[0x0 - 0xFF]

- dlg,c-mic-btn-thr : Impedance threshold between button C and Mic

	[0x0 - 0xFF]

- dlg,btn-avg : Number of 8-bit readings for averaged button measurement

	[<1>, <2>, <4>, <8>]

- dlg,adc-1bit-rpt : Repeat count for 1-bit button measurement

	[<1>, <2>, <4>, <8>]



======



Example:



	codec: da7219@1a {

		compatible = "dlg,da7219";

		reg = <0x1a>;



		interrupt-parent = <&gpio6>;

		interrupts = <11 IRQ_TYPE_LEVEL_LOW>;



		VDD-supply = <&reg_audio>;

		VDDMIC-supply = <&reg_audio>;

		VDDIO-supply = <&reg_audio>;



		#clock-cells = <1>;

		clock-output-names = "dai-wclk", "dai-bclk";



		clocks = <&clks 201>;

		clock-names = "mclk";



		dlg,ldo-lvl = <1200>;

		dlg,micbias-lvl = <2600>;

		dlg,mic-amp-in-sel = "diff";



		da7219_aad {

			dlg,btn-cfg = <50>;

			dlg,mic-det-thr = <500>;

			dlg,jack-ins-deb = <20>;

			dlg,jack-det-rate = "32ms_64ms";

			dlg,jack-rem-deb = <1>;



			dlg,a-d-btn-thr = <0xa>;

			dlg,d-b-btn-thr = <0x16>;

			dlg,b-c-btn-thr = <0x21>;

			dlg,c-mic-btn-thr = <0x3E>;



			dlg,btn-avg = <4>;

			dlg,adc-1bit-rpt = <1>;

		};

	};

Documentation/devicetree/bindings/sound/dialog,da7219.yaml

0 → 100644
+237 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/sound/dialog,da7219.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Dialog Semiconductor DA7219 Audio Codec



maintainers:

  - David Rau <David.Rau.opensource@dm.renesas.com>



description:

  The DA7219 is an ultra low-power audio codec with

  in-built advanced accessory detection (AAD) for mobile

  computing and accessory applications, which supports

  sample rates up to 96 kHz at 24-bit resolution.



properties:

  compatible:

    const: dlg,da7219



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  VDD-supply:

    description:

      VDD power supply for the device.



  VDDMIC-supply:

    description:

      VDDMIC power supply for the device.



  VDDIO-supply:

    description:

      VDDIO power supply for the device.



  interrupt-names:

    description:

      Should be "wakeup" if interrupt is to be used to wake system,

      otherwise "irq" should be used.

    enum:

      - wakeup

      - irq



  wakeup-source:

    type: boolean

    description:

      Flag to indicate this device can wake system (suspend/resume).



  "#clock-cells":

    const: 1



  clock-output-names:

    minItems: 2

    maxItems: 2

    description:

      Name given for DAI WCLK and BCLK outputs.



  clocks:

    maxItems: 1

    description:

      phandle and clock specifier for codec MCLK.



  clock-names:

    const: mclk



  dlg,micbias-lvl:

    enum: [1600, 1800, 2000, 2200, 2400, 2600]

    description:

      Voltage (mV) for Mic Bias.

    $ref: /schemas/types.yaml#/definitions/uint32



  dlg,mic-amp-in-sel:

    enum: ["diff", "se_p", "se_n"]

    description:

      Mic input source type.



      diff - Differential.



      se_p - MIC_P.

      Positive differential analog microphone input.



      se_n - MIC_N.

      Negative differential analog microphone input.

    $ref: /schemas/types.yaml#/definitions/string



  da7219_aad:

    type: object

    description:

      Configuration of advanced accessory detection.

    properties:

      dlg,micbias-pulse-lvl:

        enum: [2800, 2900]

        description:

          Mic bias higher voltage pulse level (mV).

        $ref: /schemas/types.yaml#/definitions/uint32



      dlg,micbias-pulse-time:

        description:

          Mic bias higher voltage pulse duration (ms).

        $ref: /schemas/types.yaml#/definitions/uint32

        minimum: 0



      dlg,btn-cfg:

        enum: [2, 5, 10, 50, 100, 200, 500]

        description:

          Periodic button press measurements for 4-pole jack (ms).

        $ref: /schemas/types.yaml#/definitions/uint32



      dlg,mic-det-thr:

        enum: [200, 500, 750, 1000]

        description:

          Impedance threshold for mic detection measurement (Ohms).

        $ref: /schemas/types.yaml#/definitions/uint32



      dlg,jack-ins-deb:

        enum: [5, 10, 20, 50, 100, 200, 500, 1000]

        description:

          Debounce time for jack insertion (ms).

        $ref: /schemas/types.yaml#/definitions/uint32



      dlg,jack-ins-det-pty:

        enum: ["low", "high"]

        description:

          Polarity for jack insertion detection.

        $ref: /schemas/types.yaml#/definitions/string



      dlg,jack-det-rate:

        enum: ["32_64", "64_128", "128_256", "256_512"]

        description:

          Jack type (3/4 pole) detection latency (ms).

        $ref: /schemas/types.yaml#/definitions/string



      dlg,jack-rem-deb:

        enum: [1, 5, 10, 20]

        description:

          Debounce time for jack removal (ms).

        $ref: /schemas/types.yaml#/definitions/uint32



      dlg,a-d-btn-thr:

        description:

          Impedance threshold between buttons A and D.

        $ref: /schemas/types.yaml#/definitions/uint32

        minimum: 0

        maximum: 255



      dlg,d-b-btn-thr:

        description:

          Impedance threshold between buttons D and B.

        $ref: /schemas/types.yaml#/definitions/uint32

        minimum: 0

        maximum: 255



      dlg,b-c-btn-thr:

        description:

          Impedance threshold between buttons B and C.

        $ref: /schemas/types.yaml#/definitions/uint32

        minimum: 0

        maximum: 255



      dlg,c-mic-btn-thr:

        description:

          Impedance threshold between button C and Mic.

        $ref: /schemas/types.yaml#/definitions/uint32

        minimum: 0

        maximum: 255



      dlg,btn-avg:

        enum: [1, 2, 4, 8]

        description:

          Number of 8-bit readings for averaged button measurement.

        $ref: /schemas/types.yaml#/definitions/uint32



      dlg,adc-1bit-rpt:

        enum: [1, 2, 4, 8]

        description:

          Repeat count for 1-bit button measurement.

        $ref: /schemas/types.yaml#/definitions/uint32



required:

  - compatible

  - reg

  - interrupts

  - VDD-supply

  - VDDMIC-supply

  - VDDIO-supply



additionalProperties: false



examples:

  - |

    #include <dt-bindings/interrupt-controller/irq.h>

    i2c {

      #address-cells = <1>;

      #size-cells = <0>;



      codec: da7219@1a {

          compatible = "dlg,da7219";

          reg = <0x1a>;



          interrupt-parent = <&gpio6>;

          interrupts = <11 IRQ_TYPE_LEVEL_LOW>;



          VDD-supply = <&vdd_reg>;

          VDDMIC-supply = <&vddmic_reg>;

          VDDIO-supply = <&vddio_reg>;



          #clock-cells = <1>;

          clock-output-names = "da7219-dai-wclk", "da7219-dai-bclk";



          clocks = <&clks 201>;

          clock-names = "mclk";



          dlg,micbias-lvl = <2600>;

          dlg,mic-amp-in-sel = "diff";



          da7219_aad {

              dlg,btn-cfg = <50>;

              dlg,mic-det-thr = <500>;

              dlg,jack-ins-deb = <20>;

              dlg,jack-ins-det-pty = "low";

              dlg,jack-det-rate = "32_64";

              dlg,jack-rem-deb = <1>;



              dlg,a-d-btn-thr = <0xa>;

              dlg,d-b-btn-thr = <0x16>;

              dlg,b-c-btn-thr = <0x21>;

              dlg,c-mic-btn-thr = <0x3E>;



              dlg,btn-avg = <4>;

              dlg,adc-1bit-rpt = <1>;

          };

      };

    };

include/sound/da7219-aad.h

+6 −0
Original line number Diff line number Diff line
@@ -44,6 +44,11 @@ enum da7219_aad_jack_ins_deb { 
	DA7219_AAD_JACK_INS_DEB_1S,

};



enum da7219_aad_jack_ins_det_pty {

	DA7219_AAD_JACK_INS_DET_PTY_LOW = 0,

	DA7219_AAD_JACK_INS_DET_PTY_HIGH,

};



enum da7219_aad_jack_det_rate {

	DA7219_AAD_JACK_DET_RATE_32_64MS = 0,

	DA7219_AAD_JACK_DET_RATE_64_128MS,
@@ -80,6 +85,7 @@ struct da7219_aad_pdata { 
	enum da7219_aad_btn_cfg btn_cfg;

	enum da7219_aad_mic_det_thr mic_det_thr;

	enum da7219_aad_jack_ins_deb jack_ins_deb;

	enum da7219_aad_jack_ins_det_pty jack_ins_det_pty;

	enum da7219_aad_jack_det_rate jack_det_rate;

	enum da7219_aad_jack_rem_deb jack_rem_deb;

sound/soc/codecs/da7219-aad.c

+38 −4
Original line number Diff line number Diff line
@@ -571,16 +571,29 @@ static enum da7219_aad_jack_ins_deb 
	}

}



static enum da7219_aad_jack_ins_det_pty

	da7219_aad_fw_jack_ins_det_pty(struct device *dev, const char *str)

{

	if (!strcmp(str, "low")) {

		return DA7219_AAD_JACK_INS_DET_PTY_LOW;

	} else if (!strcmp(str, "high")) {

		return DA7219_AAD_JACK_INS_DET_PTY_HIGH;

	} else {

		dev_warn(dev, "Invalid jack insertion detection polarity");

		return DA7219_AAD_JACK_INS_DET_PTY_LOW;

	}

}



static enum da7219_aad_jack_det_rate

	da7219_aad_fw_jack_det_rate(struct device *dev, const char *str)

{

	if (!strcmp(str, "32ms_64ms")) {

	if (!strcmp(str, "32_64")) {

		return DA7219_AAD_JACK_DET_RATE_32_64MS;

	} else if (!strcmp(str, "64ms_128ms")) {

	} else if (!strcmp(str, "64_128")) {

		return DA7219_AAD_JACK_DET_RATE_64_128MS;

	} else if (!strcmp(str, "128ms_256ms")) {

	} else if (!strcmp(str, "128_256")) {

		return DA7219_AAD_JACK_DET_RATE_128_256MS;

	} else if (!strcmp(str, "256ms_512ms")) {

	} else if (!strcmp(str, "256_512")) {

		return DA7219_AAD_JACK_DET_RATE_256_512MS;

	} else {

		dev_warn(dev, "Invalid jack detect rate");
@@ -688,6 +701,12 @@ static struct da7219_aad_pdata *da7219_aad_fw_to_pdata(struct device *dev) 
	else

		aad_pdata->jack_ins_deb = DA7219_AAD_JACK_INS_DEB_20MS;



	if (!fwnode_property_read_string(aad_np, "dlg,jack-ins-det-pty", &fw_str))

		aad_pdata->jack_ins_det_pty =

			da7219_aad_fw_jack_ins_det_pty(dev, fw_str);

	else

		aad_pdata->jack_ins_det_pty = DA7219_AAD_JACK_INS_DET_PTY_LOW;



	if (!fwnode_property_read_string(aad_np, "dlg,jack-det-rate", &fw_str))

		aad_pdata->jack_det_rate =

			da7219_aad_fw_jack_det_rate(dev, fw_str);
@@ -849,6 +868,21 @@ static void da7219_aad_handle_pdata(struct snd_soc_component *component) 
			mask |= DA7219_ADC_1_BIT_REPEAT_MASK;

		}

		snd_soc_component_update_bits(component, DA7219_ACCDET_CONFIG_7, mask, cfg);



		switch (aad_pdata->jack_ins_det_pty) {

		case DA7219_AAD_JACK_INS_DET_PTY_LOW:

			snd_soc_component_write(component, 0xF0, 0x8B);

			snd_soc_component_write(component, 0x75, 0x80);

			snd_soc_component_write(component, 0xF0, 0x00);

			break;

		case DA7219_AAD_JACK_INS_DET_PTY_HIGH:

			snd_soc_component_write(component, 0xF0, 0x8B);

			snd_soc_component_write(component, 0x75, 0x00);

			snd_soc_component_write(component, 0xF0, 0x00);

			break;

		default:

			break;

		}

	}

}