Skip to content

Topic/sof dev: fix TDF8532 codec and machine driver #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
plbossart merged 18 commits into from
Jul 2, 2018
Merged

Topic/sof dev: fix TDF8532 codec and machine driver #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
12ef211
ASoC: Intel: revert code related to TDF8532
plbossart Jul 2, 2018
75049e9
ASoC: tdf8532: NXP TDF8532 audio class-D amplifier driver
May 15, 2018
820b3db
ASoC: tdf8532: Fix compilation warnings
May 15, 2018
4548d57
ASoC: tdf8532: Add delay while reading a packet from I2C
May 15, 2018
39ccd48
ASoC: tdf8532: fix memleak in tdf8532_wait_state
LiucIntel May 11, 2018
ea8e1e4
ASoC: tdf8532: right free allocated space in case of error
LiucIntel May 11, 2018
3141c26
ASoC: tdf8532: Fix the codec status error issue on APL-GPMRB
May 15, 2018
078d219
ASoC: codecs: tdf8532: move to component model
plbossart Jun 23, 2018
42f6c0b
ASoC: Intel: Boards: Add BXTP MRB machine driver for NXP TDF8532
keyonjie May 22, 2018
94d68e0
ASoC: Intel: Board: DAI links for probe in GPMRB machine driver
msinnha1 Jul 6, 2017
d8be288
ASoC: Intel: Boards: Add FW logging DAI-links for GPMRB
msinnha1 Jul 6, 2017
8d04fe1
ASoC: Intel: Board: Add pm_ops to fix suspend/resume issue
kareemshaik80 Aug 30, 2017
c794c8d
ASoC: Intel: Board: Add fixup for 32 bit masking
msinnha1 Sep 4, 2017
4ed2bb3
ASoC: Intel: bxt-tdf8532: reuse machine driver for GP-MRB
keyonjie May 22, 2018
df30862
ASoC: Intel: bxt-tdf8532: FIX: don't use add_dai_link() for SOF
keyonjie May 28, 2018
5c69915
ASoC: Intel: bxt-tdf8532: change probe and trace buffer dai_links to …
keyonjie Jun 20, 2018
f8bff0c
ASoC: codecs: TDF8532: use Linux style
plbossart Jul 2, 2018
22aa067
ASoC: Intel: bxt-tdf8532: use Linux style
plbossart Jul 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
122 changes: 58 additions & 64 deletions sound/soc/codecs/tdf8532.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,7 @@
// SPDX-License-Identifier: GPL-2.0
/*
* Codec driver for NXP Semiconductors - TDF8532
* Copyright (c) 2017, Intel Corporation.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms and conditions of the GNU General Public License,
* version 2, as published by the Free Software Foundation.
*
* This program is distributed in the hope it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*/

#include <linux/module.h>
Expand All @@ -24,7 +16,7 @@
#include "tdf8532.h"

