There are no users of aic32x4_pdata in the mainline kernel, remove it.
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
---
include/sound/tlv320aic32x4.h | 52 --------------------------------
sound/soc/codecs/tlv320aic32x4.c | 14 +++------
sound/soc/codecs/tlv320aic32x4.h | 27 +++++++++++++++++
3 files changed, 32 insertions(+), 61 deletions(-)
delete mode 100644 include/sound/tlv320aic32x4.h
diff --git a/include/sound/tlv320aic32x4.h b/include/sound/tlv320aic32x4.h
deleted file mode 100644
index 0abf74d7edbd..000000000000
--- a/include/sound/tlv320aic32x4.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * tlv320aic32x4.h -- TLV320AIC32X4 Soc Audio driver platform data
- *
- * Copyright 2011 Vista Silicon S.L.
- *
- * Author: Javier Martin <javier.martin@xxxxxxxxxxxxxxxxx>
- */
-
-#ifndef _AIC32X4_PDATA_H
-#define _AIC32X4_PDATA_H
-
-#define AIC32X4_PWR_MICBIAS_2075_LDOIN 0x00000001
-#define AIC32X4_PWR_AVDD_DVDD_WEAK_DISABLE 0x00000002
-#define AIC32X4_PWR_AIC32X4_LDO_ENABLE 0x00000004
-#define AIC32X4_PWR_CMMODE_LDOIN_RANGE_18_36 0x00000008
-#define AIC32X4_PWR_CMMODE_HP_LDOIN_POWERED 0x00000010
-
-#define AIC32X4_MICPGA_ROUTE_LMIC_IN2R_10K 0x00000001
-#define AIC32X4_MICPGA_ROUTE_RMIC_IN1L_10K 0x00000002
-
-/* GPIO API */
-#define AIC32X4_MFPX_DEFAULT_VALUE 0xff
-
-#define AIC32X4_MFP1_DIN_DISABLED 0
-#define AIC32X4_MFP1_DIN_ENABLED 0x2
-#define AIC32X4_MFP1_GPIO_IN 0x4
-
-#define AIC32X4_MFP2_GPIO_OUT_LOW 0x0
-#define AIC32X4_MFP2_GPIO_OUT_HIGH 0x1
-
-#define AIC32X4_MFP_GPIO_ENABLED 0x4
-
-#define AIC32X4_MFP5_GPIO_DISABLED 0x0
-#define AIC32X4_MFP5_GPIO_INPUT 0x8
-#define AIC32X4_MFP5_GPIO_OUTPUT 0xc
-#define AIC32X4_MFP5_GPIO_OUT_LOW 0x0
-#define AIC32X4_MFP5_GPIO_OUT_HIGH 0x1
-
-struct aic32x4_setup_data {
- unsigned int gpio_func[5];
-};
-
-struct aic32x4_pdata {
- struct aic32x4_setup_data *setup;
- u32 power_cfg;
- u32 micpga_routing;
- bool swapdacs;
- int rstn_gpio;
-};
-
-#endif
diff --git a/sound/soc/codecs/tlv320aic32x4.c b/sound/soc/codecs/tlv320aic32x4.c
index ffe1828a4b7e..2dd0fe255ee6 100644
--- a/sound/soc/codecs/tlv320aic32x4.c
+++ b/sound/soc/codecs/tlv320aic32x4.c
@@ -22,7 +22,6 @@
#include <linux/of_clk.h>
#include <linux/regulator/consumer.h>
-#include <sound/tlv320aic32x4.h>
#include <sound/core.h>
#include <sound/pcm.h>
#include <sound/pcm_params.h>
@@ -33,6 +32,10 @@
#include "tlv320aic32x4.h"
+struct aic32x4_setup_data {
+ unsigned int gpio_func[5];
+};
+
struct aic32x4_priv {
struct regmap *regmap;
u32 power_cfg;
@@ -1336,7 +1339,6 @@ static int aic32x4_setup_regulators(struct device *dev,
int aic32x4_probe(struct device *dev, struct regmap *regmap)
{
struct aic32x4_priv *aic32x4;
- struct aic32x4_pdata *pdata = dev->platform_data;
struct device_node *np = dev->of_node;
int ret;
@@ -1353,13 +1355,7 @@ int aic32x4_probe(struct device *dev, struct regmap *regmap)
dev_set_drvdata(dev, aic32x4);
- if (pdata) {
- aic32x4->power_cfg = pdata->power_cfg;
- aic32x4->swapdacs = pdata->swapdacs;
- aic32x4->micpga_routing = pdata->micpga_routing;
- aic32x4->rstn_gpio = pdata->rstn_gpio;
- aic32x4->mclk_name = "mclk";
- } else if (np) {
+ if (np) {
ret = aic32x4_parse_dt(aic32x4, np);
if (ret) {
dev_err(dev, "Failed to parse DT node\n");
diff --git a/sound/soc/codecs/tlv320aic32x4.h b/sound/soc/codecs/tlv320aic32x4.h
index 4de5bd9e8cc5..f0724b6b17ee 100644
--- a/sound/soc/codecs/tlv320aic32x4.h
+++ b/sound/soc/codecs/tlv320aic32x4.h
@@ -232,4 +232,31 @@ int aic32x4_register_clocks(struct device *dev, const char *mclk_name);
#define AIC32X4_MAX_CODEC_CLKIN_FREQ 110000000
#define AIC32X4_MAX_PLL_CLKIN 20000000
+#define AIC32X4_PWR_MICBIAS_2075_LDOIN 0x00000001
+#define AIC32X4_PWR_AVDD_DVDD_WEAK_DISABLE 0x00000002
+#define AIC32X4_PWR_AIC32X4_LDO_ENABLE 0x00000004
+#define AIC32X4_PWR_CMMODE_LDOIN_RANGE_18_36 0x00000008
+#define AIC32X4_PWR_CMMODE_HP_LDOIN_POWERED 0x00000010
+
+#define AIC32X4_MICPGA_ROUTE_LMIC_IN2R_10K 0x00000001
+#define AIC32X4_MICPGA_ROUTE_RMIC_IN1L_10K 0x00000002
+
+/* GPIO API */
+#define AIC32X4_MFPX_DEFAULT_VALUE 0xff
+
+#define AIC32X4_MFP1_DIN_DISABLED 0
+#define AIC32X4_MFP1_DIN_ENABLED 0x2
+#define AIC32X4_MFP1_GPIO_IN 0x4
+
+#define AIC32X4_MFP2_GPIO_OUT_LOW 0x0
+#define AIC32X4_MFP2_GPIO_OUT_HIGH 0x1
+
+#define AIC32X4_MFP_GPIO_ENABLED 0x4
+
+#define AIC32X4_MFP5_GPIO_DISABLED 0x0
+#define AIC32X4_MFP5_GPIO_INPUT 0x8
+#define AIC32X4_MFP5_GPIO_OUTPUT 0xc
+#define AIC32X4_MFP5_GPIO_OUT_LOW 0x0
+#define AIC32X4_MFP5_GPIO_OUT_HIGH 0x1
+
#endif /* _TLV320AIC32X4_H */
--
2.38.1.431.g37b22c650d-goog
