summaryrefslogtreecommitdiff
path: root/sound/soc
diff options
context:
space:
mode:
authorKiseok Jo <kiseok.jo@irondevice.com>2023-02-09 11:49:03 +0300
committerMark Brown <broonie@kernel.org>2023-02-09 14:30:56 +0300
commit2512839dd648ffa2c2a752e1403aaeb928cff71a (patch)
tree33a1dee1596e6666306a80585ada446f0aca39fc /sound/soc
parent35ff1051b9594b05041eb2444a339345944b3241 (diff)
downloadlinux-2512839dd648ffa2c2a752e1403aaeb928cff71a.tar.xz
ASoC: SMA1303: Remove the sysclk setting in devicetree
In SMA1303, this device does not support MCLK. So it need to remove sysclk setting in devicetree. Signed-off-by: Kiseok Jo <kiseok.jo@irondevice.com> Link: https://lore.kernel.org/r/20230209084903.13000-2-kiseok.jo@irondevice.com Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/codecs/sma1303.c37
1 files changed, 2 insertions, 35 deletions
diff --git a/sound/soc/codecs/sma1303.c b/sound/soc/codecs/sma1303.c
index 9ae4e3cba3ae..727c01facf52 100644
--- a/sound/soc/codecs/sma1303.c
+++ b/sound/soc/codecs/sma1303.c
@@ -998,10 +998,7 @@ static int sma1303_dai_hw_params_amp(struct snd_pcm_substream *substream,
params_channels(params));
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
-
- if (sma1303->sys_clk_id == SMA1303_PLL_CLKIN_MCLK
- || sma1303->sys_clk_id == SMA1303_PLL_CLKIN_BCLK) {
-
+ if (sma1303->sys_clk_id == SMA1303_PLL_CLKIN_BCLK) {
if (sma1303->last_bclk != bclk) {
sma1303_setup_pll(component, bclk);
sma1303->last_bclk = bclk;
@@ -1680,9 +1677,7 @@ static struct attribute_group sma1303_attr_group = {
static int sma1303_i2c_probe(struct i2c_client *client)
{
struct sma1303_priv *sma1303;
- struct device_node *np = client->dev.of_node;
int ret, i = 0;
- u32 value = 0;
unsigned int device_info, status, otp_stat;
sma1303 = devm_kzalloc(&client->dev,
@@ -1700,35 +1695,6 @@ static int sma1303_i2c_probe(struct i2c_client *client)
return ret;
}
- if (np) {
- if (!of_property_read_u32(np, "sys-clk-id", &value)) {
- switch (value) {
- case SMA1303_EXTERNAL_CLOCK_19_2:
- case SMA1303_EXTERNAL_CLOCK_24_576:
- case SMA1303_PLL_CLKIN_MCLK:
- dev_dbg(&client->dev, "MCLK is not supported\n");
- break;
- case SMA1303_PLL_CLKIN_BCLK:
- dev_dbg(&client->dev,
- "Take an BCLK(SCK) and covert it to an internal PLL for use\n");
- break;
- default:
- dev_err(&client->dev,
- "Invalid sys-clk-id: %u\n", value);
- return -EINVAL;
- }
- sma1303->sys_clk_id = value;
- } else {
- dev_dbg(&client->dev, "Use the internal PLL clock by default\n");
- sma1303->sys_clk_id = SMA1303_PLL_CLKIN_BCLK;
- }
- } else {
- dev_err(&client->dev,
- "device node initialization error\n");
- devm_kfree(&client->dev, sma1303);
- return -ENODEV;
- }
-
ret = sma1303_regmap_read(sma1303,
SMA1303_FF_DEVICE_INDEX, &device_info);
@@ -1783,6 +1749,7 @@ static int sma1303_i2c_probe(struct i2c_client *client)
sma1303->retry_cnt = SMA1303_I2C_RETRY_COUNT;
sma1303->tdm_slot_rx = 0;
sma1303->tdm_slot_tx = 0;
+ sma1303->sys_clk_id = SMA1303_PLL_CLKIN_BCLK;
sma1303->dev = &client->dev;
sma1303->kobj = &client->dev.kobj;