static int __tdf8532_build_pkt(struct tdf8532_priv *dev_data,
va_list valist, u8 *payload)
va_list valist, u8 *payload)
{
int param;
u8 len;
Expand All @@ -34,7 +26,7 @@ static int __tdf8532_build_pkt(struct tdf8532_priv *dev_data,
payload[HEADER_TYPE] = MSG_TYPE_STX;
payload[HEADER_PKTID] = dev_data->pkt_id;

cmd_payload = &(payload[cmd_offset]);
cmd_payload = &payload[cmd_offset];

param = va_arg(valist, int);
len = 0;
Expand All @@ -53,7 +45,7 @@ static int __tdf8532_build_pkt(struct tdf8532_priv *dev_data,
}

static int __tdf8532_single_write(struct tdf8532_priv *dev_data,
int dummy, ...)
int dummy, ...)
{
va_list valist;
int ret;
Expand All @@ -67,30 +59,29 @@ static int __tdf8532_single_write(struct tdf8532_priv *dev_data,
va_end(valist);

print_hex_dump_debug("tdf8532-codec: Tx:", DUMP_PREFIX_NONE, 32, 1,
payload, len, false);
payload, len, false);
ret = i2c_master_send(dev_data->i2c, payload, len);

dev_data->pkt_id++;

if (ret < 0) {
dev_err(&(dev_data->i2c->dev),
"i2c send packet returned: %d\n", ret);
dev_err(&dev_data->i2c->dev,
"i2c send packet returned: %d\n", ret);

return ret;
}

return 0;
}


static uint8_t tdf8532_read_wait_ack(struct tdf8532_priv *dev_data,
unsigned long timeout)
static u8 tdf8532_read_wait_ack(struct tdf8532_priv *dev_data,
unsigned long timeout)
{
uint8_t ack_repl[HEADER_SIZE] = {0, 0, 0};
u8 ack_repl[HEADER_SIZE] = {0, 0, 0};
unsigned long timeout_point = jiffies + timeout;
int ret;

usleep_range(10000,20000);
usleep_range(10000, 20000);
do {
ret = i2c_master_recv(dev_data->i2c, ack_repl, HEADER_SIZE);
if (ret < 0)
Expand All @@ -107,52 +98,58 @@ static uint8_t tdf8532_read_wait_ack(struct tdf8532_priv *dev_data,
return ret;
}

static uint8_t tdf8532_single_read(struct tdf8532_priv *dev_data,
char **repl_buff)
static int tdf8532_single_read(struct tdf8532_priv *dev_data,
char **repl_buff)
{
int ret;
uint8_t len;
int len;

struct device *dev = &(dev_data->i2c->dev);
struct device *dev = &dev_data->i2c->dev;

ret = tdf8532_read_wait_ack(dev_data, msecs_to_jiffies(ACK_TIMEOUT));

if (ret < 0) {
dev_err(dev,
"Error waiting for ACK reply: %d\n", ret);
"Error waiting for ACK reply: %d\n", ret);
goto out;
}

len = ret + HEADER_SIZE;

*repl_buff = kzalloc(len, GFP_KERNEL);
if (*repl_buff == NULL) {
ret = -ENOMEM;
goto out;
}

ret = i2c_master_recv(dev_data->i2c, *repl_buff, len);

print_hex_dump_debug("tdf8532-codec: Rx:", DUMP_PREFIX_NONE, 32, 1,
*repl_buff, len, false);
*repl_buff, len, false);

if (ret < 0 || ret != len) {
dev_err(dev,
"i2c recv packet returned: %d (expected: %d)\n",
ret, len);
"i2c recv packet returned: %d (expected: %d)\n",
ret, len);

ret = -EINVAL;
goto out_free;
}

return len;

out_free:
kfree(*repl_buff);
repl_buff = NULL;
*repl_buff = NULL;
out:
return ret;
}

static int tdf8532_get_state(struct tdf8532_priv *dev_data,
struct get_dev_status_repl **status_repl)
struct get_dev_status_repl **status_repl)
{
int ret = 0;
char *repl_buff = NULL;
int ret = 0;

ret = tdf8532_amp_write(dev_data, GET_DEV_STATUS);
if (ret < 0)
Expand All @@ -162,41 +159,42 @@ static int tdf8532_get_state(struct tdf8532_priv *dev_data,
if (ret < 0)
goto out;

*status_repl = (struct get_dev_status_repl *) repl_buff;
*status_repl = (struct get_dev_status_repl *)repl_buff;

out:
return ret;
}

static int tdf8532_wait_state(struct tdf8532_priv *dev_data, u8 req_state,
unsigned long timeout)
unsigned long timeout)
{
unsigned long timeout_point = jiffies + msecs_to_jiffies(timeout);
int ret;
struct device *dev = &dev_data->i2c->dev;
struct get_dev_status_repl *status_repl = NULL;
struct device *dev = &(dev_data->i2c->dev);
u8 cur_state = STATE_NONE;
int ret;

do {
ret = tdf8532_get_state(dev_data, &status_repl);
if (ret < 0)
goto out;

cur_state = status_repl->state;
print_hex_dump_debug("tdf8532-codec: wait_state: ",
DUMP_PREFIX_NONE, 32, 1, status_repl,
6, false);
} while (time_before(jiffies, timeout_point)
&& status_repl->state != req_state);
DUMP_PREFIX_NONE, 32, 1, status_repl,
6, false);

kfree(status_repl);
status_repl = NULL;
} while (time_before(jiffies, timeout_point) && cur_state != req_state);

if (status_repl->state == req_state)
if (cur_state == req_state)
return 0;

out:
ret = -ETIME;

dev_warn(dev, "tdf8532-codec: state: %u, req_state: %u, ret: %d\n",
status_repl->state, req_state, ret);

out:
kfree(status_repl);
dev_err(dev, "tdf8532-codec: state: %u, req_state: %u, ret: %d\n",
cur_state, req_state, ret);
return ret;
}

Expand All @@ -209,21 +207,20 @@ static int tdf8532_start_play(struct tdf8532_priv *tdf8532)
return ret;

ret = tdf8532_amp_write(tdf8532, SET_CHNL_ENABLE,
CHNL_MASK(tdf8532->channels));
CHNL_MASK(tdf8532->channels));

if (ret >= 0)
ret = tdf8532_wait_state(tdf8532, STATE_PLAY, ACK_TIMEOUT);

