Unverified Commit 1946dda4 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Merge up fixes for CI 

Avoid tripping over fixed issues in CI.
parents 7590c6a8 f63550e2

Documentation/devicetree/bindings/sound/tas2562.yaml

+4 −2
Original line number Diff line number Diff line
@@ -55,7 +55,9 @@ properties: 
    description: TDM TX current sense time slot.



  '#sound-dai-cells':

    const: 1

    # The codec has a single DAI, the #sound-dai-cells=<1>; case is left in for backward

    # compatibility but is deprecated.

    enum: [0, 1]



required:

  - compatible
@@ -72,7 +74,7 @@ examples: 
     codec: codec@4c {

       compatible = "ti,tas2562";

       reg = <0x4c>;

       #sound-dai-cells = <1>;

       #sound-dai-cells = <0>;

       interrupt-parent = <&gpio1>;

       interrupts = <14>;

       shutdown-gpios = <&gpio1 15 0>;

Documentation/devicetree/bindings/sound/tas2770.yaml

+4 −2
Original line number Diff line number Diff line
@@ -57,7 +57,9 @@ properties: 
      - 1 # Falling edge



  '#sound-dai-cells':

    const: 1

    # The codec has a single DAI, the #sound-dai-cells=<1>; case is left in for backward

    # compatibility but is deprecated.

    enum: [0, 1]



required:

  - compatible
@@ -74,7 +76,7 @@ examples: 
     codec: codec@41 {

       compatible = "ti,tas2770";

       reg = <0x41>;

       #sound-dai-cells = <1>;

       #sound-dai-cells = <0>;

       interrupt-parent = <&gpio1>;

       interrupts = <14>;

       reset-gpio = <&gpio1 15 0>;

Documentation/devicetree/bindings/sound/tas27xx.yaml

+4 −2
Original line number Diff line number Diff line
@@ -50,7 +50,9 @@ properties: 
    description: TDM TX voltage sense time slot.



  '#sound-dai-cells':

    const: 1

    # The codec has a single DAI, the #sound-dai-cells=<1>; case is left in for backward

    # compatibility but is deprecated.

    enum: [0, 1]



required:

  - compatible
@@ -67,7 +69,7 @@ examples: 
     codec: codec@38 {

       compatible = "ti,tas2764";

       reg = <0x38>;

       #sound-dai-cells = <1>;

       #sound-dai-cells = <0>;

       interrupt-parent = <&gpio1>;

       interrupts = <14>;

       reset-gpios = <&gpio1 15 0>;

sound/soc/amd/yc/acp6x-mach.c

+7 −0
Original line number Diff line number Diff line
@@ -318,6 +318,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = { 
			DMI_MATCH(DMI_BOARD_NAME, "MRID6"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "System76"),

			DMI_MATCH(DMI_PRODUCT_VERSION, "pang12"),

		}

	},

	{}

};

sound/soc/codecs/ssm2602.c

+15 −0
Original line number Diff line number Diff line
@@ -53,6 +53,18 @@ static const struct reg_default ssm2602_reg[SSM2602_CACHEREGNUM] = { 
	{ .reg = 0x09, .def = 0x0000 }

};



/*

 * ssm2602 register patch

 * Workaround for playback distortions after power up: activates digital

 * core, and then powers on output, DAC, and whole chip at the same time

 */



static const struct reg_sequence ssm2602_patch[] = {

	{ SSM2602_ACTIVE, 0x01 },

	{ SSM2602_PWR,    0x07 },

	{ SSM2602_RESET,  0x00 },

};





/*Appending several "None"s just for OSS mixer use*/

static const char *ssm2602_input_select[] = {
@@ -598,6 +610,9 @@ static int ssm260x_component_probe(struct snd_soc_component *component) 
		return ret;

	}



	regmap_register_patch(ssm2602->regmap, ssm2602_patch,

			      ARRAY_SIZE(ssm2602_patch));



	/* set the update bits */

	regmap_update_bits(ssm2602->regmap, SSM2602_LINVOL,

			    LINVOL_LRIN_BOTH, LINVOL_LRIN_BOTH);