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

ASoC: Merge up fixes 

For the benefit of CI.
parents e952e89b 2b21207a

Documentation/devicetree/bindings/sound/rockchip-spdif.yaml

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ properties: 
      - const: rockchip,rk3568-spdif

      - items:

          - enum:

              - rockchip,rk3128-spdif

              - rockchip,rk3188-spdif

              - rockchip,rk3288-spdif

              - rockchip,rk3308-spdif

drivers/firmware/cirrus/cs_dsp.c

+17 −17
Original line number Diff line number Diff line
@@ -1863,7 +1863,7 @@ static int cs_dsp_adsp2_setup_algs(struct cs_dsp *dsp) 
		return PTR_ERR(adsp2_alg);



	for (i = 0; i < n_algs; i++) {

		cs_dsp_info(dsp,

		cs_dsp_dbg(dsp,

			   "%d: ID %x v%d.%d.%d XM@%x YM@%x ZM@%x\n",

			   i, be32_to_cpu(adsp2_alg[i].alg.id),

			   (be32_to_cpu(adsp2_alg[i].alg.ver) & 0xff0000) >> 16,
@@ -1996,7 +1996,7 @@ static int cs_dsp_halo_setup_algs(struct cs_dsp *dsp) 
		return PTR_ERR(halo_alg);



	for (i = 0; i < n_algs; i++) {

		cs_dsp_info(dsp,

		cs_dsp_dbg(dsp,

			   "%d: ID %x v%d.%d.%d XM@%x YM@%x\n",

			   i, be32_to_cpu(halo_alg[i].alg.id),

			   (be32_to_cpu(halo_alg[i].alg.ver) & 0xff0000) >> 16,

sound/soc/codecs/aw88395/aw88395_lib.c

+2 −0
Original line number Diff line number Diff line
@@ -452,11 +452,13 @@ static int aw_dev_parse_reg_bin_with_hdr(struct aw_device *aw_dev, 
	if ((aw_bin->all_bin_parse_num != 1) ||

		(aw_bin->header_info[0].bin_data_type != DATA_TYPE_REGISTER)) {

		dev_err(aw_dev->dev, "bin num or type error");

		ret = -EINVAL;

		goto parse_bin_failed;

	}



	if (aw_bin->header_info[0].valid_data_len % 4) {

		dev_err(aw_dev->dev, "bin data len get error!");

		ret = -EINVAL;

		goto parse_bin_failed;

	}

sound/soc/codecs/cs35l56-i2c.c

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ static int cs35l56_i2c_probe(struct i2c_client *client) 
		return -ENOMEM;



	cs35l56->base.dev = dev;

	cs35l56->base.can_hibernate = true;



	i2c_set_clientdata(client, cs35l56);

	cs35l56->base.regmap = devm_regmap_init_i2c(client, regmap_config);

sound/soc/codecs/cs42l42-sdw.c

+20 −0
Original line number Diff line number Diff line
@@ -344,6 +344,16 @@ static int cs42l42_sdw_update_status(struct sdw_slave *peripheral, 
	switch (status) {

	case SDW_SLAVE_ATTACHED:

		dev_dbg(cs42l42->dev, "ATTACHED\n");



		/*

		 * The SoundWire core can report stale ATTACH notifications

		 * if we hard-reset CS42L42 in probe() but it had already been

		 * enumerated. Reject the ATTACH if we haven't yet seen an

		 * UNATTACH report for the device being in reset.

		 */

		if (cs42l42->sdw_waiting_first_unattach)

			break;



		/*

		 * Initialise codec, this only needs to be done once.

		 * When resuming from suspend, resume callback will handle re-init of codec,
@@ -354,6 +364,16 @@ static int cs42l42_sdw_update_status(struct sdw_slave *peripheral, 
		break;

	case SDW_SLAVE_UNATTACHED:

		dev_dbg(cs42l42->dev, "UNATTACHED\n");



		if (cs42l42->sdw_waiting_first_unattach) {

			/*

			 * SoundWire core has seen that CS42L42 is not on

			 * the bus so release RESET and wait for ATTACH.

			 */

			cs42l42->sdw_waiting_first_unattach = false;

			gpiod_set_value_cansleep(cs42l42->reset_gpio, 1);

		}



		break;

	default:

		break;