return ret;
}


static int tdf8532_stop_play(struct tdf8532_priv *tdf8532)
{
int ret;

ret = tdf8532_amp_write(tdf8532, SET_CHNL_DISABLE,
CHNL_MASK(tdf8532->channels));
CHNL_MASK(tdf8532->channels));
if (ret < 0)
goto out;

Expand All @@ -247,15 +244,14 @@ static int tdf8532_stop_play(struct tdf8532_priv *tdf8532)
return ret;
}


static int tdf8532_dai_trigger(struct snd_pcm_substream *substream, int cmd,
struct snd_soc_dai *dai)
struct snd_soc_dai *dai)
{
struct snd_soc_component *component = dai->component;
struct tdf8532_priv *tdf8532 = snd_soc_component_get_drvdata(component);
int ret = 0;
struct snd_soc_codec *codec = dai->codec;
struct tdf8532_priv *tdf8532 = snd_soc_codec_get_drvdata(codec);

dev_dbg(codec->dev, "%s: cmd = %d\n", __func__, cmd);
dev_dbg(component->dev, "%s: cmd = %d\n", __func__, cmd);

switch (cmd) {
case SNDRV_PCM_TRIGGER_START:
Expand All @@ -275,10 +271,10 @@ static int tdf8532_dai_trigger(struct snd_pcm_substream *substream, int cmd,

static int tdf8532_mute(struct snd_soc_dai *dai, int mute)
{
struct snd_soc_codec *codec = dai->codec;
struct tdf8532_priv *tdf8532 = snd_soc_codec_get_drvdata(dai->codec);
struct snd_soc_component *component = dai->component;
struct tdf8532_priv *tdf8532 = snd_soc_component_get_drvdata(component);

dev_dbg(codec->dev, "%s\n", __func__);
dev_dbg(component->dev, "%s\n", __func__);

if (mute)
return tdf8532_amp_write(tdf8532, SET_CHNL_MUTE,
Expand All @@ -293,7 +289,7 @@ static const struct snd_soc_dai_ops tdf8532_dai_ops = {
.digital_mute = tdf8532_mute,
};

static struct snd_soc_codec_driver soc_codec_tdf8532;
static const struct snd_soc_component_driver soc_component_tdf8532;

static struct snd_soc_dai_driver tdf8532_dai[] = {
{
Expand All @@ -310,11 +306,11 @@ static struct snd_soc_dai_driver tdf8532_dai[] = {
};

static int tdf8532_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
const struct i2c_device_id *id)
{
int ret;
struct tdf8532_priv *dev_data;
struct device *dev = &(i2c->dev);
struct device *dev = &i2c->dev;

dev_dbg(&i2c->dev, "%s\n", __func__);

Expand All @@ -331,8 +327,8 @@ static int tdf8532_i2c_probe(struct i2c_client *i2c,

i2c_set_clientdata(i2c, dev_data);

ret = snd_soc_register_codec(&i2c->dev, &soc_codec_tdf8532,
tdf8532_dai, ARRAY_SIZE(tdf8532_dai));
ret = devm_snd_soc_register_component(&i2c->dev, &soc_component_tdf8532,
tdf8532_dai, ARRAY_SIZE(tdf8532_dai));
if (ret != 0) {
dev_err(&i2c->dev, "Failed to register codec: %d\n", ret);
goto out;
Expand All @@ -344,8 +340,6 @@ static int tdf8532_i2c_probe(struct i2c_client *i2c,

static int tdf8532_i2c_remove(struct i2c_client *i2c)
{
snd_soc_unregister_codec(&i2c->dev);

return 0;
}

Expand Down
13 changes: 2 additions & 11 deletions sound/soc/codecs/tdf8532.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,9 @@
/* SPDX-License-Identifier: GPL-2.0 */
/*
* tdf8532.h - Codec driver for NXP Semiconductors
* Copyright (c) 2017, Intel Corporation.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms and conditions of the GNU General Public License,
* version 2, as published by the Free Software Foundation.
*
* This program is distributed in the hope it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*/


#ifndef __TDF8532_H_
#define __TDF8532_H_

Expand Down Expand Up @@ -87,7 +78,7 @@ struct get_dev_status_repl {
} __packed;

/* Helpers */
#define CHNL_MASK(channels) (u8)((0x00FF << channels) >> 8)
#define CHNL_MASK(channels) (u8)((0x00FF << (channels)) >> 8)

#define tdf8532_amp_write(dev_data, ...)\
__tdf8532_single_write(dev_data, 0, AMP_MOD, __VA_ARGS__, END)
Expand Down
Loading