Skip to content

Commit

Permalink
ASoC: rt5645: Move rt5645_platform_data to sound/soc/codecs/rt5645.c
Browse files Browse the repository at this point in the history
sound/soc/codecs/rt5645.c is the only user of the rt5645_platform_data,
move its definition to sound/soc/codecs/rt5645.c and remove the now
empty include/sound/rt5645.h file.

Note since the DMI quirk mechanism uses pointers to the
rt5645_platform_data struct we can NOT simply add its members to
the rt5645_priv struct and completely remove the struct.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20210306230223.516566-1-hdegoede@redhat.com
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Hans de Goede authored and Mark Brown committed Mar 10, 2021
1 parent cc2d742 commit 452801c
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 35 deletions.
32 changes: 0 additions & 32 deletions include/sound/rt5645.h

This file was deleted.

23 changes: 22 additions & 1 deletion sound/soc/codecs/rt5645.c
Original file line number Diff line number Diff line change
Expand Up @@ -411,6 +411,27 @@ static const char *const rt5645_supply_names[] = {
"cpvdd",
};

struct rt5645_platform_data {
/* IN2 can optionally be differential */
bool in2_diff;

unsigned int dmic1_data_pin;
/* 0 = IN2N; 1 = GPIO5; 2 = GPIO11 */
unsigned int dmic2_data_pin;
/* 0 = IN2P; 1 = GPIO6; 2 = GPIO10; 3 = GPIO12 */

unsigned int jd_mode;
/* Use level triggered irq */
bool level_trigger_irq;
/* Invert JD1_1 status polarity */
bool inv_jd1_1;
/* Invert HP detect status polarity */
bool inv_hp_pol;

/* Value to assign to snd_soc_card.long_name */
const char *long_name;
};

struct rt5645_priv {
struct snd_soc_component *component;
struct rt5645_platform_data pdata;
Expand Down Expand Up @@ -3834,7 +3855,7 @@ static int rt5645_parse_dt(struct rt5645_priv *rt5645, struct device *dev)
static int rt5645_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
{
struct rt5645_platform_data *pdata = dev_get_platdata(&i2c->dev);
struct rt5645_platform_data *pdata = NULL;
const struct dmi_system_id *dmi_data;
struct rt5645_priv *rt5645;
int ret, i;
Expand Down
2 changes: 0 additions & 2 deletions sound/soc/codecs/rt5645.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
#ifndef __RT5645_H__
#define __RT5645_H__

#include <sound/rt5645.h>

/* Info */
#define RT5645_RESET 0x00
#define RT5645_VENDOR_ID 0xfd
Expand Down

0 comments on commit 452801c

Please sign in to comment.