Unverified Commit 54ac5120 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: codecs: rtq9128: Add TDM input source select 

Merge series from cy_huang@richtek.com:

This patch series create a TDM source select property and use it to
decide which TDM data source is connected.

Following by the below patch disccuion
https://lore.kernel.org/lkml/1695780376-32301-1-git-send-email-cy_huang@richtek.com/#t
It may not be a good choice to add the user controlable mixer control
item. Since it follows the board design, make it as a device property.
parents 67fcdbfd d9ef56d9

Documentation/devicetree/bindings/sound/richtek,rtq9128.yaml

+7 −0
Original line number Diff line number Diff line
@@ -28,6 +28,13 @@ properties: 
  enable-gpios:

    maxItems: 1



  richtek,tdm-input-data2-select:

    type: boolean

    description:

      By default, if TDM mode is used, TDM data input will select 'DATA1' pin

      as the data source. This option will configure TDM data input source from

      'DATA1' to 'DATA2' pin.



  '#sound-dai-cells':

    const: 0

sound/soc/codecs/rtq9128.c

+15 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/mod_devicetable.h>

#include <linux/module.h>

#include <linux/pm_runtime.h>

#include <linux/property.h>

#include <linux/regmap.h>

#include <sound/pcm_params.h>

#include <sound/soc.h>
@@ -41,6 +42,7 @@ 


#define RTQ9128_CHSTAT_VAL_MASK	GENMASK(1, 0)

#define RTQ9128_DOLEN_MASK	GENMASK(7, 6)

#define RTQ9128_TDMSRCIN_MASK	GENMASK(5, 4)

#define RTQ9128_AUDBIT_MASK	GENMASK(5, 4)

#define RTQ9128_AUDFMT_MASK	GENMASK(3, 0)

#define RTQ9128_MSMUTE_MASK	BIT(0)
@@ -59,6 +61,7 @@ struct rtq9128_data { 
	struct gpio_desc *enable;

	int tdm_slots;

	int tdm_slot_width;

	bool tdm_input_data2_select;

};



struct rtq9128_init_reg {
@@ -484,7 +487,7 @@ static int rtq9128_dai_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mas 
	struct rtq9128_data *data = snd_soc_dai_get_drvdata(dai);

	struct snd_soc_component *comp = dai->component;

	struct device *dev = dai->dev;

	unsigned int mask, start_loc;

	unsigned int mask, start_loc, srcin_select;

	int i, frame_length, ret;



	dev_dbg(dev, "%s: slot %d slot_width %d, tx/rx mask 0x%x 0x%x\n", __func__, slots,
@@ -530,6 +533,14 @@ static int rtq9128_dai_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mas 
		}

	}



	srcin_select = data->tdm_input_data2_select ? RTQ9128_TDMSRCIN_MASK : 0;

	ret = snd_soc_component_update_bits(comp, RTQ9128_REG_SDO_SEL, RTQ9128_TDMSRCIN_MASK,

					    srcin_select);

	if (ret < 0) {

		dev_err(dev, "Failed to configure TDM source input select\n");

		return ret;

	}



	data->tdm_slots = slots;

	data->tdm_slot_width = slot_width;
@@ -672,6 +683,9 @@ static int rtq9128_probe(struct i2c_client *i2c) 
	else if (data->enable)

		usleep_range(10000, 11000);



	data->tdm_input_data2_select = device_property_read_bool(dev,

								 "richtek,tdm-input-data2-select");



	i2c_set_clientdata(i2c, data);



	/*