* [PATCH 01/14] ASoC: sma1303: Add driver for Iron Device SMA1303 Amp
2023-01-06 9:15 [PATCH 00/14] ASoC: Add a driver the Iron Device SMA1303 AMP Kiseok Jo
@ 2023-01-06 9:15 ` Kiseok Jo
2023-01-06 9:15 ` [PATCH 02/14] ASoC: dt-bindings: sma1303: " Kiseok Jo
` (12 subsequent siblings)
13 siblings, 0 replies; 26+ messages in thread
From: Kiseok Jo @ 2023-01-06 9:15 UTC (permalink / raw)
To: Mark Brown; +Cc: alsa-devel, application, Kiseok Jo
The Iron Device SMA1303 is a boosted Class-D audio amplifier.
Signed-off-by: Kiseok Jo <kiseok.jo@irondevice.com>
---
sound/soc/codecs/Kconfig | 7 +
sound/soc/codecs/Makefile | 2 +
sound/soc/codecs/sma1303.c | 2117 ++++++++++++++++++++++++++++++++++++
sound/soc/codecs/sma1303.h | 609 +++++++++++
4 files changed, 2735 insertions(+)
create mode 100644 sound/soc/codecs/sma1303.c
create mode 100644 sound/soc/codecs/sma1303.h
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 0f9d71490075..83d2981a400e 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -206,6 +206,7 @@ config SND_SOC_ALL_CODECS
imply SND_SOC_SI476X
imply SND_SOC_SIMPLE_AMPLIFIER
imply SND_SOC_SIMPLE_MUX
+ imply SND_SOC_SMA1303
imply SND_SOC_SPDIF
imply SND_SOC_SRC4XXX_I2C
imply SND_SOC_SSM2305
@@ -1492,6 +1493,12 @@ config SND_SOC_SIMPLE_MUX
tristate "Simple Audio Mux"
depends on GPIOLIB
+config SND_SOC_SMA1303
+ tristate "Iron Device SMA1303 Audio Amplifier"
+ depends on I2C
+ help
+ Enable support for Iron Device SMA1303 Boosted Class-D amplifier
+
config SND_SOC_SPDIF
tristate "S/PDIF CODEC"
diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
index 71d3ce5867e4..89ffd06e9290 100644
--- a/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@ -233,6 +233,7 @@ snd-soc-sigmadsp-objs := sigmadsp.o
snd-soc-sigmadsp-i2c-objs := sigmadsp-i2c.o
snd-soc-sigmadsp-regmap-objs := sigmadsp-regmap.o
snd-soc-si476x-objs := si476x.o
+snd-soc-sma1303-objs := sma1303.o
snd-soc-spdif-tx-objs := spdif_transmitter.o
snd-soc-spdif-rx-objs := spdif_receiver.o
snd-soc-src4xxx-objs := src4xxx.o
@@ -588,6 +589,7 @@ obj-$(CONFIG_SND_SOC_SIGMADSP) += snd-soc-sigmadsp.o
obj-$(CONFIG_SND_SOC_SIGMADSP_I2C) += snd-soc-sigmadsp-i2c.o
obj-$(CONFIG_SND_SOC_SIGMADSP_REGMAP) += snd-soc-sigmadsp-regmap.o
obj-$(CONFIG_SND_SOC_SI476X) += snd-soc-si476x.o
+obj-$(CONFIG_SND_SOC_SMA1303) += snd-soc-sma1303.o
obj-$(CONFIG_SND_SOC_SPDIF) += snd-soc-spdif-rx.o snd-soc-spdif-tx.o
obj-$(CONFIG_SND_SOC_SRC4XXX) += snd-soc-src4xxx.o
obj-$(CONFIG_SND_SOC_SRC4XXX_I2C) += snd-soc-src4xxx-i2c.o
diff --git a/sound/soc/codecs/sma1303.c b/sound/soc/codecs/sma1303.c
new file mode 100644
index 000000000000..50b471920fc8
--- /dev/null
+++ b/sound/soc/codecs/sma1303.c
@@ -0,0 +1,2117 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/* sma1303.c -- sma1303 ALSA SoC Audio driver
+ *
+ * Copyright 2022 Iron Device Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/pm.h>
+#include <linux/i2c.h>
+#include <linux/regmap.h>
+#include <linux/version.h>
+#include <sound/core.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <sound/soc.h>
+#include <sound/initval.h>
+#include <sound/tlv.h>
+#include <linux/of_device.h>
+#include <linux/slab.h>
+#include <asm/div64.h>
+
+#include "sma1303.h"
+
+#define CHECK_PERIOD_TIME 1 /* sec per HZ */
+
+#define PLL_MATCH(_input_clk_name, _output_clk_name, _input_clk,\
+ _post_n, _n, _vco, _p_cp)\
+{\
+ .input_clk_name = _input_clk_name,\
+ .output_clk_name = _output_clk_name,\
+ .input_clk = _input_clk,\
+ .post_n = _post_n,\
+ .n = _n,\
+ .vco = _vco,\
+ .p_cp = _p_cp,\
+}
+
+enum sma1303_type {
+ SMA1303,
+};
+
+struct sma1303_pll_match {
+ char *input_clk_name;
+ char *output_clk_name;
+ unsigned int input_clk;
+ unsigned int post_n;
+ unsigned int n;
+ unsigned int vco;
+ unsigned int p_cp;
+};
+
+struct sma1303_priv {
+ enum sma1303_type devtype;
+ struct device *dev;
+ struct attribute_group *attr_grp;
+ struct kobject *kobj;
+ struct regmap *regmap;
+ struct sma1303_pll_match *pll_matches;
+ struct mutex lock;
+ struct delayed_work check_fault_work;
+ bool amp_power_status;
+ bool usage_status;
+ int num_of_pll_matches;
+ unsigned int sys_clk_id;
+ unsigned int init_vol;
+ unsigned int cur_vol;
+ unsigned int tdm_slot_rx;
+ unsigned int tdm_slot_tx;
+ unsigned int tsdw_cnt;
+ unsigned int format;
+ unsigned int rev_num;
+ unsigned int last_over_temp;
+ unsigned int last_ocp_val;
+ unsigned int last_bclk;
+ unsigned int frame_size;
+ unsigned int amp_mode;
+ long check_fault_period;
+ long check_fault_status;
+};
+
+static struct sma1303_pll_match sma1303_pll_matches[] = {
+PLL_MATCH("1.411MHz", "24.595MHz", 1411200, 0x07, 0xF4, 0x8B, 0x03),
+PLL_MATCH("1.536MHz", "24.576MHz", 1536000, 0x07, 0xE0, 0x8B, 0x03),
+PLL_MATCH("3.072MHz", "24.576MHz", 3072000, 0x07, 0x70, 0x8B, 0x03),
+PLL_MATCH("6.144MHz", "24.576MHz", 6144000, 0x07, 0x70, 0x8B, 0x07),
+PLL_MATCH("12.288MHz", "24.576MHz", 12288000, 0x07, 0x70, 0x8B, 0x0B),
+PLL_MATCH("19.2MHz", "24.343MHz", 19200000, 0x07, 0x47, 0x8B, 0x0A),
+PLL_MATCH("24.576MHz", "24.576MHz", 24576000, 0x07, 0x70, 0x8B, 0x0F),
+};
+
+static int sma1303_startup(struct snd_soc_component *);
+static int sma1303_shutdown(struct snd_soc_component *);
+
+static const struct reg_default sma1303_reg_def[] = {
+ { 0x00, 0x80 },
+ { 0x01, 0x00 },
+ { 0x02, 0x00 },
+ { 0x03, 0x11 },
+ { 0x04, 0x17 },
+ { 0x09, 0x00 },
+ { 0x0A, 0x31 },
+ { 0x0B, 0x98 },
+ { 0x0C, 0x84 },
+ { 0x0D, 0x07 },
+ { 0x0E, 0x3F },
+ { 0x10, 0x00 },
+ { 0x11, 0x00 },
+ { 0x12, 0x00 },
+ { 0x14, 0x5C },
+ { 0x15, 0x01 },
+ { 0x16, 0x0F },
+ { 0x17, 0x0F },
+ { 0x18, 0x0F },
+ { 0x19, 0x00 },
+ { 0x1A, 0x00 },
+ { 0x1B, 0x00 },
+ { 0x23, 0x19 },
+ { 0x24, 0x00 },
+ { 0x25, 0x00 },
+ { 0x26, 0x04 },
+ { 0x33, 0x00 },
+ { 0x36, 0x92 },
+ { 0x37, 0x27 },
+ { 0x3B, 0x5A },
+ { 0x3C, 0x20 },
+ { 0x3D, 0x00 },
+ { 0x3E, 0x03 },
+ { 0x3F, 0x0C },
+ { 0x8B, 0x07 },
+ { 0x8C, 0x70 },
+ { 0x8D, 0x8B },
+ { 0x8E, 0x6F },
+ { 0x8F, 0x03 },
+ { 0x90, 0x26 },
+ { 0x91, 0x42 },
+ { 0x92, 0xE0 },
+ { 0x94, 0x35 },
+ { 0x95, 0x0C },
+ { 0x96, 0x42 },
+ { 0x97, 0x95 },
+ { 0xA0, 0x00 },
+ { 0xA1, 0x3B },
+ { 0xA2, 0xC8 },
+ { 0xA3, 0x28 },
+ { 0xA4, 0x40 },
+ { 0xA5, 0x01 },
+ { 0xA6, 0x41 },
+ { 0xA7, 0x00 },
+};
+
+static bool sma1303_readable_register(struct device *dev, unsigned int reg)
+{
+ bool result;
+
+ if (reg > SMA1303_FF_DEVICE_INDEX)
+ return false;
+
+ switch (reg) {
+ case SMA1303_00_SYSTEM_CTRL ... SMA1303_04_INPUT1_CTRL4:
+ case SMA1303_09_OUTPUT_CTRL ... SMA1303_0E_MUTE_VOL_CTRL:
+ case SMA1303_10_SYSTEM_CTRL1 ... SMA1303_12_SYSTEM_CTRL3:
+ case SMA1303_14_MODULATOR ... SMA1303_1B_BASS_SPK7:
+ case SMA1303_23_COMP_LIM1 ... SMA1303_26_COMP_LIM4:
+ case SMA1303_33_SDM_CTRL ... SMA1303_34_OTP_DATA1:
+ case SMA1303_36_PROTECTION ... SMA1303_38_OTP_TRM0:
+ case SMA1303_3B_TEST1 ... SMA1303_3F_ATEST2:
+ case SMA1303_8B_PLL_POST_N ... SMA1303_92_FDPEC_CTRL:
+ case SMA1303_94_BOOST_CTRL1 ... SMA1303_97_BOOST_CTRL4:
+ case SMA1303_A0_PAD_CTRL0 ... SMA1303_A7_CLK_MON:
+ case SMA1303_FA_STATUS1 ... SMA1303_FB_STATUS2:
+ result = true;
+ break;
+ case SMA1303_FF_DEVICE_INDEX:
+ result = true;
+ break;
+ default:
+ result = false;
+ }
+ return result;
+}
+
+static bool sma1303_writeable_register(struct device *dev, unsigned int reg)
+{
+ bool result;
+
+ if (reg > SMA1303_FF_DEVICE_INDEX)
+ return false;
+
+ switch (reg) {
+ case SMA1303_00_SYSTEM_CTRL ... SMA1303_04_INPUT1_CTRL4:
+ case SMA1303_09_OUTPUT_CTRL ... SMA1303_0E_MUTE_VOL_CTRL:
+ case SMA1303_10_SYSTEM_CTRL1 ... SMA1303_12_SYSTEM_CTRL3:
+ case SMA1303_14_MODULATOR ... SMA1303_1B_BASS_SPK7:
+ case SMA1303_23_COMP_LIM1 ... SMA1303_26_COMP_LIM4:
+ case SMA1303_33_SDM_CTRL:
+ case SMA1303_36_PROTECTION ... SMA1303_37_SLOPE_CTRL:
+ case SMA1303_3B_TEST1 ... SMA1303_3F_ATEST2:
+ case SMA1303_8B_PLL_POST_N ... SMA1303_92_FDPEC_CTRL:
+ case SMA1303_94_BOOST_CTRL1 ... SMA1303_97_BOOST_CTRL4:
+ case SMA1303_A0_PAD_CTRL0 ... SMA1303_A7_CLK_MON:
+ result = true;
+ break;
+ default:
+ result = false;
+ }
+ return result;
+}
+
+static bool sma1303_volatile_register(struct device *dev, unsigned int reg)
+{
+ bool result;
+
+ switch (reg) {
+ case SMA1303_FA_STATUS1 ... SMA1303_FB_STATUS2:
+ result = true;
+ break;
+ case SMA1303_FF_DEVICE_INDEX:
+ result = true;
+ break;
+ default:
+ result = false;
+ }
+ return result;
+}
+
+static const DECLARE_TLV_DB_SCALE(sma1303_spk_tlv, -6000, 50, 0);
+
+static int sma1303_regmap_write(struct regmap *map, struct device *dev,
+ unsigned int reg, unsigned int val)
+{
+ int ret = 0;
+
+ ret = regmap_write(map, reg, val);
+ if (ret < 0) {
+ dev_err(dev, "Failed to write, register: 0x%02X, ret: %d\n",
+ reg, ret);
+ }
+ return ret;
+}
+
+static int sma1303_regmap_update_bits(struct regmap *map, struct device *dev,
+ unsigned int reg, unsigned int mask, unsigned int val)
+{
+ int ret = 0;
+
+ ret = regmap_update_bits(map, reg, mask, val);
+ if (ret < 0) {
+ dev_err(dev, "Failed to write, register: 0x%02X, ret: %d\n",
+ reg, ret);
+ }
+ return ret;
+}
+
+static int bytes_ext_get(struct snd_kcontrol *kcontrol,
+ struct snd_ctl_elem_value *ucontrol, int reg)
+{
+ struct snd_soc_component *component =
+ snd_soc_kcontrol_component(kcontrol);
+ struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component);
+ struct soc_bytes_ext *params = (void *)kcontrol->private_value;
+ unsigned int i, reg_val;
+ u8 *val;
+ int ret = -1;
+
+ if (component == NULL) {
+ pr_err("%s:component is NULL\n", __func__);
+ return ret;
+ }
+ if (sma1303 == NULL) {
+ pr_err("%s:sma1303 is NULL\n", __func__);
+ return ret;
+ }
+ val = (u8 *)ucontrol->value.bytes.data;
+ for (i = 0; i < params->max; i++) {
+ ret = regmap_read(sma1303->regmap, reg + i, ®_val);
+ if (ret < 0) {
+ dev_err(component->dev,
+ "Failed to read, register: %x ret: %d\n",
+ reg + i, ret);
+ return ret;
+ }
+ if (sizeof(reg_val) > 2)
+ reg_val = cpu_to_le32(reg_val);
+ else
+ reg_val = cpu_to_le16(reg_val);
+ memcpy(val + i, ®_val, sizeof(u8));
+ }
+
+ return 0;
+}
+
+static int bytes_ext_put(struct snd_kcontrol *kcontrol,
+ struct snd_ctl_elem_value *ucontrol, int reg)
+{
+ struct snd_soc_component *component =
+ snd_soc_kcontrol_component(kcontrol);
+ struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component);
+ struct soc_bytes_ext *params = (void *)kcontrol->private_value;
+ void *data;
+ u8 *val;
+ int i, ret = -1;
+
+ if (component == NULL) {
+ pr_err("%s:component is NULL\n", __func__);
+ return ret;
+ }
+ if (sma1303 == NULL) {
+ pr_err("%s:sma1303 is NULL\n", __func__);
+ return ret;
+ }
+ data = kmemdup(ucontrol->value.bytes.data,
+ params->max, GFP_KERNEL | GFP_DMA);
+ if (!data)
+ return -ENOMEM;
+
+ val = (u8 *)data;
+ for (i = 0; i < params->max; i++) {
+ ret = sma1303_regmap_write(
+ sma1303->regmap, component->dev,
+ reg + i, *(val + i));
+ if (ret < 0) {
+ kfree(data);
+ return ret;
+ }
+ }
+ kfree(data);
+
+ return 0;
+}
+
+static int amp_usage_status_get(struct snd_kcontrol *kcontrol,
+ struct snd_ctl_elem_value *ucontrol)
+{
+ struct snd_soc_component *component =
+ snd_soc_kcontrol_component(kcontrol);
+ struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component);
+ int ret = -1;
+
+ if (component == NULL) {
+ pr_err("%s:component is NULL\n", __func__);
+ return ret;
+ }
+ if (sma1303 == NULL) {
+ pr_err("%s:sma1303 is NULL\n", __func__);
+ return ret;
+ }
+ ucontrol->value.integer.value[0] = sma1303->usage_status;
+
+ if (sma1303->usage_status)
+ dev_info(component->dev, "Amplifier Power Control Enabled\n");
+ else
+ dev_info(component->dev, "Amplifier Power Control Disabled\n");
+
+ return 0;
+}
+
+static int amp_usage_status_put(struct snd_kcontrol *kcontrol,
+ struct snd_ctl_elem_value *ucontrol)
+{
+ struct snd_soc_component *component =
+ snd_soc_kcontrol_component(kcontrol);
+ struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component);
+ int ret = -1;
+
+ if (component == NULL) {
+ pr_err("%s:component is NULL\n", __func__);
+ return ret;
+ }
+ if (sma1303 == NULL) {
+ pr_err("%s:sma1303 is NULL\n", __func__);
+ return ret;
+ }
+
+ if ((sma1303->usage_status
+ != ucontrol->value.integer.value[0])
+ && (!ucontrol->value.integer.value[0])) {
+ dev_info(component->dev, "%s\n", "Force AMP Power Down");
+ ret = sma1303_shutdown(component);
+ if (ret < 0) {
+ ucontrol->value.integer.value[0]
+ = sma1303->usage_status;
+ return ret;
+ }
+
+ }
+ sma1303->usage_status = ucontrol->value.integer.value[0];
+
+ return 0;
+}
+
+static const char * const sma1303_amp_mode_text[] = {
+ "1 Chip", "Mono on 2 chips", "Left in 2 chips", "Right in 2chips"};
+
+static const struct soc_enum sma1303_amp_mode_enum =
+ SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(sma1303_amp_mode_text),
+ sma1303_amp_mode_text);
+static int sma1303_amp_mode_get(struct snd_kcontrol *kcontrol,
+ struct snd_ctl_elem_value *ucontrol)
+{
+ struct snd_soc_component *component =
+ snd_soc_kcontrol_component(kcontrol);
+ struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component);
+ int ret = -1;
+
+ if (component == NULL) {
+ pr_err("%s:component is NULL\n", __func__);
+ return ret;
+ }
+ if (sma1303 == NULL) {
+ pr_err("%s:sma1303 is NULL\n", __func__);
+ return ret;
+ }
+ ucontrol->value.integer.value[0] = sma1303->amp_mode;
+
+ switch (sma1303->amp_mode) {
+ case ONE_CHIP_SOLUTION:
+ dev_info(component->dev, "Amplifier 1 Chip Solution\n");
+ break;
+ case MONO_TWO_CHIP_SOLUTION:
+ dev_info(component->dev, "Amplifier Mono 2 Chips Solution\n");
+ break;
+ case LEFT_TWO_CHIP_SOLUTION:
+ dev_info(component->dev, "Amplifier Stereo(Left) 2 Chips Solution\n");
+ break;
+ case RIGHT_TWO_CHIP_SOLUTION:
+ dev_info(component->dev, "Amplifier Stereo(Right) 2 Chips Solution\n");
+ break;
+ default:
+ dev_err(component->dev, "Invalid Value");
+ return ret;
+ }
+ return 0;
+
+}
+
+static int sma1303_amp_mode_put(struct snd_kcontrol *kcontrol,
+ struct snd_ctl_elem_value *ucontrol)
+{
+ struct snd_soc_component *component =
+ snd_soc_kcontrol_component(kcontrol);
+ struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component);
+ int ret = 0;
+
+ if (component == NULL) {
+ pr_err("%s:component is NULL\n", __func__);
+ return -1;
+ }
+ if (sma1303 == NULL) {
+ pr_err("%s:sma1303 is NULL\n", __func__);
+ return -1;
+ }
+
+ sma1303->amp_mode = ucontrol->value.integer.value[0];
+
+ switch (sma1303->amp_mode) {
+ case ONE_CHIP_SOLUTION:
+ case MONO_TWO_CHIP_SOLUTION:
+ ret += sma1303_regmap_update_bits(
+ sma1303->regmap, component->dev,
+ SMA1303_11_SYSTEM_CTRL2,
+ MONOMIX_MASK, MONOMIX_ON);
+ ret += sma1303_regmap_update_bits(
+ sma1303->regmap, component->dev,
+ SMA1303_11_SYSTEM_CTRL2,
+ LR_DATA_SW_MASK, LR_DATA_SW_NORMAL);
+ break;
+ case LEFT_TWO_CHIP_SOLUTION:
+ ret += sma1303_regmap_update_bits(
+ sma1303->regmap, component->dev,
+ SMA1303_11_SYSTEM_CTRL2,
+ MONOMIX_MASK, MONOMIX_OFF);
+ ret += sma1303_regmap_update_bits(
+ sma1303->regmap, component->dev,
+ SMA1303_11_SYSTEM_CTRL2,
+ LR_DATA_SW_MASK, LR_DATA_SW_NORMAL);
+ break;
+ case RIGHT_TWO_CHIP_SOLUTION:
+ ret += sma1303_regmap_update_bits(
+ sma1303->regmap, component->dev,
+ SMA1303_11_SYSTEM_CTRL2,
+ MONOMIX_MASK, MONOMIX_OFF);
+ ret += sma1303_regmap_update_bits(
+ sma1303->regmap, component->dev,
+ SMA1303_11_SYSTEM_CTRL2,
+ LR_DATA_SW_MASK, LR_DATA_SW_SWAP);
+ break;
+ default:
+ dev_err(component->dev, "Invalid Value");
+ ret += -1;
+ }
+
+ return ret;
+}
+
+static const char * const sma1303_outport_config_text[] = {
+ "Enable", "Disable"};
+
+static const struct soc_enum sma1303_outport_config_enum =
+ SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(sma1303_outport_config_text),
+ sma1303_outport_config_text);
+
+static int sma1303_outport_config_get(struct snd_kcontrol *kcontrol,
+ struct snd_ctl_elem_value *ucontrol)
+{
+ struct snd_soc_component *component =
+ snd_soc_kcontrol_component(kcontrol);
+ struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component);
+ int ret = -1, data, val;
+
+ if (component == NULL) {
+ pr_err("%s:component is NULL\n", __func__);
+ return ret;
+ }
+ if (sma1303 == NULL) {
+ pr_err("%s:sma1303 is NULL\n", __func__);
+ return ret;
+ }
+
+ ret = regmap_read(sma1303->regmap, SMA1303_09_OUTPUT_CTRL, &data);
+ if (ret < 0) {
+ dev_err(component->dev,
+ "Failed to read, register: %x ret: %d\n",
+ SMA1303_09_OUTPUT_CTRL, ret);
+ return ret;
+ }
+
+ val = data & PORT_CONFIG_MASK;
+ switch (val) {
+ case INPUT_PORT_ONLY:
+ ucontrol->value.integer.value[0] = 1;
+ break;
+ case OUTPUT_PORT_ENABLE:
+ ucontrol->value.integer.value[0] = 0;
+ break;
+ default:
+ dev_err(component->dev,
+ "Invalid value, register: %x value: %d\n",
+ SMA1303_09_OUTPUT_CTRL, val);
+ return ret;
+ }
+
+ return 0;
+}
+
+static int sma1303_outport_config_put(struct snd_kcontrol *kcontrol,
+ struct snd_ctl_elem_value *ucontrol)
+{
+ struct snd_soc_component *component =
+ snd_soc_kcontrol_component(kcontrol);
+ struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component);
+ int sel = (int)ucontrol->value.integer.value[0];
+ int val, ret = -1;
+
+ if (component == NULL) {
+ pr_err("%s:component is NULL\n", __func__);
+ return ret;
+ }
+ if (sma1303 == NULL) {
+ pr_err("%s:sma1303 is NULL\n", __func__);
+ return ret;
+ }
+
+ switch (sel) {
+ case 0:
+ val = OUTPUT_PORT_ENABLE;
+ break;
+ case 1:
+ val = INPUT_PORT_ONLY;
+ break;
+ default:
+ dev_err(component->dev,
+ "Invalid value, register: %x\n",
+ SMA1303_09_OUTPUT_CTRL);
+ return ret;
+ }
+
+ return sma1303_regmap_update_bits(sma1303->regmap, component->dev,
+ SMA1303_09_OUTPUT_CTRL, PORT_CONFIG_MASK, val);
+}
+
+static const char * const sma1303_spkmute_text[] = {
+ "Unmute", "Mute"};
+
+static const struct soc_enum sma1303_spkmute_enum =
+ SOC_ENUM_SINGLE(SMA1303_0E_MUTE_VOL_CTRL, 0,
+ ARRAY_SIZE(sma1303_spkmute_text),
+ sma1303_spkmute_text);
+
+static const char * const sma1303_spkmode_text[] = {
+ "Off", "On"};
+
+static const struct soc_enum sma1303_spkmode_enum =
+ SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(sma1303_spkmode_text),
+ sma1303_spkmode_text);
+
+static int sma1303_spkmode_get(struct snd_kcontrol *kcontrol,
+ struct snd_ctl_elem_value *ucontrol)
+{
+ struct snd_soc_component *component =
+ snd_soc_kcontrol_component(kcontrol);
+ struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component);
+ int val, data, ret = -1;
+
+ if (component == NULL) {
+ pr_err("%s:component is NULL\n", __func__);
+ return ret;
+ }
+ if (sma1303 == NULL) {
+ pr_err("%s:sma1303 is NULL\n", __func__);
+ return ret;
+ }
+
+ ret = regmap_read(sma1303->regmap, SMA1303_10_SYSTEM_CTRL1, &data);
+ if (ret < 0) {
+ dev_err(component->dev,
+ "Failed to read, register: %x ret: %d\n",
+ SMA1303_10_SYSTEM_CTRL1, ret);
+ return ret;
+ }
+
+ val = data & SPK_MODE_MASK;
+ if (sma1303->amp_mode == ONE_CHIP_SOLUTION) {
+ switch (val) {
+ case SPK_OFF:
+ ucontrol->value.integer.value[0] = 0;
+ break;
+ case SPK_MONO:
+ ucontrol->value.integer.value[0] = 1;
+ break;
+ default:
+ dev_err(component->dev,
+ "Invalid value, register: %x\n",
+ SMA1303_10_SYSTEM_CTRL1);
+ return ret;
+ }
+ } else {
+ switch (val) {
+ case SPK_OFF:
+ ucontrol->value.integer.value[0] = 0;
+ break;
+ case SPK_STEREO:
+ ucontrol->value.integer.value[0] = 1;
+ break;
+ default:
+ dev_err(component->dev,
+ "Invalid value, register: %x\n",
+ SMA1303_10_SYSTEM_CTRL1);
+ return ret;
+ }
+ }
+
+ return 0;
+}
+
+static int sma1303_spkmode_put(struct snd_kcontrol *kcontrol,
+ struct snd_ctl_elem_value *ucontrol)
+{
+ struct snd_soc_component *component =
+ snd_soc_kcontrol_component(kcontrol);
+ struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component);
+ int sel = (int)ucontrol->value.integer.value[0];
+ int val, ret = -1;
+
+ if (component == NULL) {
+ pr_err("%s:component is NULL\n", __func__);
+ return ret;
+ }
+ if (sma1303 == NULL) {
+ pr_err("%s:sma1303 is NULL\n", __func__);
+ return ret;
+ }
+
+ switch (sel) {
+ case 0:
+ val = SPK_OFF;
+ break;
+ case 1:
+ if (sma1303->amp_mode == ONE_CHIP_SOLUTION)
+ val = SPK_MONO;
+ else
+ val = SPK_STEREO;
+ break;
+ default:
+ dev_err(component->dev,
+ "Invalid value, register: %x\n",
+ SMA1303_10_SYSTEM_CTRL1);
+ return ret;
+ }
+
+ return sma1303_regmap_update_bits(sma1303->regmap, component->dev,
+ SMA1303_10_SYSTEM_CTRL1, SPK_MODE_MASK, val);
+}
+
+static int postscaler_get(struct snd_kcontrol *kcontrol,
+ struct snd_ctl_elem_value *ucontrol)
+{
+ return bytes_ext_get(kcontrol, ucontrol, SMA1303_90_POSTSCALER);
+}
+
+static int postscaler_put(struct snd_kcontrol *kcontrol,
+ struct snd_ctl_elem_value *ucontrol)
+{
+ return bytes_ext_put(kcontrol, ucontrol, SMA1303_90_POSTSCALER);
+}
+
+static const char * const sma1303_postscaler_config_text[] = {
+ "Enable", "Disable"};
+
+static const struct soc_enum sma1303_postscaler_config_enum =
+ SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(sma1303_postscaler_config_text),
+ sma1303_postscaler_config_text);
+
+static int sma1303_postscaler_config_get(struct snd_kcontrol *kcontrol,
+ struct snd_ctl_elem_value *ucontrol)
+{
+ struct snd_soc_component *component =
+ snd_soc_kcontrol_component(kcontrol);
+ struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component);
+ int ret = -1, data, val;
+
+ if (component == NULL) {
+ pr_err("%s:component is NULL\n", __func__);
+ return ret;
+ }
+ if (sma1303 == NULL) {
+ pr_err("%s:sma1303 is NULL\n", __func__);
+ return ret;
+ }
+
+ ret = regmap_read(sma1303->regmap, SMA1303_90_POSTSCALER, &data);
+ if (ret < 0) {
+ dev_err(component->dev,
+ "Failed to read, register: %x ret: %d\n",
+ SMA1303_90_POSTSCALER, ret);
+ return ret;
+ }
+
+ val = data & BYP_POST_MASK;
+ switch (val) {
+ case BYP_POST_SCALER:
+ ucontrol->value.integer.value[0] = 1;
+ break;
+ case EN_POST_SCALER:
+ ucontrol->value.integer.value[0] = 0;
+ break;
+ default:
+ dev_err(component->dev,
+ "Invalid value, register: %x value: %d\n",
+ SMA1303_90_POSTSCALER, val);
+ return ret;
+ }
+
+ return 0;
+}
+
+static int sma1303_postscaler_config_put(struct snd_kcontrol *kcontrol,
+ struct snd_ctl_elem_value *ucontrol)
+{
+ struct snd_soc_component *component =
+ snd_soc_kcontrol_component(kcontrol);
+ struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component);
+ int sel = (int)ucontrol->value.integer.value[0];
+ int val, ret = -1;
+
+ if (component == NULL) {
+ pr_err("%s:component is NULL\n", __func__);
+ return ret;
+ }
+ if (sma1303 == NULL) {
+ pr_err("%s:sma1303 is NULL\n", __func__);
+ return ret;
+ }
+
+ switch (sel) {
+ case 0:
+ val = EN_POST_SCALER;
+ break;
+ case 1:
+ val = BYP_POST_SCALER;
+ break;
+ default:
+ dev_err(component->dev,
+ "Invalid value, register: %x\n",
+ SMA1303_90_POSTSCALER);
+ return ret;
+ }
+
+ return sma1303_regmap_update_bits(sma1303->regmap, component->dev,
+ SMA1303_90_POSTSCALER, BYP_POST_MASK, val);
+}
+
+static const char * const sma1303_o_format_text[] = {
+ "LJ", "I2S", "TDM"};
+
+static const struct soc_enum sma1303_o_format_enum =
+SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(sma1303_o_format_text), sma1303_o_format_text);
+
+static int sma1303_o_format_get(struct snd_kcontrol *kcontrol,
+ struct snd_ctl_elem_value *ucontrol)
+{
+ struct snd_soc_component *component =
+ snd_soc_kcontrol_component(kcontrol);
+ struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component);
+ int val, data, ret = -1;
+
+ if (component == NULL) {
+ pr_err("%s:component is NULL\n", __func__);
+ return ret;
+ }
+ if (sma1303 == NULL) {
+ pr_err("%s:sma1303 is NULL\n", __func__);
+ return ret;
+ }
+
+ ret = regmap_read(sma1303->regmap, SMA1303_A4_TOP_MAN3, &data);
+ val = data & O_FORMAT_MASK;
+ switch (val) {
+ case O_FMT_LJ:
+ ucontrol->value.integer.value[0] = 0;
+ break;
+ case O_FMT_I2S:
+ ucontrol->value.integer.value[0] = 1;
+ break;
+ case O_FMT_TDM:
+ ucontrol->value.integer.value[0] = 2;
+ break;
+ default:
+ dev_err(component->dev,
+ "Invalid value, register: %x\n",
+ SMA1303_A4_TOP_MAN3);
+ return ret;
+ }
+
+ return 0;
+}
+static int sma1303_o_format_put(struct snd_kcontrol *kcontrol,
+ struct snd_ctl_elem_value *ucontrol)
+{
+ struct snd_soc_component *component =
+ snd_soc_kcontrol_component(kcontrol);
+ struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component);
+ int sel = (int)ucontrol->value.integer.value[0];
+ int val, ret = -1;
+
+ if (component == NULL) {
+ pr_err("%s:component is NULL\n", __func__);
+ return ret;
+ }
+ if (sma1303 == NULL) {
+ pr_err("%s:sma1303 is NULL\n", __func__);
+ return ret;
+ }
+
+ switch (sel) {
+ case 0:
+ val = O_FMT_LJ;
+ break;
+ case 1:
+ val = O_FMT_I2S;
+ break;
+ case 2:
+ val = O_FMT_TDM;
+ break;
+ default:
+ dev_err(component->dev,
+ "Invalid value, register: %x\n",
+ SMA1303_A4_TOP_MAN3);
+ return ret;
+ }
+
+ return sma1303_regmap_update_bits(sma1303->regmap, component->dev,
+ SMA1303_A4_TOP_MAN3, O_FORMAT_MASK, val);
+}
+
+static const char * const sma1303_sdo_source_texts[] = {
+ "Disable", "Format_C", "Mixer_Out", "After_DSP", "After_Post"};
+static const unsigned int sma1303_sdo_source_values[] = {
+ OUT_SEL_DISABLE,
+ FORMAT_CONVERTER,
+ MIXER_OUTPUT,
+ SPEAKER_PATH,
+ POSTSCALER_OUTPUT};
+static SOC_VALUE_ENUM_SINGLE_DECL(sma1303_sdo_source_enum,
+ SMA1303_09_OUTPUT_CTRL,
+ 0, PORT_OUT_SEL_MASK,
+ sma1303_sdo_source_texts,
+ sma1303_sdo_source_values);
+static const struct snd_kcontrol_new sma1303_sdo_source_mux =
+ SOC_DAPM_ENUM("SDO Source", sma1303_sdo_source_enum);
+
+static const struct snd_kcontrol_new sma1303_snd_controls[] = {
+SOC_SINGLE_EXT("Amplifier Usage", SND_SOC_NOPM, 0, 1, 0,
+ amp_usage_status_get, amp_usage_status_put),
+SOC_ENUM_EXT("Amplifier Mode", sma1303_amp_mode_enum,
+ sma1303_amp_mode_get, sma1303_amp_mode_put),
+SOC_ENUM_EXT("Outport config", sma1303_outport_config_enum,
+ sma1303_outport_config_get, sma1303_outport_config_put),
+SOC_SINGLE_TLV("Speaker Volume", SMA1303_0A_SPK_VOL,
+ 0, 167, 1, sma1303_spk_tlv),
+SOC_ENUM("Speaker Mute Switch", sma1303_spkmute_enum),
+SOC_ENUM_EXT("Speaker Output", sma1303_spkmode_enum,
+ sma1303_spkmode_get, sma1303_spkmode_put),
+SND_SOC_BYTES_EXT("Postscaler Set", 1,
+ postscaler_get, postscaler_put),
+SOC_ENUM_EXT("Postscaler Config", sma1303_postscaler_config_enum,
+ sma1303_postscaler_config_get, sma1303_postscaler_config_put),
+SOC_ENUM_EXT("Output Format", sma1303_o_format_enum,
+ sma1303_o_format_get, sma1303_o_format_put),
+};
+
+static int sma1303_startup(struct snd_soc_component *component)
+{
+ struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component);
+ int ret = 0;
+
+ if (sma1303->amp_power_status) {
+ dev_info(component->dev, "%s : %s\n",
+ __func__, "Already AMP Power on");
+ return ret;
+ }
+
+ ret += sma1303_regmap_update_bits(sma1303->regmap, component->dev,
+ SMA1303_8E_PLL_CTRL, PLL_PD2_MASK, PLL_OPERATION2);
+
+ ret += sma1303_regmap_update_bits(sma1303->regmap, component->dev,
+ SMA1303_00_SYSTEM_CTRL, POWER_MASK, POWER_ON);
+
+ if (sma1303->amp_mode == ONE_CHIP_SOLUTION)
+ ret += sma1303_regmap_update_bits(sma1303->regmap, component->dev,
+ SMA1303_10_SYSTEM_CTRL1, SPK_MODE_MASK, SPK_MONO);
+ else
+ ret += sma1303_regmap_update_bits(sma1303->regmap, component->dev,
+ SMA1303_10_SYSTEM_CTRL1, SPK_MODE_MASK, SPK_STEREO);
+
+ if (sma1303->check_fault_status) {
+ if (sma1303->check_fault_period > 0)
+ queue_delayed_work(system_freezable_wq,
+ &sma1303->check_fault_work,
+ sma1303->check_fault_period * HZ);
+ else
+ queue_delayed_work(system_freezable_wq,
+ &sma1303->check_fault_work,
+ CHECK_PERIOD_TIME * HZ);
+ }
+
+ ret += sma1303_regmap_update_bits(sma1303->regmap, component->dev,
+ SMA1303_0E_MUTE_VOL_CTRL, SPK_MUTE_MASK, SPK_UNMUTE);
+
+ sma1303->amp_power_status = true;
+
+ return ret;
+}
+
+static int sma1303_shutdown(struct snd_soc_component *component)
+{
+ struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component);
+ int ret = 0;
+
+ if (!(sma1303->amp_power_status)) {
+ dev_info(component->dev, "%s : %s\n",
+ __func__, "Already AMP Shutdown");
+ return ret;
+ }
+
+ ret += sma1303_regmap_update_bits(sma1303->regmap, component->dev,
+ SMA1303_0E_MUTE_VOL_CTRL, SPK_MUTE_MASK, SPK_MUTE);
+
+ cancel_delayed_work_sync(&sma1303->check_fault_work);
+
+ msleep(55);
+
+ ret += sma1303_regmap_update_bits(sma1303->regmap, component->dev,
+ SMA1303_10_SYSTEM_CTRL1, SPK_MODE_MASK, SPK_OFF);
+
+ ret += sma1303_regmap_update_bits(sma1303->regmap, component->dev,
+ SMA1303_00_SYSTEM_CTRL, POWER_MASK, POWER_OFF);
+
+ ret += sma1303_regmap_update_bits(sma1303->regmap, component->dev,
+ SMA1303_8E_PLL_CTRL, PLL_PD2_MASK, PLL_PD2);
+
+ sma1303->amp_power_status = false;
+
+ return ret;
+}
+
+static int sma1303_clk_supply_event(struct snd_soc_dapm_widget *w,
+ struct snd_kcontrol *kcontrol, int event)
+{
+ struct snd_soc_component *component =
+ snd_soc_dapm_to_component(w->dapm);
+
+ switch (event) {
+ case SND_SOC_DAPM_PRE_PMU:
+ dev_info(component->dev, "%s : PRE_PMU\n", __func__);
+ break;
+
+ case SND_SOC_DAPM_POST_PMD:
+ dev_info(component->dev, "%s : POST_PMD\n", __func__);
+ break;
+ }
+
+ return 0;
+}
+
+static int sma1303_dac_event(struct snd_soc_dapm_widget *w,
+ struct snd_kcontrol *kcontrol, int event)
+{
+ struct snd_soc_component *component =
+ snd_soc_dapm_to_component(w->dapm);
+ struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component);
+
+ switch (event) {
+ case SND_SOC_DAPM_PRE_PMU:
+ dev_info(component->dev, "%s : PRE_PMU\n", __func__);
+
+ if (sma1303->usage_status)
+ sma1303_startup(component);
+
+ break;
+
+ case SND_SOC_DAPM_POST_PMU:
+ dev_info(component->dev, "%s : POST_PMU\n", __func__);
+
+ break;
+
+ case SND_SOC_DAPM_PRE_PMD:
+ dev_info(component->dev, "%s : PRE_PMD\n", __func__);
+
+ sma1303_shutdown(component);
+
+ break;
+
+ case SND_SOC_DAPM_POST_PMD:
+ dev_info(component->dev, "%s : POST_PMD\n", __func__);
+
+ break;
+ }
+
+ return 0;
+}
+
+static int sma1303_dac_feedback_event(struct snd_soc_dapm_widget *w,
+ struct snd_kcontrol *kcontrol, int event)
+{
+ struct snd_soc_component *component =
+ snd_soc_dapm_to_component(w->dapm);
+ struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component);
+ int ret = 0;
+
+ switch (event) {
+ case SND_SOC_DAPM_PRE_PMU:
+ dev_info(component->dev,
+ "%s : DAC feedback ON\n", __func__);
+ ret += sma1303_regmap_update_bits(
+ sma1303->regmap, component->dev,
+ SMA1303_09_OUTPUT_CTRL,
+ PORT_CONFIG_MASK|PORT_OUT_SEL_MASK,
+ OUTPUT_PORT_ENABLE|SPEAKER_PATH);
+
+ ret += sma1303_regmap_update_bits(
+ sma1303->regmap, component->dev,
+ SMA1303_A3_TOP_MAN2,
+ SDO_OUTPUT_MASK, NORMAL_OUT);
+ break;
+
+ case SND_SOC_DAPM_PRE_PMD:
+ dev_info(component->dev,
+ "%s : DAC feedback OFF\n", __func__);
+ ret += sma1303_regmap_update_bits(
+ sma1303->regmap, component->dev,
+ SMA1303_09_OUTPUT_CTRL,
+ PORT_OUT_SEL_MASK, OUT_SEL_DISABLE);
+
+ ret += sma1303_regmap_update_bits(
+ sma1303->regmap, component->dev,
+ SMA1303_A3_TOP_MAN2, SDO_OUTPUT_MASK,
+ HIGH_Z_OUT);
+ break;
+ }
+
+ return ret;
+}
+
+static const struct snd_soc_dapm_widget sma1303_dapm_widgets[] = {
+SND_SOC_DAPM_SUPPLY("CLK_SUPPLY", SND_SOC_NOPM, 0, 0, sma1303_clk_supply_event,
+ SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
+SND_SOC_DAPM_DAC_E("DAC", "Playback", SND_SOC_NOPM, 0, 0, sma1303_dac_event,
+ SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU |
+ SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD),
+SND_SOC_DAPM_ADC_E("DAC_FEEDBACK", "Capture", SND_SOC_NOPM, 0, 0,
+ sma1303_dac_feedback_event,
+ SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_PRE_PMD),
+SND_SOC_DAPM_OUTPUT("SPK"),
+SND_SOC_DAPM_INPUT("SDO"),
+SND_SOC_DAPM_MUX("SDO Source", SND_SOC_NOPM, 0, 0, &sma1303_sdo_source_mux),
+};
+
+static const struct snd_soc_dapm_route sma1303_audio_map[] = {
+{"DAC", NULL, "CLK_SUPPLY"},
+{"SPK", NULL, "DAC"},
+{"SDO Source", "Disable", "SDO"},
+{"SDO Source", "Format_C", "SDO"},
+{"SDO Source", "Mixer_Out", "SDO"},
+{"SDO Source", "After_DSP", "SDO"},
+{"SDO Source", "After_Post", "SDO"},
+{"DAC_FEEDBACK", NULL, "SDO Source"},
+};
+
+static int sma1303_setup_pll(struct snd_soc_component *component,
+ unsigned int bclk)
+{
+ struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component);
+
+ int i = 0, ret = 0;
+
+ dev_info(component->dev, "%s : BCLK = %dHz\n",
+ __func__, bclk);
+
+ if (sma1303->sys_clk_id == SMA1303_PLL_CLKIN_MCLK) {
+ dev_info(component->dev, "%s : MCLK is not supported\n",
+ __func__);
+ } else if (sma1303->sys_clk_id == SMA1303_PLL_CLKIN_BCLK) {
+ for (i = 0; i < sma1303->num_of_pll_matches; i++) {
+ if (sma1303->pll_matches[i].input_clk == bclk)
+ break;
+ }
+ if (i == sma1303->num_of_pll_matches) {
+ dev_info(component->dev, "%s : No matching value between pll table and SCK\n",
+ __func__);
+ return -EINVAL;
+ }
+
+ ret += sma1303_regmap_update_bits(
+ sma1303->regmap, component->dev,
+ SMA1303_A2_TOP_MAN1,
+ PLL_PD_MASK|PLL_REF_CLK_MASK,
+ PLL_OPERATION|PLL_SCK);
+ }
+
+ ret += sma1303_regmap_write(sma1303->regmap, component->dev,
+ SMA1303_8B_PLL_POST_N,
+ sma1303->pll_matches[i].post_n);
+
+ ret += sma1303_regmap_write(sma1303->regmap, component->dev,
+ SMA1303_8C_PLL_N,
+ sma1303->pll_matches[i].n);
+
+ ret += sma1303_regmap_write(sma1303->regmap, component->dev,
+ SMA1303_8D_PLL_A_SETTING,
+ sma1303->pll_matches[i].vco);
+
+ ret += sma1303_regmap_write(sma1303->regmap, component->dev,
+ SMA1303_8F_PLL_P_CP,
+ sma1303->pll_matches[i].p_cp);
+
+ return ret;
+}
+
+static int sma1303_dai_hw_params_amp(struct snd_pcm_substream *substream,
+ struct snd_pcm_hw_params *params, struct snd_soc_dai *dai)
+{
+ struct snd_soc_component *component = dai->component;
+ struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component);
+ unsigned int input_format = 0;
+ unsigned int bclk = 0;
+ int ret = 0;
+
+ if (sma1303->format == SND_SOC_DAIFMT_DSP_A)
+ bclk = params_rate(params) * sma1303->frame_size;
+ else
+ bclk = params_rate(params) * params_physical_width(params)
+ * params_channels(params);
+
+ dev_info(component->dev,
+ "%s : rate = %d : bit size = %d : channel = %d\n",
+ __func__, params_rate(params), params_width(params),
+ params_channels(params));
+
+ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
+
+ if (sma1303->usage_status &&
+ (sma1303->sys_clk_id == SMA1303_PLL_CLKIN_MCLK
+ || sma1303->sys_clk_id == SMA1303_PLL_CLKIN_BCLK)) {
+
+ if (sma1303->last_bclk != bclk) {
+ if (sma1303->amp_power_status) {
+ sma1303_shutdown(component);
+ sma1303_setup_pll(component, bclk);
+ sma1303_startup(component);
+ } else
+ sma1303_setup_pll(component, bclk);
+
+ sma1303->last_bclk = bclk;
+ }
+ }
+
+ switch (params_rate(params)) {
+ case 8000:
+ case 12000:
+ case 16000:
+ case 24000:
+ case 32000:
+ case 44100:
+ case 48000:
+ case 96000:
+ ret += sma1303_regmap_update_bits(
+ sma1303->regmap, component->dev,
+ SMA1303_A2_TOP_MAN1,
+ DAC_DN_CONV_MASK, DAC_DN_CONV_DISABLE);
+
+ ret += sma1303_regmap_update_bits(
+ sma1303->regmap, component->dev,
+ SMA1303_01_INPUT1_CTRL1,
+ LEFTPOL_MASK, LOW_FIRST_CH);
+ break;
+
+ case 192000:
+ ret += sma1303_regmap_update_bits(
+ sma1303->regmap, component->dev,
+ SMA1303_A2_TOP_MAN1,
+ DAC_DN_CONV_MASK, DAC_DN_CONV_ENABLE);
+
+ ret += sma1303_regmap_update_bits(
+ sma1303->regmap, component->dev,
+ SMA1303_01_INPUT1_CTRL1,
+ LEFTPOL_MASK, HIGH_FIRST_CH);
+ break;
+
+ default:
+ dev_err(component->dev, "%s not support rate : %d\n",
+ __func__, params_rate(params));
+
+ return -EINVAL;
+ }
+
+ } else {
+
+ switch (params_format(params)) {
+
+ case SNDRV_PCM_FORMAT_S16_LE:
+ dev_info(component->dev,
+ "%s set format SNDRV_PCM_FORMAT_S16_LE\n",
+ __func__);
+ ret += sma1303_regmap_update_bits(
+ sma1303->regmap, component->dev,
+ SMA1303_A4_TOP_MAN3,
+ SCK_RATE_MASK, SCK_32FS);
+ break;
+
+ case SNDRV_PCM_FORMAT_S24_LE:
+ dev_info(component->dev,
+ "%s set format SNDRV_PCM_FORMAT_S24_LE\n",
+ __func__);
+ ret += sma1303_regmap_update_bits(
+ sma1303->regmap, component->dev,
+ SMA1303_A4_TOP_MAN3,
+ SCK_RATE_MASK, SCK_64FS);
+ break;
+ case SNDRV_PCM_FORMAT_S32_LE:
+ dev_info(component->dev,
+ "%s set format SNDRV_PCM_FORMAT_S32_LE\n",
+ __func__);
+ ret += sma1303_regmap_update_bits(
+ sma1303->regmap, component->dev,
+ SMA1303_A4_TOP_MAN3,
+ SCK_RATE_MASK, SCK_64FS);
+ break;
+ default:
+ dev_err(component->dev,
+ "%s not support data bit : %d\n", __func__,
+ params_format(params));
+ return -EINVAL;
+ }
+ }
+
+ switch (params_width(params)) {
+ case 16:
+ switch (sma1303->format) {
+ case SND_SOC_DAIFMT_I2S:
+ input_format |= STANDARD_I2S;
+ break;
+ case SND_SOC_DAIFMT_LEFT_J:
+ input_format |= LJ;
+ break;
+ case SND_SOC_DAIFMT_RIGHT_J:
+ input_format |= RJ_16BIT;
+ break;
+ }
+ break;
+ case 24:
+ case 32:
+ switch (sma1303->format) {
+ case SND_SOC_DAIFMT_I2S:
+ input_format |= STANDARD_I2S;
+ break;
+ case SND_SOC_DAIFMT_LEFT_J:
+ input_format |= LJ;
+ break;
+ case SND_SOC_DAIFMT_RIGHT_J:
+ input_format |= RJ_24BIT;
+ break;
+ }
+ break;
+
+ default:
+ dev_err(component->dev,
+ "%s not support data bit : %d\n", __func__,
+ params_format(params));
+ return -EINVAL;
+ }
+
+ ret += sma1303_regmap_update_bits(
+ sma1303->regmap, component->dev,
+ SMA1303_01_INPUT1_CTRL1,
+ I2S_MODE_MASK, input_format);
+ return ret;
+}
+
+static int sma1303_dai_set_sysclk_amp(struct snd_soc_dai *dai,
+ int clk_id, unsigned int freq, int dir)
+{
+ struct snd_soc_component *component = dai->component;
+ struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component);
+
+ switch (clk_id) {
+ case SMA1303_EXTERNAL_CLOCK_19_2:
+ break;
+ case SMA1303_EXTERNAL_CLOCK_24_576:
+ break;
+ case SMA1303_PLL_CLKIN_MCLK:
+ break;
+ case SMA1303_PLL_CLKIN_BCLK:
+ break;
+ default:
+ dev_err(component->dev, "Invalid clk id: %d\n", clk_id);
+ return -EINVAL;
+ }
+ sma1303->sys_clk_id = clk_id;
+ return 0;
+}
+
+static int sma1303_dai_mute(struct snd_soc_dai *dai, int mute, int stream)
+{
+ struct snd_soc_component *component = dai->component;
+ struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component);
+ int ret = 0;
+
+ if (stream == SNDRV_PCM_STREAM_CAPTURE)
+ return ret;
+
+ if (!(sma1303->amp_power_status)) {
+ dev_info(component->dev, "%s : %s\n",
+ __func__, "Already AMP Shutdown");
+ return ret;
+ }
+
+ if (mute) {
+ dev_info(component->dev, "%s : %s\n", __func__, "MUTE");
+
+ ret += sma1303_regmap_update_bits(
+ sma1303->regmap, component->dev,
+ SMA1303_0E_MUTE_VOL_CTRL,
+ SPK_MUTE_MASK, SPK_MUTE);
+ } else {
+ dev_info(component->dev, "%s : %s\n", __func__, "UNMUTE");
+
+ ret += sma1303_regmap_update_bits(
+ sma1303->regmap, component->dev,
+ SMA1303_0E_MUTE_VOL_CTRL,
+ SPK_MUTE_MASK, SPK_UNMUTE);
+ }
+
+ return ret;
+}
+
+static int sma1303_dai_set_fmt_amp(struct snd_soc_dai *dai,
+ unsigned int fmt)
+{
+ struct snd_soc_component *component = dai->component;
+ struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component);
+ int ret = 0;
+
+ switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
+
+ case SND_SOC_DAIFMT_CBS_CFS:
+ dev_info(component->dev,
+ "%s : %s\n", __func__, "I2S/TDM Device mode");
+ ret += sma1303_regmap_update_bits(
+ sma1303->regmap, component->dev,
+ SMA1303_01_INPUT1_CTRL1,
+ CONTROLLER_DEVICE_MASK, DEVICE_MODE);
+ break;
+
+ case SND_SOC_DAIFMT_CBM_CFM:
+ dev_info(component->dev,
+ "%s : %s\n", __func__, "I2S/TDM Controller mode");
+ ret += sma1303_regmap_update_bits(
+ sma1303->regmap, component->dev,
+ SMA1303_01_INPUT1_CTRL1,
+ CONTROLLER_DEVICE_MASK, CONTROLLER_MODE);
+ break;
+
+ default:
+ dev_err(component->dev,
+ "Unsupported Controller/Device : 0x%x\n", fmt);
+ return -EINVAL;
+ }
+
+ switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
+
+ case SND_SOC_DAIFMT_I2S:
+ case SND_SOC_DAIFMT_RIGHT_J:
+ case SND_SOC_DAIFMT_LEFT_J:
+ case SND_SOC_DAIFMT_DSP_A:
+ case SND_SOC_DAIFMT_DSP_B:
+ sma1303->format = fmt & SND_SOC_DAIFMT_FORMAT_MASK;
+ break;
+ default:
+ dev_err(component->dev,
+ "Unsupported Audio Interface Format : 0x%x\n", fmt);
+ return -EINVAL;
+ }
+
+ switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
+
+ case SND_SOC_DAIFMT_IB_NF:
+ dev_info(component->dev, "%s : %s\n",
+ __func__, "Invert BCLK + Normal Frame");
+ ret += sma1303_regmap_update_bits(
+ sma1303->regmap, component->dev,
+ SMA1303_01_INPUT1_CTRL1,
+ SCK_RISING_MASK, SCK_RISING_EDGE);
+ break;
+ case SND_SOC_DAIFMT_IB_IF:
+ dev_info(component->dev, "%s : %s\n",
+ __func__, "Invert BCLK + Invert Frame");
+ ret += sma1303_regmap_update_bits(
+ sma1303->regmap, component->dev,
+ SMA1303_01_INPUT1_CTRL1,
+ LEFTPOL_MASK|SCK_RISING_MASK,
+ HIGH_FIRST_CH|SCK_RISING_EDGE);
+ break;
+ case SND_SOC_DAIFMT_NB_IF:
+ dev_info(component->dev, "%s : %s\n",
+ __func__, "Normal BCLK + Invert Frame");
+ ret += sma1303_regmap_update_bits(
+ sma1303->regmap, component->dev,
+ SMA1303_01_INPUT1_CTRL1,
+ LEFTPOL_MASK, HIGH_FIRST_CH);
+ break;
+ case SND_SOC_DAIFMT_NB_NF:
+ dev_info(component->dev, "%s : %s\n",
+ __func__, "Normal BCLK + Normal Frame");
+ break;
+ default:
+ dev_err(component->dev,
+ "Unsupported Bit & Frameclock : 0x%x\n", fmt);
+ return -EINVAL;
+ }
+
+ return ret;
+}
+
+static int sma1303_dai_set_tdm_slot(struct snd_soc_dai *dai,
+ unsigned int tx_mask, unsigned int rx_mask,
+ int slots, int slot_width)
+{
+ struct snd_soc_component *component = dai->component;
+ struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component);
+ int ret = 0;
+
+ dev_info(component->dev, "%s : slots = %d, slot_width - %d\n",
+ __func__, slots, slot_width);
+
+ sma1303->frame_size = slot_width * slots;
+
+ ret += sma1303_regmap_update_bits(
+ sma1303->regmap, component->dev,
+ SMA1303_A4_TOP_MAN3,
+ O_FORMAT_MASK, O_FMT_TDM);
+
+ switch (slot_width) {
+ case 16:
+ ret += sma1303_regmap_update_bits(
+ sma1303->regmap, component->dev,
+ SMA1303_A6_TDM2,
+ TDM_DL_MASK, TDM_DL_16);
+ break;
+ case 32:
+ ret += sma1303_regmap_update_bits(
+ sma1303->regmap, component->dev,
+ SMA1303_A6_TDM2,
+ TDM_DL_MASK, TDM_DL_32);
+ break;
+ default:
+ dev_err(component->dev, "%s not support TDM %d slot_width\n",
+ __func__, slot_width);
+ }
+
+ switch (slots) {
+ case 4:
+ ret += sma1303_regmap_update_bits(
+ sma1303->regmap, component->dev,
+ SMA1303_A6_TDM2,
+ TDM_N_SLOT_MASK, TDM_N_SLOT_4);
+ break;
+ case 8:
+ ret += sma1303_regmap_update_bits(
+ sma1303->regmap, component->dev,
+ SMA1303_A6_TDM2,
+ TDM_N_SLOT_MASK, TDM_N_SLOT_8);
+ break;
+ default:
+ dev_err(component->dev, "%s not support TDM %d slots\n",
+ __func__, slots);
+ }
+
+ if (sma1303->tdm_slot_rx < slots)
+ ret += sma1303_regmap_update_bits(
+ sma1303->regmap, component->dev,
+ SMA1303_A5_TDM1, TDM_SLOT1_RX_POS_MASK,
+ (sma1303->tdm_slot_rx) << 3);
+ else
+ dev_err(component->dev, "%s Incorrect tdm-slot-rx %d set\n",
+ __func__, sma1303->tdm_slot_rx);
+
+ ret += sma1303_regmap_update_bits(
+ sma1303->regmap, component->dev,
+ SMA1303_A5_TDM1,
+ TDM_CLK_POL_MASK, TDM_CLK_POL_RISE);
+
+ ret += sma1303_regmap_update_bits(
+ sma1303->regmap, component->dev,
+ SMA1303_A5_TDM1,
+ TDM_TX_MODE_MASK, TDM_TX_MONO);
+
+ if (sma1303->tdm_slot_tx < slots)
+ ret += sma1303_regmap_update_bits(
+ sma1303->regmap, component->dev,
+ SMA1303_A6_TDM2, TDM_SLOT1_TX_POS_MASK,
+ (sma1303->tdm_slot_tx) << 3);
+ else
+ dev_err(component->dev, "%s Incorrect tdm-slot-tx %d set\n",
+ __func__, sma1303->tdm_slot_tx);
+
+ return ret;
+}
+
+static const struct snd_soc_dai_ops sma1303_dai_ops_amp = {
+ .set_sysclk = sma1303_dai_set_sysclk_amp,
+ .set_fmt = sma1303_dai_set_fmt_amp,
+ .hw_params = sma1303_dai_hw_params_amp,
+ .mute_stream = sma1303_dai_mute,
+ .set_tdm_slot = sma1303_dai_set_tdm_slot,
+};
+
+#define SMA1303_RATES SNDRV_PCM_RATE_8000_192000
+#define SMA1303_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE | \
+ SNDRV_PCM_FMTBIT_S32_LE)
+
+static struct snd_soc_dai_driver sma1303_dai[] = {
+{
+ .name = "sma1303-amplifier",
+ .id = 0,
+ .playback = {
+ .stream_name = "Playback",
+ .channels_min = 1,
+ .channels_max = 2,
+ .rates = SMA1303_RATES,
+ .formats = SMA1303_FORMATS,
+ },
+ .capture = {
+ .stream_name = "Capture",
+ .channels_min = 1,
+ .channels_max = 2,
+ .rates = SMA1303_RATES,
+ .formats = SMA1303_FORMATS,
+ },
+ .ops = &sma1303_dai_ops_amp,
+}
+};
+
+static void sma1303_check_fault_worker(struct work_struct *work)
+{
+ struct sma1303_priv *sma1303 =
+ container_of(work, struct sma1303_priv, check_fault_work.work);
+ int ret = 0;
+ unsigned int over_temp, ocp_val, uvlo_val;
+
+ mutex_lock(&sma1303->lock);
+
+ if (sma1303->tsdw_cnt)
+ ret = regmap_read(sma1303->regmap,
+ SMA1303_0A_SPK_VOL, &sma1303->cur_vol);
+ else
+ ret = regmap_read(sma1303->regmap,
+ SMA1303_0A_SPK_VOL, &sma1303->init_vol);
+
+ if (ret != 0) {
+ dev_err(sma1303->dev,
+ "failed to read SMA1303_0A_SPK_VOL : %d\n", ret);
+ mutex_unlock(&sma1303->lock);
+ return;
+ }
+
+ ret = regmap_read(sma1303->regmap, SMA1303_FA_STATUS1, &over_temp);
+ if (ret != 0) {
+ dev_err(sma1303->dev,
+ "failed to read SMA1303_FA_STATUS1 : %d\n", ret);
+ mutex_unlock(&sma1303->lock);
+ return;
+ }
+
+ ret = regmap_read(sma1303->regmap, SMA1303_FB_STATUS2, &ocp_val);
+ if (ret != 0) {
+ dev_err(sma1303->dev,
+ "failed to read SMA1303_FB_STATUS2 : %d\n", ret);
+ mutex_unlock(&sma1303->lock);
+ return;
+ }
+
+ ret = regmap_read(sma1303->regmap, SMA1303_FF_DEVICE_INDEX, &uvlo_val);
+ if (ret != 0) {
+ dev_err(sma1303->dev,
+ "failed to read SMA1303_FF_DEVICE_INDEX : %d\n", ret);
+ mutex_unlock(&sma1303->lock);
+ return;
+ }
+
+ if (~over_temp & OT1_OK_STATUS) {
+ dev_crit(sma1303->dev,
+ "%s : OT1(Over Temperature Level 1)\n", __func__);
+
+ if ((sma1303->cur_vol + 6) <= 0xFF)
+ sma1303_regmap_write(
+ sma1303->regmap, sma1303->dev,
+ SMA1303_0A_SPK_VOL, sma1303->cur_vol + 6);
+
+ sma1303->tsdw_cnt++;
+ } else if (sma1303->tsdw_cnt) {
+ sma1303_regmap_write(
+ sma1303->regmap, sma1303->dev,
+ SMA1303_0A_SPK_VOL, sma1303->init_vol);
+ sma1303->tsdw_cnt = 0;
+ sma1303->cur_vol = sma1303->init_vol;
+ }
+
+ if (~over_temp & OT2_OK_STATUS) {
+ dev_crit(sma1303->dev,
+ "%s : OT2(Over Temperature Level 2)\n", __func__);
+ }
+ if (ocp_val & OCP_SPK_STATUS) {
+ dev_crit(sma1303->dev,
+ "%s : OCP_SPK(Over Current Protect SPK)\n", __func__);
+ }
+ if (ocp_val & OCP_BST_STATUS) {
+ dev_crit(sma1303->dev,
+ "%s : OCP_BST(Over Current Protect Boost)\n", __func__);
+ }
+ if ((ocp_val & CLK_MON_STATUS) && (sma1303->amp_power_status)) {
+ dev_crit(sma1303->dev,
+ "%s : CLK_FAULT(No clock input)\n", __func__);
+ }
+ if (uvlo_val & UVLO_BST_STATUS) {
+ dev_crit(sma1303->dev,
+ "%s : UVLO(Under Voltage Lock Out)\n", __func__);
+ }
+
+ if ((over_temp != sma1303->last_over_temp) ||
+ (ocp_val != sma1303->last_ocp_val)) {
+
+ dev_crit(sma1303->dev, "Please check AMP status");
+ dev_info(sma1303->dev, "STATUS1=0x%02X : STATUS2=0x%02X\n",
+ over_temp, ocp_val);
+ sma1303->last_over_temp = over_temp;
+ sma1303->last_ocp_val = ocp_val;
+ }
+
+ if (sma1303->check_fault_status) {
+ if (sma1303->check_fault_period > 0)
+ queue_delayed_work(system_freezable_wq,
+ &sma1303->check_fault_work,
+ sma1303->check_fault_period * HZ);
+ else
+ queue_delayed_work(system_freezable_wq,
+ &sma1303->check_fault_work,
+ CHECK_PERIOD_TIME * HZ);
+ }
+
+ if (!(~over_temp & OT1_OK_STATUS) && !(~over_temp & OT2_OK_STATUS)
+ && !(ocp_val & OCP_SPK_STATUS)
+ && !(ocp_val & OCP_BST_STATUS)
+ && !(ocp_val & CLK_MON_STATUS)
+ && !(uvlo_val & UVLO_BST_STATUS)) {
+ }
+
+ mutex_unlock(&sma1303->lock);
+}
+
+#ifdef CONFIG_PM
+static int sma1303_suspend(struct snd_soc_component *component)
+{
+ return 0;
+}
+
+static int sma1303_resume(struct snd_soc_component *component)
+{
+ return 0;
+}
+#else
+#define sma1303_suspend NULL
+#define sma1303_resume NULL
+#endif
+
+static int sma1303_probe(struct snd_soc_component *component)
+{
+ struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component);
+ struct snd_soc_dapm_context *dapm =
+ snd_soc_component_get_dapm(component);
+ char *dapm_widget_str = NULL;
+ int prefix_len = 0, str_max = 30, ret = 0, i = 0;
+ unsigned int status, otp_stat;
+
+ if (component->name_prefix != NULL) {
+ dev_info(component->dev, "%s : component name prefix - %s\n",
+ __func__, component->name_prefix);
+
+ prefix_len = strlen(component->name_prefix);
+ dapm_widget_str = kzalloc(prefix_len + str_max, GFP_KERNEL);
+
+ if (!dapm_widget_str) {
+ kfree(dapm_widget_str);
+ return -ENOMEM;
+ }
+
+ strcpy(dapm_widget_str, component->name_prefix);
+ strcat(dapm_widget_str, " Playback");
+
+ snd_soc_dapm_ignore_suspend(dapm, dapm_widget_str);
+
+ memset(dapm_widget_str + prefix_len, 0, str_max);
+
+ strcpy(dapm_widget_str, component->name_prefix);
+ strcat(dapm_widget_str, " SPK");
+
+ snd_soc_dapm_ignore_suspend(dapm, dapm_widget_str);
+
+ kfree(dapm_widget_str);
+ } else {
+ snd_soc_dapm_ignore_suspend(dapm, "Playback");
+ snd_soc_dapm_ignore_suspend(dapm, "SPK");
+ }
+
+ snd_soc_dapm_sync(dapm);
+
+ ret += sma1303_regmap_update_bits(
+ sma1303->regmap, component->dev,
+ SMA1303_00_SYSTEM_CTRL,
+ RESETBYI2C_MASK, RESETBYI2C_RESET);
+
+ ret += regmap_read(sma1303->regmap, SMA1303_FF_DEVICE_INDEX, &status);
+ if (ret < 0) {
+ dev_err(sma1303->dev,
+ "failed to read, register: %02X, ret: %d\n",
+ SMA1303_FF_DEVICE_INDEX, ret);
+ return ret;
+ }
+ sma1303->rev_num = status & REV_NUM_STATUS;
+ if (sma1303->rev_num == REV_NUM_TV0)
+ dev_info(component->dev, "SMA1303 Trimming Version 0\n");
+ else if (sma1303->rev_num == REV_NUM_TV1)
+ dev_info(component->dev, "SMA1303 Trimming Version 1\n");
+
+ ret += regmap_read(sma1303->regmap, SMA1303_FB_STATUS2, &otp_stat);
+ if (ret < 0)
+ dev_err(sma1303->dev,
+ "failed to read, register: %02X, ret: %d\n",
+ SMA1303_FF_DEVICE_INDEX, ret);
+
+ if (((sma1303->rev_num == REV_NUM_TV0) &&
+ ((otp_stat & 0x0E) == OTP_STAT_OK_0)) ||
+ ((sma1303->rev_num != REV_NUM_TV0) &&
+ ((otp_stat & 0x0C) == OTP_STAT_OK_1)))
+ dev_info(component->dev, "SMA1303 OTP Status Successful\n");
+ else
+ dev_info(component->dev, "SMA1303 OTP Status Fail\n");
+
+ for (i = 0; i < (unsigned int)ARRAY_SIZE(sma1303_reg_def); i++)
+ ret += sma1303_regmap_write(
+ sma1303->regmap, component->dev,
+ sma1303_reg_def[i].reg,
+ sma1303_reg_def[i].def);
+
+ ret += sma1303_regmap_write(sma1303->regmap, component->dev,
+ SMA1303_0A_SPK_VOL, sma1303->init_vol);
+
+ dev_info(component->dev,
+ "%s init_vol is 0x%x\n", __func__, sma1303->init_vol);
+
+ return ret;
+}
+
+static void sma1303_remove(struct snd_soc_component *component)
+{
+ struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component);
+
+ cancel_delayed_work_sync(&sma1303->check_fault_work);
+}
+
+static const struct snd_soc_component_driver sma1303_component = {
+ .probe = sma1303_probe,
+ .remove = sma1303_remove,
+ .suspend = sma1303_suspend,
+ .resume = sma1303_resume,
+ .controls = sma1303_snd_controls,
+ .num_controls = ARRAY_SIZE(sma1303_snd_controls),
+ .dapm_widgets = sma1303_dapm_widgets,
+ .num_dapm_widgets = ARRAY_SIZE(sma1303_dapm_widgets),
+ .dapm_routes = sma1303_audio_map,
+ .num_dapm_routes = ARRAY_SIZE(sma1303_audio_map),
+};
+
+const struct regmap_config sma_i2c_regmap = {
+ .reg_bits = 8,
+ .val_bits = 8,
+
+ .max_register = SMA1303_FF_DEVICE_INDEX,
+ .readable_reg = sma1303_readable_register,
+ .writeable_reg = sma1303_writeable_register,
+ .volatile_reg = sma1303_volatile_register,
+
+ .cache_type = REGCACHE_NONE,
+ .reg_defaults = sma1303_reg_def,
+ .num_reg_defaults = ARRAY_SIZE(sma1303_reg_def),
+};
+
+static ssize_t check_fault_period_show(struct device *dev,
+ struct device_attribute *devattr, char *buf)
+{
+ struct sma1303_priv *sma1303 = dev_get_drvdata(dev);
+ int rc;
+
+ rc = (int)snprintf(buf, PAGE_SIZE,
+ "%ld\n", sma1303->check_fault_period);
+
+ return (ssize_t)rc;
+}
+
+static ssize_t check_fault_period_store(struct device *dev,
+ struct device_attribute *devattr, const char *buf, size_t count)
+{
+ struct sma1303_priv *sma1303 = dev_get_drvdata(dev);
+ int ret;
+
+ ret = kstrtol(buf, 10, &sma1303->check_fault_period);
+
+ if (ret)
+ return -EINVAL;
+
+ return (ssize_t)count;
+}
+
+static DEVICE_ATTR_RW(check_fault_period);
+
+static ssize_t check_fault_status_show(struct device *dev,
+ struct device_attribute *devattr, char *buf)
+{
+ struct sma1303_priv *sma1303 = dev_get_drvdata(dev);
+ int rc;
+
+ rc = (int)snprintf(buf, PAGE_SIZE,
+ "%ld\n", sma1303->check_fault_status);
+
+ return (ssize_t)rc;
+}
+
+static ssize_t check_fault_status_store(struct device *dev,
+ struct device_attribute *devattr, const char *buf, size_t count)
+{
+ struct sma1303_priv *sma1303 = dev_get_drvdata(dev);
+ int ret;
+
+ ret = kstrtol(buf, 10, &sma1303->check_fault_status);
+
+ if (ret)
+ return -EINVAL;
+
+ if (sma1303->check_fault_status) {
+ if (sma1303->check_fault_period > 0)
+ queue_delayed_work(system_freezable_wq,
+ &sma1303->check_fault_work,
+ sma1303->check_fault_period * HZ);
+ else
+ queue_delayed_work(system_freezable_wq,
+ &sma1303->check_fault_work,
+ CHECK_PERIOD_TIME * HZ);
+ }
+
+ return (ssize_t)count;
+}
+
+static DEVICE_ATTR_RW(check_fault_status);
+
+static struct attribute *sma1303_attr[] = {
+ &dev_attr_check_fault_period.attr,
+ &dev_attr_check_fault_status.attr,
+ NULL,
+};
+
+static struct attribute_group sma1303_attr_group = {
+ .attrs = sma1303_attr,
+};
+
+static int sma1303_i2c_probe(struct i2c_client *client,
+ const struct i2c_device_id *id)
+{
+ struct sma1303_priv *sma1303;
+ struct device_node *np = client->dev.of_node;
+ int ret;
+ u32 value;
+ unsigned int device_info;
+
+ dev_info(&client->dev, "%s is here. Driver version REV018\n", __func__);
+
+ sma1303 = devm_kzalloc(&client->dev, sizeof(struct sma1303_priv),
+ GFP_KERNEL);
+
+ if (!sma1303)
+ return -ENOMEM;
+
+ sma1303->regmap = devm_regmap_init_i2c(client, &sma_i2c_regmap);
+
+ if (IS_ERR(sma1303->regmap)) {
+ ret = PTR_ERR(sma1303->regmap);
+ dev_err(&client->dev,
+ "Failed to allocate register map: %d\n", ret);
+
+ devm_kfree(&client->dev, sma1303);
+
+ return ret;
+ }
+
+ if (np) {
+ if (!of_property_read_u32(np, "tdm-slot-rx", &value)) {
+ dev_info(&client->dev,
+ "tdm slot rx is '%d' from DT\n", value);
+ sma1303->tdm_slot_rx = value;
+ } else {
+ dev_info(&client->dev,
+ "Default setting of tdm slot rx is '0'\n");
+ sma1303->tdm_slot_rx = 0;
+ }
+ if (!of_property_read_u32(np, "tdm-slot-tx", &value)) {
+ dev_info(&client->dev,
+ "tdm slot tx is '%d' from DT\n", value);
+ sma1303->tdm_slot_tx = value;
+ } else {
+ dev_info(&client->dev,
+ "Default setting of tdm slot tx is '0'\n");
+ sma1303->tdm_slot_tx = 0;
+ }
+ 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_info(&client->dev, "MCLK is not supported\n");
+ break;
+ case SMA1303_PLL_CLKIN_BCLK:
+ dev_info(&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: %d\n", value);
+ return -EINVAL;
+ }
+ sma1303->sys_clk_id = value;
+ } else {
+ dev_info(&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 = regmap_read(sma1303->regmap,
+ SMA1303_FF_DEVICE_INDEX, &device_info);
+
+ if ((ret != 0) || ((device_info & 0xF8) != DEVICE_ID)) {
+ dev_err(&client->dev, "device initialization error (%d 0x%02X)",
+ ret, device_info);
+ }
+ dev_info(&client->dev, "chip version 0x%02X\n", device_info);
+
+ sma1303->last_over_temp = 0xC0;
+ sma1303->last_ocp_val = 0x0A;
+ sma1303->tsdw_cnt = 0;
+ sma1303->init_vol = 0x31;
+ sma1303->cur_vol = sma1303->init_vol;
+ sma1303->last_bclk = 0;
+
+ INIT_DELAYED_WORK(&sma1303->check_fault_work,
+ sma1303_check_fault_worker);
+
+ mutex_init(&sma1303->lock);
+ sma1303->check_fault_period = CHECK_PERIOD_TIME;
+
+ sma1303->devtype = id->driver_data;
+ sma1303->dev = &client->dev;
+ sma1303->kobj = &client->dev.kobj;
+
+ i2c_set_clientdata(client, sma1303);
+
+ sma1303->amp_mode = ONE_CHIP_SOLUTION;
+ sma1303->usage_status = true;
+ sma1303->amp_power_status = false;
+ sma1303->check_fault_status = true;
+ sma1303->pll_matches = sma1303_pll_matches;
+ sma1303->num_of_pll_matches =
+ ARRAY_SIZE(sma1303_pll_matches);
+
+ ret = devm_snd_soc_register_component(&client->dev,
+ &sma1303_component, sma1303_dai, 1);
+
+ if (ret) {
+ dev_err(&client->dev, "Failed to register component");
+ snd_soc_unregister_component(&client->dev);
+
+ if (sma1303)
+ devm_kfree(&client->dev, sma1303);
+
+ return ret;
+ }
+
+ sma1303->attr_grp = &sma1303_attr_group;
+ ret = sysfs_create_group(sma1303->kobj, sma1303->attr_grp);
+
+ if (ret) {
+ dev_err(&client->dev,
+ "failed to create attribute group [%d]\n", ret);
+ sma1303->attr_grp = NULL;
+ }
+
+ return ret;
+}
+
+static void sma1303_i2c_remove(struct i2c_client *client)
+{
+ struct sma1303_priv *sma1303 =
+ (struct sma1303_priv *) i2c_get_clientdata(client);
+
+ cancel_delayed_work_sync(&sma1303->check_fault_work);
+
+ snd_soc_unregister_component(&client->dev);
+
+ if (sma1303)
+ devm_kfree(&client->dev, sma1303);
+}
+
+static const struct i2c_device_id sma1303_i2c_id[] = {
+ {"sma1303", 0},
+ {}
+};
+MODULE_DEVICE_TABLE(i2c, sma1303_i2c_id);
+
+static const struct of_device_id sma1303_of_match[] = {
+ { .compatible = "irondevice,sma1303", },
+ { }
+};
+MODULE_DEVICE_TABLE(of, sma1303_of_match);
+
+static struct i2c_driver sma1303_i2c_driver = {
+ .driver = {
+ .name = "sma1303",
+ .of_match_table = sma1303_of_match,
+ },
+ .probe = sma1303_i2c_probe,
+ .remove = sma1303_i2c_remove,
+ .id_table = sma1303_i2c_id,
+};
+
+static int __init sma1303_init(void)
+{
+ int ret;
+
+ ret = i2c_add_driver(&sma1303_i2c_driver);
+
+ if (ret)
+ pr_err("Failed to register sma1303 I2C driver: %d\n", ret);
+
+ return ret;
+}
+
+static void __exit sma1303_exit(void)
+{
+ i2c_del_driver(&sma1303_i2c_driver);
+}
+
+module_init(sma1303_init);
+module_exit(sma1303_exit);
+
+MODULE_DESCRIPTION("ALSA SoC SMA1303 driver");
+MODULE_AUTHOR("Gyuhwa Park, <gyuhwa.park@irondevice.com>");
+MODULE_AUTHOR("Kiseok Jo, <kiseok.jo@irondevice.com>");
+MODULE_LICENSE("GPL v2");
diff --git a/sound/soc/codecs/sma1303.h b/sound/soc/codecs/sma1303.h
new file mode 100644
index 000000000000..d1fa2acaba85
--- /dev/null
+++ b/sound/soc/codecs/sma1303.h
@@ -0,0 +1,609 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later
+ * sma1303.h -- sma1303 ALSA SoC Audio driver
+ *
+ * Copyright 2022 Iron Device Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef _SMA1303_H
+#define _SMA1303_H
+
+#define SMA1303_I2C_ADDR_00 0x1e
+#define SMA1303_I2C_ADDR_01 0x3e
+#define SMA1303_I2C_ADDR_10 0x5e
+#define SMA1303_I2C_ADDR_11 0x7e
+
+#define SMA1303_EXTERNAL_CLOCK_19_2 0x00
+#define SMA1303_EXTERNAL_CLOCK_24_576 0x01
+#define SMA1303_PLL_CLKIN_MCLK 0x02
+#define SMA1303_PLL_CLKIN_BCLK 0x03
+
+#define ONE_CHIP_SOLUTION 0x00
+#define MONO_TWO_CHIP_SOLUTION 0x01
+#define LEFT_TWO_CHIP_SOLUTION 0x02
+#define RIGHT_TWO_CHIP_SOLUTION 0x03
+
+/*
+ * SMA1303 Register Definition
+ */
+
+/* SMA1303 Register Addresses */
+#define SMA1303_00_SYSTEM_CTRL 0x00
+#define SMA1303_01_INPUT1_CTRL1 0x01
+#define SMA1303_02_INPUT1_CTRL2 0x02
+#define SMA1303_03_INPUT1_CTRL3 0x03
+#define SMA1303_04_INPUT1_CTRL4 0x04
+/* 0x05 ~ 0x08 : Reserved */
+#define SMA1303_09_OUTPUT_CTRL 0x09
+#define SMA1303_0A_SPK_VOL 0x0a
+#define SMA1303_0B_BST_TEST 0x0b
+#define SMA1303_0C_BST_TEST1 0x0c
+#define SMA1303_0D_SPK_TEST 0x0d
+#define SMA1303_0E_MUTE_VOL_CTRL 0x0e
+/* 0x0F : Reserved */
+#define SMA1303_10_SYSTEM_CTRL1 0x10
+#define SMA1303_11_SYSTEM_CTRL2 0x11
+#define SMA1303_12_SYSTEM_CTRL3 0x12
+/* 0x13 : Reserved */
+#define SMA1303_14_MODULATOR 0x14
+#define SMA1303_15_BASS_SPK1 0x15
+#define SMA1303_16_BASS_SPK2 0x16
+#define SMA1303_17_BASS_SPK3 0x17
+#define SMA1303_18_BASS_SPK4 0x18
+#define SMA1303_19_BASS_SPK5 0x19
+#define SMA1303_1A_BASS_SPK6 0x1a
+#define SMA1303_1B_BASS_SPK7 0x1b
+/* 0x1C ~ 0x22 : Reserved */
+#define SMA1303_23_COMP_LIM1 0x23
+#define SMA1303_24_COMP_LIM2 0x24
+#define SMA1303_25_COMP_LIM3 0x25
+#define SMA1303_26_COMP_LIM4 0x26
+/* 0x27 ~ 0x32 : Reserved */
+#define SMA1303_33_SDM_CTRL 0x33
+#define SMA1303_34_OTP_DATA1 0x34
+/* 0x35 : Reserved */
+#define SMA1303_36_PROTECTION 0x36
+#define SMA1303_37_SLOPE_CTRL 0x37
+#define SMA1303_38_OTP_TRM0 0x38
+/* 0x39 ~ 0x3A : Reserved */
+#define SMA1303_3B_TEST1 0x3b
+#define SMA1303_3C_TEST2 0x3c
+#define SMA1303_3D_TEST3 0x3d
+#define SMA1303_3E_ATEST1 0x3e
+#define SMA1303_3F_ATEST2 0x3f
+/* 0x40 ~ 0x8A : Reserved */
+#define SMA1303_8B_PLL_POST_N 0x8b
+#define SMA1303_8C_PLL_N 0x8c
+#define SMA1303_8D_PLL_A_SETTING 0x8d
+#define SMA1303_8E_PLL_CTRL 0x8e
+#define SMA1303_8F_PLL_P_CP 0x8f
+#define SMA1303_90_POSTSCALER 0x90
+#define SMA1303_91_CLASS_G_CTRL 0x91
+#define SMA1303_92_FDPEC_CTRL 0x92
+/* 0x93 : Reserved */
+#define SMA1303_94_BOOST_CTRL1 0x94
+#define SMA1303_95_BOOST_CTRL2 0x95
+#define SMA1303_96_BOOST_CTRL3 0x96
+#define SMA1303_97_BOOST_CTRL4 0x97
+/* 0x98 ~ 0x9F : Reserved */
+#define SMA1303_A0_PAD_CTRL0 0xa0
+#define SMA1303_A1_PAD_CTRL1 0xa1
+#define SMA1303_A2_TOP_MAN1 0xa2
+#define SMA1303_A3_TOP_MAN2 0xa3
+#define SMA1303_A4_TOP_MAN3 0xa4
+#define SMA1303_A5_TDM1 0xa5
+#define SMA1303_A6_TDM2 0xa6
+#define SMA1303_A7_CLK_MON 0xa7
+/* 0xA8 ~ 0xF9 : Reserved */
+#define SMA1303_FA_STATUS1 0xfa
+#define SMA1303_FB_STATUS2 0xfb
+/* 0xFC ~ 0xFE : Reserved */
+#define SMA1303_FF_DEVICE_INDEX 0xff
+
+/* SMA1303 Registers Bit Fields */
+
+/* SYSTEM_CTRL : 0x00 */
+#define RESETBYI2C_MASK (1<<1)
+#define RESETBYI2C_NORMAL (0<<1)
+#define RESETBYI2C_RESET (1<<1)
+
+#define POWER_MASK (1<<0)
+#define POWER_OFF (0<<0)
+#define POWER_ON (1<<0)
+
+/* INTPUT CTRL1 : 0x01 */
+#define CONTROLLER_DEVICE_MASK (1<<7)
+#define DEVICE_MODE (0<<7)
+#define CONTROLLER_MODE (1<<7)
+
+#define I2S_MODE_MASK (7<<4)
+#define STANDARD_I2S (0<<4)
+#define LJ (1<<4)
+#define RJ_16BIT (4<<4)
+#define RJ_18BIT (5<<4)
+#define RJ_20BIT (6<<4)
+#define RJ_24BIT (7<<4)
+
+#define LEFTPOL_MASK (1<<3)
+#define LOW_FIRST_CH (0<<3)
+#define HIGH_FIRST_CH (1<<3)
+
+#define SCK_RISING_MASK (1<<2)
+#define SCK_FALLING_EDGE (0<<2)
+#define SCK_RISING_EDGE (1<<2)
+
+/* INTPUT CTRL2 : 0x02 */
+#define IMODE_MASK (3<<6)
+#define I2S (0<<6)
+#define PCM_SHORT (1<<6)
+#define PCM_LONG (2<<6)
+
+#define RIGHT_FIRST_MASK (1<<5)
+#define LEFT_NORMAL (0<<5)
+#define RIGHT_INVERTED (1<<5)
+
+#define PCM_ALAW_MASK (1<<4)
+#define PCM_U_DECODING (0<<4)
+#define PCM_A_DECODING (1<<4)
+
+#define PCM_COMP_MASK (1<<3)
+#define PCM_LINEAR (0<<3)
+#define PCM_COMPANDING (1<<3)
+
+#define INPUTSEL_MASK (1<<2)
+#define PCM_8KHZ (0<<2)
+#define PCM_16KHZ (1<<2)
+
+#define PCM_STEREO_MASK (1<<1)
+#define PCM_MONO (0<<1)
+#define PCM_STEREO (1<<1)
+
+#define PCM_DL_MASK (1<<0)
+#define PCM_8BIT (0<<0)
+#define PCM_16BIT (1<<0)
+
+/* INTPUT CTRL3 : 0x03 */
+#define PCM_N_SLOT_MASK (15<<0)
+#define PCM_N_SLOT1 (0<<0)
+#define PCM_N_SLOT2 (1<<0)
+#define PCM_N_SLOT3 (2<<0)
+#define PCM_N_SLOT4 (3<<0)
+#define PCM_N_SLOT5 (4<<0)
+#define PCM_N_SLOT6 (5<<0)
+#define PCM_N_SLOT7 (6<<0)
+#define PCM_N_SLOT8 (7<<0)
+#define PCM_N_SLOT9 (8<<0)
+#define PCM_N_SLOT10 (9<<0)
+#define PCM_N_SLOT11 (10<<0)
+#define PCM_N_SLOT12 (11<<0)
+#define PCM_N_SLOT13 (12<<0)
+#define PCM_N_SLOT14 (13<<0)
+#define PCM_N_SLOT15 (14<<0)
+#define PCM_N_SLOT16 (15<<0)
+
+/* INTPUT CTRL4 : 0x04 */
+#define PCM1_SLOT_MASK (15<<4)
+#define PCM1_SLOT1 (0<<4)
+#define PCM1_SLOT2 (1<<4)
+#define PCM1_SLOT3 (2<<4)
+#define PCM1_SLOT4 (3<<4)
+#define PCM1_SLOT5 (4<<4)
+#define PCM1_SLOT6 (5<<4)
+#define PCM1_SLOT7 (6<<4)
+#define PCM1_SLOT8 (7<<4)
+#define PCM1_SLOT9 (8<<4)
+#define PCM1_SLOT10 (9<<4)
+#define PCM1_SLOT11 (10<<4)
+#define PCM1_SLOT12 (11<<4)
+#define PCM1_SLOT13 (12<<4)
+#define PCM1_SLOT14 (13<<4)
+#define PCM1_SLOT15 (14<<4)
+#define PCM1_SLOT16 (15<<4)
+
+#define PCM2_SLOT_MASK (15<<0)
+#define PCM2_SLOT1 (0<<0)
+#define PCM2_SLOT2 (1<<0)
+#define PCM2_SLOT3 (2<<0)
+#define PCM2_SLOT4 (3<<0)
+#define PCM2_SLOT5 (4<<0)
+#define PCM2_SLOT6 (5<<0)
+#define PCM2_SLOT7 (6<<0)
+#define PCM2_SLOT8 (7<<0)
+#define PCM2_SLOT9 (8<<0)
+#define PCM2_SLOT10 (9<<0)
+#define PCM2_SLOT11 (10<<0)
+#define PCM2_SLOT12 (11<<0)
+#define PCM2_SLOT13 (12<<0)
+#define PCM2_SLOT14 (13<<0)
+#define PCM2_SLOT15 (14<<0)
+#define PCM2_SLOT16 (15<<0)
+
+/* OUTPUT CTRL : 0x09 */
+#define PORT_CONFIG_MASK (3<<5)
+#define INPUT_PORT_ONLY (0<<5)
+#define OUTPUT_PORT_ENABLE (2<<5)
+
+#define PORT_OUT_SEL_MASK (7<<0)
+#define OUT_SEL_DISABLE (0<<0)
+#define FORMAT_CONVERTER (1<<0)
+#define MIXER_OUTPUT (2<<0)
+#define SPEAKER_PATH (3<<0)
+#define POSTSCALER_OUTPUT (4<<0)
+
+/* BST_TEST : 0x0B */
+#define BST_OFF_SLOPE_MASK (3<<6)
+#define BST_OFF_SLOPE_6_7ns (0<<6)
+#define BST_OFF_SLOPE_4_8ns (1<<6)
+#define BST_OFF_SLOPE_2_6ns (2<<6)
+#define BST_OFF_SLOPE_1_2ns (3<<6)
+
+#define OCP_TEST_MASK (1<<5)
+#define OCP_NORMAL_MODE (0<<5)
+#define OCP_TEST_MODE (1<<5)
+
+#define BST_FAST_LEBN_MASK (1<<4)
+#define BST_SHORT_LEB (0<<4)
+#define BST_LONG_LEB (1<<4)
+
+#define HIGH_PGAIN_MASK (1<<3)
+#define NORMAL_P_GAIN (0<<3)
+#define HIGH_P_GAIN (1<<3)
+
+#define VCOMP_MASK (1<<2)
+#define VCOMP_NORMAL_MODE (0<<2)
+#define VCOMP_V_MON_MODE (1<<2)
+
+#define PMOS_ON_MASK (1<<1)
+#define PMOS_NORMAL_MODE (0<<1)
+#define PMOS_TEST_MODE (1<<1)
+
+#define NMOS_ON_MASK (1<<0)
+#define NMOS_NORMAL_MODE (0<<0)
+#define NMOS_TEST_MODE (1<<0)
+
+/* BST_TEST1 : 0x0C */
+#define SET_OCP_H_MASK (3<<6)
+#define HIGH_OCP_4_5_LVL (0<<6)
+#define HIGH_OCP_3_2_LVL (1<<6)
+#define HIGH_OCP_2_1_LVL (2<<6)
+#define HIGH_OCP_0_9_LVL (3<<6)
+
+#define OCL_TEST_MASK (1<<5)
+#define OCL_NORMAL_MODE (0<<5)
+#define OCL_TEST_MODE (1<<5)
+
+#define LOOP_CHECK_MASK (1<<4)
+#define BST_LOOP_NORMAL_MODE (0<<4)
+#define BST_LOOP_CHECK_MODE (1<<4)
+
+#define EN_SH_PRT_MASK (1<<3)
+#define EN_SH_PRT_DISABLE (0<<3)
+#define EN_SH_PRT_ENABLE (1<<3)
+
+/* SPK_TEST : 0x0D */
+#define VREF_MON_MASK (1<<3)
+#define VREF_NORMAL_MODE (0<<3)
+#define VREF_V_MON_MODE (1<<3)
+
+#define SPK_OCP_DLYN_MASK (1<<2)
+#define SPK_OCP_LONG_DELAY (0<<2)
+#define SPK_OCP_NORMAL (1<<2)
+
+#define SPK_OFF_SLOPE_MASK (3<<0)
+#define SPK_OFF_SLOPE_SLOW (0<<0)
+#define SPK_OFF_SLOPE_FAST (3<<0)
+
+/* MUTE_VOL_CTRL : 0x0E */
+#define VOL_SLOPE_MASK (3<<6)
+#define VOL_SLOPE_OFF (0<<6)
+#define VOL_SLOPE_SLOW (1<<6)
+#define VOL_SLOPE_MID (2<<6)
+#define VOL_SLOPE_FAST (3<<6)
+
+#define MUTE_SLOPE_MASK (3<<4)
+#define MUTE_SLOPE_OFF (0<<4)
+#define MUTE_SLOPE_SLOW (1<<4)
+#define MUTE_SLOPE_MID (2<<4)
+#define MUTE_SLOPE_FAST (3<<4)
+
+#define SPK_MUTE_MASK (1<<0)
+#define SPK_UNMUTE (0<<0)
+#define SPK_MUTE (1<<0)
+
+/* SYSTEM_CTRL1 :0x10 */
+#define SPK_MODE_MASK (7<<2)
+#define SPK_OFF (0<<2)
+#define SPK_MONO (1<<2)
+#define SPK_STEREO (4<<2)
+
+/* SYSTEM_CTRL2 : 0x11 */
+#define SPK_BS_MASK (1<<6)
+#define SPK_BS_BYP (0<<6)
+#define SPK_BS_EN (1<<6)
+#define SPK_LIM_MASK (1<<5)
+#define SPK_LIM_BYP (0<<5)
+#define SPK_LIM_EN (1<<5)
+
+#define LR_DATA_SW_MASK (1<<4)
+#define LR_DATA_SW_NORMAL (0<<4)
+#define LR_DATA_SW_SWAP (1<<4)
+
+#define MONOMIX_MASK (1<<0)
+#define MONOMIX_OFF (0<<0)
+#define MONOMIX_ON (1<<0)
+
+/* SYSTEM_CTRL3 : 0x12 */
+#define INPUT_MASK (3<<6)
+#define INPUT_0_DB (0<<6)
+#define INPUT_M6_DB (1<<6)
+#define INPUT_M12_DB (2<<6)
+#define INPUT_INFI_DB (3<<6)
+#define INPUT_R_MASK (3<<4)
+#define INPUT_R_0_DB (0<<4)
+#define INPUT_R_M6_DB (1<<4)
+#define INPUT_R_M12_DB (2<<4)
+#define INPUT_R_INFI_DB (3<<4)
+
+/* Modulator : 0x14 */
+#define SPK_HYSFB_MASK (3<<6)
+#define HYSFB_625K (0<<6)
+#define HYSFB_414K (1<<6)
+#define HYSFB_297K (2<<6)
+#define HYSFB_226K (3<<6)
+#define SPK_BDELAY_MASK (63<<0)
+
+/* SDM CONTROL : 0x33 */
+#define SDM_Q_SEL_MASK (1<<2)
+#define QUART_SEL_1_DIV_4 (0<<2)
+#define QUART_SEL_1_DIV_8 (1<<2)
+
+/* OTP_DATA1 : 0x34 */
+#define OTP_LVL_MASK (1<<5)
+#define OTP_LVL_NORMAL (0<<5)
+#define OTP_LVL_LOW (1<<5)
+
+/* PROTECTION : 0x36 */
+#define EDGE_DIS_MASK (1<<7)
+#define EDGE_DIS_ENABLE (0<<7)
+#define EDGE_DIS_DISABLE (1<<7)
+
+#define SPK_OCP_DIS_MASK (1<<3)
+#define SPK_OCP_ENABLE (0<<3)
+#define SPK_OCP_DISABLE (1<<3)
+
+#define OCP_MODE_MASK (1<<2)
+#define AUTO_RECOVER (0<<2)
+#define SHUT_DOWN_PERMANENT (1<<2)
+
+#define OTP_MODE_MASK (3<<0)
+#define OTP_MODE_DISABLE (0<<0)
+#define IG_THR1_SHUT_THR2 (1<<0)
+#define REC_THR1_SHUT_THR2 (2<<0)
+#define SHUT_THR1_SHUT_THR2 (3<<0)
+
+/* TEST2 : 0x3C */
+#define SPK_HSDM_BP_MASK (1<<4)
+#define SPK_HSDM_ENABLE (0<<4)
+#define SPK_HSDM_BYPASS (1<<4)
+
+#define SDM_SYNC_DIS_MASK (1<<5)
+#define SDM_SYNC_NORMAL (0<<5)
+#define SDM_SYNC_DISABLE (1<<5)
+
+/* ATEST2 : 0x3F */
+#define SPK_OUT_FREQ_MASK (1<<2)
+#define SPK_OUT_FREQ_360K (0<<2)
+#define SPK_OUT_FREQ_410K (1<<2)
+
+#define LOW_POWER_MODE_MASK (1<<3)
+#define LOW_POWER_MODE_DISABLE (0<<3)
+#define LOW_POWER_MODE_ENABLE (1<<3)
+
+#define THERMAL_ADJUST_MASK (3<<5)
+#define THERMAL_150_110 (0<<5)
+#define THERMAL_160_120 (1<<5)
+#define THERMAL_140_100 (2<<5)
+
+#define FAST_OFF_DRIVE_SPK_MASK (1<<0)
+#define FAST_OFF_DRIVE_SPK_DISABLE (0<<0)
+#define FAST_OFF_DRIVE_SPK_ENABLE (1<<0)
+
+/* PLL_CTRL : 0x8E */
+#define TRM_LVL_MASK (1<<4)
+#define TRM_LVL_NORMAL (0<<4)
+#define TRM_LVL_LOW (1<<4)
+
+#define LOW_OCL_MODE_MASK (1<<3)
+#define LOW_OCL_MODE (0<<3)
+#define NORMAL_OCL_MODE (1<<3)
+
+#define PLL_PD2_MASK (7<<0)
+#define PLL_PD2 (7<<0)
+#define PLL_OPERATION2 (0<<0)
+
+/* POSTSCALER : 0x90 */
+#define BYP_POST_MASK (1<<0)
+#define EN_POST_SCALER (0<<0)
+#define BYP_POST_SCALER (1<<0)
+
+/* FDPEC CONTROL : 0x92 */
+#define FLT_VDD_GAIN_MASK (15<<4)
+#define FLT_VDD_GAIN_2P40 (0<<4)
+#define FLT_VDD_GAIN_2P45 (1<<4)
+#define FLT_VDD_GAIN_2P50 (2<<4)
+#define FLT_VDD_GAIN_2P55 (3<<4)
+#define FLT_VDD_GAIN_2P60 (4<<4)
+#define FLT_VDD_GAIN_2P65 (5<<4)
+#define FLT_VDD_GAIN_2P70 (6<<4)
+#define FLT_VDD_GAIN_2P75 (7<<4)
+#define FLT_VDD_GAIN_2P80 (8<<4)
+#define FLT_VDD_GAIN_2P85 (9<<4)
+#define FLT_VDD_GAIN_2P90 (10<<4)
+#define FLT_VDD_GAIN_2P95 (11<<4)
+#define FLT_VDD_GAIN_3P00 (12<<4)
+#define FLT_VDD_GAIN_3P05 (13<<4)
+#define FLT_VDD_GAIN_3P10 (14<<4)
+#define FLT_VDD_GAIN_3P15 (15<<4)
+
+#define DIS_FCHG_MASK (1<<2)
+#define EN_FAST_CHARGE (0<<2)
+#define DIS_FAST_CHARGE (1<<2)
+
+/* BOOST_CONTROL4 : 0x97 */
+#define TRM_VBST_MASK (7<<2)
+#define TRM_VBST_5P5 (0<<2)
+#define TRM_VBST_5P6 (1<<2)
+#define TRM_VBST_5P7 (2<<2)
+#define TRM_VBST_5P8 (3<<2)
+#define TRM_VBST_5P9 (4<<2)
+#define TRM_VBST_6P0 (5<<2)
+#define TRM_VBST_6P1 (6<<2)
+#define TRM_VBST_6P2 (7<<2)
+
+/* TOP_MAN1 : 0xA2 */
+#define PLL_LOCK_SKIP_MASK (1<<7)
+#define PLL_LOCK_ENABLE (0<<7)
+#define PLL_LOCK_DISABLE (1<<7)
+
+#define PLL_PD_MASK (1<<6)
+#define PLL_OPERATION (0<<6)
+#define PLL_PD (1<<6)
+
+#define PLL_DIV_MASK (3<<4)
+#define PLL_OUT (0<<4)
+#define PLL_OUT_2 (1<<4)
+#define PLL_OUT_4 (2<<4)
+#define PLL_OUT_8 (3<<4)
+
+#define PLL_REF_CLK_MASK (1<<3)
+#define PLL_REF_CLK1 (0<<3)
+#define PLL_SCK (1<<3)
+
+#define DAC_DN_CONV_MASK (1<<2)
+#define DAC_DN_CONV_DISABLE (0<<2)
+#define DAC_DN_CONV_ENABLE (1<<2)
+
+#define SDO_IO_MASK (1<<1)
+#define HIGH_Z_LRCK_H (0<<1)
+#define HIGH_Z_LRCK_L (1<<1)
+
+#define SDO_OUTPUT2_MASK (1<<0)
+#define SDO_NORMAL (0<<0)
+#define SDO_OUTPUT_ONLY (1<<0)
+
+/* TOP_MAN2 : 0xA3 */
+#define MON_OSC_PLL_MASK (1<<7)
+#define PLL_SDO (0<<7)
+#define PLL_OSC (1<<7)
+
+#define TEST_CLKO_EN_MASK (1<<6)
+#define NORMAL_SDO (0<<6)
+#define CLK_OUT_SDO (1<<6)
+
+#define SDO_OUTPUT_MASK (1<<3)
+#define NORMAL_OUT (0<<3)
+#define HIGH_Z_OUT (1<<3)
+
+#define CLOCK_MON_MASK (1<<1)
+#define CLOCK_MON (0<<1)
+#define CLOCK_NOT_MON (1<<1)
+
+#define OSC_PD_MASK (1<<0)
+#define NORMAL_OPERATION_OSC (0<<0)
+#define POWER_DOWN_OSC (1<<0)
+
+/* TOP_MAN3 0xA4 */
+#define O_FORMAT_MASK (7<<5)
+#define O_FMT_LJ (1<<5)
+#define O_FMT_I2S (2<<5)
+#define O_FMT_TDM (4<<5)
+
+#define SCK_RATE_MASK (1<<3)
+#define SCK_64FS (0<<3)
+#define SCK_32FS (2<<3)
+
+#define LRCK_POL_MASK (1<<0)
+#define L_VALID (0<<0)
+#define R_VALID (1<<0)
+
+/* TDM1 FORMAT : 0xA5 */
+#define TDM_CLK_POL_MASK (1<<7)
+#define TDM_CLK_POL_RISE (0<<7)
+#define TDM_CLK_POL_FALL (1<<7)
+
+#define TDM_TX_MODE_MASK (1<<6)
+#define TDM_TX_MONO (0<<6)
+#define TDM_TX_STEREO (1<<6)
+
+#define TDM_SLOT1_RX_POS_MASK (7<<3)
+#define TDM_SLOT1_RX_POS_0 (0<<3)
+#define TDM_SLOT1_RX_POS_1 (1<<3)
+#define TDM_SLOT1_RX_POS_2 (2<<3)
+#define TDM_SLOT1_RX_POS_3 (3<<3)
+#define TDM_SLOT1_RX_POS_4 (4<<3)
+#define TDM_SLOT1_RX_POS_5 (5<<3)
+#define TDM_SLOT1_RX_POS_6 (6<<3)
+#define TDM_SLOT1_RX_POS_7 (7<<3)
+
+#define TDM_SLOT2_RX_POS_MASK (7<<0)
+#define TDM_SLOT2_RX_POS_0 (0<<0)
+#define TDM_SLOT2_RX_POS_1 (1<<0)
+#define TDM_SLOT2_RX_POS_2 (2<<0)
+#define TDM_SLOT2_RX_POS_3 (3<<0)
+#define TDM_SLOT2_RX_POS_4 (4<<0)
+#define TDM_SLOT2_RX_POS_5 (5<<0)
+#define TDM_SLOT2_RX_POS_6 (6<<0)
+#define TDM_SLOT2_RX_POS_7 (7<<0)
+
+/* TDM2 FORMAT : 0xA6 */
+#define TDM_DL_MASK (1<<7)
+#define TDM_DL_16 (0<<7)
+#define TDM_DL_32 (1<<7)
+
+#define TDM_N_SLOT_MASK (1<<6)
+#define TDM_N_SLOT_4 (0<<6)
+#define TDM_N_SLOT_8 (1<<6)
+
+#define TDM_SLOT1_TX_POS_MASK (7<<3)
+#define TDM_SLOT1_TX_POS_0 (0<<3)
+#define TDM_SLOT1_TX_POS_1 (1<<3)
+#define TDM_SLOT1_TX_POS_2 (2<<3)
+#define TDM_SLOT1_TX_POS_3 (3<<3)
+#define TDM_SLOT1_TX_POS_4 (4<<3)
+#define TDM_SLOT1_TX_POS_5 (5<<3)
+#define TDM_SLOT1_TX_POS_6 (6<<3)
+#define TDM_SLOT1_TX_POS_7 (7<<3)
+
+#define TDM_SLOT2_TX_POS_MASK (7<<0)
+#define TDM_SLOT2_TX_POS_0 (0<<0)
+#define TDM_SLOT2_TX_POS_1 (1<<0)
+#define TDM_SLOT2_TX_POS_2 (2<<0)
+#define TDM_SLOT2_TX_POS_3 (3<<0)
+#define TDM_SLOT2_TX_POS_4 (4<<0)
+#define TDM_SLOT2_TX_POS_5 (5<<0)
+#define TDM_SLOT2_TX_POS_6 (6<<0)
+#define TDM_SLOT2_TX_POS_7 (7<<0)
+
+/* STATUS1 : 0xFA */
+#define OT1_OK_STATUS (1<<7)
+#define OT2_OK_STATUS (1<<6)
+
+/* STATUS2 : 0xFB */
+#define OCP_SPK_STATUS (1<<5)
+#define OCP_BST_STATUS (1<<4)
+#define OTP_STAT_OK_0 (5<<1)
+#define OTP_STAT_OK_1 (2<<2)
+
+#define CLK_MON_STATUS (1<<0)
+
+/* DEVICE_INFO : 0xFF */
+#define DEVICE_ID (2<<3)
+#define UVLO_BST_STATUS (1<<2)
+#define REV_NUM_STATUS (3<<0)
+#define REV_NUM_TV0 (0<<0)
+#define REV_NUM_TV1 (1<<0)
+
+#endif
--
2.30.2
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 02/14] ASoC: dt-bindings: sma1303: Iron Device SMA1303 Amp
2023-01-06 9:15 [PATCH 00/14] ASoC: Add a driver the Iron Device SMA1303 AMP Kiseok Jo
2023-01-06 9:15 ` [PATCH 01/14] ASoC: sma1303: Add driver for Iron Device SMA1303 Amp Kiseok Jo
@ 2023-01-06 9:15 ` Kiseok Jo
2023-01-06 9:15 ` [PATCH 03/14] Add the i2c-retry count and callback function in regmap function Kiseok Jo
` (11 subsequent siblings)
13 siblings, 0 replies; 26+ messages in thread
From: Kiseok Jo @ 2023-01-06 9:15 UTC (permalink / raw)
To: Mark Brown; +Cc: alsa-devel, application, Kiseok Jo
Modified the schema binding and added the vendor prefixes.
Signed-off-by: Kiseok Jo <kiseok.jo@irondevice.com>
---
.../bindings/sound/irondevice,sma1303.yaml | 40 +++++++++++++++++++
.../devicetree/bindings/vendor-prefixes.yaml | 2 +
2 files changed, 42 insertions(+)
create mode 100644 Documentation/devicetree/bindings/sound/irondevice,sma1303.yaml
diff --git a/Documentation/devicetree/bindings/sound/irondevice,sma1303.yaml b/Documentation/devicetree/bindings/sound/irondevice,sma1303.yaml
new file mode 100644
index 000000000000..8c3b85f962ff
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/irondevice,sma1303.yaml
@@ -0,0 +1,40 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/sound/irondevice,sma1303.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Iron Device SMA1303 Audio Amplifier
+
+maintainers:
+ - Kiseok Jo <kiseok.jo@irondevice.com>
+
+description:
+ SMA1303 digital class-D audio amplifier with an integrated boost converter.
+
+allOf:
+ - $ref: name-prefix.yaml#
+
+properties:
+ compatible:
+ const: irondevice,sma1303
+
+ reg:
+ description:
+ I2C address of the amplifier. See the datasheet for possible values.
+
+required:
+ - compatible
+ - reg
+
+additionalProperties: true
+
+examples:
+ - |
+ #include <dt-bindings/gpio/gpio.h>
+ i2c_bus {
+ sma1303_amp: sma1303@1e {
+ compatible = "irondevice,sma1303";
+ reg = <0x1e>;
+ };
+ };
\ No newline at end of file
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentation/devicetree/bindings/vendor-prefixes.yaml
index 70ffb3780621..271ff119764a 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
+++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
@@ -635,6 +635,8 @@ patternProperties:
description: Inverse Path
"^iom,.*":
description: Iomega Corporation
+ "^irondevice,.*":
+ description: Iron Device Corporation
"^isee,.*":
description: ISEE 2007 S.L.
"^isil,.*":
--
2.30.2
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 03/14] Add the i2c-retry count and callback function in regmap function.
2023-01-06 9:15 [PATCH 00/14] ASoC: Add a driver the Iron Device SMA1303 AMP Kiseok Jo
2023-01-06 9:15 ` [PATCH 01/14] ASoC: sma1303: Add driver for Iron Device SMA1303 Amp Kiseok Jo
2023-01-06 9:15 ` [PATCH 02/14] ASoC: dt-bindings: sma1303: " Kiseok Jo
@ 2023-01-06 9:15 ` Kiseok Jo
2023-01-06 9:15 ` [PATCH 04/14] Removed the usage control and add the power switch on DAPM route Kiseok Jo
` (10 subsequent siblings)
13 siblings, 0 replies; 26+ messages in thread
From: Kiseok Jo @ 2023-01-06 9:15 UTC (permalink / raw)
To: Mark Brown; +Cc: alsa-devel, application, Kiseok Jo
Signed-off-by: Kiseok Jo <kiseok.jo@irondevice.com>
Reported-by: Mark Brown <broonie@kernel.org>
---
sound/soc/codecs/sma1303.c | 261 ++++++++++++++++++++-----------------
sound/soc/codecs/sma1303.h | 9 ++
2 files changed, 147 insertions(+), 123 deletions(-)
diff --git a/sound/soc/codecs/sma1303.c b/sound/soc/codecs/sma1303.c
index 50b471920fc8..8bd59a481f2d 100644
--- a/sound/soc/codecs/sma1303.c
+++ b/sound/soc/codecs/sma1303.c
@@ -47,6 +47,8 @@ enum sma1303_type {
SMA1303,
};
+struct callback_ops gCallback;
+
struct sma1303_pll_match {
char *input_clk_name;
char *output_clk_name;
@@ -69,6 +71,7 @@ struct sma1303_priv {
bool amp_power_status;
bool usage_status;
int num_of_pll_matches;
+ int retry_cnt;
unsigned int sys_clk_id;
unsigned int init_vol;
unsigned int cur_vol;
@@ -233,28 +236,66 @@ static bool sma1303_volatile_register(struct device *dev, unsigned int reg)
static const DECLARE_TLV_DB_SCALE(sma1303_spk_tlv, -6000, 50, 0);
-static int sma1303_regmap_write(struct regmap *map, struct device *dev,
+void sma1303_set_callback_func(struct callback_ops ops)
+{
+ if (ops.set_i2c_err)
+ gCallback.set_i2c_err = ops.set_i2c_err;
+}
+EXPORT_SYMBOL(sma1303_set_callback_func);
+
+static int sma1303_regmap_write(struct sma1303_priv *sma1303,
unsigned int reg, unsigned int val)
{
int ret = 0;
+ int cnt = sma1303->retry_cnt;
- ret = regmap_write(map, reg, val);
- if (ret < 0) {
- dev_err(dev, "Failed to write, register: 0x%02X, ret: %d\n",
- reg, ret);
+ while (cnt--) {
+ ret = regmap_write(sma1303->regmap, reg, val);
+ if (ret < 0) {
+ dev_err(sma1303->dev,
+ "Failed to write [0x%02X]\n", reg);
+ if (gCallback.set_i2c_err)
+ gCallback.set_i2c_err(sma1303->dev, ret);
+ } else
+ break;
}
return ret;
}
-static int sma1303_regmap_update_bits(struct regmap *map, struct device *dev,
+static int sma1303_regmap_update_bits(struct sma1303_priv *sma1303,
unsigned int reg, unsigned int mask, unsigned int val)
{
int ret = 0;
+ int cnt = sma1303->retry_cnt;
- ret = regmap_update_bits(map, reg, mask, val);
- if (ret < 0) {
- dev_err(dev, "Failed to write, register: 0x%02X, ret: %d\n",
- reg, ret);
+ while (cnt--) {
+ ret = regmap_update_bits(sma1303->regmap, reg, mask, val);
+ if (ret < 0) {
+ dev_err(sma1303->dev,
+ "Failed to update [0x%02X]\n", reg);
+ if (gCallback.set_i2c_err)
+ gCallback.set_i2c_err(sma1303->dev, ret);
+ } else
+ break;
+ }
+ return ret;
+}
+
+static int sma1303_regmap_read(struct sma1303_priv *sma1303,
+ unsigned int reg, unsigned int *val)
+{
+ int ret;
+ int cnt = sma1303->retry_cnt;
+
+ while (cnt--) {
+ ret = regmap_read(sma1303->regmap, reg, val);
+ if (ret < 0) {
+ dev_err(sma1303->dev,
+ "Failed to read [0x%02X]\n", reg);
+ if (gCallback.set_i2c_err)
+ gCallback.set_i2c_err(sma1303->dev, ret);
+ } else
+ break;
}
return ret;
}
@@ -280,7 +321,7 @@ static int bytes_ext_get(struct snd_kcontrol *kcontrol,
}
val = (u8 *)ucontrol->value.bytes.data;
for (i = 0; i < params->max; i++) {
- ret = regmap_read(sma1303->regmap, reg + i, ®_val);
+ ret = sma1303_regmap_read(sma1303, reg + i, ®_val);
if (ret < 0) {
dev_err(component->dev,
"Failed to read, register: %x ret: %d\n",
@@ -323,9 +364,7 @@ static int bytes_ext_put(struct snd_kcontrol *kcontrol,
val = (u8 *)data;
for (i = 0; i < params->max; i++) {
- ret = sma1303_regmap_write(
- sma1303->regmap, component->dev,
- reg + i, *(val + i));
+ ret = sma1303_regmap_write(sma1303, reg + i, *(val + i));
if (ret < 0) {
kfree(data);
return ret;
@@ -463,32 +502,26 @@ static int sma1303_amp_mode_put(struct snd_kcontrol *kcontrol,
switch (sma1303->amp_mode) {
case ONE_CHIP_SOLUTION:
case MONO_TWO_CHIP_SOLUTION:
- ret += sma1303_regmap_update_bits(
- sma1303->regmap, component->dev,
+ ret += sma1303_regmap_update_bits(sma1303,
SMA1303_11_SYSTEM_CTRL2,
MONOMIX_MASK, MONOMIX_ON);
- ret += sma1303_regmap_update_bits(
- sma1303->regmap, component->dev,
+ ret += sma1303_regmap_update_bits(sma1303,
SMA1303_11_SYSTEM_CTRL2,
LR_DATA_SW_MASK, LR_DATA_SW_NORMAL);
break;
case LEFT_TWO_CHIP_SOLUTION:
- ret += sma1303_regmap_update_bits(
- sma1303->regmap, component->dev,
+ ret += sma1303_regmap_update_bits(sma1303,
SMA1303_11_SYSTEM_CTRL2,
MONOMIX_MASK, MONOMIX_OFF);
- ret += sma1303_regmap_update_bits(
- sma1303->regmap, component->dev,
+ ret += sma1303_regmap_update_bits(sma1303,
SMA1303_11_SYSTEM_CTRL2,
LR_DATA_SW_MASK, LR_DATA_SW_NORMAL);
break;
case RIGHT_TWO_CHIP_SOLUTION:
- ret += sma1303_regmap_update_bits(
- sma1303->regmap, component->dev,
+ ret += sma1303_regmap_update_bits(sma1303,
SMA1303_11_SYSTEM_CTRL2,
MONOMIX_MASK, MONOMIX_OFF);
- ret += sma1303_regmap_update_bits(
- sma1303->regmap, component->dev,
+ ret += sma1303_regmap_update_bits(sma1303,
SMA1303_11_SYSTEM_CTRL2,
LR_DATA_SW_MASK, LR_DATA_SW_SWAP);
break;
@@ -524,7 +557,7 @@ static int sma1303_outport_config_get(struct snd_kcontrol *kcontrol,
return ret;
}
- ret = regmap_read(sma1303->regmap, SMA1303_09_OUTPUT_CTRL, &data);
+ ret = sma1303_regmap_read(sma1303, SMA1303_09_OUTPUT_CTRL, &data);
if (ret < 0) {
dev_err(component->dev,
"Failed to read, register: %x ret: %d\n",
@@ -582,7 +615,7 @@ static int sma1303_outport_config_put(struct snd_kcontrol *kcontrol,
return ret;
}
- return sma1303_regmap_update_bits(sma1303->regmap, component->dev,
+ return sma1303_regmap_update_bits(sma1303,
SMA1303_09_OUTPUT_CTRL, PORT_CONFIG_MASK, val);
}
@@ -618,7 +651,7 @@ static int sma1303_spkmode_get(struct snd_kcontrol *kcontrol,
return ret;
}
- ret = regmap_read(sma1303->regmap, SMA1303_10_SYSTEM_CTRL1, &data);
+ ret = sma1303_regmap_read(sma1303, SMA1303_10_SYSTEM_CTRL1, &data);
if (ret < 0) {
dev_err(component->dev,
"Failed to read, register: %x ret: %d\n",
@@ -695,7 +728,7 @@ static int sma1303_spkmode_put(struct snd_kcontrol *kcontrol,
return ret;
}
- return sma1303_regmap_update_bits(sma1303->regmap, component->dev,
+ return sma1303_regmap_update_bits(sma1303,
SMA1303_10_SYSTEM_CTRL1, SPK_MODE_MASK, val);
}
@@ -735,7 +768,7 @@ static int sma1303_postscaler_config_get(struct snd_kcontrol *kcontrol,
return ret;
}
- ret = regmap_read(sma1303->regmap, SMA1303_90_POSTSCALER, &data);
+ ret = sma1303_regmap_read(sma1303, SMA1303_90_POSTSCALER, &data);
if (ret < 0) {
dev_err(component->dev,
"Failed to read, register: %x ret: %d\n",
@@ -793,7 +826,7 @@ static int sma1303_postscaler_config_put(struct snd_kcontrol *kcontrol,
return ret;
}
- return sma1303_regmap_update_bits(sma1303->regmap, component->dev,
+ return sma1303_regmap_update_bits(sma1303,
SMA1303_90_POSTSCALER, BYP_POST_MASK, val);
}
@@ -820,7 +853,7 @@ static int sma1303_o_format_get(struct snd_kcontrol *kcontrol,
return ret;
}
- ret = regmap_read(sma1303->regmap, SMA1303_A4_TOP_MAN3, &data);
+ ret = sma1303_regmap_read(sma1303, SMA1303_A4_TOP_MAN3, &data);
val = data & O_FORMAT_MASK;
switch (val) {
case O_FMT_LJ:
@@ -876,7 +909,7 @@ static int sma1303_o_format_put(struct snd_kcontrol *kcontrol,
return ret;
}
- return sma1303_regmap_update_bits(sma1303->regmap, component->dev,
+ return sma1303_regmap_update_bits(sma1303,
SMA1303_A4_TOP_MAN3, O_FORMAT_MASK, val);
}
@@ -927,17 +960,17 @@ static int sma1303_startup(struct snd_soc_component *component)
return ret;
}
- ret += sma1303_regmap_update_bits(sma1303->regmap, component->dev,
+ ret += sma1303_regmap_update_bits(sma1303,
SMA1303_8E_PLL_CTRL, PLL_PD2_MASK, PLL_OPERATION2);
- ret += sma1303_regmap_update_bits(sma1303->regmap, component->dev,
+ ret += sma1303_regmap_update_bits(sma1303,
SMA1303_00_SYSTEM_CTRL, POWER_MASK, POWER_ON);
if (sma1303->amp_mode == ONE_CHIP_SOLUTION)
- ret += sma1303_regmap_update_bits(sma1303->regmap, component->dev,
+ ret += sma1303_regmap_update_bits(sma1303,
SMA1303_10_SYSTEM_CTRL1, SPK_MODE_MASK, SPK_MONO);
else
- ret += sma1303_regmap_update_bits(sma1303->regmap, component->dev,
+ ret += sma1303_regmap_update_bits(sma1303,
SMA1303_10_SYSTEM_CTRL1, SPK_MODE_MASK, SPK_STEREO);
if (sma1303->check_fault_status) {
@@ -951,7 +984,7 @@ static int sma1303_startup(struct snd_soc_component *component)
CHECK_PERIOD_TIME * HZ);
}
- ret += sma1303_regmap_update_bits(sma1303->regmap, component->dev,
+ ret += sma1303_regmap_update_bits(sma1303,
SMA1303_0E_MUTE_VOL_CTRL, SPK_MUTE_MASK, SPK_UNMUTE);
sma1303->amp_power_status = true;
@@ -970,20 +1003,20 @@ static int sma1303_shutdown(struct snd_soc_component *component)
return ret;
}
- ret += sma1303_regmap_update_bits(sma1303->regmap, component->dev,
+ ret += sma1303_regmap_update_bits(sma1303,
SMA1303_0E_MUTE_VOL_CTRL, SPK_MUTE_MASK, SPK_MUTE);
cancel_delayed_work_sync(&sma1303->check_fault_work);
msleep(55);
- ret += sma1303_regmap_update_bits(sma1303->regmap, component->dev,
+ ret += sma1303_regmap_update_bits(sma1303,
SMA1303_10_SYSTEM_CTRL1, SPK_MODE_MASK, SPK_OFF);
- ret += sma1303_regmap_update_bits(sma1303->regmap, component->dev,
+ ret += sma1303_regmap_update_bits(sma1303,
SMA1303_00_SYSTEM_CTRL, POWER_MASK, POWER_OFF);
- ret += sma1303_regmap_update_bits(sma1303->regmap, component->dev,
+ ret += sma1303_regmap_update_bits(sma1303,
SMA1303_8E_PLL_CTRL, PLL_PD2_MASK, PLL_PD2);
sma1303->amp_power_status = false;
@@ -1059,14 +1092,12 @@ static int sma1303_dac_feedback_event(struct snd_soc_dapm_widget *w,
case SND_SOC_DAPM_PRE_PMU:
dev_info(component->dev,
"%s : DAC feedback ON\n", __func__);
- ret += sma1303_regmap_update_bits(
- sma1303->regmap, component->dev,
+ ret += sma1303_regmap_update_bits(sma1303,
SMA1303_09_OUTPUT_CTRL,
PORT_CONFIG_MASK|PORT_OUT_SEL_MASK,
OUTPUT_PORT_ENABLE|SPEAKER_PATH);
- ret += sma1303_regmap_update_bits(
- sma1303->regmap, component->dev,
+ ret += sma1303_regmap_update_bits(sma1303,
SMA1303_A3_TOP_MAN2,
SDO_OUTPUT_MASK, NORMAL_OUT);
break;
@@ -1074,13 +1105,11 @@ static int sma1303_dac_feedback_event(struct snd_soc_dapm_widget *w,
case SND_SOC_DAPM_PRE_PMD:
dev_info(component->dev,
"%s : DAC feedback OFF\n", __func__);
- ret += sma1303_regmap_update_bits(
- sma1303->regmap, component->dev,
+ ret += sma1303_regmap_update_bits(sma1303,
SMA1303_09_OUTPUT_CTRL,
PORT_OUT_SEL_MASK, OUT_SEL_DISABLE);
- ret += sma1303_regmap_update_bits(
- sma1303->regmap, component->dev,
+ ret += sma1303_regmap_update_bits(sma1303,
SMA1303_A3_TOP_MAN2, SDO_OUTPUT_MASK,
HIGH_Z_OUT);
break;
@@ -1138,26 +1167,25 @@ static int sma1303_setup_pll(struct snd_soc_component *component,
return -EINVAL;
}
- ret += sma1303_regmap_update_bits(
- sma1303->regmap, component->dev,
+ ret += sma1303_regmap_update_bits(sma1303,
SMA1303_A2_TOP_MAN1,
PLL_PD_MASK|PLL_REF_CLK_MASK,
PLL_OPERATION|PLL_SCK);
}
- ret += sma1303_regmap_write(sma1303->regmap, component->dev,
+ ret += sma1303_regmap_write(sma1303,
SMA1303_8B_PLL_POST_N,
sma1303->pll_matches[i].post_n);
- ret += sma1303_regmap_write(sma1303->regmap, component->dev,
+ ret += sma1303_regmap_write(sma1303,
SMA1303_8C_PLL_N,
sma1303->pll_matches[i].n);
- ret += sma1303_regmap_write(sma1303->regmap, component->dev,
+ ret += sma1303_regmap_write(sma1303,
SMA1303_8D_PLL_A_SETTING,
sma1303->pll_matches[i].vco);
- ret += sma1303_regmap_write(sma1303->regmap, component->dev,
+ ret += sma1303_regmap_write(sma1303,
SMA1303_8F_PLL_P_CP,
sma1303->pll_matches[i].p_cp);
@@ -1211,25 +1239,21 @@ static int sma1303_dai_hw_params_amp(struct snd_pcm_substream *substream,
case 44100:
case 48000:
case 96000:
- ret += sma1303_regmap_update_bits(
- sma1303->regmap, component->dev,
+ ret += sma1303_regmap_update_bits(sma1303,
SMA1303_A2_TOP_MAN1,
DAC_DN_CONV_MASK, DAC_DN_CONV_DISABLE);
- ret += sma1303_regmap_update_bits(
- sma1303->regmap, component->dev,
+ ret += sma1303_regmap_update_bits(sma1303,
SMA1303_01_INPUT1_CTRL1,
LEFTPOL_MASK, LOW_FIRST_CH);
break;
case 192000:
- ret += sma1303_regmap_update_bits(
- sma1303->regmap, component->dev,
+ ret += sma1303_regmap_update_bits(sma1303,
SMA1303_A2_TOP_MAN1,
DAC_DN_CONV_MASK, DAC_DN_CONV_ENABLE);
- ret += sma1303_regmap_update_bits(
- sma1303->regmap, component->dev,
+ ret += sma1303_regmap_update_bits(sma1303,
SMA1303_01_INPUT1_CTRL1,
LEFTPOL_MASK, HIGH_FIRST_CH);
break;
@@ -1249,8 +1273,7 @@ static int sma1303_dai_hw_params_amp(struct snd_pcm_substream *substream,
dev_info(component->dev,
"%s set format SNDRV_PCM_FORMAT_S16_LE\n",
__func__);
- ret += sma1303_regmap_update_bits(
- sma1303->regmap, component->dev,
+ ret += sma1303_regmap_update_bits(sma1303,
SMA1303_A4_TOP_MAN3,
SCK_RATE_MASK, SCK_32FS);
break;
@@ -1259,8 +1282,7 @@ static int sma1303_dai_hw_params_amp(struct snd_pcm_substream *substream,
dev_info(component->dev,
"%s set format SNDRV_PCM_FORMAT_S24_LE\n",
__func__);
- ret += sma1303_regmap_update_bits(
- sma1303->regmap, component->dev,
+ ret += sma1303_regmap_update_bits(sma1303,
SMA1303_A4_TOP_MAN3,
SCK_RATE_MASK, SCK_64FS);
break;
@@ -1268,8 +1290,7 @@ static int sma1303_dai_hw_params_amp(struct snd_pcm_substream *substream,
dev_info(component->dev,
"%s set format SNDRV_PCM_FORMAT_S32_LE\n",
__func__);
- ret += sma1303_regmap_update_bits(
- sma1303->regmap, component->dev,
+ ret += sma1303_regmap_update_bits(sma1303,
SMA1303_A4_TOP_MAN3,
SCK_RATE_MASK, SCK_64FS);
break;
@@ -1317,8 +1338,7 @@ static int sma1303_dai_hw_params_amp(struct snd_pcm_substream *substream,
return -EINVAL;
}
- ret += sma1303_regmap_update_bits(
- sma1303->regmap, component->dev,
+ ret += sma1303_regmap_update_bits(sma1303,
SMA1303_01_INPUT1_CTRL1,
I2S_MODE_MASK, input_format);
return ret;
@@ -1365,15 +1385,13 @@ static int sma1303_dai_mute(struct snd_soc_dai *dai, int mute, int stream)
if (mute) {
dev_info(component->dev, "%s : %s\n", __func__, "MUTE");
- ret += sma1303_regmap_update_bits(
- sma1303->regmap, component->dev,
+ ret += sma1303_regmap_update_bits(sma1303,
SMA1303_0E_MUTE_VOL_CTRL,
SPK_MUTE_MASK, SPK_MUTE);
} else {
dev_info(component->dev, "%s : %s\n", __func__, "UNMUTE");
- ret += sma1303_regmap_update_bits(
- sma1303->regmap, component->dev,
+ ret += sma1303_regmap_update_bits(sma1303,
SMA1303_0E_MUTE_VOL_CTRL,
SPK_MUTE_MASK, SPK_UNMUTE);
}
@@ -1393,8 +1411,7 @@ static int sma1303_dai_set_fmt_amp(struct snd_soc_dai *dai,
case SND_SOC_DAIFMT_CBS_CFS:
dev_info(component->dev,
"%s : %s\n", __func__, "I2S/TDM Device mode");
- ret += sma1303_regmap_update_bits(
- sma1303->regmap, component->dev,
+ ret += sma1303_regmap_update_bits(sma1303,
SMA1303_01_INPUT1_CTRL1,
CONTROLLER_DEVICE_MASK, DEVICE_MODE);
break;
@@ -1402,8 +1419,7 @@ static int sma1303_dai_set_fmt_amp(struct snd_soc_dai *dai,
case SND_SOC_DAIFMT_CBM_CFM:
dev_info(component->dev,
"%s : %s\n", __func__, "I2S/TDM Controller mode");
- ret += sma1303_regmap_update_bits(
- sma1303->regmap, component->dev,
+ ret += sma1303_regmap_update_bits(sma1303,
SMA1303_01_INPUT1_CTRL1,
CONTROLLER_DEVICE_MASK, CONTROLLER_MODE);
break;
@@ -1434,16 +1450,14 @@ static int sma1303_dai_set_fmt_amp(struct snd_soc_dai *dai,
case SND_SOC_DAIFMT_IB_NF:
dev_info(component->dev, "%s : %s\n",
__func__, "Invert BCLK + Normal Frame");
- ret += sma1303_regmap_update_bits(
- sma1303->regmap, component->dev,
+ ret += sma1303_regmap_update_bits(sma1303,
SMA1303_01_INPUT1_CTRL1,
SCK_RISING_MASK, SCK_RISING_EDGE);
break;
case SND_SOC_DAIFMT_IB_IF:
dev_info(component->dev, "%s : %s\n",
__func__, "Invert BCLK + Invert Frame");
- ret += sma1303_regmap_update_bits(
- sma1303->regmap, component->dev,
+ ret += sma1303_regmap_update_bits(sma1303,
SMA1303_01_INPUT1_CTRL1,
LEFTPOL_MASK|SCK_RISING_MASK,
HIGH_FIRST_CH|SCK_RISING_EDGE);
@@ -1451,8 +1465,7 @@ static int sma1303_dai_set_fmt_amp(struct snd_soc_dai *dai,
case SND_SOC_DAIFMT_NB_IF:
dev_info(component->dev, "%s : %s\n",
__func__, "Normal BCLK + Invert Frame");
- ret += sma1303_regmap_update_bits(
- sma1303->regmap, component->dev,
+ ret += sma1303_regmap_update_bits(sma1303,
SMA1303_01_INPUT1_CTRL1,
LEFTPOL_MASK, HIGH_FIRST_CH);
break;
@@ -1482,21 +1495,18 @@ static int sma1303_dai_set_tdm_slot(struct snd_soc_dai *dai,
sma1303->frame_size = slot_width * slots;
- ret += sma1303_regmap_update_bits(
- sma1303->regmap, component->dev,
+ ret += sma1303_regmap_update_bits(sma1303,
SMA1303_A4_TOP_MAN3,
O_FORMAT_MASK, O_FMT_TDM);
switch (slot_width) {
case 16:
- ret += sma1303_regmap_update_bits(
- sma1303->regmap, component->dev,
+ ret += sma1303_regmap_update_bits(sma1303,
SMA1303_A6_TDM2,
TDM_DL_MASK, TDM_DL_16);
break;
case 32:
- ret += sma1303_regmap_update_bits(
- sma1303->regmap, component->dev,
+ ret += sma1303_regmap_update_bits(sma1303,
SMA1303_A6_TDM2,
TDM_DL_MASK, TDM_DL_32);
break;
@@ -1507,14 +1517,12 @@ static int sma1303_dai_set_tdm_slot(struct snd_soc_dai *dai,
switch (slots) {
case 4:
- ret += sma1303_regmap_update_bits(
- sma1303->regmap, component->dev,
+ ret += sma1303_regmap_update_bits(sma1303,
SMA1303_A6_TDM2,
TDM_N_SLOT_MASK, TDM_N_SLOT_4);
break;
case 8:
- ret += sma1303_regmap_update_bits(
- sma1303->regmap, component->dev,
+ ret += sma1303_regmap_update_bits(sma1303,
SMA1303_A6_TDM2,
TDM_N_SLOT_MASK, TDM_N_SLOT_8);
break;
@@ -1524,27 +1532,23 @@ static int sma1303_dai_set_tdm_slot(struct snd_soc_dai *dai,
}
if (sma1303->tdm_slot_rx < slots)
- ret += sma1303_regmap_update_bits(
- sma1303->regmap, component->dev,
+ ret += sma1303_regmap_update_bits(sma1303,
SMA1303_A5_TDM1, TDM_SLOT1_RX_POS_MASK,
(sma1303->tdm_slot_rx) << 3);
else
dev_err(component->dev, "%s Incorrect tdm-slot-rx %d set\n",
__func__, sma1303->tdm_slot_rx);
- ret += sma1303_regmap_update_bits(
- sma1303->regmap, component->dev,
+ ret += sma1303_regmap_update_bits(sma1303,
SMA1303_A5_TDM1,
TDM_CLK_POL_MASK, TDM_CLK_POL_RISE);
- ret += sma1303_regmap_update_bits(
- sma1303->regmap, component->dev,
+ ret += sma1303_regmap_update_bits(sma1303,
SMA1303_A5_TDM1,
TDM_TX_MODE_MASK, TDM_TX_MONO);
if (sma1303->tdm_slot_tx < slots)
- ret += sma1303_regmap_update_bits(
- sma1303->regmap, component->dev,
+ ret += sma1303_regmap_update_bits(sma1303,
SMA1303_A6_TDM2, TDM_SLOT1_TX_POS_MASK,
(sma1303->tdm_slot_tx) << 3);
else
@@ -1598,10 +1602,10 @@ static void sma1303_check_fault_worker(struct work_struct *work)
mutex_lock(&sma1303->lock);
if (sma1303->tsdw_cnt)
- ret = regmap_read(sma1303->regmap,
+ ret = sma1303_regmap_read(sma1303,
SMA1303_0A_SPK_VOL, &sma1303->cur_vol);
else
- ret = regmap_read(sma1303->regmap,
+ ret = sma1303_regmap_read(sma1303,
SMA1303_0A_SPK_VOL, &sma1303->init_vol);
if (ret != 0) {
@@ -1611,7 +1615,7 @@ static void sma1303_check_fault_worker(struct work_struct *work)
return;
}
- ret = regmap_read(sma1303->regmap, SMA1303_FA_STATUS1, &over_temp);
+ ret = sma1303_regmap_read(sma1303, SMA1303_FA_STATUS1, &over_temp);
if (ret != 0) {
dev_err(sma1303->dev,
"failed to read SMA1303_FA_STATUS1 : %d\n", ret);
@@ -1619,7 +1623,7 @@ static void sma1303_check_fault_worker(struct work_struct *work)
return;
}
- ret = regmap_read(sma1303->regmap, SMA1303_FB_STATUS2, &ocp_val);
+ ret = sma1303_regmap_read(sma1303, SMA1303_FB_STATUS2, &ocp_val);
if (ret != 0) {
dev_err(sma1303->dev,
"failed to read SMA1303_FB_STATUS2 : %d\n", ret);
@@ -1627,7 +1631,7 @@ static void sma1303_check_fault_worker(struct work_struct *work)
return;
}
- ret = regmap_read(sma1303->regmap, SMA1303_FF_DEVICE_INDEX, &uvlo_val);
+ ret = sma1303_regmap_read(sma1303, SMA1303_FF_DEVICE_INDEX, &uvlo_val);
if (ret != 0) {
dev_err(sma1303->dev,
"failed to read SMA1303_FF_DEVICE_INDEX : %d\n", ret);
@@ -1640,14 +1644,12 @@ static void sma1303_check_fault_worker(struct work_struct *work)
"%s : OT1(Over Temperature Level 1)\n", __func__);
if ((sma1303->cur_vol + 6) <= 0xFF)
- sma1303_regmap_write(
- sma1303->regmap, sma1303->dev,
+ sma1303_regmap_write(sma1303,
SMA1303_0A_SPK_VOL, sma1303->cur_vol + 6);
sma1303->tsdw_cnt++;
} else if (sma1303->tsdw_cnt) {
- sma1303_regmap_write(
- sma1303->regmap, sma1303->dev,
+ sma1303_regmap_write(sma1303,
SMA1303_0A_SPK_VOL, sma1303->init_vol);
sma1303->tsdw_cnt = 0;
sma1303->cur_vol = sma1303->init_vol;
@@ -1761,12 +1763,11 @@ static int sma1303_probe(struct snd_soc_component *component)
snd_soc_dapm_sync(dapm);
- ret += sma1303_regmap_update_bits(
- sma1303->regmap, component->dev,
+ ret += sma1303_regmap_update_bits(sma1303,
SMA1303_00_SYSTEM_CTRL,
RESETBYI2C_MASK, RESETBYI2C_RESET);
- ret += regmap_read(sma1303->regmap, SMA1303_FF_DEVICE_INDEX, &status);
+ ret += sma1303_regmap_read(sma1303, SMA1303_FF_DEVICE_INDEX, &status);
if (ret < 0) {
dev_err(sma1303->dev,
"failed to read, register: %02X, ret: %d\n",
@@ -1779,7 +1780,7 @@ static int sma1303_probe(struct snd_soc_component *component)
else if (sma1303->rev_num == REV_NUM_TV1)
dev_info(component->dev, "SMA1303 Trimming Version 1\n");
- ret += regmap_read(sma1303->regmap, SMA1303_FB_STATUS2, &otp_stat);
+ ret += sma1303_regmap_read(sma1303, SMA1303_FB_STATUS2, &otp_stat);
if (ret < 0)
dev_err(sma1303->dev,
"failed to read, register: %02X, ret: %d\n",
@@ -1794,12 +1795,11 @@ static int sma1303_probe(struct snd_soc_component *component)
dev_info(component->dev, "SMA1303 OTP Status Fail\n");
for (i = 0; i < (unsigned int)ARRAY_SIZE(sma1303_reg_def); i++)
- ret += sma1303_regmap_write(
- sma1303->regmap, component->dev,
+ ret += sma1303_regmap_write(sma1303,
sma1303_reg_def[i].reg,
sma1303_reg_def[i].def);
- ret += sma1303_regmap_write(sma1303->regmap, component->dev,
+ ret += sma1303_regmap_write(sma1303,
SMA1303_0A_SPK_VOL, sma1303->init_vol);
dev_info(component->dev,
@@ -1949,6 +1949,21 @@ static int sma1303_i2c_probe(struct i2c_client *client,
}
if (np) {
+ if (!of_property_read_u32(np, "i2c-retry", &value)) {
+ if (value > 50 || value < 0) {
+ sma1303->retry_cnt = SMA1303_I2C_RETRY_COUNT;
+ dev_info(&client->dev, "%s : %s\n", __func__,
+ "i2c-retry out of range (up to 50)");
+ } else {
+ sma1303->retry_cnt = value;
+ dev_info(&client->dev, "%s : %s = %d\n",
+ __func__, "i2c-retry count", value);
+ }
+ } else {
+ dev_info(&client->dev, "%s : %s = %d\n", __func__,
+ "i2c-retry count", SMA1303_I2C_RETRY_COUNT);
+ sma1303->retry_cnt = SMA1303_I2C_RETRY_COUNT;
+ }
if (!of_property_read_u32(np, "tdm-slot-rx", &value)) {
dev_info(&client->dev,
"tdm slot rx is '%d' from DT\n", value);
@@ -1995,8 +2010,8 @@ static int sma1303_i2c_probe(struct i2c_client *client,
return -ENODEV;
}
- ret = regmap_read(sma1303->regmap,
- SMA1303_FF_DEVICE_INDEX, &device_info);
+ ret = sma1303_regmap_read(sma1303,
+ SMA1303_FF_DEVICE_INDEX, &device_info);
if ((ret != 0) || ((device_info & 0xF8) != DEVICE_ID)) {
dev_err(&client->dev, "device initialization error (%d 0x%02X)",
diff --git a/sound/soc/codecs/sma1303.h b/sound/soc/codecs/sma1303.h
index d1fa2acaba85..186af18188e9 100644
--- a/sound/soc/codecs/sma1303.h
+++ b/sound/soc/codecs/sma1303.h
@@ -11,6 +11,13 @@
#ifndef _SMA1303_H
#define _SMA1303_H
+typedef void (*callback_fptr) (void *device, int err);
+struct callback_ops {
+ callback_fptr set_i2c_err;
+};
+
+void sma1303_set_callback_func(struct callback_ops ops);
+
#define SMA1303_I2C_ADDR_00 0x1e
#define SMA1303_I2C_ADDR_01 0x3e
#define SMA1303_I2C_ADDR_10 0x5e
@@ -26,6 +33,8 @@
#define LEFT_TWO_CHIP_SOLUTION 0x02
#define RIGHT_TWO_CHIP_SOLUTION 0x03
+#define SMA1303_I2C_RETRY_COUNT 3
+
/*
* SMA1303 Register Definition
*/
--
2.30.2
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 04/14] Removed the usage control and add the power switch on DAPM route.
2023-01-06 9:15 [PATCH 00/14] ASoC: Add a driver the Iron Device SMA1303 AMP Kiseok Jo
` (2 preceding siblings ...)
2023-01-06 9:15 ` [PATCH 03/14] Add the i2c-retry count and callback function in regmap function Kiseok Jo
@ 2023-01-06 9:15 ` Kiseok Jo
2023-01-06 13:59 ` Mark Brown
2023-01-06 9:15 ` [PATCH 05/14] Change the DAPM route and widgets Kiseok Jo
` (9 subsequent siblings)
13 siblings, 1 reply; 26+ messages in thread
From: Kiseok Jo @ 2023-01-06 9:15 UTC (permalink / raw)
To: Mark Brown; +Cc: alsa-devel, application, Kiseok Jo
Signed-off-by: Kiseok Jo <kiseok.jo@irondevice.com>
Reported-by: Mark Brown <broonie@kernel.org>
---
sound/soc/codecs/sma1303.c | 79 ++++----------------------------------
1 file changed, 8 insertions(+), 71 deletions(-)
diff --git a/sound/soc/codecs/sma1303.c b/sound/soc/codecs/sma1303.c
index 8bd59a481f2d..f78cd2daad61 100644
--- a/sound/soc/codecs/sma1303.c
+++ b/sound/soc/codecs/sma1303.c
@@ -69,7 +69,6 @@ struct sma1303_priv {
struct mutex lock;
struct delayed_work check_fault_work;
bool amp_power_status;
- bool usage_status;
int num_of_pll_matches;
int retry_cnt;
unsigned int sys_clk_id;
@@ -375,66 +374,6 @@ static int bytes_ext_put(struct snd_kcontrol *kcontrol,
return 0;
}
-static int amp_usage_status_get(struct snd_kcontrol *kcontrol,
- struct snd_ctl_elem_value *ucontrol)
-{
- struct snd_soc_component *component =
- snd_soc_kcontrol_component(kcontrol);
- struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component);
- int ret = -1;
-
- if (component == NULL) {
- pr_err("%s:component is NULL\n", __func__);
- return ret;
- }
- if (sma1303 == NULL) {
- pr_err("%s:sma1303 is NULL\n", __func__);
- return ret;
- }
- ucontrol->value.integer.value[0] = sma1303->usage_status;
-
- if (sma1303->usage_status)
- dev_info(component->dev, "Amplifier Power Control Enabled\n");
- else
- dev_info(component->dev, "Amplifier Power Control Disabled\n");
-
- return 0;
-}
-
-static int amp_usage_status_put(struct snd_kcontrol *kcontrol,
- struct snd_ctl_elem_value *ucontrol)
-{
- struct snd_soc_component *component =
- snd_soc_kcontrol_component(kcontrol);
- struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component);
- int ret = -1;
-
- if (component == NULL) {
- pr_err("%s:component is NULL\n", __func__);
- return ret;
- }
- if (sma1303 == NULL) {
- pr_err("%s:sma1303 is NULL\n", __func__);
- return ret;
- }
-
- if ((sma1303->usage_status
- != ucontrol->value.integer.value[0])
- && (!ucontrol->value.integer.value[0])) {
- dev_info(component->dev, "%s\n", "Force AMP Power Down");
- ret = sma1303_shutdown(component);
- if (ret < 0) {
- ucontrol->value.integer.value[0]
- = sma1303->usage_status;
- return ret;
- }
-
- }
- sma1303->usage_status = ucontrol->value.integer.value[0];
-
- return 0;
-}
-
static const char * const sma1303_amp_mode_text[] = {
"1 Chip", "Mono on 2 chips", "Left in 2 chips", "Right in 2chips"};
@@ -928,10 +867,10 @@ static SOC_VALUE_ENUM_SINGLE_DECL(sma1303_sdo_source_enum,
sma1303_sdo_source_values);
static const struct snd_kcontrol_new sma1303_sdo_source_mux =
SOC_DAPM_ENUM("SDO Source", sma1303_sdo_source_enum);
+static const struct snd_kcontrol_new sma1303_enable_control =
+ SOC_DAPM_SINGLE_VIRT("Switch", 1);
static const struct snd_kcontrol_new sma1303_snd_controls[] = {
-SOC_SINGLE_EXT("Amplifier Usage", SND_SOC_NOPM, 0, 1, 0,
- amp_usage_status_get, amp_usage_status_put),
SOC_ENUM_EXT("Amplifier Mode", sma1303_amp_mode_enum,
sma1303_amp_mode_get, sma1303_amp_mode_put),
SOC_ENUM_EXT("Outport config", sma1303_outport_config_enum,
@@ -1048,14 +987,12 @@ static int sma1303_dac_event(struct snd_soc_dapm_widget *w,
{
struct snd_soc_component *component =
snd_soc_dapm_to_component(w->dapm);
- struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component);
switch (event) {
case SND_SOC_DAPM_PRE_PMU:
dev_info(component->dev, "%s : PRE_PMU\n", __func__);
- if (sma1303->usage_status)
- sma1303_startup(component);
+ sma1303_startup(component);
break;
@@ -1130,11 +1067,13 @@ SND_SOC_DAPM_ADC_E("DAC_FEEDBACK", "Capture", SND_SOC_NOPM, 0, 0,
SND_SOC_DAPM_OUTPUT("SPK"),
SND_SOC_DAPM_INPUT("SDO"),
SND_SOC_DAPM_MUX("SDO Source", SND_SOC_NOPM, 0, 0, &sma1303_sdo_source_mux),
+SND_SOC_DAPM_SWITCH("AMP Enable", SND_SOC_NOPM, 0, 1, &sma1303_enable_control),
};
static const struct snd_soc_dapm_route sma1303_audio_map[] = {
{"DAC", NULL, "CLK_SUPPLY"},
-{"SPK", NULL, "DAC"},
+{"AMP Enable", "Switch", "DAC"},
+{"SPK", NULL, "AMP Enable"},
{"SDO Source", "Disable", "SDO"},
{"SDO Source", "Format_C", "SDO"},
{"SDO Source", "Mixer_Out", "SDO"},
@@ -1214,9 +1153,8 @@ static int sma1303_dai_hw_params_amp(struct snd_pcm_substream *substream,
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
- if (sma1303->usage_status &&
- (sma1303->sys_clk_id == SMA1303_PLL_CLKIN_MCLK
- || sma1303->sys_clk_id == SMA1303_PLL_CLKIN_BCLK)) {
+ if (sma1303->sys_clk_id == SMA1303_PLL_CLKIN_MCLK
+ || sma1303->sys_clk_id == SMA1303_PLL_CLKIN_BCLK) {
if (sma1303->last_bclk != bclk) {
if (sma1303->amp_power_status) {
@@ -2039,7 +1977,6 @@ static int sma1303_i2c_probe(struct i2c_client *client,
i2c_set_clientdata(client, sma1303);
sma1303->amp_mode = ONE_CHIP_SOLUTION;
- sma1303->usage_status = true;
sma1303->amp_power_status = false;
sma1303->check_fault_status = true;
sma1303->pll_matches = sma1303_pll_matches;
--
2.30.2
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH 04/14] Removed the usage control and add the power switch on DAPM route.
2023-01-06 9:15 ` [PATCH 04/14] Removed the usage control and add the power switch on DAPM route Kiseok Jo
@ 2023-01-06 13:59 ` Mark Brown
2023-01-09 9:33 ` Ki-Seok Jo
0 siblings, 1 reply; 26+ messages in thread
From: Mark Brown @ 2023-01-06 13:59 UTC (permalink / raw)
To: Kiseok Jo; +Cc: alsa-devel, application
[-- Attachment #1: Type: text/plain, Size: 693 bytes --]
On Fri, Jan 06, 2023 at 06:15:33PM +0900, Kiseok Jo wrote:
> Signed-off-by: Kiseok Jo <kiseok.jo@irondevice.com>
> Reported-by: Mark Brown <broonie@kernel.org>
> ---
> sound/soc/codecs/sma1303.c | 79 ++++----------------------------------
> 1 file changed, 8 insertions(+), 71 deletions(-)
This and most of your other followup patches should be part of patch 1 -
normally you shouldn't introduce problems then fix them as part of the
same patch series, this makes it very hard to review things since people
will see the problems earlier on and perhaps not get as far as seeing
the fix. Once the code is merged changes need to be incremental but
until then you should fix the patch itself.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 26+ messages in thread
* RE: [PATCH 04/14] Removed the usage control and add the power switch on DAPM route.
2023-01-06 13:59 ` Mark Brown
@ 2023-01-09 9:33 ` Ki-Seok Jo
0 siblings, 0 replies; 26+ messages in thread
From: Ki-Seok Jo @ 2023-01-09 9:33 UTC (permalink / raw)
To: Mark Brown; +Cc: alsa-devel@alsa-project.org, Application
> On Fri, Jan 06, 2023 at 06:15:33PM +0900, Kiseok Jo wrote:
> > Signed-off-by: Kiseok Jo <kiseok.jo@irondevice.com>
> > Reported-by: Mark Brown <broonie@kernel.org>
> > ---
> > sound/soc/codecs/sma1303.c | 79
> > ++++----------------------------------
> > 1 file changed, 8 insertions(+), 71 deletions(-)
> This and most of your other followup patches should be part of patch 1 - normally you shouldn't introduce problems then fix them as part of the same patch series, this makes it very hard to review things since people will see the problems earlier on and perhaps not get as far as seeing the fix. Once the code is merged changes need to be incremental but until then you should fix the patch itself.
Thank you for your reply.
I misunderstood what you say. I haven't registered the new driver code on the kernel.
So I think it's not new patch. So I resend the mail updating patch version applied your feedback.
(Because this patch's topic is 'Add driver')
If the driver is registered and there are any changes, I'll make a new patch for each changes.
And the patches doesn't make same patch series.
I already resent the patch mail for registering a new driver, please check if there is a problem.
Thank you.
Best regards,
Kiseok Jo
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH 05/14] Change the DAPM route and widgets
2023-01-06 9:15 [PATCH 00/14] ASoC: Add a driver the Iron Device SMA1303 AMP Kiseok Jo
` (3 preceding siblings ...)
2023-01-06 9:15 ` [PATCH 04/14] Removed the usage control and add the power switch on DAPM route Kiseok Jo
@ 2023-01-06 9:15 ` Kiseok Jo
2023-01-06 9:15 ` [PATCH 06/14] Use the prefixs all definitions Kiseok Jo
` (8 subsequent siblings)
13 siblings, 0 replies; 26+ messages in thread
From: Kiseok Jo @ 2023-01-06 9:15 UTC (permalink / raw)
To: Mark Brown; +Cc: alsa-devel, application, Kiseok Jo
Remove the control of 'amp_mode', and add the 'AIF IN' in DAPM.
Remove the outport and add SDO Enable event in DAPM.
In DAPM, instead of DAC and ADC, AIF IN & OUT were used,
and AMP power control was added.
Signed-off-by: Kiseok Jo <kiseok.jo@irondevice.com>
Reported-by: Mark Brown <broonie@kernel.org>
---
sound/soc/codecs/sma1303.c | 644 ++++++++++++++-----------------------
sound/soc/codecs/sma1303.h | 8 +-
2 files changed, 253 insertions(+), 399 deletions(-)
diff --git a/sound/soc/codecs/sma1303.c b/sound/soc/codecs/sma1303.c
index f78cd2daad61..1ef0b145f5ba 100644
--- a/sound/soc/codecs/sma1303.c
+++ b/sound/soc/codecs/sma1303.c
@@ -374,190 +374,6 @@ static int bytes_ext_put(struct snd_kcontrol *kcontrol,
return 0;
}
-static const char * const sma1303_amp_mode_text[] = {
- "1 Chip", "Mono on 2 chips", "Left in 2 chips", "Right in 2chips"};
-
-static const struct soc_enum sma1303_amp_mode_enum =
- SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(sma1303_amp_mode_text),
- sma1303_amp_mode_text);
-static int sma1303_amp_mode_get(struct snd_kcontrol *kcontrol,
- struct snd_ctl_elem_value *ucontrol)
-{
- struct snd_soc_component *component =
- snd_soc_kcontrol_component(kcontrol);
- struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component);
- int ret = -1;
-
- if (component == NULL) {
- pr_err("%s:component is NULL\n", __func__);
- return ret;
- }
- if (sma1303 == NULL) {
- pr_err("%s:sma1303 is NULL\n", __func__);
- return ret;
- }
- ucontrol->value.integer.value[0] = sma1303->amp_mode;
-
- switch (sma1303->amp_mode) {
- case ONE_CHIP_SOLUTION:
- dev_info(component->dev, "Amplifier 1 Chip Solution\n");
- break;
- case MONO_TWO_CHIP_SOLUTION:
- dev_info(component->dev, "Amplifier Mono 2 Chips Solution\n");
- break;
- case LEFT_TWO_CHIP_SOLUTION:
- dev_info(component->dev, "Amplifier Stereo(Left) 2 Chips Solution\n");
- break;
- case RIGHT_TWO_CHIP_SOLUTION:
- dev_info(component->dev, "Amplifier Stereo(Right) 2 Chips Solution\n");
- break;
- default:
- dev_err(component->dev, "Invalid Value");
- return ret;
- }
- return 0;
-
-}
-
-static int sma1303_amp_mode_put(struct snd_kcontrol *kcontrol,
- struct snd_ctl_elem_value *ucontrol)
-{
- struct snd_soc_component *component =
- snd_soc_kcontrol_component(kcontrol);
- struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component);
- int ret = 0;
-
- if (component == NULL) {
- pr_err("%s:component is NULL\n", __func__);
- return -1;
- }
- if (sma1303 == NULL) {
- pr_err("%s:sma1303 is NULL\n", __func__);
- return -1;
- }
-
- sma1303->amp_mode = ucontrol->value.integer.value[0];
-
- switch (sma1303->amp_mode) {
- case ONE_CHIP_SOLUTION:
- case MONO_TWO_CHIP_SOLUTION:
- ret += sma1303_regmap_update_bits(sma1303,
- SMA1303_11_SYSTEM_CTRL2,
- MONOMIX_MASK, MONOMIX_ON);
- ret += sma1303_regmap_update_bits(sma1303,
- SMA1303_11_SYSTEM_CTRL2,
- LR_DATA_SW_MASK, LR_DATA_SW_NORMAL);
- break;
- case LEFT_TWO_CHIP_SOLUTION:
- ret += sma1303_regmap_update_bits(sma1303,
- SMA1303_11_SYSTEM_CTRL2,
- MONOMIX_MASK, MONOMIX_OFF);
- ret += sma1303_regmap_update_bits(sma1303,
- SMA1303_11_SYSTEM_CTRL2,
- LR_DATA_SW_MASK, LR_DATA_SW_NORMAL);
- break;
- case RIGHT_TWO_CHIP_SOLUTION:
- ret += sma1303_regmap_update_bits(sma1303,
- SMA1303_11_SYSTEM_CTRL2,
- MONOMIX_MASK, MONOMIX_OFF);
- ret += sma1303_regmap_update_bits(sma1303,
- SMA1303_11_SYSTEM_CTRL2,
- LR_DATA_SW_MASK, LR_DATA_SW_SWAP);
- break;
- default:
- dev_err(component->dev, "Invalid Value");
- ret += -1;
- }
-
- return ret;
-}
-
-static const char * const sma1303_outport_config_text[] = {
- "Enable", "Disable"};
-
-static const struct soc_enum sma1303_outport_config_enum =
- SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(sma1303_outport_config_text),
- sma1303_outport_config_text);
-
-static int sma1303_outport_config_get(struct snd_kcontrol *kcontrol,
- struct snd_ctl_elem_value *ucontrol)
-{
- struct snd_soc_component *component =
- snd_soc_kcontrol_component(kcontrol);
- struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component);
- int ret = -1, data, val;
-
- if (component == NULL) {
- pr_err("%s:component is NULL\n", __func__);
- return ret;
- }
- if (sma1303 == NULL) {
- pr_err("%s:sma1303 is NULL\n", __func__);
- return ret;
- }
-
- ret = sma1303_regmap_read(sma1303, SMA1303_09_OUTPUT_CTRL, &data);
- if (ret < 0) {
- dev_err(component->dev,
- "Failed to read, register: %x ret: %d\n",
- SMA1303_09_OUTPUT_CTRL, ret);
- return ret;
- }
-
- val = data & PORT_CONFIG_MASK;
- switch (val) {
- case INPUT_PORT_ONLY:
- ucontrol->value.integer.value[0] = 1;
- break;
- case OUTPUT_PORT_ENABLE:
- ucontrol->value.integer.value[0] = 0;
- break;
- default:
- dev_err(component->dev,
- "Invalid value, register: %x value: %d\n",
- SMA1303_09_OUTPUT_CTRL, val);
- return ret;
- }
-
- return 0;
-}
-
-static int sma1303_outport_config_put(struct snd_kcontrol *kcontrol,
- struct snd_ctl_elem_value *ucontrol)
-{
- struct snd_soc_component *component =
- snd_soc_kcontrol_component(kcontrol);
- struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component);
- int sel = (int)ucontrol->value.integer.value[0];
- int val, ret = -1;
-
- if (component == NULL) {
- pr_err("%s:component is NULL\n", __func__);
- return ret;
- }
- if (sma1303 == NULL) {
- pr_err("%s:sma1303 is NULL\n", __func__);
- return ret;
- }
-
- switch (sel) {
- case 0:
- val = OUTPUT_PORT_ENABLE;
- break;
- case 1:
- val = INPUT_PORT_ONLY;
- break;
- default:
- dev_err(component->dev,
- "Invalid value, register: %x\n",
- SMA1303_09_OUTPUT_CTRL);
- return ret;
- }
-
- return sma1303_regmap_update_bits(sma1303,
- SMA1303_09_OUTPUT_CTRL, PORT_CONFIG_MASK, val);
-}
-
static const char * const sma1303_spkmute_text[] = {
"Unmute", "Mute"};
@@ -566,111 +382,6 @@ static const struct soc_enum sma1303_spkmute_enum =
ARRAY_SIZE(sma1303_spkmute_text),
sma1303_spkmute_text);
-static const char * const sma1303_spkmode_text[] = {
- "Off", "On"};
-
-static const struct soc_enum sma1303_spkmode_enum =
- SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(sma1303_spkmode_text),
- sma1303_spkmode_text);
-
-static int sma1303_spkmode_get(struct snd_kcontrol *kcontrol,
- struct snd_ctl_elem_value *ucontrol)
-{
- struct snd_soc_component *component =
- snd_soc_kcontrol_component(kcontrol);
- struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component);
- int val, data, ret = -1;
-
- if (component == NULL) {
- pr_err("%s:component is NULL\n", __func__);
- return ret;
- }
- if (sma1303 == NULL) {
- pr_err("%s:sma1303 is NULL\n", __func__);
- return ret;
- }
-
- ret = sma1303_regmap_read(sma1303, SMA1303_10_SYSTEM_CTRL1, &data);
- if (ret < 0) {
- dev_err(component->dev,
- "Failed to read, register: %x ret: %d\n",
- SMA1303_10_SYSTEM_CTRL1, ret);
- return ret;
- }
-
- val = data & SPK_MODE_MASK;
- if (sma1303->amp_mode == ONE_CHIP_SOLUTION) {
- switch (val) {
- case SPK_OFF:
- ucontrol->value.integer.value[0] = 0;
- break;
- case SPK_MONO:
- ucontrol->value.integer.value[0] = 1;
- break;
- default:
- dev_err(component->dev,
- "Invalid value, register: %x\n",
- SMA1303_10_SYSTEM_CTRL1);
- return ret;
- }
- } else {
- switch (val) {
- case SPK_OFF:
- ucontrol->value.integer.value[0] = 0;
- break;
- case SPK_STEREO:
- ucontrol->value.integer.value[0] = 1;
- break;
- default:
- dev_err(component->dev,
- "Invalid value, register: %x\n",
- SMA1303_10_SYSTEM_CTRL1);
- return ret;
- }
- }
-
- return 0;
-}
-
-static int sma1303_spkmode_put(struct snd_kcontrol *kcontrol,
- struct snd_ctl_elem_value *ucontrol)
-{
- struct snd_soc_component *component =
- snd_soc_kcontrol_component(kcontrol);
- struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component);
- int sel = (int)ucontrol->value.integer.value[0];
- int val, ret = -1;
-
- if (component == NULL) {
- pr_err("%s:component is NULL\n", __func__);
- return ret;
- }
- if (sma1303 == NULL) {
- pr_err("%s:sma1303 is NULL\n", __func__);
- return ret;
- }
-
- switch (sel) {
- case 0:
- val = SPK_OFF;
- break;
- case 1:
- if (sma1303->amp_mode == ONE_CHIP_SOLUTION)
- val = SPK_MONO;
- else
- val = SPK_STEREO;
- break;
- default:
- dev_err(component->dev,
- "Invalid value, register: %x\n",
- SMA1303_10_SYSTEM_CTRL1);
- return ret;
- }
-
- return sma1303_regmap_update_bits(sma1303,
- SMA1303_10_SYSTEM_CTRL1, SPK_MODE_MASK, val);
-}
-
static int postscaler_get(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{
@@ -852,41 +563,18 @@ static int sma1303_o_format_put(struct snd_kcontrol *kcontrol,
SMA1303_A4_TOP_MAN3, O_FORMAT_MASK, val);
}
-static const char * const sma1303_sdo_source_texts[] = {
- "Disable", "Format_C", "Mixer_Out", "After_DSP", "After_Post"};
-static const unsigned int sma1303_sdo_source_values[] = {
- OUT_SEL_DISABLE,
- FORMAT_CONVERTER,
- MIXER_OUTPUT,
- SPEAKER_PATH,
- POSTSCALER_OUTPUT};
-static SOC_VALUE_ENUM_SINGLE_DECL(sma1303_sdo_source_enum,
- SMA1303_09_OUTPUT_CTRL,
- 0, PORT_OUT_SEL_MASK,
- sma1303_sdo_source_texts,
- sma1303_sdo_source_values);
-static const struct snd_kcontrol_new sma1303_sdo_source_mux =
- SOC_DAPM_ENUM("SDO Source", sma1303_sdo_source_enum);
-static const struct snd_kcontrol_new sma1303_enable_control =
- SOC_DAPM_SINGLE_VIRT("Switch", 1);
+static const char * const sma1303_aif_in_source_text[] = {
+ "Mono", "Left", "Right"};
+static const char * const sma1303_aif_out_source_text[] = {
+ "Disable", "After_FmtC", "After_Mixer", "After_DSP", "After_Post",
+ "Clk_PLL", "Clk_OSC"};
-static const struct snd_kcontrol_new sma1303_snd_controls[] = {
-SOC_ENUM_EXT("Amplifier Mode", sma1303_amp_mode_enum,
- sma1303_amp_mode_get, sma1303_amp_mode_put),
-SOC_ENUM_EXT("Outport config", sma1303_outport_config_enum,
- sma1303_outport_config_get, sma1303_outport_config_put),
-SOC_SINGLE_TLV("Speaker Volume", SMA1303_0A_SPK_VOL,
- 0, 167, 1, sma1303_spk_tlv),
-SOC_ENUM("Speaker Mute Switch", sma1303_spkmute_enum),
-SOC_ENUM_EXT("Speaker Output", sma1303_spkmode_enum,
- sma1303_spkmode_get, sma1303_spkmode_put),
-SND_SOC_BYTES_EXT("Postscaler Set", 1,
- postscaler_get, postscaler_put),
-SOC_ENUM_EXT("Postscaler Config", sma1303_postscaler_config_enum,
- sma1303_postscaler_config_get, sma1303_postscaler_config_put),
-SOC_ENUM_EXT("Output Format", sma1303_o_format_enum,
- sma1303_o_format_get, sma1303_o_format_put),
-};
+static const struct soc_enum sma1303_aif_in_source_enum =
+ SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(sma1303_aif_in_source_text),
+ sma1303_aif_in_source_text);
+static const struct soc_enum sma1303_aif_out_source_enum =
+ SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(sma1303_aif_out_source_text),
+ sma1303_aif_out_source_text);
static int sma1303_startup(struct snd_soc_component *component)
{
@@ -905,7 +593,7 @@ static int sma1303_startup(struct snd_soc_component *component)
ret += sma1303_regmap_update_bits(sma1303,
SMA1303_00_SYSTEM_CTRL, POWER_MASK, POWER_ON);
- if (sma1303->amp_mode == ONE_CHIP_SOLUTION)
+ if (sma1303->amp_mode == SMA1303_MONO)
ret += sma1303_regmap_update_bits(sma1303,
SMA1303_10_SYSTEM_CTRL1, SPK_MODE_MASK, SPK_MONO);
else
@@ -963,62 +651,157 @@ static int sma1303_shutdown(struct snd_soc_component *component)
return ret;
}
-static int sma1303_clk_supply_event(struct snd_soc_dapm_widget *w,
+static int sma1303_aif_in_event(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol, int event)
{
struct snd_soc_component *component =
- snd_soc_dapm_to_component(w->dapm);
+ snd_soc_dapm_to_component(w->dapm);
+ struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component);
+ unsigned int mux = dapm_kcontrol_get_value(w->kcontrols[0]);
+ int ret = 0;
switch (event) {
case SND_SOC_DAPM_PRE_PMU:
- dev_info(component->dev, "%s : PRE_PMU\n", __func__);
- break;
+ switch (mux) {
+ case 0:
+ ret += sma1303_regmap_update_bits(sma1303,
+ SMA1303_11_SYSTEM_CTRL2,
+ MONOMIX_MASK,
+ MONOMIX_ON);
+ ret += sma1303->amp_mode = SMA1303_MONO;
+ break;
+ case 1:
+ ret += sma1303_regmap_update_bits(sma1303,
+ SMA1303_11_SYSTEM_CTRL2,
+ MONOMIX_MASK,
+ MONOMIX_OFF);
+ ret += sma1303_regmap_update_bits(sma1303,
+ SMA1303_11_SYSTEM_CTRL2,
+ LR_DATA_SW_MASK,
+ LR_DATA_SW_NORMAL);
+ ret += sma1303->amp_mode = SMA1303_STEREO;
+ break;
+ case 2:
+ ret += sma1303_regmap_update_bits(sma1303,
+ SMA1303_11_SYSTEM_CTRL2,
+ MONOMIX_MASK,
+ MONOMIX_OFF);
+ ret += sma1303_regmap_update_bits(sma1303,
+ SMA1303_11_SYSTEM_CTRL2,
+ LR_DATA_SW_MASK,
+ LR_DATA_SW_NORMAL);
+ sma1303->amp_mode = SMA1303_STEREO;
+ break;
+ default:
+ dev_err(sma1303->dev, "%s : Invald value (%d)\n",
+ __func__, mux);
+ return -EINVAL;
+ }
- case SND_SOC_DAPM_POST_PMD:
- dev_info(component->dev, "%s : POST_PMD\n", __func__);
- break;
+ dev_info(sma1303->dev, "%s : Source : %s\n", __func__,
+ sma1303_aif_in_source_text[mux]);
+ break;
}
-
- return 0;
+ return ret;
}
-static int sma1303_dac_event(struct snd_soc_dapm_widget *w,
+static int sma1303_aif_out_event(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol, int event)
{
struct snd_soc_component *component =
- snd_soc_dapm_to_component(w->dapm);
+ snd_soc_dapm_to_component(w->dapm);
+ struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component);
+ unsigned int mux = dapm_kcontrol_get_value(w->kcontrols[0]);
+ int ret = 0;
switch (event) {
case SND_SOC_DAPM_PRE_PMU:
- dev_info(component->dev, "%s : PRE_PMU\n", __func__);
-
- sma1303_startup(component);
-
- break;
-
- case SND_SOC_DAPM_POST_PMU:
- dev_info(component->dev, "%s : POST_PMU\n", __func__);
-
- break;
-
- case SND_SOC_DAPM_PRE_PMD:
- dev_info(component->dev, "%s : PRE_PMD\n", __func__);
-
- sma1303_shutdown(component);
-
- break;
-
- case SND_SOC_DAPM_POST_PMD:
- dev_info(component->dev, "%s : POST_PMD\n", __func__);
+ switch (mux) {
+ case 0:
+ ret += sma1303_regmap_update_bits(sma1303,
+ SMA1303_A3_TOP_MAN2,
+ TEST_CLKO_EN_MASK,
+ NORMAL_SDO);
+ ret += sma1303_regmap_update_bits(sma1303,
+ SMA1303_09_OUTPUT_CTRL,
+ PORT_OUT_SEL_MASK,
+ OUT_SEL_DISABLE);
+ break;
+ case 1:
+ ret += sma1303_regmap_update_bits(sma1303,
+ SMA1303_A3_TOP_MAN2,
+ TEST_CLKO_EN_MASK,
+ NORMAL_SDO);
+ ret += sma1303_regmap_update_bits(sma1303,
+ SMA1303_09_OUTPUT_CTRL,
+ PORT_OUT_SEL_MASK,
+ FORMAT_CONVERTER);
+ break;
+ case 2:
+ ret += sma1303_regmap_update_bits(sma1303,
+ SMA1303_A3_TOP_MAN2,
+ TEST_CLKO_EN_MASK,
+ NORMAL_SDO);
+ ret += sma1303_regmap_update_bits(sma1303,
+ SMA1303_09_OUTPUT_CTRL,
+ PORT_OUT_SEL_MASK,
+ MIXER_OUTPUT);
+ break;
+ case 3:
+ ret += sma1303_regmap_update_bits(sma1303,
+ SMA1303_A3_TOP_MAN2,
+ TEST_CLKO_EN_MASK,
+ NORMAL_SDO);
+ ret += sma1303_regmap_update_bits(sma1303,
+ SMA1303_09_OUTPUT_CTRL,
+ PORT_OUT_SEL_MASK,
+ SPEAKER_PATH);
+ break;
+ case 4:
+ ret += sma1303_regmap_update_bits(sma1303,
+ SMA1303_A3_TOP_MAN2,
+ TEST_CLKO_EN_MASK,
+ NORMAL_SDO);
+ ret += sma1303_regmap_update_bits(sma1303,
+ SMA1303_09_OUTPUT_CTRL,
+ PORT_OUT_SEL_MASK,
+ POSTSCALER_OUTPUT);
+ break;
+ case 5:
+ ret += sma1303_regmap_update_bits(sma1303,
+ SMA1303_A3_TOP_MAN2,
+ TEST_CLKO_EN_MASK,
+ CLK_OUT_SDO);
+ ret += sma1303_regmap_update_bits(sma1303,
+ SMA1303_A3_TOP_MAN2,
+ MON_OSC_PLL_MASK,
+ PLL_SDO);
+ break;
+ case 6:
+ ret += sma1303_regmap_update_bits(sma1303,
+ SMA1303_A3_TOP_MAN2,
+ TEST_CLKO_EN_MASK,
+ CLK_OUT_SDO);
+ ret += sma1303_regmap_update_bits(sma1303,
+ SMA1303_A3_TOP_MAN2,
+ MON_OSC_PLL_MASK,
+ PLL_OSC);
+ break;
+ default:
+ dev_err(sma1303->dev, "%s : Invald value (%d)\n",
+ __func__, mux);
+ return -EINVAL;
+ }
+ dev_info(sma1303->dev, "%s : Source : %s\n", __func__,
+ sma1303_aif_out_source_text[mux]);
break;
}
-
- return 0;
+ return ret;
}
-static int sma1303_dac_feedback_event(struct snd_soc_dapm_widget *w,
- struct snd_kcontrol *kcontrol, int event)
+static int sma1303_sdo_event(struct snd_soc_dapm_widget *w,
+ struct snd_kcontrol *kcontrol, int event)
{
struct snd_soc_component *component =
snd_soc_dapm_to_component(w->dapm);
@@ -1027,59 +810,132 @@ static int sma1303_dac_feedback_event(struct snd_soc_dapm_widget *w,
switch (event) {
case SND_SOC_DAPM_PRE_PMU:
- dev_info(component->dev,
- "%s : DAC feedback ON\n", __func__);
+ dev_info(sma1303->dev,
+ "%s : SND_SOC_DAPM_PRE_PMU\n", __func__);
ret += sma1303_regmap_update_bits(sma1303,
SMA1303_09_OUTPUT_CTRL,
- PORT_CONFIG_MASK|PORT_OUT_SEL_MASK,
- OUTPUT_PORT_ENABLE|SPEAKER_PATH);
-
+ PORT_CONFIG_MASK,
+ OUTPUT_PORT_ENABLE);
ret += sma1303_regmap_update_bits(sma1303,
SMA1303_A3_TOP_MAN2,
- SDO_OUTPUT_MASK, NORMAL_OUT);
+ SDO_OUTPUT_MASK,
+ NORMAL_OUT);
break;
-
- case SND_SOC_DAPM_PRE_PMD:
- dev_info(component->dev,
- "%s : DAC feedback OFF\n", __func__);
+ case SND_SOC_DAPM_POST_PMD:
+ dev_info(sma1303->dev,
+ "%s : SND_SOC_DAPM_POST_PMD\n", __func__);
ret += sma1303_regmap_update_bits(sma1303,
SMA1303_09_OUTPUT_CTRL,
- PORT_OUT_SEL_MASK, OUT_SEL_DISABLE);
-
+ PORT_CONFIG_MASK,
+ INPUT_PORT_ONLY);
ret += sma1303_regmap_update_bits(sma1303,
- SMA1303_A3_TOP_MAN2, SDO_OUTPUT_MASK,
+ SMA1303_A3_TOP_MAN2,
+ SDO_OUTPUT_MASK,
HIGH_Z_OUT);
break;
}
+ return ret;
+}
+
+static int sma1303_power_event(struct snd_soc_dapm_widget *w,
+ struct snd_kcontrol *kcontrol, int event)
+{
+ struct snd_soc_component *component =
+ snd_soc_dapm_to_component(w->dapm);
+ struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component);
+ int ret = 0;
+ switch (event) {
+ case SND_SOC_DAPM_POST_PMU:
+ dev_info(sma1303->dev,
+ "%s : SND_SOC_DAPM_POST_PMU\n", __func__);
+ ret = sma1303_startup(component);
+ break;
+ case SND_SOC_DAPM_PRE_PMD:
+ dev_info(sma1303->dev,
+ "%s : SND_SOC_DAPM_PRE_PMD\n", __func__);
+ ret = sma1303_shutdown(component);
+ break;
+ }
return ret;
}
+static const struct snd_kcontrol_new sma1303_aif_in_source_control =
+ SOC_DAPM_ENUM("AIF IN Source", sma1303_aif_in_source_enum);
+static const struct snd_kcontrol_new sma1303_aif_out_source_control =
+ SOC_DAPM_ENUM("AIF OUT Source", sma1303_aif_out_source_enum);
+static const struct snd_kcontrol_new sma1303_sdo_control =
+ SOC_DAPM_SINGLE_VIRT("Switch", 1);
+static const struct snd_kcontrol_new sma1303_enable_control =
+ SOC_DAPM_SINGLE_VIRT("Switch", 1);
+
+static const struct snd_kcontrol_new sma1303_snd_controls[] = {
+SOC_SINGLE_TLV("Speaker Volume", SMA1303_0A_SPK_VOL,
+ 0, 167, 1, sma1303_spk_tlv),
+SOC_ENUM("Speaker Mute Switch", sma1303_spkmute_enum),
+SND_SOC_BYTES_EXT("Postscaler Set", 1,
+ postscaler_get, postscaler_put),
+SOC_ENUM_EXT("Postscaler Config", sma1303_postscaler_config_enum,
+ sma1303_postscaler_config_get, sma1303_postscaler_config_put),
+SOC_ENUM_EXT("Output Format", sma1303_o_format_enum,
+ sma1303_o_format_get, sma1303_o_format_put),
+};
+
static const struct snd_soc_dapm_widget sma1303_dapm_widgets[] = {
-SND_SOC_DAPM_SUPPLY("CLK_SUPPLY", SND_SOC_NOPM, 0, 0, sma1303_clk_supply_event,
- SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
-SND_SOC_DAPM_DAC_E("DAC", "Playback", SND_SOC_NOPM, 0, 0, sma1303_dac_event,
- SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU |
- SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD),
-SND_SOC_DAPM_ADC_E("DAC_FEEDBACK", "Capture", SND_SOC_NOPM, 0, 0,
- sma1303_dac_feedback_event,
- SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_PRE_PMD),
-SND_SOC_DAPM_OUTPUT("SPK"),
-SND_SOC_DAPM_INPUT("SDO"),
-SND_SOC_DAPM_MUX("SDO Source", SND_SOC_NOPM, 0, 0, &sma1303_sdo_source_mux),
-SND_SOC_DAPM_SWITCH("AMP Enable", SND_SOC_NOPM, 0, 1, &sma1303_enable_control),
+ /* platform domain */
+ SND_SOC_DAPM_OUTPUT("SPK"),
+ SND_SOC_DAPM_INPUT("SDO"),
+
+ /* path domain */
+ SND_SOC_DAPM_MUX_E("AIF IN Source", SND_SOC_NOPM, 0, 0,
+ &sma1303_aif_in_source_control,
+ sma1303_aif_in_event,
+ SND_SOC_DAPM_PRE_PMU),
+ SND_SOC_DAPM_MUX_E("AIF OUT Source", SND_SOC_NOPM, 0, 0,
+ &sma1303_aif_out_source_control,
+ sma1303_aif_out_event,
+ SND_SOC_DAPM_PRE_PMU),
+ SND_SOC_DAPM_SWITCH_E("SDO Enable", SND_SOC_NOPM, 0, 0,
+ &sma1303_sdo_control,
+ sma1303_sdo_event,
+ SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
+ SND_SOC_DAPM_MIXER("Entry", SND_SOC_NOPM, 0, 0, NULL, 0),
+ SND_SOC_DAPM_OUT_DRV_E("AMP Power", SND_SOC_NOPM, 0, 0, NULL, 0,
+ sma1303_power_event,
+ SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),
+ SND_SOC_DAPM_SWITCH("AMP Enable", SND_SOC_NOPM, 0, 1,
+ &sma1303_enable_control),
+
+ /* stream domain */
+ SND_SOC_DAPM_AIF_IN("AIF IN", "Playback", 0, SND_SOC_NOPM, 0, 0),
+ SND_SOC_DAPM_AIF_OUT("AIF OUT", "Capture", 0, SND_SOC_NOPM, 0, 0),
};
static const struct snd_soc_dapm_route sma1303_audio_map[] = {
-{"DAC", NULL, "CLK_SUPPLY"},
-{"AMP Enable", "Switch", "DAC"},
-{"SPK", NULL, "AMP Enable"},
-{"SDO Source", "Disable", "SDO"},
-{"SDO Source", "Format_C", "SDO"},
-{"SDO Source", "Mixer_Out", "SDO"},
-{"SDO Source", "After_DSP", "SDO"},
-{"SDO Source", "After_Post", "SDO"},
-{"DAC_FEEDBACK", NULL, "SDO Source"},
+ /* Playback */
+ {"AIF IN Source", "Mono", "AIF IN"},
+ {"AIF IN Source", "Left", "AIF IN"},
+ {"AIF IN Source", "Right", "AIF IN"},
+
+ {"SDO Enable", "Switch", "AIF IN"},
+ {"AIF OUT Source", "Disable", "SDO Enable"},
+ {"AIF OUT Source", "After_FmtC", "SDO Enable"},
+ {"AIF OUT Source", "After_Mixer", "SDO Enable"},
+ {"AIF OUT Source", "After_DSP", "SDO Enable"},
+ {"AIF OUT Source", "After_Post", "SDO Enable"},
+ {"AIF OUT Source", "Clk_PLL", "SDO Enable"},
+ {"AIF OUT Source", "Clk_OSC", "SDO Enable"},
+
+ {"Entry", NULL, "AIF OUT Source"},
+ {"Entry", NULL, "AIF IN Source"},
+
+ {"AMP Power", NULL, "Entry"},
+
+ {"AMP Enable", "Switch", "AMP Power"},
+ {"SPK", NULL, "AMP Enable"},
+
+ /* Capture */
+ {"AIF OUT", NULL, "AMP Enable"},
};
static int sma1303_setup_pll(struct snd_soc_component *component,
@@ -1976,7 +1832,7 @@ static int sma1303_i2c_probe(struct i2c_client *client,
i2c_set_clientdata(client, sma1303);
- sma1303->amp_mode = ONE_CHIP_SOLUTION;
+ sma1303->amp_mode = SMA1303_MONO;
sma1303->amp_power_status = false;
sma1303->check_fault_status = true;
sma1303->pll_matches = sma1303_pll_matches;
diff --git a/sound/soc/codecs/sma1303.h b/sound/soc/codecs/sma1303.h
index 186af18188e9..95535546fd73 100644
--- a/sound/soc/codecs/sma1303.h
+++ b/sound/soc/codecs/sma1303.h
@@ -28,12 +28,10 @@ void sma1303_set_callback_func(struct callback_ops ops);
#define SMA1303_PLL_CLKIN_MCLK 0x02
#define SMA1303_PLL_CLKIN_BCLK 0x03
-#define ONE_CHIP_SOLUTION 0x00
-#define MONO_TWO_CHIP_SOLUTION 0x01
-#define LEFT_TWO_CHIP_SOLUTION 0x02
-#define RIGHT_TWO_CHIP_SOLUTION 0x03
+#define SMA1303_MONO 0x00
+#define SMA1303_STEREO 0x01
-#define SMA1303_I2C_RETRY_COUNT 3
+#define SMA1303_I2C_RETRY_COUNT 3
/*
* SMA1303 Register Definition
--
2.30.2
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 06/14] Use the prefixs all definitions
2023-01-06 9:15 [PATCH 00/14] ASoC: Add a driver the Iron Device SMA1303 AMP Kiseok Jo
` (4 preceding siblings ...)
2023-01-06 9:15 ` [PATCH 05/14] Change the DAPM route and widgets Kiseok Jo
@ 2023-01-06 9:15 ` Kiseok Jo
2023-01-06 9:15 ` [PATCH 07/14] Remove the control of output format Kiseok Jo
` (7 subsequent siblings)
13 siblings, 0 replies; 26+ messages in thread
From: Kiseok Jo @ 2023-01-06 9:15 UTC (permalink / raw)
To: Mark Brown; +Cc: alsa-devel, application, Kiseok Jo, Pierre-Louis Bossart
Modified to the kernel coding style.
Signed-off-by: Kiseok Jo <kiseok.jo@irondevice.com>
Reported-by: Mark Brown <broonie@kernel.org>
Reported-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
sound/soc/codecs/sma1303.c | 570 +++++++++++---------------
sound/soc/codecs/sma1303.h | 802 ++++++++++++++++++-------------------
2 files changed, 642 insertions(+), 730 deletions(-)
diff --git a/sound/soc/codecs/sma1303.c b/sound/soc/codecs/sma1303.c
index 1ef0b145f5ba..42352fa6de56 100644
--- a/sound/soc/codecs/sma1303.c
+++ b/sound/soc/codecs/sma1303.c
@@ -1,12 +1,11 @@
// SPDX-License-Identifier: GPL-2.0-or-later
-/* sma1303.c -- sma1303 ALSA SoC Audio driver
- *
- * Copyright 2022 Iron Device Corporation
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
+//
+// sma1303.c -- sma1303 ALSA SoC Audio driver
+//
+// Copyright 2023 Iron Device Corporation
+//
+// Auther: Gyuhwa Park <gyuhwa.park@irondevice.com>
+// Kiseok Jo <kiseok.jo@irondevice.com>
#include <linux/module.h>
#include <linux/moduleparam.h>
@@ -61,29 +60,29 @@ struct sma1303_pll_match {
struct sma1303_priv {
enum sma1303_type devtype;
- struct device *dev;
struct attribute_group *attr_grp;
+ struct delayed_work check_fault_work;
+ struct device *dev;
struct kobject *kobj;
+ struct mutex lock;
struct regmap *regmap;
struct sma1303_pll_match *pll_matches;
- struct mutex lock;
- struct delayed_work check_fault_work;
bool amp_power_status;
int num_of_pll_matches;
int retry_cnt;
- unsigned int sys_clk_id;
- unsigned int init_vol;
+ unsigned int amp_mode;
unsigned int cur_vol;
+ unsigned int format;
+ unsigned int frame_size;
+ unsigned int init_vol;
+ unsigned int last_bclk;
+ unsigned int last_ocp_val;
+ unsigned int last_over_temp;
+ unsigned int rev_num;
+ unsigned int sys_clk_id;
unsigned int tdm_slot_rx;
unsigned int tdm_slot_tx;
unsigned int tsdw_cnt;
- unsigned int format;
- unsigned int rev_num;
- unsigned int last_over_temp;
- unsigned int last_ocp_val;
- unsigned int last_bclk;
- unsigned int frame_size;
- unsigned int amp_mode;
long check_fault_period;
long check_fault_status;
};
@@ -245,7 +244,7 @@ EXPORT_SYMBOL(sma1303_set_callback_func);
static int sma1303_regmap_write(struct sma1303_priv *sma1303,
unsigned int reg, unsigned int val)
{
- int ret = 0;
+ int ret;
int cnt = sma1303->retry_cnt;
while (cnt--) {
@@ -264,7 +263,7 @@ static int sma1303_regmap_write(struct sma1303_priv *sma1303,
static int sma1303_regmap_update_bits(struct sma1303_priv *sma1303,
unsigned int reg, unsigned int mask, unsigned int val)
{
- int ret = 0;
+ int ret;
int cnt = sma1303->retry_cnt;
while (cnt--) {
@@ -308,25 +307,11 @@ static int bytes_ext_get(struct snd_kcontrol *kcontrol,
struct soc_bytes_ext *params = (void *)kcontrol->private_value;
unsigned int i, reg_val;
u8 *val;
- int ret = -1;
+ int ret;
- if (component == NULL) {
- pr_err("%s:component is NULL\n", __func__);
- return ret;
- }
- if (sma1303 == NULL) {
- pr_err("%s:sma1303 is NULL\n", __func__);
- return ret;
- }
val = (u8 *)ucontrol->value.bytes.data;
for (i = 0; i < params->max; i++) {
ret = sma1303_regmap_read(sma1303, reg + i, ®_val);
- if (ret < 0) {
- dev_err(component->dev,
- "Failed to read, register: %x ret: %d\n",
- reg + i, ret);
- return ret;
- }
if (sizeof(reg_val) > 2)
reg_val = cpu_to_le32(reg_val);
else
@@ -334,7 +319,7 @@ static int bytes_ext_get(struct snd_kcontrol *kcontrol,
memcpy(val + i, ®_val, sizeof(u8));
}
- return 0;
+ return ret;
}
static int bytes_ext_put(struct snd_kcontrol *kcontrol,
@@ -346,16 +331,8 @@ static int bytes_ext_put(struct snd_kcontrol *kcontrol,
struct soc_bytes_ext *params = (void *)kcontrol->private_value;
void *data;
u8 *val;
- int i, ret = -1;
+ int i, ret;
- if (component == NULL) {
- pr_err("%s:component is NULL\n", __func__);
- return ret;
- }
- if (sma1303 == NULL) {
- pr_err("%s:sma1303 is NULL\n", __func__);
- return ret;
- }
data = kmemdup(ucontrol->value.bytes.data,
params->max, GFP_KERNEL | GFP_DMA);
if (!data)
@@ -407,41 +384,25 @@ static int sma1303_postscaler_config_get(struct snd_kcontrol *kcontrol,
struct snd_soc_component *component =
snd_soc_kcontrol_component(kcontrol);
struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component);
- int ret = -1, data, val;
-
- if (component == NULL) {
- pr_err("%s:component is NULL\n", __func__);
- return ret;
- }
- if (sma1303 == NULL) {
- pr_err("%s:sma1303 is NULL\n", __func__);
- return ret;
- }
+ int ret, data, val;
ret = sma1303_regmap_read(sma1303, SMA1303_90_POSTSCALER, &data);
- if (ret < 0) {
- dev_err(component->dev,
- "Failed to read, register: %x ret: %d\n",
- SMA1303_90_POSTSCALER, ret);
- return ret;
- }
-
- val = data & BYP_POST_MASK;
+ val = data & SMA1303_BYP_POST_MASK;
switch (val) {
- case BYP_POST_SCALER:
+ case SMA1303_BYP_POST_SCALER:
ucontrol->value.integer.value[0] = 1;
break;
- case EN_POST_SCALER:
+ case SMA1303_EN_POST_SCALER:
ucontrol->value.integer.value[0] = 0;
break;
default:
dev_err(component->dev,
"Invalid value, register: %x value: %d\n",
SMA1303_90_POSTSCALER, val);
- return ret;
+ return -EINVAL;
}
- return 0;
+ return ret;
}
static int sma1303_postscaler_config_put(struct snd_kcontrol *kcontrol,
@@ -451,33 +412,24 @@ static int sma1303_postscaler_config_put(struct snd_kcontrol *kcontrol,
snd_soc_kcontrol_component(kcontrol);
struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component);
int sel = (int)ucontrol->value.integer.value[0];
- int val, ret = -1;
-
- if (component == NULL) {
- pr_err("%s:component is NULL\n", __func__);
- return ret;
- }
- if (sma1303 == NULL) {
- pr_err("%s:sma1303 is NULL\n", __func__);
- return ret;
- }
+ int val;
switch (sel) {
case 0:
- val = EN_POST_SCALER;
+ val = SMA1303_EN_POST_SCALER;
break;
case 1:
- val = BYP_POST_SCALER;
+ val = SMA1303_BYP_POST_SCALER;
break;
default:
dev_err(component->dev,
"Invalid value, register: %x\n",
SMA1303_90_POSTSCALER);
- return ret;
+ return -EINVAL;
}
return sma1303_regmap_update_bits(sma1303,
- SMA1303_90_POSTSCALER, BYP_POST_MASK, val);
+ SMA1303_90_POSTSCALER, SMA1303_BYP_POST_MASK, val);
}
static const char * const sma1303_o_format_text[] = {
@@ -492,37 +444,28 @@ static int sma1303_o_format_get(struct snd_kcontrol *kcontrol,
struct snd_soc_component *component =
snd_soc_kcontrol_component(kcontrol);
struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component);
- int val, data, ret = -1;
-
- if (component == NULL) {
- pr_err("%s:component is NULL\n", __func__);
- return ret;
- }
- if (sma1303 == NULL) {
- pr_err("%s:sma1303 is NULL\n", __func__);
- return ret;
- }
+ int val, data, ret;
ret = sma1303_regmap_read(sma1303, SMA1303_A4_TOP_MAN3, &data);
- val = data & O_FORMAT_MASK;
+ val = data & SMA1303_O_FORMAT_MASK;
switch (val) {
- case O_FMT_LJ:
+ case SMA1303_O_FMT_LJ:
ucontrol->value.integer.value[0] = 0;
break;
- case O_FMT_I2S:
+ case SMA1303_O_FMT_I2S:
ucontrol->value.integer.value[0] = 1;
break;
- case O_FMT_TDM:
+ case SMA1303_O_FMT_TDM:
ucontrol->value.integer.value[0] = 2;
break;
default:
dev_err(component->dev,
"Invalid value, register: %x\n",
SMA1303_A4_TOP_MAN3);
- return ret;
+ return -EINVAL;
}
- return 0;
+ return ret;
}
static int sma1303_o_format_put(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
@@ -531,36 +474,27 @@ static int sma1303_o_format_put(struct snd_kcontrol *kcontrol,
snd_soc_kcontrol_component(kcontrol);
struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component);
int sel = (int)ucontrol->value.integer.value[0];
- int val, ret = -1;
-
- if (component == NULL) {
- pr_err("%s:component is NULL\n", __func__);
- return ret;
- }
- if (sma1303 == NULL) {
- pr_err("%s:sma1303 is NULL\n", __func__);
- return ret;
- }
+ int val;
switch (sel) {
case 0:
- val = O_FMT_LJ;
+ val = SMA1303_O_FMT_LJ;
break;
case 1:
- val = O_FMT_I2S;
+ val = SMA1303_O_FMT_I2S;
break;
case 2:
- val = O_FMT_TDM;
+ val = SMA1303_O_FMT_TDM;
break;
default:
dev_err(component->dev,
"Invalid value, register: %x\n",
SMA1303_A4_TOP_MAN3);
- return ret;
+ return -EINVAL;
}
return sma1303_regmap_update_bits(sma1303,
- SMA1303_A4_TOP_MAN3, O_FORMAT_MASK, val);
+ SMA1303_A4_TOP_MAN3, SMA1303_O_FORMAT_MASK, val);
}
static const char * const sma1303_aif_in_source_text[] = {
@@ -587,18 +521,22 @@ static int sma1303_startup(struct snd_soc_component *component)
return ret;
}
- ret += sma1303_regmap_update_bits(sma1303,
- SMA1303_8E_PLL_CTRL, PLL_PD2_MASK, PLL_OPERATION2);
+ ret += sma1303_regmap_update_bits(sma1303, SMA1303_8E_PLL_CTRL,
+ SMA1303_PLL_PD2_MASK, SMA1303_PLL_OPERATION2);
- ret += sma1303_regmap_update_bits(sma1303,
- SMA1303_00_SYSTEM_CTRL, POWER_MASK, POWER_ON);
+ ret += sma1303_regmap_update_bits(sma1303, SMA1303_00_SYSTEM_CTRL,
+ SMA1303_POWER_MASK, SMA1303_POWER_ON);
if (sma1303->amp_mode == SMA1303_MONO)
ret += sma1303_regmap_update_bits(sma1303,
- SMA1303_10_SYSTEM_CTRL1, SPK_MODE_MASK, SPK_MONO);
+ SMA1303_10_SYSTEM_CTRL1,
+ SMA1303_SPK_MODE_MASK,
+ SMA1303_SPK_MONO);
else
ret += sma1303_regmap_update_bits(sma1303,
- SMA1303_10_SYSTEM_CTRL1, SPK_MODE_MASK, SPK_STEREO);
+ SMA1303_10_SYSTEM_CTRL1,
+ SMA1303_SPK_MODE_MASK,
+ SMA1303_SPK_STEREO);
if (sma1303->check_fault_status) {
if (sma1303->check_fault_period > 0)
@@ -611,8 +549,8 @@ static int sma1303_startup(struct snd_soc_component *component)
CHECK_PERIOD_TIME * HZ);
}
- ret += sma1303_regmap_update_bits(sma1303,
- SMA1303_0E_MUTE_VOL_CTRL, SPK_MUTE_MASK, SPK_UNMUTE);
+ ret += sma1303_regmap_update_bits(sma1303, SMA1303_0E_MUTE_VOL_CTRL,
+ SMA1303_SPK_MUTE_MASK, SMA1303_SPK_UNMUTE);
sma1303->amp_power_status = true;
@@ -630,21 +568,21 @@ static int sma1303_shutdown(struct snd_soc_component *component)
return ret;
}
- ret += sma1303_regmap_update_bits(sma1303,
- SMA1303_0E_MUTE_VOL_CTRL, SPK_MUTE_MASK, SPK_MUTE);
+ ret += sma1303_regmap_update_bits(sma1303, SMA1303_0E_MUTE_VOL_CTRL,
+ SMA1303_SPK_MUTE_MASK, SMA1303_SPK_MUTE);
cancel_delayed_work_sync(&sma1303->check_fault_work);
msleep(55);
- ret += sma1303_regmap_update_bits(sma1303,
- SMA1303_10_SYSTEM_CTRL1, SPK_MODE_MASK, SPK_OFF);
+ ret += sma1303_regmap_update_bits(sma1303, SMA1303_10_SYSTEM_CTRL1,
+ SMA1303_SPK_MODE_MASK, SMA1303_SPK_OFF);
- ret += sma1303_regmap_update_bits(sma1303,
- SMA1303_00_SYSTEM_CTRL, POWER_MASK, POWER_OFF);
+ ret += sma1303_regmap_update_bits(sma1303, SMA1303_00_SYSTEM_CTRL,
+ SMA1303_POWER_MASK, SMA1303_POWER_OFF);
- ret += sma1303_regmap_update_bits(sma1303,
- SMA1303_8E_PLL_CTRL, PLL_PD2_MASK, PLL_PD2);
+ ret += sma1303_regmap_update_bits(sma1303, SMA1303_8E_PLL_CTRL,
+ SMA1303_PLL_PD2_MASK, SMA1303_PLL_PD2);
sma1303->amp_power_status = false;
@@ -666,30 +604,30 @@ static int sma1303_aif_in_event(struct snd_soc_dapm_widget *w,
case 0:
ret += sma1303_regmap_update_bits(sma1303,
SMA1303_11_SYSTEM_CTRL2,
- MONOMIX_MASK,
- MONOMIX_ON);
+ SMA1303_MONOMIX_MASK,
+ SMA1303_MONOMIX_ON);
ret += sma1303->amp_mode = SMA1303_MONO;
break;
case 1:
ret += sma1303_regmap_update_bits(sma1303,
SMA1303_11_SYSTEM_CTRL2,
- MONOMIX_MASK,
- MONOMIX_OFF);
+ SMA1303_MONOMIX_MASK,
+ SMA1303_MONOMIX_OFF);
ret += sma1303_regmap_update_bits(sma1303,
SMA1303_11_SYSTEM_CTRL2,
- LR_DATA_SW_MASK,
- LR_DATA_SW_NORMAL);
+ SMA1303_LR_DATA_SW_MASK,
+ SMA1303_LR_DATA_SW_NORMAL);
ret += sma1303->amp_mode = SMA1303_STEREO;
break;
case 2:
ret += sma1303_regmap_update_bits(sma1303,
SMA1303_11_SYSTEM_CTRL2,
- MONOMIX_MASK,
- MONOMIX_OFF);
+ SMA1303_MONOMIX_MASK,
+ SMA1303_MONOMIX_OFF);
ret += sma1303_regmap_update_bits(sma1303,
SMA1303_11_SYSTEM_CTRL2,
- LR_DATA_SW_MASK,
- LR_DATA_SW_NORMAL);
+ SMA1303_LR_DATA_SW_MASK,
+ SMA1303_LR_DATA_SW_NORMAL);
sma1303->amp_mode = SMA1303_STEREO;
break;
default:
@@ -720,72 +658,72 @@ static int sma1303_aif_out_event(struct snd_soc_dapm_widget *w,
case 0:
ret += sma1303_regmap_update_bits(sma1303,
SMA1303_A3_TOP_MAN2,
- TEST_CLKO_EN_MASK,
- NORMAL_SDO);
+ SMA1303_TEST_CLKO_EN_MASK,
+ SMA1303_NORMAL_SDO);
ret += sma1303_regmap_update_bits(sma1303,
SMA1303_09_OUTPUT_CTRL,
- PORT_OUT_SEL_MASK,
- OUT_SEL_DISABLE);
+ SMA1303_PORT_OUT_SEL_MASK,
+ SMA1303_OUT_SEL_DISABLE);
break;
case 1:
ret += sma1303_regmap_update_bits(sma1303,
SMA1303_A3_TOP_MAN2,
- TEST_CLKO_EN_MASK,
- NORMAL_SDO);
+ SMA1303_TEST_CLKO_EN_MASK,
+ SMA1303_NORMAL_SDO);
ret += sma1303_regmap_update_bits(sma1303,
SMA1303_09_OUTPUT_CTRL,
- PORT_OUT_SEL_MASK,
- FORMAT_CONVERTER);
+ SMA1303_PORT_OUT_SEL_MASK,
+ SMA1303_FORMAT_CONVERTER);
break;
case 2:
ret += sma1303_regmap_update_bits(sma1303,
SMA1303_A3_TOP_MAN2,
- TEST_CLKO_EN_MASK,
- NORMAL_SDO);
+ SMA1303_TEST_CLKO_EN_MASK,
+ SMA1303_NORMAL_SDO);
ret += sma1303_regmap_update_bits(sma1303,
SMA1303_09_OUTPUT_CTRL,
- PORT_OUT_SEL_MASK,
- MIXER_OUTPUT);
+ SMA1303_PORT_OUT_SEL_MASK,
+ SMA1303_MIXER_OUTPUT);
break;
case 3:
ret += sma1303_regmap_update_bits(sma1303,
SMA1303_A3_TOP_MAN2,
- TEST_CLKO_EN_MASK,
- NORMAL_SDO);
+ SMA1303_TEST_CLKO_EN_MASK,
+ SMA1303_NORMAL_SDO);
ret += sma1303_regmap_update_bits(sma1303,
SMA1303_09_OUTPUT_CTRL,
- PORT_OUT_SEL_MASK,
- SPEAKER_PATH);
+ SMA1303_PORT_OUT_SEL_MASK,
+ SMA1303_SPEAKER_PATH);
break;
case 4:
ret += sma1303_regmap_update_bits(sma1303,
SMA1303_A3_TOP_MAN2,
- TEST_CLKO_EN_MASK,
- NORMAL_SDO);
+ SMA1303_TEST_CLKO_EN_MASK,
+ SMA1303_NORMAL_SDO);
ret += sma1303_regmap_update_bits(sma1303,
SMA1303_09_OUTPUT_CTRL,
- PORT_OUT_SEL_MASK,
- POSTSCALER_OUTPUT);
+ SMA1303_PORT_OUT_SEL_MASK,
+ SMA1303_POSTSCALER_OUTPUT);
break;
case 5:
ret += sma1303_regmap_update_bits(sma1303,
SMA1303_A3_TOP_MAN2,
- TEST_CLKO_EN_MASK,
- CLK_OUT_SDO);
+ SMA1303_TEST_CLKO_EN_MASK,
+ SMA1303_CLK_OUT_SDO);
ret += sma1303_regmap_update_bits(sma1303,
SMA1303_A3_TOP_MAN2,
- MON_OSC_PLL_MASK,
- PLL_SDO);
+ SMA1303_MON_OSC_PLL_MASK,
+ SMA1303_PLL_SDO);
break;
case 6:
ret += sma1303_regmap_update_bits(sma1303,
SMA1303_A3_TOP_MAN2,
- TEST_CLKO_EN_MASK,
- CLK_OUT_SDO);
+ SMA1303_TEST_CLKO_EN_MASK,
+ SMA1303_CLK_OUT_SDO);
ret += sma1303_regmap_update_bits(sma1303,
SMA1303_A3_TOP_MAN2,
- MON_OSC_PLL_MASK,
- PLL_OSC);
+ SMA1303_MON_OSC_PLL_MASK,
+ SMA1303_OSC_SDO);
break;
default:
dev_err(sma1303->dev, "%s : Invald value (%d)\n",
@@ -814,24 +752,24 @@ static int sma1303_sdo_event(struct snd_soc_dapm_widget *w,
"%s : SND_SOC_DAPM_PRE_PMU\n", __func__);
ret += sma1303_regmap_update_bits(sma1303,
SMA1303_09_OUTPUT_CTRL,
- PORT_CONFIG_MASK,
- OUTPUT_PORT_ENABLE);
+ SMA1303_PORT_CONFIG_MASK,
+ SMA1303_OUTPUT_PORT_ENABLE);
ret += sma1303_regmap_update_bits(sma1303,
SMA1303_A3_TOP_MAN2,
- SDO_OUTPUT_MASK,
- NORMAL_OUT);
+ SMA1303_SDO_OUTPUT_MASK,
+ SMA1303_NORMAL_OUT);
break;
case SND_SOC_DAPM_POST_PMD:
dev_info(sma1303->dev,
"%s : SND_SOC_DAPM_POST_PMD\n", __func__);
ret += sma1303_regmap_update_bits(sma1303,
SMA1303_09_OUTPUT_CTRL,
- PORT_CONFIG_MASK,
- INPUT_PORT_ONLY);
+ SMA1303_PORT_CONFIG_MASK,
+ SMA1303_INPUT_PORT_ONLY);
ret += sma1303_regmap_update_bits(sma1303,
SMA1303_A3_TOP_MAN2,
- SDO_OUTPUT_MASK,
- HIGH_Z_OUT);
+ SMA1303_SDO_OUTPUT_MASK,
+ SMA1303_HIGH_Z_OUT);
break;
}
return ret;
@@ -964,8 +902,8 @@ static int sma1303_setup_pll(struct snd_soc_component *component,
ret += sma1303_regmap_update_bits(sma1303,
SMA1303_A2_TOP_MAN1,
- PLL_PD_MASK|PLL_REF_CLK_MASK,
- PLL_OPERATION|PLL_SCK);
+ SMA1303_PLL_PD_MASK|SMA1303_PLL_REF_CLK_MASK,
+ SMA1303_PLL_OPERATION|SMA1303_PLL_SCK);
}
ret += sma1303_regmap_write(sma1303,
@@ -1033,24 +971,28 @@ static int sma1303_dai_hw_params_amp(struct snd_pcm_substream *substream,
case 44100:
case 48000:
case 96000:
- ret += sma1303_regmap_update_bits(sma1303,
- SMA1303_A2_TOP_MAN1,
- DAC_DN_CONV_MASK, DAC_DN_CONV_DISABLE);
+ ret += sma1303_regmap_update_bits(sma1303,
+ SMA1303_A2_TOP_MAN1,
+ SMA1303_DAC_DN_CONV_MASK,
+ SMA1303_DAC_DN_CONV_DISABLE);
- ret += sma1303_regmap_update_bits(sma1303,
- SMA1303_01_INPUT1_CTRL1,
- LEFTPOL_MASK, LOW_FIRST_CH);
- break;
+ ret += sma1303_regmap_update_bits(sma1303,
+ SMA1303_01_INPUT1_CTRL1,
+ SMA1303_LEFTPOL_MASK,
+ SMA1303_LOW_FIRST_CH);
+ break;
case 192000:
- ret += sma1303_regmap_update_bits(sma1303,
- SMA1303_A2_TOP_MAN1,
- DAC_DN_CONV_MASK, DAC_DN_CONV_ENABLE);
+ ret += sma1303_regmap_update_bits(sma1303,
+ SMA1303_A2_TOP_MAN1,
+ SMA1303_DAC_DN_CONV_MASK,
+ SMA1303_DAC_DN_CONV_ENABLE);
- ret += sma1303_regmap_update_bits(sma1303,
- SMA1303_01_INPUT1_CTRL1,
- LEFTPOL_MASK, HIGH_FIRST_CH);
- break;
+ ret += sma1303_regmap_update_bits(sma1303,
+ SMA1303_01_INPUT1_CTRL1,
+ SMA1303_LEFTPOL_MASK,
+ SMA1303_HIGH_FIRST_CH);
+ break;
default:
dev_err(component->dev, "%s not support rate : %d\n",
@@ -1069,7 +1011,8 @@ static int sma1303_dai_hw_params_amp(struct snd_pcm_substream *substream,
__func__);
ret += sma1303_regmap_update_bits(sma1303,
SMA1303_A4_TOP_MAN3,
- SCK_RATE_MASK, SCK_32FS);
+ SMA1303_SCK_RATE_MASK,
+ SMA1303_SCK_32FS);
break;
case SNDRV_PCM_FORMAT_S24_LE:
@@ -1078,7 +1021,8 @@ static int sma1303_dai_hw_params_amp(struct snd_pcm_substream *substream,
__func__);
ret += sma1303_regmap_update_bits(sma1303,
SMA1303_A4_TOP_MAN3,
- SCK_RATE_MASK, SCK_64FS);
+ SMA1303_SCK_RATE_MASK,
+ SMA1303_SCK_64FS);
break;
case SNDRV_PCM_FORMAT_S32_LE:
dev_info(component->dev,
@@ -1086,7 +1030,8 @@ static int sma1303_dai_hw_params_amp(struct snd_pcm_substream *substream,
__func__);
ret += sma1303_regmap_update_bits(sma1303,
SMA1303_A4_TOP_MAN3,
- SCK_RATE_MASK, SCK_64FS);
+ SMA1303_SCK_RATE_MASK,
+ SMA1303_SCK_64FS);
break;
default:
dev_err(component->dev,
@@ -1100,13 +1045,13 @@ static int sma1303_dai_hw_params_amp(struct snd_pcm_substream *substream,
case 16:
switch (sma1303->format) {
case SND_SOC_DAIFMT_I2S:
- input_format |= STANDARD_I2S;
+ input_format |= SMA1303_STANDARD_I2S;
break;
case SND_SOC_DAIFMT_LEFT_J:
- input_format |= LJ;
+ input_format |= SMA1303_LJ;
break;
case SND_SOC_DAIFMT_RIGHT_J:
- input_format |= RJ_16BIT;
+ input_format |= SMA1303_RJ_16BIT;
break;
}
break;
@@ -1114,13 +1059,13 @@ static int sma1303_dai_hw_params_amp(struct snd_pcm_substream *substream,
case 32:
switch (sma1303->format) {
case SND_SOC_DAIFMT_I2S:
- input_format |= STANDARD_I2S;
+ input_format |= SMA1303_STANDARD_I2S;
break;
case SND_SOC_DAIFMT_LEFT_J:
- input_format |= LJ;
+ input_format |= SMA1303_LJ;
break;
case SND_SOC_DAIFMT_RIGHT_J:
- input_format |= RJ_24BIT;
+ input_format |= SMA1303_RJ_24BIT;
break;
}
break;
@@ -1134,7 +1079,7 @@ static int sma1303_dai_hw_params_amp(struct snd_pcm_substream *substream,
ret += sma1303_regmap_update_bits(sma1303,
SMA1303_01_INPUT1_CTRL1,
- I2S_MODE_MASK, input_format);
+ SMA1303_I2S_MODE_MASK, input_format);
return ret;
}
@@ -1181,13 +1126,15 @@ static int sma1303_dai_mute(struct snd_soc_dai *dai, int mute, int stream)
ret += sma1303_regmap_update_bits(sma1303,
SMA1303_0E_MUTE_VOL_CTRL,
- SPK_MUTE_MASK, SPK_MUTE);
+ SMA1303_SPK_MUTE_MASK,
+ SMA1303_SPK_MUTE);
} else {
dev_info(component->dev, "%s : %s\n", __func__, "UNMUTE");
ret += sma1303_regmap_update_bits(sma1303,
SMA1303_0E_MUTE_VOL_CTRL,
- SPK_MUTE_MASK, SPK_UNMUTE);
+ SMA1303_SPK_MUTE_MASK,
+ SMA1303_SPK_UNMUTE);
}
return ret;
@@ -1207,7 +1154,8 @@ static int sma1303_dai_set_fmt_amp(struct snd_soc_dai *dai,
"%s : %s\n", __func__, "I2S/TDM Device mode");
ret += sma1303_regmap_update_bits(sma1303,
SMA1303_01_INPUT1_CTRL1,
- CONTROLLER_DEVICE_MASK, DEVICE_MODE);
+ SMA1303_CONTROLLER_DEVICE_MASK,
+ SMA1303_DEVICE_MODE);
break;
case SND_SOC_DAIFMT_CBM_CFM:
@@ -1215,7 +1163,8 @@ static int sma1303_dai_set_fmt_amp(struct snd_soc_dai *dai,
"%s : %s\n", __func__, "I2S/TDM Controller mode");
ret += sma1303_regmap_update_bits(sma1303,
SMA1303_01_INPUT1_CTRL1,
- CONTROLLER_DEVICE_MASK, CONTROLLER_MODE);
+ SMA1303_CONTROLLER_DEVICE_MASK,
+ SMA1303_CONTROLLER_MODE);
break;
default:
@@ -1246,22 +1195,24 @@ static int sma1303_dai_set_fmt_amp(struct snd_soc_dai *dai,
__func__, "Invert BCLK + Normal Frame");
ret += sma1303_regmap_update_bits(sma1303,
SMA1303_01_INPUT1_CTRL1,
- SCK_RISING_MASK, SCK_RISING_EDGE);
+ SMA1303_SCK_RISING_MASK,
+ SMA1303_SCK_RISING_EDGE);
break;
case SND_SOC_DAIFMT_IB_IF:
dev_info(component->dev, "%s : %s\n",
__func__, "Invert BCLK + Invert Frame");
ret += sma1303_regmap_update_bits(sma1303,
SMA1303_01_INPUT1_CTRL1,
- LEFTPOL_MASK|SCK_RISING_MASK,
- HIGH_FIRST_CH|SCK_RISING_EDGE);
+ SMA1303_LEFTPOL_MASK|SMA1303_SCK_RISING_MASK,
+ SMA1303_HIGH_FIRST_CH|SMA1303_SCK_RISING_EDGE);
break;
case SND_SOC_DAIFMT_NB_IF:
dev_info(component->dev, "%s : %s\n",
__func__, "Normal BCLK + Invert Frame");
ret += sma1303_regmap_update_bits(sma1303,
SMA1303_01_INPUT1_CTRL1,
- LEFTPOL_MASK, HIGH_FIRST_CH);
+ SMA1303_LEFTPOL_MASK,
+ SMA1303_HIGH_FIRST_CH);
break;
case SND_SOC_DAIFMT_NB_NF:
dev_info(component->dev, "%s : %s\n",
@@ -1290,61 +1241,70 @@ static int sma1303_dai_set_tdm_slot(struct snd_soc_dai *dai,
sma1303->frame_size = slot_width * slots;
ret += sma1303_regmap_update_bits(sma1303,
- SMA1303_A4_TOP_MAN3,
- O_FORMAT_MASK, O_FMT_TDM);
+ SMA1303_A4_TOP_MAN3,
+ SMA1303_O_FORMAT_MASK,
+ SMA1303_O_FMT_TDM);
switch (slot_width) {
case 16:
- ret += sma1303_regmap_update_bits(sma1303,
- SMA1303_A6_TDM2,
- TDM_DL_MASK, TDM_DL_16);
- break;
+ ret += sma1303_regmap_update_bits(sma1303,
+ SMA1303_A6_TDM2,
+ SMA1303_TDM_DL_MASK,
+ SMA1303_TDM_DL_16);
+ break;
case 32:
- ret += sma1303_regmap_update_bits(sma1303,
- SMA1303_A6_TDM2,
- TDM_DL_MASK, TDM_DL_32);
- break;
+ ret += sma1303_regmap_update_bits(sma1303,
+ SMA1303_A6_TDM2,
+ SMA1303_TDM_DL_MASK,
+ SMA1303_TDM_DL_32);
+ break;
default:
- dev_err(component->dev, "%s not support TDM %d slot_width\n",
- __func__, slot_width);
+ dev_err(component->dev, "%s not support TDM %d slot_width\n",
+ __func__, slot_width);
}
switch (slots) {
case 4:
- ret += sma1303_regmap_update_bits(sma1303,
- SMA1303_A6_TDM2,
- TDM_N_SLOT_MASK, TDM_N_SLOT_4);
- break;
+ ret += sma1303_regmap_update_bits(sma1303,
+ SMA1303_A6_TDM2,
+ SMA1303_TDM_N_SLOT_MASK,
+ SMA1303_TDM_N_SLOT_4);
+ break;
case 8:
- ret += sma1303_regmap_update_bits(sma1303,
- SMA1303_A6_TDM2,
- TDM_N_SLOT_MASK, TDM_N_SLOT_8);
- break;
+ ret += sma1303_regmap_update_bits(sma1303,
+ SMA1303_A6_TDM2,
+ SMA1303_TDM_N_SLOT_MASK,
+ SMA1303_TDM_N_SLOT_8);
+ break;
default:
- dev_err(component->dev, "%s not support TDM %d slots\n",
+ dev_err(component->dev, "%s not support TDM %d slots\n",
__func__, slots);
}
if (sma1303->tdm_slot_rx < slots)
ret += sma1303_regmap_update_bits(sma1303,
- SMA1303_A5_TDM1, TDM_SLOT1_RX_POS_MASK,
- (sma1303->tdm_slot_rx) << 3);
+ SMA1303_A5_TDM1,
+ SMA1303_TDM_SLOT1_RX_POS_MASK,
+ (sma1303->tdm_slot_rx) << 3);
else
dev_err(component->dev, "%s Incorrect tdm-slot-rx %d set\n",
- __func__, sma1303->tdm_slot_rx);
+ __func__, sma1303->tdm_slot_rx);
ret += sma1303_regmap_update_bits(sma1303,
- SMA1303_A5_TDM1,
- TDM_CLK_POL_MASK, TDM_CLK_POL_RISE);
+ SMA1303_A5_TDM1,
+ SMA1303_TDM_CLK_POL_MASK,
+ SMA1303_TDM_CLK_POL_RISE);
ret += sma1303_regmap_update_bits(sma1303,
- SMA1303_A5_TDM1,
- TDM_TX_MODE_MASK, TDM_TX_MONO);
+ SMA1303_A5_TDM1,
+ SMA1303_TDM_TX_MODE_MASK,
+ SMA1303_TDM_TX_MONO);
if (sma1303->tdm_slot_tx < slots)
ret += sma1303_regmap_update_bits(sma1303,
- SMA1303_A6_TDM2, TDM_SLOT1_TX_POS_MASK,
- (sma1303->tdm_slot_tx) << 3);
+ SMA1303_A6_TDM2,
+ SMA1303_TDM_SLOT1_TX_POS_MASK,
+ (sma1303->tdm_slot_tx) << 3);
else
dev_err(component->dev, "%s Incorrect tdm-slot-tx %d set\n",
__func__, sma1303->tdm_slot_tx);
@@ -1365,25 +1325,25 @@ static const struct snd_soc_dai_ops sma1303_dai_ops_amp = {
SNDRV_PCM_FMTBIT_S32_LE)
static struct snd_soc_dai_driver sma1303_dai[] = {
-{
- .name = "sma1303-amplifier",
- .id = 0,
- .playback = {
- .stream_name = "Playback",
- .channels_min = 1,
- .channels_max = 2,
- .rates = SMA1303_RATES,
- .formats = SMA1303_FORMATS,
+ {
+ .name = "sma1303-amplifier",
+ .id = 0,
+ .playback = {
+ .stream_name = "Playback",
+ .channels_min = 1,
+ .channels_max = 2,
+ .rates = SMA1303_RATES,
+ .formats = SMA1303_FORMATS,
+ },
+ .capture = {
+ .stream_name = "Capture",
+ .channels_min = 1,
+ .channels_max = 2,
+ .rates = SMA1303_RATES,
+ .formats = SMA1303_FORMATS,
+ },
+ .ops = &sma1303_dai_ops_amp,
},
- .capture = {
- .stream_name = "Capture",
- .channels_min = 1,
- .channels_max = 2,
- .rates = SMA1303_RATES,
- .formats = SMA1303_FORMATS,
- },
- .ops = &sma1303_dai_ops_amp,
-}
};
static void sma1303_check_fault_worker(struct work_struct *work)
@@ -1433,7 +1393,7 @@ static void sma1303_check_fault_worker(struct work_struct *work)
return;
}
- if (~over_temp & OT1_OK_STATUS) {
+ if (~over_temp & SMA1303_OT1_OK_STATUS) {
dev_crit(sma1303->dev,
"%s : OT1(Over Temperature Level 1)\n", __func__);
@@ -1449,23 +1409,23 @@ static void sma1303_check_fault_worker(struct work_struct *work)
sma1303->cur_vol = sma1303->init_vol;
}
- if (~over_temp & OT2_OK_STATUS) {
+ if (~over_temp & SMA1303_OT2_OK_STATUS) {
dev_crit(sma1303->dev,
"%s : OT2(Over Temperature Level 2)\n", __func__);
}
- if (ocp_val & OCP_SPK_STATUS) {
+ if (ocp_val & SMA1303_OCP_SPK_STATUS) {
dev_crit(sma1303->dev,
"%s : OCP_SPK(Over Current Protect SPK)\n", __func__);
}
- if (ocp_val & OCP_BST_STATUS) {
+ if (ocp_val & SMA1303_OCP_BST_STATUS) {
dev_crit(sma1303->dev,
"%s : OCP_BST(Over Current Protect Boost)\n", __func__);
}
- if ((ocp_val & CLK_MON_STATUS) && (sma1303->amp_power_status)) {
+ if ((ocp_val & SMA1303_CLK_MON_STATUS) && (sma1303->amp_power_status)) {
dev_crit(sma1303->dev,
"%s : CLK_FAULT(No clock input)\n", __func__);
}
- if (uvlo_val & UVLO_BST_STATUS) {
+ if (uvlo_val & SMA1303_UVLO_BST_STATUS) {
dev_crit(sma1303->dev,
"%s : UVLO(Under Voltage Lock Out)\n", __func__);
}
@@ -1491,31 +1451,17 @@ static void sma1303_check_fault_worker(struct work_struct *work)
CHECK_PERIOD_TIME * HZ);
}
- if (!(~over_temp & OT1_OK_STATUS) && !(~over_temp & OT2_OK_STATUS)
- && !(ocp_val & OCP_SPK_STATUS)
- && !(ocp_val & OCP_BST_STATUS)
- && !(ocp_val & CLK_MON_STATUS)
- && !(uvlo_val & UVLO_BST_STATUS)) {
+ if (!(~over_temp & SMA1303_OT1_OK_STATUS)
+ && !(~over_temp & SMA1303_OT2_OK_STATUS)
+ && !(ocp_val & SMA1303_OCP_SPK_STATUS)
+ && !(ocp_val & SMA1303_OCP_BST_STATUS)
+ && !(ocp_val & SMA1303_CLK_MON_STATUS)
+ && !(uvlo_val & SMA1303_UVLO_BST_STATUS)) {
}
mutex_unlock(&sma1303->lock);
}
-#ifdef CONFIG_PM
-static int sma1303_suspend(struct snd_soc_component *component)
-{
- return 0;
-}
-
-static int sma1303_resume(struct snd_soc_component *component)
-{
- return 0;
-}
-#else
-#define sma1303_suspend NULL
-#define sma1303_resume NULL
-#endif
-
static int sma1303_probe(struct snd_soc_component *component)
{
struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component);
@@ -1559,7 +1505,7 @@ static int sma1303_probe(struct snd_soc_component *component)
ret += sma1303_regmap_update_bits(sma1303,
SMA1303_00_SYSTEM_CTRL,
- RESETBYI2C_MASK, RESETBYI2C_RESET);
+ SMA1303_RESETBYI2C_MASK, SMA1303_RESETBYI2C_RESET);
ret += sma1303_regmap_read(sma1303, SMA1303_FF_DEVICE_INDEX, &status);
if (ret < 0) {
@@ -1568,10 +1514,10 @@ static int sma1303_probe(struct snd_soc_component *component)
SMA1303_FF_DEVICE_INDEX, ret);
return ret;
}
- sma1303->rev_num = status & REV_NUM_STATUS;
- if (sma1303->rev_num == REV_NUM_TV0)
+ sma1303->rev_num = status & SMA1303_REV_NUM_STATUS;
+ if (sma1303->rev_num == SMA1303_REV_NUM_TV0)
dev_info(component->dev, "SMA1303 Trimming Version 0\n");
- else if (sma1303->rev_num == REV_NUM_TV1)
+ else if (sma1303->rev_num == SMA1303_REV_NUM_TV1)
dev_info(component->dev, "SMA1303 Trimming Version 1\n");
ret += sma1303_regmap_read(sma1303, SMA1303_FB_STATUS2, &otp_stat);
@@ -1580,10 +1526,10 @@ static int sma1303_probe(struct snd_soc_component *component)
"failed to read, register: %02X, ret: %d\n",
SMA1303_FF_DEVICE_INDEX, ret);
- if (((sma1303->rev_num == REV_NUM_TV0) &&
- ((otp_stat & 0x0E) == OTP_STAT_OK_0)) ||
- ((sma1303->rev_num != REV_NUM_TV0) &&
- ((otp_stat & 0x0C) == OTP_STAT_OK_1)))
+ if (((sma1303->rev_num == SMA1303_REV_NUM_TV0) &&
+ ((otp_stat & 0x0E) == SMA1303_OTP_STAT_OK_0)) ||
+ ((sma1303->rev_num != SMA1303_REV_NUM_TV0) &&
+ ((otp_stat & 0x0C) == SMA1303_OTP_STAT_OK_1)))
dev_info(component->dev, "SMA1303 OTP Status Successful\n");
else
dev_info(component->dev, "SMA1303 OTP Status Fail\n");
@@ -1612,8 +1558,6 @@ static void sma1303_remove(struct snd_soc_component *component)
static const struct snd_soc_component_driver sma1303_component = {
.probe = sma1303_probe,
.remove = sma1303_remove,
- .suspend = sma1303_suspend,
- .resume = sma1303_resume,
.controls = sma1303_snd_controls,
.num_controls = ARRAY_SIZE(sma1303_snd_controls),
.dapm_widgets = sma1303_dapm_widgets,
@@ -1722,8 +1666,6 @@ static int sma1303_i2c_probe(struct i2c_client *client,
u32 value;
unsigned int device_info;
- dev_info(&client->dev, "%s is here. Driver version REV018\n", __func__);
-
sma1303 = devm_kzalloc(&client->dev, sizeof(struct sma1303_priv),
GFP_KERNEL);
@@ -1737,8 +1679,6 @@ static int sma1303_i2c_probe(struct i2c_client *client,
dev_err(&client->dev,
"Failed to allocate register map: %d\n", ret);
- devm_kfree(&client->dev, sma1303);
-
return ret;
}
@@ -1807,14 +1747,14 @@ static int sma1303_i2c_probe(struct i2c_client *client,
ret = sma1303_regmap_read(sma1303,
SMA1303_FF_DEVICE_INDEX, &device_info);
- if ((ret != 0) || ((device_info & 0xF8) != DEVICE_ID)) {
+ if ((ret != 0) || ((device_info & 0xF8) != SMA1303_DEVICE_ID)) {
dev_err(&client->dev, "device initialization error (%d 0x%02X)",
ret, device_info);
}
dev_info(&client->dev, "chip version 0x%02X\n", device_info);
sma1303->last_over_temp = 0xC0;
- sma1303->last_ocp_val = 0x0A;
+ sma1303->last_ocp_val = 0x08;
sma1303->tsdw_cnt = 0;
sma1303->init_vol = 0x31;
sma1303->cur_vol = sma1303->init_vol;
@@ -1826,7 +1766,6 @@ static int sma1303_i2c_probe(struct i2c_client *client,
mutex_init(&sma1303->lock);
sma1303->check_fault_period = CHECK_PERIOD_TIME;
- sma1303->devtype = id->driver_data;
sma1303->dev = &client->dev;
sma1303->kobj = &client->dev.kobj;
@@ -1844,10 +1783,6 @@ static int sma1303_i2c_probe(struct i2c_client *client,
if (ret) {
dev_err(&client->dev, "Failed to register component");
- snd_soc_unregister_component(&client->dev);
-
- if (sma1303)
- devm_kfree(&client->dev, sma1303);
return ret;
}
@@ -1870,11 +1805,6 @@ static void sma1303_i2c_remove(struct i2c_client *client)
(struct sma1303_priv *) i2c_get_clientdata(client);
cancel_delayed_work_sync(&sma1303->check_fault_work);
-
- snd_soc_unregister_component(&client->dev);
-
- if (sma1303)
- devm_kfree(&client->dev, sma1303);
}
static const struct i2c_device_id sma1303_i2c_id[] = {
@@ -1899,25 +1829,7 @@ static struct i2c_driver sma1303_i2c_driver = {
.id_table = sma1303_i2c_id,
};
-static int __init sma1303_init(void)
-{
- int ret;
-
- ret = i2c_add_driver(&sma1303_i2c_driver);
-
- if (ret)
- pr_err("Failed to register sma1303 I2C driver: %d\n", ret);
-
- return ret;
-}
-
-static void __exit sma1303_exit(void)
-{
- i2c_del_driver(&sma1303_i2c_driver);
-}
-
-module_init(sma1303_init);
-module_exit(sma1303_exit);
+module_i2c_driver(sma1303_i2c_driver);
MODULE_DESCRIPTION("ALSA SoC SMA1303 driver");
MODULE_AUTHOR("Gyuhwa Park, <gyuhwa.park@irondevice.com>");
diff --git a/sound/soc/codecs/sma1303.h b/sound/soc/codecs/sma1303.h
index 95535546fd73..a96c3de28d57 100644
--- a/sound/soc/codecs/sma1303.h
+++ b/sound/soc/codecs/sma1303.h
@@ -1,11 +1,11 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/*
* sma1303.h -- sma1303 ALSA SoC Audio driver
*
- * Copyright 2022 Iron Device Corporation
+ * Copyright 2023 Iron Device Corporation
+ *
+ * Author: Kiseok Jo <kiseok.jo@irondevice.com>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
*/
#ifndef _SMA1303_H
@@ -113,504 +113,504 @@ void sma1303_set_callback_func(struct callback_ops ops);
/* SMA1303 Registers Bit Fields */
/* SYSTEM_CTRL : 0x00 */
-#define RESETBYI2C_MASK (1<<1)
-#define RESETBYI2C_NORMAL (0<<1)
-#define RESETBYI2C_RESET (1<<1)
+#define SMA1303_RESETBYI2C_MASK (1<<1)
+#define SMA1303_RESETBYI2C_NORMAL (0<<1)
+#define SMA1303_RESETBYI2C_RESET (1<<1)
-#define POWER_MASK (1<<0)
-#define POWER_OFF (0<<0)
-#define POWER_ON (1<<0)
+#define SMA1303_POWER_MASK (1<<0)
+#define SMA1303_POWER_OFF (0<<0)
+#define SMA1303_POWER_ON (1<<0)
/* INTPUT CTRL1 : 0x01 */
-#define CONTROLLER_DEVICE_MASK (1<<7)
-#define DEVICE_MODE (0<<7)
-#define CONTROLLER_MODE (1<<7)
-
-#define I2S_MODE_MASK (7<<4)
-#define STANDARD_I2S (0<<4)
-#define LJ (1<<4)
-#define RJ_16BIT (4<<4)
-#define RJ_18BIT (5<<4)
-#define RJ_20BIT (6<<4)
-#define RJ_24BIT (7<<4)
-
-#define LEFTPOL_MASK (1<<3)
-#define LOW_FIRST_CH (0<<3)
-#define HIGH_FIRST_CH (1<<3)
-
-#define SCK_RISING_MASK (1<<2)
-#define SCK_FALLING_EDGE (0<<2)
-#define SCK_RISING_EDGE (1<<2)
+#define SMA1303_CONTROLLER_DEVICE_MASK (1<<7)
+#define SMA1303_DEVICE_MODE (0<<7)
+#define SMA1303_CONTROLLER_MODE (1<<7)
+
+#define SMA1303_I2S_MODE_MASK (7<<4)
+#define SMA1303_STANDARD_I2S (0<<4)
+#define SMA1303_LJ (1<<4)
+#define SMA1303_RJ_16BIT (4<<4)
+#define SMA1303_RJ_18BIT (5<<4)
+#define SMA1303_RJ_20BIT (6<<4)
+#define SMA1303_RJ_24BIT (7<<4)
+
+#define SMA1303_LEFTPOL_MASK (1<<3)
+#define SMA1303_LOW_FIRST_CH (0<<3)
+#define SMA1303_HIGH_FIRST_CH (1<<3)
+
+#define SMA1303_SCK_RISING_MASK (1<<2)
+#define SMA1303_SCK_FALLING_EDGE (0<<2)
+#define SMA1303_SCK_RISING_EDGE (1<<2)
/* INTPUT CTRL2 : 0x02 */
-#define IMODE_MASK (3<<6)
-#define I2S (0<<6)
-#define PCM_SHORT (1<<6)
-#define PCM_LONG (2<<6)
+#define SMA1303_IMODE_MASK (3<<6)
+#define SMA1303_I2S (0<<6)
+#define SMA1303_PCM_SHORT (1<<6)
+#define SMA1303_PCM_LONG (2<<6)
-#define RIGHT_FIRST_MASK (1<<5)
-#define LEFT_NORMAL (0<<5)
-#define RIGHT_INVERTED (1<<5)
+#define RSMA1303_IGHT_FIRST_MASK (1<<5)
+#define SMA1303_LEFT_NORMAL (0<<5)
+#define SMA1303_RIGHT_INVERTED (1<<5)
-#define PCM_ALAW_MASK (1<<4)
-#define PCM_U_DECODING (0<<4)
-#define PCM_A_DECODING (1<<4)
+#define SMA1303_PCM_ALAW_MASK (1<<4)
+#define SMA1303_PCM_U_DECODING (0<<4)
+#define SMA1303_PCM_A_DECODING (1<<4)
-#define PCM_COMP_MASK (1<<3)
-#define PCM_LINEAR (0<<3)
-#define PCM_COMPANDING (1<<3)
+#define SMA1303_PCM_COMP_MASK (1<<3)
+#define SMA1303_PCM_LINEAR (0<<3)
+#define SMA1303_PCM_COMPANDING (1<<3)
-#define INPUTSEL_MASK (1<<2)
-#define PCM_8KHZ (0<<2)
-#define PCM_16KHZ (1<<2)
+#define SMA1303_INPUTSEL_MASK (1<<2)
+#define SMA1303_PCM_8KHZ (0<<2)
+#define SMA1303_PCM_16KHZ (1<<2)
-#define PCM_STEREO_MASK (1<<1)
-#define PCM_MONO (0<<1)
-#define PCM_STEREO (1<<1)
+#define SMA1303_PCM_STEREO_MASK (1<<1)
+#define SMA1303_PCM_MONO (0<<1)
+#define SMA1303_PCM_STEREO (1<<1)
-#define PCM_DL_MASK (1<<0)
-#define PCM_8BIT (0<<0)
-#define PCM_16BIT (1<<0)
+#define SMA1303_PCM_DL_MASK (1<<0)
+#define SMA1303_PCM_8BIT (0<<0)
+#define SMA1303_PCM_16BIT (1<<0)
/* INTPUT CTRL3 : 0x03 */
-#define PCM_N_SLOT_MASK (15<<0)
-#define PCM_N_SLOT1 (0<<0)
-#define PCM_N_SLOT2 (1<<0)
-#define PCM_N_SLOT3 (2<<0)
-#define PCM_N_SLOT4 (3<<0)
-#define PCM_N_SLOT5 (4<<0)
-#define PCM_N_SLOT6 (5<<0)
-#define PCM_N_SLOT7 (6<<0)
-#define PCM_N_SLOT8 (7<<0)
-#define PCM_N_SLOT9 (8<<0)
-#define PCM_N_SLOT10 (9<<0)
-#define PCM_N_SLOT11 (10<<0)
-#define PCM_N_SLOT12 (11<<0)
-#define PCM_N_SLOT13 (12<<0)
-#define PCM_N_SLOT14 (13<<0)
-#define PCM_N_SLOT15 (14<<0)
-#define PCM_N_SLOT16 (15<<0)
+#define SMA1303_PCM_N_SLOT_MASK (15<<0)
+#define SMA1303_PCM_N_SLOT1 (0<<0)
+#define SMA1303_PCM_N_SLOT2 (1<<0)
+#define SMA1303_PCM_N_SLOT3 (2<<0)
+#define SMA1303_PCM_N_SLOT4 (3<<0)
+#define SMA1303_PCM_N_SLOT5 (4<<0)
+#define SMA1303_PCM_N_SLOT6 (5<<0)
+#define SMA1303_PCM_N_SLOT7 (6<<0)
+#define SMA1303_PCM_N_SLOT8 (7<<0)
+#define SMA1303_PCM_N_SLOT9 (8<<0)
+#define SMA1303_PCM_N_SLOT10 (9<<0)
+#define SMA1303_PCM_N_SLOT11 (10<<0)
+#define SMA1303_PCM_N_SLOT12 (11<<0)
+#define SMA1303_PCM_N_SLOT13 (12<<0)
+#define SMA1303_PCM_N_SLOT14 (13<<0)
+#define SMA1303_PCM_N_SLOT15 (14<<0)
+#define SMA1303_PCM_N_SLOT16 (15<<0)
/* INTPUT CTRL4 : 0x04 */
-#define PCM1_SLOT_MASK (15<<4)
-#define PCM1_SLOT1 (0<<4)
-#define PCM1_SLOT2 (1<<4)
-#define PCM1_SLOT3 (2<<4)
-#define PCM1_SLOT4 (3<<4)
-#define PCM1_SLOT5 (4<<4)
-#define PCM1_SLOT6 (5<<4)
-#define PCM1_SLOT7 (6<<4)
-#define PCM1_SLOT8 (7<<4)
-#define PCM1_SLOT9 (8<<4)
-#define PCM1_SLOT10 (9<<4)
-#define PCM1_SLOT11 (10<<4)
-#define PCM1_SLOT12 (11<<4)
-#define PCM1_SLOT13 (12<<4)
-#define PCM1_SLOT14 (13<<4)
-#define PCM1_SLOT15 (14<<4)
-#define PCM1_SLOT16 (15<<4)
-
-#define PCM2_SLOT_MASK (15<<0)
-#define PCM2_SLOT1 (0<<0)
-#define PCM2_SLOT2 (1<<0)
-#define PCM2_SLOT3 (2<<0)
-#define PCM2_SLOT4 (3<<0)
-#define PCM2_SLOT5 (4<<0)
-#define PCM2_SLOT6 (5<<0)
-#define PCM2_SLOT7 (6<<0)
-#define PCM2_SLOT8 (7<<0)
-#define PCM2_SLOT9 (8<<0)
-#define PCM2_SLOT10 (9<<0)
-#define PCM2_SLOT11 (10<<0)
-#define PCM2_SLOT12 (11<<0)
-#define PCM2_SLOT13 (12<<0)
-#define PCM2_SLOT14 (13<<0)
-#define PCM2_SLOT15 (14<<0)
-#define PCM2_SLOT16 (15<<0)
+#define SMA1303_PCM1_SLOT_MASK (15<<4)
+#define SMA1303_PCM1_SLOT1 (0<<4)
+#define SMA1303_PCM1_SLOT2 (1<<4)
+#define SMA1303_PCM1_SLOT3 (2<<4)
+#define SMA1303_PCM1_SLOT4 (3<<4)
+#define SMA1303_PCM1_SLOT5 (4<<4)
+#define SMA1303_PCM1_SLOT6 (5<<4)
+#define SMA1303_PCM1_SLOT7 (6<<4)
+#define SMA1303_PCM1_SLOT8 (7<<4)
+#define SMA1303_PCM1_SLOT9 (8<<4)
+#define SMA1303_PCM1_SLOT10 (9<<4)
+#define SMA1303_PCM1_SLOT11 (10<<4)
+#define SMA1303_PCM1_SLOT12 (11<<4)
+#define SMA1303_PCM1_SLOT13 (12<<4)
+#define SMA1303_PCM1_SLOT14 (13<<4)
+#define SMA1303_PCM1_SLOT15 (14<<4)
+#define SMA1303_PCM1_SLOT16 (15<<4)
+
+#define SMA1303_PCM2_SLOT_MASK (15<<0)
+#define SMA1303_PCM2_SLOT1 (0<<0)
+#define SMA1303_PCM2_SLOT2 (1<<0)
+#define SMA1303_PCM2_SLOT3 (2<<0)
+#define SMA1303_PCM2_SLOT4 (3<<0)
+#define SMA1303_PCM2_SLOT5 (4<<0)
+#define SMA1303_PCM2_SLOT6 (5<<0)
+#define SMA1303_PCM2_SLOT7 (6<<0)
+#define SMA1303_PCM2_SLOT8 (7<<0)
+#define SMA1303_PCM2_SLOT9 (8<<0)
+#define SMA1303_PCM2_SLOT10 (9<<0)
+#define SMA1303_PCM2_SLOT11 (10<<0)
+#define SMA1303_PCM2_SLOT12 (11<<0)
+#define SMA1303_PCM2_SLOT13 (12<<0)
+#define SMA1303_PCM2_SLOT14 (13<<0)
+#define SMA1303_PCM2_SLOT15 (14<<0)
+#define SMA1303_PCM2_SLOT16 (15<<0)
/* OUTPUT CTRL : 0x09 */
-#define PORT_CONFIG_MASK (3<<5)
-#define INPUT_PORT_ONLY (0<<5)
-#define OUTPUT_PORT_ENABLE (2<<5)
+#define SMA1303_PORT_CONFIG_MASK (3<<5)
+#define SMA1303_INPUT_PORT_ONLY (0<<5)
+#define SMA1303_OUTPUT_PORT_ENABLE (2<<5)
-#define PORT_OUT_SEL_MASK (7<<0)
-#define OUT_SEL_DISABLE (0<<0)
-#define FORMAT_CONVERTER (1<<0)
-#define MIXER_OUTPUT (2<<0)
-#define SPEAKER_PATH (3<<0)
-#define POSTSCALER_OUTPUT (4<<0)
+#define SMA1303_PORT_OUT_SEL_MASK (7<<0)
+#define SMA1303_OUT_SEL_DISABLE (0<<0)
+#define SMA1303_FORMAT_CONVERTER (1<<0)
+#define SMA1303_MIXER_OUTPUT (2<<0)
+#define SMA1303_SPEAKER_PATH (3<<0)
+#define SMA1303_POSTSCALER_OUTPUT (4<<0)
/* BST_TEST : 0x0B */
-#define BST_OFF_SLOPE_MASK (3<<6)
-#define BST_OFF_SLOPE_6_7ns (0<<6)
-#define BST_OFF_SLOPE_4_8ns (1<<6)
-#define BST_OFF_SLOPE_2_6ns (2<<6)
-#define BST_OFF_SLOPE_1_2ns (3<<6)
+#define SMA1303_BST_OFF_SLOPE_MASK (3<<6)
+#define SMA1303_BST_OFF_SLOPE_6_7ns (0<<6)
+#define SMA1303_BST_OFF_SLOPE_4_8ns (1<<6)
+#define SMA1303_BST_OFF_SLOPE_2_6ns (2<<6)
+#define SMA1303_BST_OFF_SLOPE_1_2ns (3<<6)
-#define OCP_TEST_MASK (1<<5)
-#define OCP_NORMAL_MODE (0<<5)
-#define OCP_TEST_MODE (1<<5)
+#define SMA1303_OCP_TEST_MASK (1<<5)
+#define SMA1303_OCP_NORMAL_MODE (0<<5)
+#define SMA1303_OCP_TEST_MODE (1<<5)
-#define BST_FAST_LEBN_MASK (1<<4)
-#define BST_SHORT_LEB (0<<4)
-#define BST_LONG_LEB (1<<4)
+#define SMA1303_BST_FAST_LEBN_MASK (1<<4)
+#define SMA1303_BST_SHORT_LEB (0<<4)
+#define SMA1303_BST_LONG_LEB (1<<4)
-#define HIGH_PGAIN_MASK (1<<3)
-#define NORMAL_P_GAIN (0<<3)
-#define HIGH_P_GAIN (1<<3)
+#define SMA1303_HIGH_PGAIN_MASK (1<<3)
+#define SMA1303_NORMAL_P_GAIN (0<<3)
+#define SMA1303_HIGH_P_GAIN (1<<3)
-#define VCOMP_MASK (1<<2)
-#define VCOMP_NORMAL_MODE (0<<2)
-#define VCOMP_V_MON_MODE (1<<2)
+#define SMA1303_VCOMP_MASK (1<<2)
+#define SMA1303_VCOMP_NORMAL_MODE (0<<2)
+#define SMA1303_VCOMP_V_MON_MODE (1<<2)
-#define PMOS_ON_MASK (1<<1)
-#define PMOS_NORMAL_MODE (0<<1)
-#define PMOS_TEST_MODE (1<<1)
+#define SMA1303_PMOS_ON_MASK (1<<1)
+#define SMA1303_PMOS_NORMAL_MODE (0<<1)
+#define SMA1303_PMOS_TEST_MODE (1<<1)
-#define NMOS_ON_MASK (1<<0)
-#define NMOS_NORMAL_MODE (0<<0)
-#define NMOS_TEST_MODE (1<<0)
+#define SMA1303_NMOS_ON_MASK (1<<0)
+#define SMA1303_NMOS_NORMAL_MODE (0<<0)
+#define SMA1303_NMOS_TEST_MODE (1<<0)
/* BST_TEST1 : 0x0C */
-#define SET_OCP_H_MASK (3<<6)
-#define HIGH_OCP_4_5_LVL (0<<6)
-#define HIGH_OCP_3_2_LVL (1<<6)
-#define HIGH_OCP_2_1_LVL (2<<6)
-#define HIGH_OCP_0_9_LVL (3<<6)
+#define SMA1303_SET_OCP_H_MASK (3<<6)
+#define SMA1303_HIGH_OCP_4_5_LVL (0<<6)
+#define SMA1303_HIGH_OCP_3_2_LVL (1<<6)
+#define SMA1303_HIGH_OCP_2_1_LVL (2<<6)
+#define SMA1303_HIGH_OCP_0_9_LVL (3<<6)
-#define OCL_TEST_MASK (1<<5)
-#define OCL_NORMAL_MODE (0<<5)
-#define OCL_TEST_MODE (1<<5)
+#define SMA1303_OCL_TEST_MASK (1<<5)
+#define SMA1303_OCL_NORMAL_MODE (0<<5)
+#define SMA1303_OCL_TEST_MODE (1<<5)
-#define LOOP_CHECK_MASK (1<<4)
-#define BST_LOOP_NORMAL_MODE (0<<4)
-#define BST_LOOP_CHECK_MODE (1<<4)
+#define SMA1303_LOOP_CHECK_MASK (1<<4)
+#define SMA1303_BST_LOOP_NORMAL_MODE (0<<4)
+#define SMA1303_BST_LOOP_CHECK_MODE (1<<4)
-#define EN_SH_PRT_MASK (1<<3)
-#define EN_SH_PRT_DISABLE (0<<3)
-#define EN_SH_PRT_ENABLE (1<<3)
+#define SMA1303_EN_SH_PRT_MASK (1<<3)
+#define SMA1303_EN_SH_PRT_DISABLE (0<<3)
+#define SMA1303_EN_SH_PRT_ENABLE (1<<3)
/* SPK_TEST : 0x0D */
-#define VREF_MON_MASK (1<<3)
-#define VREF_NORMAL_MODE (0<<3)
-#define VREF_V_MON_MODE (1<<3)
+#define SMA1303_VREF_MON_MASK (1<<3)
+#define SMA1303_VREF_NORMAL_MODE (0<<3)
+#define SMA1303_VREF_V_MON_MODE (1<<3)
-#define SPK_OCP_DLYN_MASK (1<<2)
-#define SPK_OCP_LONG_DELAY (0<<2)
-#define SPK_OCP_NORMAL (1<<2)
+#define SMA1303_SPK_OCP_DLYN_MASK (1<<2)
+#define SMA1303_SPK_OCP_LONG_DELAY (0<<2)
+#define SMA1303_SPK_OCP_NORMAL (1<<2)
-#define SPK_OFF_SLOPE_MASK (3<<0)
-#define SPK_OFF_SLOPE_SLOW (0<<0)
-#define SPK_OFF_SLOPE_FAST (3<<0)
+#define SMA1303_SPK_OFF_SLOPE_MASK (3<<0)
+#define SMA1303_SPK_OFF_SLOPE_SLOW (0<<0)
+#define SMA1303_SPK_OFF_SLOPE_FAST (3<<0)
/* MUTE_VOL_CTRL : 0x0E */
-#define VOL_SLOPE_MASK (3<<6)
-#define VOL_SLOPE_OFF (0<<6)
-#define VOL_SLOPE_SLOW (1<<6)
-#define VOL_SLOPE_MID (2<<6)
-#define VOL_SLOPE_FAST (3<<6)
-
-#define MUTE_SLOPE_MASK (3<<4)
-#define MUTE_SLOPE_OFF (0<<4)
-#define MUTE_SLOPE_SLOW (1<<4)
-#define MUTE_SLOPE_MID (2<<4)
-#define MUTE_SLOPE_FAST (3<<4)
-
-#define SPK_MUTE_MASK (1<<0)
-#define SPK_UNMUTE (0<<0)
-#define SPK_MUTE (1<<0)
+#define SMA1303_VOL_SLOPE_MASK (3<<6)
+#define SMA1303_VOL_SLOPE_OFF (0<<6)
+#define SMA1303_VOL_SLOPE_SLOW (1<<6)
+#define SMA1303_VOL_SLOPE_MID (2<<6)
+#define SMA1303_VOL_SLOPE_FAST (3<<6)
+
+#define SMA1303_MUTE_SLOPE_MASK (3<<4)
+#define SMA1303_MUTE_SLOPE_OFF (0<<4)
+#define SMA1303_MUTE_SLOPE_SLOW (1<<4)
+#define SMA1303_MUTE_SLOPE_MID (2<<4)
+#define SMA1303_MUTE_SLOPE_FAST (3<<4)
+
+#define SMA1303_SPK_MUTE_MASK (1<<0)
+#define SMA1303_SPK_UNMUTE (0<<0)
+#define SMA1303_SPK_MUTE (1<<0)
/* SYSTEM_CTRL1 :0x10 */
-#define SPK_MODE_MASK (7<<2)
-#define SPK_OFF (0<<2)
-#define SPK_MONO (1<<2)
-#define SPK_STEREO (4<<2)
+#define SMA1303_SPK_MODE_MASK (7<<2)
+#define SMA1303_SPK_OFF (0<<2)
+#define SMA1303_SPK_MONO (1<<2)
+#define SMA1303_SPK_STEREO (4<<2)
/* SYSTEM_CTRL2 : 0x11 */
-#define SPK_BS_MASK (1<<6)
-#define SPK_BS_BYP (0<<6)
-#define SPK_BS_EN (1<<6)
-#define SPK_LIM_MASK (1<<5)
-#define SPK_LIM_BYP (0<<5)
-#define SPK_LIM_EN (1<<5)
+#define SMA1303_SPK_BS_MASK (1<<6)
+#define SMA1303_SPK_BS_BYP (0<<6)
+#define SMA1303_SPK_BS_EN (1<<6)
+#define SMA1303_SPK_LIM_MASK (1<<5)
+#define SMA1303_SPK_LIM_BYP (0<<5)
+#define SMA1303_SPK_LIM_EN (1<<5)
-#define LR_DATA_SW_MASK (1<<4)
-#define LR_DATA_SW_NORMAL (0<<4)
-#define LR_DATA_SW_SWAP (1<<4)
+#define SMA1303_LR_DATA_SW_MASK (1<<4)
+#define SMA1303_LR_DATA_SW_NORMAL (0<<4)
+#define SMA1303_LR_DATA_SW_SWAP (1<<4)
-#define MONOMIX_MASK (1<<0)
-#define MONOMIX_OFF (0<<0)
-#define MONOMIX_ON (1<<0)
+#define SMA1303_MONOMIX_MASK (1<<0)
+#define SMA1303_MONOMIX_OFF (0<<0)
+#define SMA1303_MONOMIX_ON (1<<0)
/* SYSTEM_CTRL3 : 0x12 */
-#define INPUT_MASK (3<<6)
-#define INPUT_0_DB (0<<6)
-#define INPUT_M6_DB (1<<6)
-#define INPUT_M12_DB (2<<6)
-#define INPUT_INFI_DB (3<<6)
-#define INPUT_R_MASK (3<<4)
-#define INPUT_R_0_DB (0<<4)
-#define INPUT_R_M6_DB (1<<4)
-#define INPUT_R_M12_DB (2<<4)
-#define INPUT_R_INFI_DB (3<<4)
+#define SMA1303_INPUT_MASK (3<<6)
+#define SMA1303_INPUT_0_DB (0<<6)
+#define SMA1303_INPUT_M6_DB (1<<6)
+#define SMA1303_INPUT_M12_DB (2<<6)
+#define SMA1303_INPUT_INFI_DB (3<<6)
+#define SMA1303_INPUT_R_MASK (3<<4)
+#define SMA1303_INPUT_R_0_DB (0<<4)
+#define SMA1303_INPUT_R_M6_DB (1<<4)
+#define SMA1303_INPUT_R_M12_DB (2<<4)
+#define SMA1303_INPUT_R_INFI_DB (3<<4)
/* Modulator : 0x14 */
-#define SPK_HYSFB_MASK (3<<6)
-#define HYSFB_625K (0<<6)
-#define HYSFB_414K (1<<6)
-#define HYSFB_297K (2<<6)
-#define HYSFB_226K (3<<6)
-#define SPK_BDELAY_MASK (63<<0)
+#define SMA1303_SPK_HYSFB_MASK (3<<6)
+#define SMA1303_HYSFB_625K (0<<6)
+#define SMA1303_HYSFB_414K (1<<6)
+#define SMA1303_HYSFB_297K (2<<6)
+#define SMA1303_HYSFB_226K (3<<6)
+#define SMA1303_SPK_BDELAY_MASK (63<<0)
/* SDM CONTROL : 0x33 */
-#define SDM_Q_SEL_MASK (1<<2)
-#define QUART_SEL_1_DIV_4 (0<<2)
-#define QUART_SEL_1_DIV_8 (1<<2)
+#define SMA1303_SDM_Q_SEL_MASK (1<<2)
+#define SMA1303_QUART_SEL_1_DIV_4 (0<<2)
+#define SMA1303_QUART_SEL_1_DIV_8 (1<<2)
/* OTP_DATA1 : 0x34 */
-#define OTP_LVL_MASK (1<<5)
-#define OTP_LVL_NORMAL (0<<5)
-#define OTP_LVL_LOW (1<<5)
+#define SMA1303_OTP_LVL_MASK (1<<5)
+#define SMA1303_OTP_LVL_NORMAL (0<<5)
+#define SMA1303_OTP_LVL_LOW (1<<5)
/* PROTECTION : 0x36 */
-#define EDGE_DIS_MASK (1<<7)
-#define EDGE_DIS_ENABLE (0<<7)
-#define EDGE_DIS_DISABLE (1<<7)
+#define SMA1303_EDGE_DIS_MASK (1<<7)
+#define SMA1303_EDGE_DIS_ENABLE (0<<7)
+#define SMA1303_EDGE_DIS_DISABLE (1<<7)
-#define SPK_OCP_DIS_MASK (1<<3)
-#define SPK_OCP_ENABLE (0<<3)
-#define SPK_OCP_DISABLE (1<<3)
+#define SMA1303_SPK_OCP_DIS_MASK (1<<3)
+#define SMA1303_SPK_OCP_ENABLE (0<<3)
+#define SMA1303_SPK_OCP_DISABLE (1<<3)
-#define OCP_MODE_MASK (1<<2)
-#define AUTO_RECOVER (0<<2)
-#define SHUT_DOWN_PERMANENT (1<<2)
+#define SMA1303_OCP_MODE_MASK (1<<2)
+#define SMA1303_AUTO_RECOVER (0<<2)
+#define SMA1303_SHUT_DOWN_PERMANENT (1<<2)
-#define OTP_MODE_MASK (3<<0)
-#define OTP_MODE_DISABLE (0<<0)
-#define IG_THR1_SHUT_THR2 (1<<0)
-#define REC_THR1_SHUT_THR2 (2<<0)
-#define SHUT_THR1_SHUT_THR2 (3<<0)
+#define SMA1303_OTP_MODE_MASK (3<<0)
+#define SMA1303_OTP_MODE_DISABLE (0<<0)
+#define SMA1303_IG_THR1_SHUT_THR2 (1<<0)
+#define SMA1303_REC_THR1_SHUT_THR2 (2<<0)
+#define SMA1303_SHUT_THR1_SHUT_THR2 (3<<0)
/* TEST2 : 0x3C */
-#define SPK_HSDM_BP_MASK (1<<4)
-#define SPK_HSDM_ENABLE (0<<4)
-#define SPK_HSDM_BYPASS (1<<4)
+#define SMA1303_SPK_HSDM_BP_MASK (1<<4)
+#define SMA1303_SPK_HSDM_ENABLE (0<<4)
+#define SMA1303_SPK_HSDM_BYPASS (1<<4)
-#define SDM_SYNC_DIS_MASK (1<<5)
-#define SDM_SYNC_NORMAL (0<<5)
-#define SDM_SYNC_DISABLE (1<<5)
+#define SMA1303_SDM_SYNC_DIS_MASK (1<<5)
+#define SMA1303_SDM_SYNC_NORMAL (0<<5)
+#define SMA1303_SDM_SYNC_DISABLE (1<<5)
/* ATEST2 : 0x3F */
-#define SPK_OUT_FREQ_MASK (1<<2)
-#define SPK_OUT_FREQ_360K (0<<2)
-#define SPK_OUT_FREQ_410K (1<<2)
+#define SMA1303_SPK_OUT_FREQ_MASK (1<<2)
+#define SMA1303_SPK_OUT_FREQ_360K (0<<2)
+#define SMA1303_SPK_OUT_FREQ_410K (1<<2)
-#define LOW_POWER_MODE_MASK (1<<3)
-#define LOW_POWER_MODE_DISABLE (0<<3)
-#define LOW_POWER_MODE_ENABLE (1<<3)
+#define SMA1303_LOW_POWER_MODE_MASK (1<<3)
+#define SMA1303_LOW_POWER_MODE_DISABLE (0<<3)
+#define SMA1303_LOW_POWER_MODE_ENABLE (1<<3)
-#define THERMAL_ADJUST_MASK (3<<5)
-#define THERMAL_150_110 (0<<5)
-#define THERMAL_160_120 (1<<5)
-#define THERMAL_140_100 (2<<5)
+#define SMA1303_THERMAL_ADJUST_MASK (3<<5)
+#define SMA1303_THERMAL_150_110 (0<<5)
+#define SMA1303_THERMAL_160_120 (1<<5)
+#define SMA1303_THERMAL_140_100 (2<<5)
-#define FAST_OFF_DRIVE_SPK_MASK (1<<0)
-#define FAST_OFF_DRIVE_SPK_DISABLE (0<<0)
-#define FAST_OFF_DRIVE_SPK_ENABLE (1<<0)
+#define SMA1303_FAST_OFF_DRIVE_SPK_MASK (1<<0)
+#define SMA1303_FAST_OFF_DRIVE_SPK_DISABLE (0<<0)
+#define SMA1303_FAST_OFF_DRIVE_SPK_ENABLE (1<<0)
/* PLL_CTRL : 0x8E */
-#define TRM_LVL_MASK (1<<4)
-#define TRM_LVL_NORMAL (0<<4)
-#define TRM_LVL_LOW (1<<4)
+#define SMA1303_TRM_LVL_MASK (1<<4)
+#define SMA1303_TRM_LVL_NORMAL (0<<4)
+#define SMA1303_TRM_LVL_LOW (1<<4)
-#define LOW_OCL_MODE_MASK (1<<3)
-#define LOW_OCL_MODE (0<<3)
-#define NORMAL_OCL_MODE (1<<3)
+#define SMA1303_LOW_OCL_MODE_MASK (1<<3)
+#define SMA1303_LOW_OCL_MODE (0<<3)
+#define SMA1303_NORMAL_OCL_MODE (1<<3)
-#define PLL_PD2_MASK (7<<0)
-#define PLL_PD2 (7<<0)
-#define PLL_OPERATION2 (0<<0)
+#define SMA1303_PLL_PD2_MASK (7<<0)
+#define SMA1303_PLL_PD2 (7<<0)
+#define SMA1303_PLL_OPERATION2 (0<<0)
/* POSTSCALER : 0x90 */
-#define BYP_POST_MASK (1<<0)
-#define EN_POST_SCALER (0<<0)
-#define BYP_POST_SCALER (1<<0)
+#define SMA1303_BYP_POST_MASK (1<<0)
+#define SMA1303_EN_POST_SCALER (0<<0)
+#define SMA1303_BYP_POST_SCALER (1<<0)
/* FDPEC CONTROL : 0x92 */
-#define FLT_VDD_GAIN_MASK (15<<4)
-#define FLT_VDD_GAIN_2P40 (0<<4)
-#define FLT_VDD_GAIN_2P45 (1<<4)
-#define FLT_VDD_GAIN_2P50 (2<<4)
-#define FLT_VDD_GAIN_2P55 (3<<4)
-#define FLT_VDD_GAIN_2P60 (4<<4)
-#define FLT_VDD_GAIN_2P65 (5<<4)
-#define FLT_VDD_GAIN_2P70 (6<<4)
-#define FLT_VDD_GAIN_2P75 (7<<4)
-#define FLT_VDD_GAIN_2P80 (8<<4)
-#define FLT_VDD_GAIN_2P85 (9<<4)
-#define FLT_VDD_GAIN_2P90 (10<<4)
-#define FLT_VDD_GAIN_2P95 (11<<4)
-#define FLT_VDD_GAIN_3P00 (12<<4)
-#define FLT_VDD_GAIN_3P05 (13<<4)
-#define FLT_VDD_GAIN_3P10 (14<<4)
-#define FLT_VDD_GAIN_3P15 (15<<4)
-
-#define DIS_FCHG_MASK (1<<2)
-#define EN_FAST_CHARGE (0<<2)
-#define DIS_FAST_CHARGE (1<<2)
+#define SMA1303_FLT_VDD_GAIN_MASK (15<<4)
+#define SMA1303_FLT_VDD_GAIN_2P40 (0<<4)
+#define SMA1303_FLT_VDD_GAIN_2P45 (1<<4)
+#define SMA1303_FLT_VDD_GAIN_2P50 (2<<4)
+#define SMA1303_FLT_VDD_GAIN_2P55 (3<<4)
+#define SMA1303_FLT_VDD_GAIN_2P60 (4<<4)
+#define SMA1303_FLT_VDD_GAIN_2P65 (5<<4)
+#define SMA1303_FLT_VDD_GAIN_2P70 (6<<4)
+#define SMA1303_FLT_VDD_GAIN_2P75 (7<<4)
+#define SMA1303_FLT_VDD_GAIN_2P80 (8<<4)
+#define SMA1303_FLT_VDD_GAIN_2P85 (9<<4)
+#define SMA1303_FLT_VDD_GAIN_2P90 (10<<4)
+#define SMA1303_FLT_VDD_GAIN_2P95 (11<<4)
+#define SMA1303_FLT_VDD_GAIN_3P00 (12<<4)
+#define SMA1303_FLT_VDD_GAIN_3P05 (13<<4)
+#define SMA1303_FLT_VDD_GAIN_3P10 (14<<4)
+#define SMA1303_FLT_VDD_GAIN_3P15 (15<<4)
+
+#define SMA1303_DIS_FCHG_MASK (1<<2)
+#define SMA1303_EN_FAST_CHARGE (0<<2)
+#define SMA1303_DIS_FAST_CHARGE (1<<2)
/* BOOST_CONTROL4 : 0x97 */
-#define TRM_VBST_MASK (7<<2)
-#define TRM_VBST_5P5 (0<<2)
-#define TRM_VBST_5P6 (1<<2)
-#define TRM_VBST_5P7 (2<<2)
-#define TRM_VBST_5P8 (3<<2)
-#define TRM_VBST_5P9 (4<<2)
-#define TRM_VBST_6P0 (5<<2)
-#define TRM_VBST_6P1 (6<<2)
-#define TRM_VBST_6P2 (7<<2)
+#define SMA1303_TRM_VBST_MASK (7<<2)
+#define SMA1303_TRM_VBST_5P5 (0<<2)
+#define SMA1303_TRM_VBST_5P6 (1<<2)
+#define SMA1303_TRM_VBST_5P7 (2<<2)
+#define SMA1303_TRM_VBST_5P8 (3<<2)
+#define SMA1303_TRM_VBST_5P9 (4<<2)
+#define SMA1303_TRM_VBST_6P0 (5<<2)
+#define SMA1303_TRM_VBST_6P1 (6<<2)
+#define SMA1303_TRM_VBST_6P2 (7<<2)
/* TOP_MAN1 : 0xA2 */
-#define PLL_LOCK_SKIP_MASK (1<<7)
-#define PLL_LOCK_ENABLE (0<<7)
-#define PLL_LOCK_DISABLE (1<<7)
+#define SMA1303_PLL_LOCK_SKIP_MASK (1<<7)
+#define SMA1303_PLL_LOCK_ENABLE (0<<7)
+#define SMA1303_PLL_LOCK_DISABLE (1<<7)
-#define PLL_PD_MASK (1<<6)
-#define PLL_OPERATION (0<<6)
-#define PLL_PD (1<<6)
+#define SMA1303_PLL_PD_MASK (1<<6)
+#define SMA1303_PLL_OPERATION (0<<6)
+#define SMA1303_PLL_PD (1<<6)
-#define PLL_DIV_MASK (3<<4)
-#define PLL_OUT (0<<4)
-#define PLL_OUT_2 (1<<4)
-#define PLL_OUT_4 (2<<4)
-#define PLL_OUT_8 (3<<4)
+#define SMA1303_PLL_DIV_MASK (3<<4)
+#define SMA1303_PLL_OUT (0<<4)
+#define SMA1303_PLL_OUT_2 (1<<4)
+#define SMA1303_PLL_OUT_4 (2<<4)
+#define SMA1303_PLL_OUT_8 (3<<4)
-#define PLL_REF_CLK_MASK (1<<3)
-#define PLL_REF_CLK1 (0<<3)
-#define PLL_SCK (1<<3)
+#define SMA1303_PLL_REF_CLK_MASK (1<<3)
+#define SMA1303_PLL_REF_CLK1 (0<<3)
+#define SMA1303_PLL_SCK (1<<3)
-#define DAC_DN_CONV_MASK (1<<2)
-#define DAC_DN_CONV_DISABLE (0<<2)
-#define DAC_DN_CONV_ENABLE (1<<2)
+#define SMA1303_DAC_DN_CONV_MASK (1<<2)
+#define SMA1303_DAC_DN_CONV_DISABLE (0<<2)
+#define SMA1303_DAC_DN_CONV_ENABLE (1<<2)
-#define SDO_IO_MASK (1<<1)
-#define HIGH_Z_LRCK_H (0<<1)
-#define HIGH_Z_LRCK_L (1<<1)
+#define SMA1303_SDO_IO_MASK (1<<1)
+#define SMA1303_HIGH_Z_LRCK_H (0<<1)
+#define SMA1303_HIGH_Z_LRCK_L (1<<1)
-#define SDO_OUTPUT2_MASK (1<<0)
-#define SDO_NORMAL (0<<0)
-#define SDO_OUTPUT_ONLY (1<<0)
+#define SMA1303_SDO_OUTPUT2_MASK (1<<0)
+#define SMA1303_SDO_NORMAL (0<<0)
+#define SMA1303_SDO_OUTPUT_ONLY (1<<0)
/* TOP_MAN2 : 0xA3 */
-#define MON_OSC_PLL_MASK (1<<7)
-#define PLL_SDO (0<<7)
-#define PLL_OSC (1<<7)
+#define SMA1303_MON_OSC_PLL_MASK (1<<7)
+#define SMA1303_PLL_SDO (0<<7)
+#define SMA1303_OSC_SDO (1<<7)
-#define TEST_CLKO_EN_MASK (1<<6)
-#define NORMAL_SDO (0<<6)
-#define CLK_OUT_SDO (1<<6)
+#define SMA1303_TEST_CLKO_EN_MASK (1<<6)
+#define SMA1303_NORMAL_SDO (0<<6)
+#define SMA1303_CLK_OUT_SDO (1<<6)
-#define SDO_OUTPUT_MASK (1<<3)
-#define NORMAL_OUT (0<<3)
-#define HIGH_Z_OUT (1<<3)
+#define SMA1303_SDO_OUTPUT_MASK (1<<3)
+#define SMA1303_NORMAL_OUT (0<<3)
+#define SMA1303_HIGH_Z_OUT (1<<3)
-#define CLOCK_MON_MASK (1<<1)
-#define CLOCK_MON (0<<1)
-#define CLOCK_NOT_MON (1<<1)
+#define SMA1303_CLOCK_MON_MASK (1<<1)
+#define SMA1303_CLOCK_MON (0<<1)
+#define SMA1303_CLOCK_NOT_MON (1<<1)
-#define OSC_PD_MASK (1<<0)
-#define NORMAL_OPERATION_OSC (0<<0)
-#define POWER_DOWN_OSC (1<<0)
+#define SMA1303_OSC_PD_MASK (1<<0)
+#define SMA1303_NORMAL_OPERATION_OSC (0<<0)
+#define SMA1303_POWER_DOWN_OSC (1<<0)
/* TOP_MAN3 0xA4 */
-#define O_FORMAT_MASK (7<<5)
-#define O_FMT_LJ (1<<5)
-#define O_FMT_I2S (2<<5)
-#define O_FMT_TDM (4<<5)
+#define SMA1303_O_FORMAT_MASK (7<<5)
+#define SMA1303_O_FMT_LJ (1<<5)
+#define SMA1303_O_FMT_I2S (2<<5)
+#define SMA1303_O_FMT_TDM (4<<5)
-#define SCK_RATE_MASK (1<<3)
-#define SCK_64FS (0<<3)
-#define SCK_32FS (2<<3)
+#define SMA1303_SCK_RATE_MASK (1<<3)
+#define SMA1303_SCK_64FS (0<<3)
+#define SMA1303_SCK_32FS (2<<3)
-#define LRCK_POL_MASK (1<<0)
-#define L_VALID (0<<0)
-#define R_VALID (1<<0)
+#define SMA1303_LRCK_POL_MASK (1<<0)
+#define SMA1303_L_VALID (0<<0)
+#define SMA1303_R_VALID (1<<0)
/* TDM1 FORMAT : 0xA5 */
-#define TDM_CLK_POL_MASK (1<<7)
-#define TDM_CLK_POL_RISE (0<<7)
-#define TDM_CLK_POL_FALL (1<<7)
-
-#define TDM_TX_MODE_MASK (1<<6)
-#define TDM_TX_MONO (0<<6)
-#define TDM_TX_STEREO (1<<6)
-
-#define TDM_SLOT1_RX_POS_MASK (7<<3)
-#define TDM_SLOT1_RX_POS_0 (0<<3)
-#define TDM_SLOT1_RX_POS_1 (1<<3)
-#define TDM_SLOT1_RX_POS_2 (2<<3)
-#define TDM_SLOT1_RX_POS_3 (3<<3)
-#define TDM_SLOT1_RX_POS_4 (4<<3)
-#define TDM_SLOT1_RX_POS_5 (5<<3)
-#define TDM_SLOT1_RX_POS_6 (6<<3)
-#define TDM_SLOT1_RX_POS_7 (7<<3)
-
-#define TDM_SLOT2_RX_POS_MASK (7<<0)
-#define TDM_SLOT2_RX_POS_0 (0<<0)
-#define TDM_SLOT2_RX_POS_1 (1<<0)
-#define TDM_SLOT2_RX_POS_2 (2<<0)
-#define TDM_SLOT2_RX_POS_3 (3<<0)
-#define TDM_SLOT2_RX_POS_4 (4<<0)
-#define TDM_SLOT2_RX_POS_5 (5<<0)
-#define TDM_SLOT2_RX_POS_6 (6<<0)
-#define TDM_SLOT2_RX_POS_7 (7<<0)
+#define SMA1303_TDM_CLK_POL_MASK (1<<7)
+#define SMA1303_TDM_CLK_POL_RISE (0<<7)
+#define SMA1303_TDM_CLK_POL_FALL (1<<7)
+
+#define SMA1303_TDM_TX_MODE_MASK (1<<6)
+#define SMA1303_TDM_TX_MONO (0<<6)
+#define SMA1303_TDM_TX_STEREO (1<<6)
+
+#define SMA1303_TDM_SLOT1_RX_POS_MASK (7<<3)
+#define SMA1303_TDM_SLOT1_RX_POS_0 (0<<3)
+#define SMA1303_TDM_SLOT1_RX_POS_1 (1<<3)
+#define SMA1303_TDM_SLOT1_RX_POS_2 (2<<3)
+#define SMA1303_TDM_SLOT1_RX_POS_3 (3<<3)
+#define SMA1303_TDM_SLOT1_RX_POS_4 (4<<3)
+#define SMA1303_TDM_SLOT1_RX_POS_5 (5<<3)
+#define SMA1303_TDM_SLOT1_RX_POS_6 (6<<3)
+#define SMA1303_TDM_SLOT1_RX_POS_7 (7<<3)
+
+#define SMA1303_TDM_SLOT2_RX_POS_MASK (7<<0)
+#define SMA1303_TDM_SLOT2_RX_POS_0 (0<<0)
+#define SMA1303_TDM_SLOT2_RX_POS_1 (1<<0)
+#define SMA1303_TDM_SLOT2_RX_POS_2 (2<<0)
+#define SMA1303_TDM_SLOT2_RX_POS_3 (3<<0)
+#define SMA1303_TDM_SLOT2_RX_POS_4 (4<<0)
+#define SMA1303_TDM_SLOT2_RX_POS_5 (5<<0)
+#define SMA1303_TDM_SLOT2_RX_POS_6 (6<<0)
+#define SMA1303_TDM_SLOT2_RX_POS_7 (7<<0)
/* TDM2 FORMAT : 0xA6 */
-#define TDM_DL_MASK (1<<7)
-#define TDM_DL_16 (0<<7)
-#define TDM_DL_32 (1<<7)
-
-#define TDM_N_SLOT_MASK (1<<6)
-#define TDM_N_SLOT_4 (0<<6)
-#define TDM_N_SLOT_8 (1<<6)
-
-#define TDM_SLOT1_TX_POS_MASK (7<<3)
-#define TDM_SLOT1_TX_POS_0 (0<<3)
-#define TDM_SLOT1_TX_POS_1 (1<<3)
-#define TDM_SLOT1_TX_POS_2 (2<<3)
-#define TDM_SLOT1_TX_POS_3 (3<<3)
-#define TDM_SLOT1_TX_POS_4 (4<<3)
-#define TDM_SLOT1_TX_POS_5 (5<<3)
-#define TDM_SLOT1_TX_POS_6 (6<<3)
-#define TDM_SLOT1_TX_POS_7 (7<<3)
-
-#define TDM_SLOT2_TX_POS_MASK (7<<0)
-#define TDM_SLOT2_TX_POS_0 (0<<0)
-#define TDM_SLOT2_TX_POS_1 (1<<0)
-#define TDM_SLOT2_TX_POS_2 (2<<0)
-#define TDM_SLOT2_TX_POS_3 (3<<0)
-#define TDM_SLOT2_TX_POS_4 (4<<0)
-#define TDM_SLOT2_TX_POS_5 (5<<0)
-#define TDM_SLOT2_TX_POS_6 (6<<0)
-#define TDM_SLOT2_TX_POS_7 (7<<0)
+#define SMA1303_TDM_DL_MASK (1<<7)
+#define SMA1303_TDM_DL_16 (0<<7)
+#define SMA1303_TDM_DL_32 (1<<7)
+
+#define SMA1303_TDM_N_SLOT_MASK (1<<6)
+#define SMA1303_TDM_N_SLOT_4 (0<<6)
+#define SMA1303_TDM_N_SLOT_8 (1<<6)
+
+#define SMA1303_TDM_SLOT1_TX_POS_MASK (7<<3)
+#define SMA1303_TDM_SLOT1_TX_POS_0 (0<<3)
+#define SMA1303_TDM_SLOT1_TX_POS_1 (1<<3)
+#define SMA1303_TDM_SLOT1_TX_POS_2 (2<<3)
+#define SMA1303_TDM_SLOT1_TX_POS_3 (3<<3)
+#define SMA1303_TDM_SLOT1_TX_POS_4 (4<<3)
+#define SMA1303_TDM_SLOT1_TX_POS_5 (5<<3)
+#define SMA1303_TDM_SLOT1_TX_POS_6 (6<<3)
+#define SMA1303_TDM_SLOT1_TX_POS_7 (7<<3)
+
+#define SMA1303_TDM_SLOT2_TX_POS_MASK (7<<0)
+#define SMA1303_TDM_SLOT2_TX_POS_0 (0<<0)
+#define SMA1303_TDM_SLOT2_TX_POS_1 (1<<0)
+#define SMA1303_TDM_SLOT2_TX_POS_2 (2<<0)
+#define SMA1303_TDM_SLOT2_TX_POS_3 (3<<0)
+#define SMA1303_TDM_SLOT2_TX_POS_4 (4<<0)
+#define SMA1303_TDM_SLOT2_TX_POS_5 (5<<0)
+#define SMA1303_TDM_SLOT2_TX_POS_6 (6<<0)
+#define SMA1303_TDM_SLOT2_TX_POS_7 (7<<0)
/* STATUS1 : 0xFA */
-#define OT1_OK_STATUS (1<<7)
-#define OT2_OK_STATUS (1<<6)
+#define SMA1303_OT1_OK_STATUS (1<<7)
+#define SMA1303_OT2_OK_STATUS (1<<6)
/* STATUS2 : 0xFB */
-#define OCP_SPK_STATUS (1<<5)
-#define OCP_BST_STATUS (1<<4)
-#define OTP_STAT_OK_0 (5<<1)
-#define OTP_STAT_OK_1 (2<<2)
+#define SMA1303_OCP_SPK_STATUS (1<<5)
+#define SMA1303_OCP_BST_STATUS (1<<4)
+#define SMA1303_OTP_STAT_OK_0 (5<<1)
+#define SMA1303_OTP_STAT_OK_1 (2<<2)
-#define CLK_MON_STATUS (1<<0)
+#define SMA1303_CLK_MON_STATUS (1<<0)
/* DEVICE_INFO : 0xFF */
-#define DEVICE_ID (2<<3)
-#define UVLO_BST_STATUS (1<<2)
-#define REV_NUM_STATUS (3<<0)
-#define REV_NUM_TV0 (0<<0)
-#define REV_NUM_TV1 (1<<0)
+#define SMA1303_DEVICE_ID (2<<3)
+#define SMA1303_UVLO_BST_STATUS (1<<2)
+#define SMA1303_REV_NUM_STATUS (3<<0)
+#define SMA1303_REV_NUM_TV0 (0<<0)
+#define SMA1303_REV_NUM_TV1 (1<<0)
#endif
--
2.30.2
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 07/14] Remove the control of output format
2023-01-06 9:15 [PATCH 00/14] ASoC: Add a driver the Iron Device SMA1303 AMP Kiseok Jo
` (5 preceding siblings ...)
2023-01-06 9:15 ` [PATCH 06/14] Use the prefixs all definitions Kiseok Jo
@ 2023-01-06 9:15 ` Kiseok Jo
2023-01-06 9:15 ` [PATCH 08/14] Remove the mute control Kiseok Jo
` (6 subsequent siblings)
13 siblings, 0 replies; 26+ messages in thread
From: Kiseok Jo @ 2023-01-06 9:15 UTC (permalink / raw)
To: Mark Brown; +Cc: alsa-devel, application, Kiseok Jo
Remove output format like I2S, left justifed.
And then it add in hw_params.
Signed-off-by: Kiseok Jo <kiseok.jo@irondevice.com>
Reported-by: Mark Brown <broonie@kernel.org>
---
sound/soc/codecs/sma1303.c | 141 +++++++++++++------------------------
1 file changed, 48 insertions(+), 93 deletions(-)
diff --git a/sound/soc/codecs/sma1303.c b/sound/soc/codecs/sma1303.c
index 42352fa6de56..1199302af01d 100644
--- a/sound/soc/codecs/sma1303.c
+++ b/sound/soc/codecs/sma1303.c
@@ -432,71 +432,6 @@ static int sma1303_postscaler_config_put(struct snd_kcontrol *kcontrol,
SMA1303_90_POSTSCALER, SMA1303_BYP_POST_MASK, val);
}
-static const char * const sma1303_o_format_text[] = {
- "LJ", "I2S", "TDM"};
-
-static const struct soc_enum sma1303_o_format_enum =
-SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(sma1303_o_format_text), sma1303_o_format_text);
-
-static int sma1303_o_format_get(struct snd_kcontrol *kcontrol,
- struct snd_ctl_elem_value *ucontrol)
-{
- struct snd_soc_component *component =
- snd_soc_kcontrol_component(kcontrol);
- struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component);
- int val, data, ret;
-
- ret = sma1303_regmap_read(sma1303, SMA1303_A4_TOP_MAN3, &data);
- val = data & SMA1303_O_FORMAT_MASK;
- switch (val) {
- case SMA1303_O_FMT_LJ:
- ucontrol->value.integer.value[0] = 0;
- break;
- case SMA1303_O_FMT_I2S:
- ucontrol->value.integer.value[0] = 1;
- break;
- case SMA1303_O_FMT_TDM:
- ucontrol->value.integer.value[0] = 2;
- break;
- default:
- dev_err(component->dev,
- "Invalid value, register: %x\n",
- SMA1303_A4_TOP_MAN3);
- return -EINVAL;
- }
-
- return ret;
-}
-static int sma1303_o_format_put(struct snd_kcontrol *kcontrol,
- struct snd_ctl_elem_value *ucontrol)
-{
- struct snd_soc_component *component =
- snd_soc_kcontrol_component(kcontrol);
- struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component);
- int sel = (int)ucontrol->value.integer.value[0];
- int val;
-
- switch (sel) {
- case 0:
- val = SMA1303_O_FMT_LJ;
- break;
- case 1:
- val = SMA1303_O_FMT_I2S;
- break;
- case 2:
- val = SMA1303_O_FMT_TDM;
- break;
- default:
- dev_err(component->dev,
- "Invalid value, register: %x\n",
- SMA1303_A4_TOP_MAN3);
- return -EINVAL;
- }
-
- return sma1303_regmap_update_bits(sma1303,
- SMA1303_A4_TOP_MAN3, SMA1303_O_FORMAT_MASK, val);
-}
-
static const char * const sma1303_aif_in_source_text[] = {
"Mono", "Left", "Right"};
static const char * const sma1303_aif_out_source_text[] = {
@@ -815,8 +750,6 @@ SND_SOC_BYTES_EXT("Postscaler Set", 1,
postscaler_get, postscaler_put),
SOC_ENUM_EXT("Postscaler Config", sma1303_postscaler_config_enum,
sma1303_postscaler_config_get, sma1303_postscaler_config_put),
-SOC_ENUM_EXT("Output Format", sma1303_o_format_enum,
- sma1303_o_format_get, sma1303_o_format_put),
};
static const struct snd_soc_dapm_widget sma1303_dapm_widgets[] = {
@@ -930,7 +863,6 @@ static int sma1303_dai_hw_params_amp(struct snd_pcm_substream *substream,
{
struct snd_soc_component *component = dai->component;
struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component);
- unsigned int input_format = 0;
unsigned int bclk = 0;
int ret = 0;
@@ -1041,35 +973,61 @@ static int sma1303_dai_hw_params_amp(struct snd_pcm_substream *substream,
}
}
- switch (params_width(params)) {
- case 16:
- switch (sma1303->format) {
- case SND_SOC_DAIFMT_I2S:
- input_format |= SMA1303_STANDARD_I2S;
- break;
- case SND_SOC_DAIFMT_LEFT_J:
- input_format |= SMA1303_LJ;
+ switch (sma1303->format) {
+ case SND_SOC_DAIFMT_I2S:
+ ret += sma1303_regmap_update_bits(sma1303,
+ SMA1303_01_INPUT1_CTRL1,
+ SMA1303_I2S_MODE_MASK,
+ SMA1303_STANDARD_I2S);
+ ret += sma1303_regmap_update_bits(sma1303,
+ SMA1303_A4_TOP_MAN3,
+ SMA1303_O_FORMAT_MASK,
+ SMA1303_O_FMT_I2S);
+ break;
+ case SND_SOC_DAIFMT_LEFT_J:
+ ret += sma1303_regmap_update_bits(sma1303,
+ SMA1303_01_INPUT1_CTRL1,
+ SMA1303_I2S_MODE_MASK,
+ SMA1303_LJ);
+ ret += sma1303_regmap_update_bits(sma1303,
+ SMA1303_A4_TOP_MAN3,
+ SMA1303_O_FORMAT_MASK,
+ SMA1303_O_FMT_LJ);
+ break;
+ case SND_SOC_DAIFMT_RIGHT_J:
+ switch (params_width(params)) {
+ case 16:
+ ret += sma1303_regmap_update_bits(sma1303,
+ SMA1303_01_INPUT1_CTRL1,
+ SMA1303_I2S_MODE_MASK,
+ SMA1303_RJ_16BIT);
break;
- case SND_SOC_DAIFMT_RIGHT_J:
- input_format |= SMA1303_RJ_16BIT;
+ case 24:
+ case 32:
+ ret += sma1303_regmap_update_bits(sma1303,
+ SMA1303_01_INPUT1_CTRL1,
+ SMA1303_I2S_MODE_MASK,
+ SMA1303_RJ_24BIT);
break;
}
break;
+ case SND_SOC_DAIFMT_DSP_A:
+ ret += sma1303_regmap_update_bits(sma1303,
+ SMA1303_01_INPUT1_CTRL1,
+ SMA1303_I2S_MODE_MASK,
+ SMA1303_STANDARD_I2S);
+ ret += sma1303_regmap_update_bits(sma1303,
+ SMA1303_A4_TOP_MAN3,
+ SMA1303_O_FORMAT_MASK,
+ SMA1303_O_FMT_TDM);
+ break;
+ }
+
+ switch (params_width(params)) {
+ case 16:
case 24:
case 32:
- switch (sma1303->format) {
- case SND_SOC_DAIFMT_I2S:
- input_format |= SMA1303_STANDARD_I2S;
- break;
- case SND_SOC_DAIFMT_LEFT_J:
- input_format |= SMA1303_LJ;
- break;
- case SND_SOC_DAIFMT_RIGHT_J:
- input_format |= SMA1303_RJ_24BIT;
- break;
- }
break;
-
default:
dev_err(component->dev,
"%s not support data bit : %d\n", __func__,
@@ -1077,9 +1035,6 @@ static int sma1303_dai_hw_params_amp(struct snd_pcm_substream *substream,
return -EINVAL;
}
- ret += sma1303_regmap_update_bits(sma1303,
- SMA1303_01_INPUT1_CTRL1,
- SMA1303_I2S_MODE_MASK, input_format);
return ret;
}
--
2.30.2
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 08/14] Remove the mute control
2023-01-06 9:15 [PATCH 00/14] ASoC: Add a driver the Iron Device SMA1303 AMP Kiseok Jo
` (6 preceding siblings ...)
2023-01-06 9:15 ` [PATCH 07/14] Remove the control of output format Kiseok Jo
@ 2023-01-06 9:15 ` Kiseok Jo
2023-01-06 9:15 ` [PATCH 09/14] Add the prefix for component controls Kiseok Jo
` (5 subsequent siblings)
13 siblings, 0 replies; 26+ messages in thread
From: Kiseok Jo @ 2023-01-06 9:15 UTC (permalink / raw)
To: Mark Brown; +Cc: alsa-devel, application, Kiseok Jo
Remove the mute control and add the force mute control instead.
Already used the dai mute_stream.
Signed-off-by: Kiseok Jo <kiseok.jo@irondevice.com>
---
sound/soc/codecs/sma1303.c | 72 +++++++++++++++++++++++++-------------
1 file changed, 47 insertions(+), 25 deletions(-)
diff --git a/sound/soc/codecs/sma1303.c b/sound/soc/codecs/sma1303.c
index 1199302af01d..3a60927e20aa 100644
--- a/sound/soc/codecs/sma1303.c
+++ b/sound/soc/codecs/sma1303.c
@@ -68,6 +68,7 @@ struct sma1303_priv {
struct regmap *regmap;
struct sma1303_pll_match *pll_matches;
bool amp_power_status;
+ bool force_mute_status;
int num_of_pll_matches;
int retry_cnt;
unsigned int amp_mode;
@@ -351,14 +352,6 @@ static int bytes_ext_put(struct snd_kcontrol *kcontrol,
return 0;
}
-static const char * const sma1303_spkmute_text[] = {
- "Unmute", "Mute"};
-
-static const struct soc_enum sma1303_spkmute_enum =
- SOC_ENUM_SINGLE(SMA1303_0E_MUTE_VOL_CTRL, 0,
- ARRAY_SIZE(sma1303_spkmute_text),
- sma1303_spkmute_text);
-
static int postscaler_get(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{
@@ -445,6 +438,34 @@ static const struct soc_enum sma1303_aif_out_source_enum =
SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(sma1303_aif_out_source_text),
sma1303_aif_out_source_text);
+static int sma1303_force_mute_get(struct snd_kcontrol *kcontrol,
+ struct snd_ctl_elem_value *ucontrol)
+{
+ struct snd_soc_component *component =
+ snd_soc_kcontrol_component(kcontrol);
+ struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component);
+
+ ucontrol->value.integer.value[0] = (int)sma1303->force_mute_status;
+ dev_info(sma1303->dev, "%s : Force Mute %s\n", __func__,
+ sma1303->force_mute_status ? "ON" : "OFF");
+
+ return 0;
+}
+
+static int sma1303_force_mute_put(struct snd_kcontrol *kcontrol,
+ struct snd_ctl_elem_value *ucontrol)
+{
+ struct snd_soc_component *component =
+ snd_soc_kcontrol_component(kcontrol);
+ struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component);
+
+ sma1303->force_mute_status = (bool)ucontrol->value.integer.value[0];
+ dev_info(sma1303->dev, "%s : Force Mute %s\n", __func__,
+ sma1303->force_mute_status ? "ON" : "OFF");
+
+ return 0;
+}
+
static int sma1303_startup(struct snd_soc_component *component)
{
struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component);
@@ -484,9 +505,6 @@ static int sma1303_startup(struct snd_soc_component *component)
CHECK_PERIOD_TIME * HZ);
}
- ret += sma1303_regmap_update_bits(sma1303, SMA1303_0E_MUTE_VOL_CTRL,
- SMA1303_SPK_MUTE_MASK, SMA1303_SPK_UNMUTE);
-
sma1303->amp_power_status = true;
return ret;
@@ -503,9 +521,6 @@ static int sma1303_shutdown(struct snd_soc_component *component)
return ret;
}
- ret += sma1303_regmap_update_bits(sma1303, SMA1303_0E_MUTE_VOL_CTRL,
- SMA1303_SPK_MUTE_MASK, SMA1303_SPK_MUTE);
-
cancel_delayed_work_sync(&sma1303->check_fault_work);
msleep(55);
@@ -743,13 +758,14 @@ static const struct snd_kcontrol_new sma1303_enable_control =
SOC_DAPM_SINGLE_VIRT("Switch", 1);
static const struct snd_kcontrol_new sma1303_snd_controls[] = {
-SOC_SINGLE_TLV("Speaker Volume", SMA1303_0A_SPK_VOL,
+ SOC_SINGLE_TLV("Speaker Volume", SMA1303_0A_SPK_VOL,
0, 167, 1, sma1303_spk_tlv),
-SOC_ENUM("Speaker Mute Switch", sma1303_spkmute_enum),
-SND_SOC_BYTES_EXT("Postscaler Set", 1,
+ SND_SOC_BYTES_EXT("Postscaler Set", 1,
postscaler_get, postscaler_put),
-SOC_ENUM_EXT("Postscaler Config", sma1303_postscaler_config_enum,
- sma1303_postscaler_config_get, sma1303_postscaler_config_put),
+ SOC_ENUM_EXT("Postscaler Config", sma1303_postscaler_config_enum,
+ sma1303_postscaler_config_get, sma1303_postscaler_config_put),
+ SOC_SINGLE_BOOL_EXT("Force Mute", 0,
+ sma1303_force_mute_get, sma1303_force_mute_put),
};
static const struct snd_soc_dapm_widget sma1303_dapm_widgets[] = {
@@ -1084,12 +1100,17 @@ static int sma1303_dai_mute(struct snd_soc_dai *dai, int mute, int stream)
SMA1303_SPK_MUTE_MASK,
SMA1303_SPK_MUTE);
} else {
- dev_info(component->dev, "%s : %s\n", __func__, "UNMUTE");
-
- ret += sma1303_regmap_update_bits(sma1303,
- SMA1303_0E_MUTE_VOL_CTRL,
- SMA1303_SPK_MUTE_MASK,
- SMA1303_SPK_UNMUTE);
+ if (!sma1303->force_mute_status) {
+ dev_info(component->dev, "%s : %s\n",
+ __func__, "UNMUTE");
+ ret += sma1303_regmap_update_bits(sma1303,
+ SMA1303_0E_MUTE_VOL_CTRL,
+ SMA1303_SPK_MUTE_MASK,
+ SMA1303_SPK_UNMUTE);
+ } else {
+ dev_info(sma1303->dev,
+ "%s : FORCE MUTE!!!\n", __func__);
+ }
}
return ret;
@@ -1728,6 +1749,7 @@ static int sma1303_i2c_probe(struct i2c_client *client,
sma1303->amp_mode = SMA1303_MONO;
sma1303->amp_power_status = false;
+ sma1303->force_mute_status = false;
sma1303->check_fault_status = true;
sma1303->pll_matches = sma1303_pll_matches;
sma1303->num_of_pll_matches =
--
2.30.2
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 09/14] Add the prefix for component controls
2023-01-06 9:15 [PATCH 00/14] ASoC: Add a driver the Iron Device SMA1303 AMP Kiseok Jo
` (7 preceding siblings ...)
2023-01-06 9:15 ` [PATCH 08/14] Remove the mute control Kiseok Jo
@ 2023-01-06 9:15 ` Kiseok Jo
2023-01-06 9:15 ` [PATCH 10/14] Remove the shutdown and startup when set PLL Kiseok Jo
` (4 subsequent siblings)
13 siblings, 0 replies; 26+ messages in thread
From: Kiseok Jo @ 2023-01-06 9:15 UTC (permalink / raw)
To: Mark Brown; +Cc: alsa-devel, application, Kiseok Jo, kernel test robot
Add the device name on prefix for component controls.
Signed-off-by: Kiseok Jo <kiseok.jo@irondevice.com>
Reported-by: kernel test robot <lkp@intel.com>
---
sound/soc/codecs/sma1303.c | 79 ++++++++++++++++++++++----------------
1 file changed, 46 insertions(+), 33 deletions(-)
diff --git a/sound/soc/codecs/sma1303.c b/sound/soc/codecs/sma1303.c
index 3a60927e20aa..1991c8d21ba3 100644
--- a/sound/soc/codecs/sma1303.c
+++ b/sound/soc/codecs/sma1303.c
@@ -29,6 +29,7 @@
#include "sma1303.h"
#define CHECK_PERIOD_TIME 1 /* sec per HZ */
+#define MAX_CONTROL_NAME 48
#define PLL_MATCH(_input_clk_name, _output_clk_name, _input_clk,\
_post_n, _n, _vco, _p_cp)\
@@ -88,6 +89,8 @@ struct sma1303_priv {
long check_fault_status;
};
+static struct snd_kcontrol_new *sma1303_controls;
+
static struct sma1303_pll_match sma1303_pll_matches[] = {
PLL_MATCH("1.411MHz", "24.595MHz", 1411200, 0x07, 0xF4, 0x8B, 0x03),
PLL_MATCH("1.536MHz", "24.576MHz", 1536000, 0x07, 0xE0, 0x8B, 0x03),
@@ -825,6 +828,47 @@ static const struct snd_soc_dapm_route sma1303_audio_map[] = {
{"AIF OUT", NULL, "AMP Enable"},
};
+static int sma1303_add_component_controls(struct snd_soc_component *component)
+{
+ struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component);
+ unsigned char **name;
+ int index, ret = 0, size, apply = 0;
+
+ sma1303_controls = devm_kzalloc(sma1303->dev,
+ sizeof(sma1303_snd_controls), GFP_KERNEL);
+ name = devm_kzalloc(sma1303->dev,
+ ARRAY_SIZE(sma1303_snd_controls), GFP_KERNEL);
+
+ for (index = 0; index < ARRAY_SIZE(sma1303_snd_controls); index++) {
+ sma1303_controls[index] = sma1303_snd_controls[index];
+ name[index] = devm_kzalloc(sma1303->dev,
+ MAX_CONTROL_NAME, GFP_KERNEL);
+ size = strlen(sma1303_snd_controls[index].name)
+ + strlen(sma1303->dev->driver->name);
+ if (!name[index] || size > MAX_CONTROL_NAME) {
+ sma1303_controls[index].name =
+ sma1303_snd_controls[index].name;
+ } else {
+ scnprintf(name[index], MAX_CONTROL_NAME, "%s %s",
+ sma1303->dev->driver->name,
+ sma1303_snd_controls[index].name);
+ sma1303_controls[index].name = name[index];
+ apply++;
+ }
+ }
+
+ ret = snd_soc_add_component_controls(component,
+ sma1303_controls, ARRAY_SIZE(sma1303_snd_controls));
+
+ dev_info(sma1303->dev,
+ "%s : prefix=\"%s\", total_num=%d, apply_num=%d\n",
+ __func__, sma1303->dev->driver->name,
+ (int)ARRAY_SIZE(sma1303_snd_controls), apply);
+
+ return ret;
+
+}
+
static int sma1303_setup_pll(struct snd_soc_component *component,
unsigned int bclk)
{
@@ -1443,39 +1487,10 @@ static int sma1303_probe(struct snd_soc_component *component)
struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component);
struct snd_soc_dapm_context *dapm =
snd_soc_component_get_dapm(component);
- char *dapm_widget_str = NULL;
- int prefix_len = 0, str_max = 30, ret = 0, i = 0;
+ int ret = 0, i = 0;
unsigned int status, otp_stat;
- if (component->name_prefix != NULL) {
- dev_info(component->dev, "%s : component name prefix - %s\n",
- __func__, component->name_prefix);
-
- prefix_len = strlen(component->name_prefix);
- dapm_widget_str = kzalloc(prefix_len + str_max, GFP_KERNEL);
-
- if (!dapm_widget_str) {
- kfree(dapm_widget_str);
- return -ENOMEM;
- }
-
- strcpy(dapm_widget_str, component->name_prefix);
- strcat(dapm_widget_str, " Playback");
-
- snd_soc_dapm_ignore_suspend(dapm, dapm_widget_str);
-
- memset(dapm_widget_str + prefix_len, 0, str_max);
-
- strcpy(dapm_widget_str, component->name_prefix);
- strcat(dapm_widget_str, " SPK");
-
- snd_soc_dapm_ignore_suspend(dapm, dapm_widget_str);
-
- kfree(dapm_widget_str);
- } else {
- snd_soc_dapm_ignore_suspend(dapm, "Playback");
- snd_soc_dapm_ignore_suspend(dapm, "SPK");
- }
+ ret += sma1303_add_component_controls(component);
snd_soc_dapm_sync(dapm);
@@ -1534,8 +1549,6 @@ static void sma1303_remove(struct snd_soc_component *component)
static const struct snd_soc_component_driver sma1303_component = {
.probe = sma1303_probe,
.remove = sma1303_remove,
- .controls = sma1303_snd_controls,
- .num_controls = ARRAY_SIZE(sma1303_snd_controls),
.dapm_widgets = sma1303_dapm_widgets,
.num_dapm_widgets = ARRAY_SIZE(sma1303_dapm_widgets),
.dapm_routes = sma1303_audio_map,
--
2.30.2
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 10/14] Remove the shutdown and startup when set PLL
2023-01-06 9:15 [PATCH 00/14] ASoC: Add a driver the Iron Device SMA1303 AMP Kiseok Jo
` (8 preceding siblings ...)
2023-01-06 9:15 ` [PATCH 09/14] Add the prefix for component controls Kiseok Jo
@ 2023-01-06 9:15 ` Kiseok Jo
2023-01-06 9:15 ` [PATCH 11/14] Delete the header file of "linux/version.h" Kiseok Jo
` (3 subsequent siblings)
13 siblings, 0 replies; 26+ messages in thread
From: Kiseok Jo @ 2023-01-06 9:15 UTC (permalink / raw)
To: Mark Brown; +Cc: alsa-devel, application, Kiseok Jo
Signed-off-by: Kiseok Jo <kiseok.jo@irondevice.com>
Reported-by: Mark Brown <broonie@kernel.org>
---
sound/soc/codecs/sma1303.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/sound/soc/codecs/sma1303.c b/sound/soc/codecs/sma1303.c
index 1991c8d21ba3..0b4ca935ae9f 100644
--- a/sound/soc/codecs/sma1303.c
+++ b/sound/soc/codecs/sma1303.c
@@ -943,13 +943,7 @@ static int sma1303_dai_hw_params_amp(struct snd_pcm_substream *substream,
|| sma1303->sys_clk_id == SMA1303_PLL_CLKIN_BCLK) {
if (sma1303->last_bclk != bclk) {
- if (sma1303->amp_power_status) {
- sma1303_shutdown(component);
- sma1303_setup_pll(component, bclk);
- sma1303_startup(component);
- } else
- sma1303_setup_pll(component, bclk);
-
+ sma1303_setup_pll(component, bclk);
sma1303->last_bclk = bclk;
}
}
--
2.30.2
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 11/14] Delete the header file of "linux/version.h"
2023-01-06 9:15 [PATCH 00/14] ASoC: Add a driver the Iron Device SMA1303 AMP Kiseok Jo
` (9 preceding siblings ...)
2023-01-06 9:15 ` [PATCH 10/14] Remove the shutdown and startup when set PLL Kiseok Jo
@ 2023-01-06 9:15 ` Kiseok Jo
2023-01-06 9:15 ` [PATCH 12/14] Add the postscaler's switch in DAPM manage Kiseok Jo
` (2 subsequent siblings)
13 siblings, 0 replies; 26+ messages in thread
From: Kiseok Jo @ 2023-01-06 9:15 UTC (permalink / raw)
To: Mark Brown; +Cc: alsa-devel, application, Kiseok Jo, kernel test robot
Signed-off-by: Kiseok Jo <kiseok.jo@irondevice.com>
Reported-by: kernel test robot <lkp@intel.com>
---
sound/soc/codecs/sma1303.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/sound/soc/codecs/sma1303.c b/sound/soc/codecs/sma1303.c
index 0b4ca935ae9f..ea4356233c2f 100644
--- a/sound/soc/codecs/sma1303.c
+++ b/sound/soc/codecs/sma1303.c
@@ -15,7 +15,6 @@
#include <linux/pm.h>
#include <linux/i2c.h>
#include <linux/regmap.h>
-#include <linux/version.h>
#include <sound/core.h>
#include <sound/pcm.h>
#include <sound/pcm_params.h>
--
2.30.2
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 12/14] Add the postscaler's switch in DAPM manage.
2023-01-06 9:15 [PATCH 00/14] ASoC: Add a driver the Iron Device SMA1303 AMP Kiseok Jo
` (10 preceding siblings ...)
2023-01-06 9:15 ` [PATCH 11/14] Delete the header file of "linux/version.h" Kiseok Jo
@ 2023-01-06 9:15 ` Kiseok Jo
2023-01-06 9:15 ` [PATCH 13/14] Move the initial settings to i2c driver probe Kiseok Jo
2023-01-06 9:15 ` [PATCH 14/14] Fixed the retry_cnt bug about being zero Kiseok Jo
13 siblings, 0 replies; 26+ messages in thread
From: Kiseok Jo @ 2023-01-06 9:15 UTC (permalink / raw)
To: Mark Brown; +Cc: alsa-devel, application, Kiseok Jo
Signed-off-by: Kiseok Jo <kiseok.jo@irondevice.com>
---
sound/soc/codecs/sma1303.c | 196 +++++++++++++------------------------
1 file changed, 66 insertions(+), 130 deletions(-)
diff --git a/sound/soc/codecs/sma1303.c b/sound/soc/codecs/sma1303.c
index ea4356233c2f..08f5054fde1d 100644
--- a/sound/soc/codecs/sma1303.c
+++ b/sound/soc/codecs/sma1303.c
@@ -301,132 +301,6 @@ static int sma1303_regmap_read(struct sma1303_priv *sma1303,
return ret;
}
-static int bytes_ext_get(struct snd_kcontrol *kcontrol,
- struct snd_ctl_elem_value *ucontrol, int reg)
-{
- struct snd_soc_component *component =
- snd_soc_kcontrol_component(kcontrol);
- struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component);
- struct soc_bytes_ext *params = (void *)kcontrol->private_value;
- unsigned int i, reg_val;
- u8 *val;
- int ret;
-
- val = (u8 *)ucontrol->value.bytes.data;
- for (i = 0; i < params->max; i++) {
- ret = sma1303_regmap_read(sma1303, reg + i, ®_val);
- if (sizeof(reg_val) > 2)
- reg_val = cpu_to_le32(reg_val);
- else
- reg_val = cpu_to_le16(reg_val);
- memcpy(val + i, ®_val, sizeof(u8));
- }
-
- return ret;
-}
-
-static int bytes_ext_put(struct snd_kcontrol *kcontrol,
- struct snd_ctl_elem_value *ucontrol, int reg)
-{
- struct snd_soc_component *component =
- snd_soc_kcontrol_component(kcontrol);
- struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component);
- struct soc_bytes_ext *params = (void *)kcontrol->private_value;
- void *data;
- u8 *val;
- int i, ret;
-
- data = kmemdup(ucontrol->value.bytes.data,
- params->max, GFP_KERNEL | GFP_DMA);
- if (!data)
- return -ENOMEM;
-
- val = (u8 *)data;
- for (i = 0; i < params->max; i++) {
- ret = sma1303_regmap_write(sma1303, reg + i, *(val + i));
- if (ret < 0) {
- kfree(data);
- return ret;
- }
- }
- kfree(data);
-
- return 0;
-}
-
-static int postscaler_get(struct snd_kcontrol *kcontrol,
- struct snd_ctl_elem_value *ucontrol)
-{
- return bytes_ext_get(kcontrol, ucontrol, SMA1303_90_POSTSCALER);
-}
-
-static int postscaler_put(struct snd_kcontrol *kcontrol,
- struct snd_ctl_elem_value *ucontrol)
-{
- return bytes_ext_put(kcontrol, ucontrol, SMA1303_90_POSTSCALER);
-}
-
-static const char * const sma1303_postscaler_config_text[] = {
- "Enable", "Disable"};
-
-static const struct soc_enum sma1303_postscaler_config_enum =
- SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(sma1303_postscaler_config_text),
- sma1303_postscaler_config_text);
-
-static int sma1303_postscaler_config_get(struct snd_kcontrol *kcontrol,
- struct snd_ctl_elem_value *ucontrol)
-{
- struct snd_soc_component *component =
- snd_soc_kcontrol_component(kcontrol);
- struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component);
- int ret, data, val;
-
- ret = sma1303_regmap_read(sma1303, SMA1303_90_POSTSCALER, &data);
- val = data & SMA1303_BYP_POST_MASK;
- switch (val) {
- case SMA1303_BYP_POST_SCALER:
- ucontrol->value.integer.value[0] = 1;
- break;
- case SMA1303_EN_POST_SCALER:
- ucontrol->value.integer.value[0] = 0;
- break;
- default:
- dev_err(component->dev,
- "Invalid value, register: %x value: %d\n",
- SMA1303_90_POSTSCALER, val);
- return -EINVAL;
- }
-
- return ret;
-}
-
-static int sma1303_postscaler_config_put(struct snd_kcontrol *kcontrol,
- struct snd_ctl_elem_value *ucontrol)
-{
- struct snd_soc_component *component =
- snd_soc_kcontrol_component(kcontrol);
- struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component);
- int sel = (int)ucontrol->value.integer.value[0];
- int val;
-
- switch (sel) {
- case 0:
- val = SMA1303_EN_POST_SCALER;
- break;
- case 1:
- val = SMA1303_BYP_POST_SCALER;
- break;
- default:
- dev_err(component->dev,
- "Invalid value, register: %x\n",
- SMA1303_90_POSTSCALER);
- return -EINVAL;
- }
-
- return sma1303_regmap_update_bits(sma1303,
- SMA1303_90_POSTSCALER, SMA1303_BYP_POST_MASK, val);
-}
-
static const char * const sma1303_aif_in_source_text[] = {
"Mono", "Left", "Right"};
static const char * const sma1303_aif_out_source_text[] = {
@@ -468,6 +342,34 @@ static int sma1303_force_mute_put(struct snd_kcontrol *kcontrol,
return 0;
}
+static int sma1303_postscaler_get(struct snd_kcontrol *kcontrol,
+ struct snd_ctl_elem_value *ucontrol)
+{
+ struct snd_soc_component *component =
+ snd_soc_kcontrol_component(kcontrol);
+ struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component);
+ int val, ret;
+
+ ret = sma1303_regmap_read(sma1303, SMA1303_90_POSTSCALER, &val);
+ ucontrol->value.integer.value[0] = (val & 0x7E) >> 1;
+
+ return ret;
+}
+
+static int sma1303_postscaler_put(struct snd_kcontrol *kcontrol,
+ struct snd_ctl_elem_value *ucontrol)
+{
+ struct snd_soc_component *component =
+ snd_soc_kcontrol_component(kcontrol);
+ struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component);
+ int ret, sel = (int)ucontrol->value.integer.value[0];
+
+ ret = sma1303_regmap_update_bits(sma1303,
+ SMA1303_90_POSTSCALER, 0x70, (sel << 1));
+
+ return ret;
+}
+
static int sma1303_startup(struct snd_soc_component *component)
{
struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component);
@@ -727,6 +629,34 @@ static int sma1303_sdo_event(struct snd_soc_dapm_widget *w,
return ret;
}
+static int sma1303_post_scaler_event(struct snd_soc_dapm_widget *w,
+ struct snd_kcontrol *kcontrol, int event)
+{
+ struct snd_soc_component *component =
+ snd_soc_dapm_to_component(w->dapm);
+ struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component);
+
+ switch (event) {
+ case SND_SOC_DAPM_PRE_PMU:
+ dev_info(sma1303->dev,
+ "%s : SND_SOC_DAPM_PRE_PMU\n", __func__);
+ sma1303_regmap_update_bits(sma1303,
+ SMA1303_90_POSTSCALER,
+ SMA1303_BYP_POST_MASK,
+ SMA1303_EN_POST_SCALER);
+ break;
+ case SND_SOC_DAPM_POST_PMD:
+ dev_info(sma1303->dev,
+ "%s : SND_SOC_DAPM_POST_PMD\n", __func__);
+ sma1303_regmap_update_bits(sma1303,
+ SMA1303_90_POSTSCALER,
+ SMA1303_BYP_POST_MASK,
+ SMA1303_BYP_POST_SCALER);
+ break;
+ }
+ return 0;
+}
+
static int sma1303_power_event(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol, int event)
{
@@ -756,18 +686,18 @@ static const struct snd_kcontrol_new sma1303_aif_out_source_control =
SOC_DAPM_ENUM("AIF OUT Source", sma1303_aif_out_source_enum);
static const struct snd_kcontrol_new sma1303_sdo_control =
SOC_DAPM_SINGLE_VIRT("Switch", 1);
+static const struct snd_kcontrol_new sma1303_post_scaler_control =
+ SOC_DAPM_SINGLE_VIRT("Switch", 1);
static const struct snd_kcontrol_new sma1303_enable_control =
SOC_DAPM_SINGLE_VIRT("Switch", 1);
static const struct snd_kcontrol_new sma1303_snd_controls[] = {
SOC_SINGLE_TLV("Speaker Volume", SMA1303_0A_SPK_VOL,
0, 167, 1, sma1303_spk_tlv),
- SND_SOC_BYTES_EXT("Postscaler Set", 1,
- postscaler_get, postscaler_put),
- SOC_ENUM_EXT("Postscaler Config", sma1303_postscaler_config_enum,
- sma1303_postscaler_config_get, sma1303_postscaler_config_put),
SOC_SINGLE_BOOL_EXT("Force Mute", 0,
sma1303_force_mute_get, sma1303_force_mute_put),
+ SOC_SINGLE_EXT("Postscaler Gain", SMA1303_90_POSTSCALER, 1, 0x30, 0,
+ sma1303_postscaler_get, sma1303_postscaler_put),
};
static const struct snd_soc_dapm_widget sma1303_dapm_widgets[] = {
@@ -789,6 +719,10 @@ static const struct snd_soc_dapm_widget sma1303_dapm_widgets[] = {
sma1303_sdo_event,
SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
SND_SOC_DAPM_MIXER("Entry", SND_SOC_NOPM, 0, 0, NULL, 0),
+ SND_SOC_DAPM_SWITCH_E("Post Scaler", SND_SOC_NOPM, 0, 1,
+ &sma1303_post_scaler_control,
+ sma1303_post_scaler_event,
+ SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
SND_SOC_DAPM_OUT_DRV_E("AMP Power", SND_SOC_NOPM, 0, 0, NULL, 0,
sma1303_power_event,
SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),
@@ -818,6 +752,8 @@ static const struct snd_soc_dapm_route sma1303_audio_map[] = {
{"Entry", NULL, "AIF OUT Source"},
{"Entry", NULL, "AIF IN Source"},
+ {"Post Scaler", "Switch", "Entry"},
+ {"AMP Power", NULL, "Entry"},
{"AMP Power", NULL, "Entry"},
{"AMP Enable", "Switch", "AMP Power"},
--
2.30.2
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 13/14] Move the initial settings to i2c driver probe
2023-01-06 9:15 [PATCH 00/14] ASoC: Add a driver the Iron Device SMA1303 AMP Kiseok Jo
` (11 preceding siblings ...)
2023-01-06 9:15 ` [PATCH 12/14] Add the postscaler's switch in DAPM manage Kiseok Jo
@ 2023-01-06 9:15 ` Kiseok Jo
2023-01-06 9:15 ` [PATCH 14/14] Fixed the retry_cnt bug about being zero Kiseok Jo
13 siblings, 0 replies; 26+ messages in thread
From: Kiseok Jo @ 2023-01-06 9:15 UTC (permalink / raw)
To: Mark Brown; +Cc: alsa-devel, application, Kiseok Jo
Signed-off-by: Kiseok Jo <kiseok.jo@irondevice.com>
Reported-by: Mark Brown <broonie@kernel.org>
---
sound/soc/codecs/sma1303.c | 106 +++++++++++++++++--------------------
1 file changed, 48 insertions(+), 58 deletions(-)
diff --git a/sound/soc/codecs/sma1303.c b/sound/soc/codecs/sma1303.c
index 08f5054fde1d..1a5d992bf3db 100644
--- a/sound/soc/codecs/sma1303.c
+++ b/sound/soc/codecs/sma1303.c
@@ -1416,49 +1416,12 @@ static int sma1303_probe(struct snd_soc_component *component)
struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component);
struct snd_soc_dapm_context *dapm =
snd_soc_component_get_dapm(component);
- int ret = 0, i = 0;
- unsigned int status, otp_stat;
+ int ret = 0;
ret += sma1303_add_component_controls(component);
snd_soc_dapm_sync(dapm);
- ret += sma1303_regmap_update_bits(sma1303,
- SMA1303_00_SYSTEM_CTRL,
- SMA1303_RESETBYI2C_MASK, SMA1303_RESETBYI2C_RESET);
-
- ret += sma1303_regmap_read(sma1303, SMA1303_FF_DEVICE_INDEX, &status);
- if (ret < 0) {
- dev_err(sma1303->dev,
- "failed to read, register: %02X, ret: %d\n",
- SMA1303_FF_DEVICE_INDEX, ret);
- return ret;
- }
- sma1303->rev_num = status & SMA1303_REV_NUM_STATUS;
- if (sma1303->rev_num == SMA1303_REV_NUM_TV0)
- dev_info(component->dev, "SMA1303 Trimming Version 0\n");
- else if (sma1303->rev_num == SMA1303_REV_NUM_TV1)
- dev_info(component->dev, "SMA1303 Trimming Version 1\n");
-
- ret += sma1303_regmap_read(sma1303, SMA1303_FB_STATUS2, &otp_stat);
- if (ret < 0)
- dev_err(sma1303->dev,
- "failed to read, register: %02X, ret: %d\n",
- SMA1303_FF_DEVICE_INDEX, ret);
-
- if (((sma1303->rev_num == SMA1303_REV_NUM_TV0) &&
- ((otp_stat & 0x0E) == SMA1303_OTP_STAT_OK_0)) ||
- ((sma1303->rev_num != SMA1303_REV_NUM_TV0) &&
- ((otp_stat & 0x0C) == SMA1303_OTP_STAT_OK_1)))
- dev_info(component->dev, "SMA1303 OTP Status Successful\n");
- else
- dev_info(component->dev, "SMA1303 OTP Status Fail\n");
-
- for (i = 0; i < (unsigned int)ARRAY_SIZE(sma1303_reg_def); i++)
- ret += sma1303_regmap_write(sma1303,
- sma1303_reg_def[i].reg,
- sma1303_reg_def[i].def);
-
ret += sma1303_regmap_write(sma1303,
SMA1303_0A_SPK_VOL, sma1303->init_vol);
@@ -1580,18 +1543,17 @@ static int sma1303_i2c_probe(struct i2c_client *client,
{
struct sma1303_priv *sma1303;
struct device_node *np = client->dev.of_node;
- int ret;
+ int ret, i = 0;
u32 value;
- unsigned int device_info;
-
- sma1303 = devm_kzalloc(&client->dev, sizeof(struct sma1303_priv),
- GFP_KERNEL);
+ unsigned int device_info, status, otp_stat;
+ sma1303 = devm_kzalloc(&client->dev,
+ sizeof(struct sma1303_priv), GFP_KERNEL);
if (!sma1303)
return -ENOMEM;
+ sma1303->dev = &client->dev;
sma1303->regmap = devm_regmap_init_i2c(client, &sma_i2c_regmap);
-
if (IS_ERR(sma1303->regmap)) {
ret = PTR_ERR(sma1303->regmap);
dev_err(&client->dev,
@@ -1671,35 +1633,64 @@ static int sma1303_i2c_probe(struct i2c_client *client,
}
dev_info(&client->dev, "chip version 0x%02X\n", device_info);
- sma1303->last_over_temp = 0xC0;
- sma1303->last_ocp_val = 0x08;
- sma1303->tsdw_cnt = 0;
+ ret += sma1303_regmap_update_bits(sma1303,
+ SMA1303_00_SYSTEM_CTRL,
+ SMA1303_RESETBYI2C_MASK, SMA1303_RESETBYI2C_RESET);
+
+ ret += sma1303_regmap_read(sma1303, SMA1303_FF_DEVICE_INDEX, &status);
+ sma1303->rev_num = status & SMA1303_REV_NUM_STATUS;
+ if (sma1303->rev_num == SMA1303_REV_NUM_TV0)
+ dev_info(&client->dev, "SMA1303 Trimming Version 0\n");
+ else if (sma1303->rev_num == SMA1303_REV_NUM_TV1)
+ dev_info(&client->dev, "SMA1303 Trimming Version 1\n");
+
+ ret += sma1303_regmap_read(sma1303, SMA1303_FB_STATUS2, &otp_stat);
+ if (ret < 0)
+ dev_err(&client->dev,
+ "failed to read, register: %02X, ret: %d\n",
+ SMA1303_FF_DEVICE_INDEX, ret);
+
+ if (((sma1303->rev_num == SMA1303_REV_NUM_TV0) &&
+ ((otp_stat & 0x0E) == SMA1303_OTP_STAT_OK_0)) ||
+ ((sma1303->rev_num != SMA1303_REV_NUM_TV0) &&
+ ((otp_stat & 0x0C) == SMA1303_OTP_STAT_OK_1)))
+ dev_info(&client->dev, "SMA1303 OTP Status Successful\n");
+ else
+ dev_info(&client->dev, "SMA1303 OTP Status Fail\n");
+
+ for (i = 0; i < (unsigned int)ARRAY_SIZE(sma1303_reg_def); i++)
+ ret += sma1303_regmap_write(sma1303,
+ sma1303_reg_def[i].reg,
+ sma1303_reg_def[i].def);
+
+ sma1303->amp_mode = SMA1303_MONO;
+ sma1303->amp_power_status = false;
+ sma1303->check_fault_period = CHECK_PERIOD_TIME;
+ sma1303->check_fault_status = true;
+ sma1303->force_mute_status = false;
sma1303->init_vol = 0x31;
sma1303->cur_vol = sma1303->init_vol;
sma1303->last_bclk = 0;
+ sma1303->last_ocp_val = 0x08;
+ sma1303->last_over_temp = 0xC0;
+ sma1303->tsdw_cnt = 0;
- INIT_DELAYED_WORK(&sma1303->check_fault_work,
- sma1303_check_fault_worker);
+ sma1303->dev = &client->dev;
+ sma1303->kobj = &client->dev.kobj;
mutex_init(&sma1303->lock);
- sma1303->check_fault_period = CHECK_PERIOD_TIME;
- sma1303->dev = &client->dev;
- sma1303->kobj = &client->dev.kobj;
+ INIT_DELAYED_WORK(&sma1303->check_fault_work,
+ sma1303_check_fault_worker);
i2c_set_clientdata(client, sma1303);
- sma1303->amp_mode = SMA1303_MONO;
- sma1303->amp_power_status = false;
- sma1303->force_mute_status = false;
- sma1303->check_fault_status = true;
sma1303->pll_matches = sma1303_pll_matches;
sma1303->num_of_pll_matches =
ARRAY_SIZE(sma1303_pll_matches);
ret = devm_snd_soc_register_component(&client->dev,
&sma1303_component, sma1303_dai, 1);
-
if (ret) {
dev_err(&client->dev, "Failed to register component");
@@ -1708,7 +1699,6 @@ static int sma1303_i2c_probe(struct i2c_client *client,
sma1303->attr_grp = &sma1303_attr_group;
ret = sysfs_create_group(sma1303->kobj, sma1303->attr_grp);
-
if (ret) {
dev_err(&client->dev,
"failed to create attribute group [%d]\n", ret);
--
2.30.2
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 14/14] Fixed the retry_cnt bug about being zero
2023-01-06 9:15 [PATCH 00/14] ASoC: Add a driver the Iron Device SMA1303 AMP Kiseok Jo
` (12 preceding siblings ...)
2023-01-06 9:15 ` [PATCH 13/14] Move the initial settings to i2c driver probe Kiseok Jo
@ 2023-01-06 9:15 ` Kiseok Jo
2023-01-06 9:27 ` Dan Carpenter
13 siblings, 1 reply; 26+ messages in thread
From: Kiseok Jo @ 2023-01-06 9:15 UTC (permalink / raw)
To: Mark Brown
Cc: alsa-devel, Dan Carpenter, application, Kiseok Jo,
kernel test robot
Signed-off-by: Kiseok Jo <kiseok.jo@irondevice.com>
Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Dan Carpenter <error27@gmail.com>
---
sound/soc/codecs/sma1303.c | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/sound/soc/codecs/sma1303.c b/sound/soc/codecs/sma1303.c
index 1a5d992bf3db..4f9dab5d1613 100644
--- a/sound/soc/codecs/sma1303.c
+++ b/sound/soc/codecs/sma1303.c
@@ -247,7 +247,7 @@ EXPORT_SYMBOL(sma1303_set_callback_func);
static int sma1303_regmap_write(struct sma1303_priv *sma1303,
unsigned int reg, unsigned int val)
{
- int ret;
+ int ret = 0;
int cnt = sma1303->retry_cnt;
while (cnt--) {
@@ -266,7 +266,7 @@ static int sma1303_regmap_write(struct sma1303_priv *sma1303,
static int sma1303_regmap_update_bits(struct sma1303_priv *sma1303,
unsigned int reg, unsigned int mask, unsigned int val)
{
- int ret;
+ int ret = 0;
int cnt = sma1303->retry_cnt;
while (cnt--) {
@@ -285,7 +285,7 @@ static int sma1303_regmap_update_bits(struct sma1303_priv *sma1303,
static int sma1303_regmap_read(struct sma1303_priv *sma1303,
unsigned int reg, unsigned int *val)
{
- int ret;
+ int ret = 0;
int cnt = sma1303->retry_cnt;
while (cnt--) {
@@ -772,12 +772,13 @@ static int sma1303_add_component_controls(struct snd_soc_component *component)
sma1303_controls = devm_kzalloc(sma1303->dev,
sizeof(sma1303_snd_controls), GFP_KERNEL);
name = devm_kzalloc(sma1303->dev,
- ARRAY_SIZE(sma1303_snd_controls), GFP_KERNEL);
+ ARRAY_SIZE(sma1303_snd_controls)*sizeof(char *),
+ GFP_KERNEL);
for (index = 0; index < ARRAY_SIZE(sma1303_snd_controls); index++) {
sma1303_controls[index] = sma1303_snd_controls[index];
name[index] = devm_kzalloc(sma1303->dev,
- MAX_CONTROL_NAME, GFP_KERNEL);
+ MAX_CONTROL_NAME*sizeof(char), GFP_KERNEL);
size = strlen(sma1303_snd_controls[index].name)
+ strlen(sma1303->dev->driver->name);
if (!name[index] || size > MAX_CONTROL_NAME) {
@@ -1544,7 +1545,7 @@ 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;
+ u32 value = 0;
unsigned int device_info, status, otp_stat;
sma1303 = devm_kzalloc(&client->dev,
@@ -1564,13 +1565,13 @@ static int sma1303_i2c_probe(struct i2c_client *client,
if (np) {
if (!of_property_read_u32(np, "i2c-retry", &value)) {
- if (value > 50 || value < 0) {
+ if (value > 50 || value <= 0) {
sma1303->retry_cnt = SMA1303_I2C_RETRY_COUNT;
dev_info(&client->dev, "%s : %s\n", __func__,
"i2c-retry out of range (up to 50)");
} else {
sma1303->retry_cnt = value;
- dev_info(&client->dev, "%s : %s = %d\n",
+ dev_info(&client->dev, "%s : %s = %u\n",
__func__, "i2c-retry count", value);
}
} else {
@@ -1589,7 +1590,7 @@ static int sma1303_i2c_probe(struct i2c_client *client,
}
if (!of_property_read_u32(np, "tdm-slot-tx", &value)) {
dev_info(&client->dev,
- "tdm slot tx is '%d' from DT\n", value);
+ "tdm slot tx is '%u' from DT\n", value);
sma1303->tdm_slot_tx = value;
} else {
dev_info(&client->dev,
@@ -1609,7 +1610,7 @@ static int sma1303_i2c_probe(struct i2c_client *client,
break;
default:
dev_err(&client->dev,
- "Invalid sys-clk-id: %d\n", value);
+ "Invalid sys-clk-id: %u\n", value);
return -EINVAL;
}
sma1303->sys_clk_id = value;
--
2.30.2
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH 14/14] Fixed the retry_cnt bug about being zero
2023-01-06 9:15 ` [PATCH 14/14] Fixed the retry_cnt bug about being zero Kiseok Jo
@ 2023-01-06 9:27 ` Dan Carpenter
2023-01-06 9:30 ` Dan Carpenter
2023-01-06 9:55 ` Ki-Seok Jo
0 siblings, 2 replies; 26+ messages in thread
From: Dan Carpenter @ 2023-01-06 9:27 UTC (permalink / raw)
To: Kiseok Jo; +Cc: alsa-devel, Mark Brown, application, kernel test robot
There are a number of issues with this patch... :(
The bug reports were from kbuild so you'll probably need to just resend
the patch series from before as a v2 or something. It can't be
[PATCH 14/14]. Where are the others in the series?
If you do fix these issues as a separate patch:
1) It needs a subsystem prefix like "[PATCH] ASoC: sma1303: " or something.
2) It fixes 3 different issues so it should be 3 different patches.
3) It needs a commit description.
4) It needs a Fixes tag.
> @@ -772,12 +772,13 @@ static int sma1303_add_component_controls(struct snd_soc_component *component)
> sma1303_controls = devm_kzalloc(sma1303->dev,
> sizeof(sma1303_snd_controls), GFP_KERNEL);
> name = devm_kzalloc(sma1303->dev,
> - ARRAY_SIZE(sma1303_snd_controls), GFP_KERNEL);
> + ARRAY_SIZE(sma1303_snd_controls)*sizeof(char *),
> + GFP_KERNEL);
I am surprised checkpatch doesn't complain that spaces are required
around the * operator. Please just use sizeof(sma1303_snd_controls).
Otherwise you have to use devm_kcalloc() to avoid checkers warning about
integer overflows.
>
> for (index = 0; index < ARRAY_SIZE(sma1303_snd_controls); index++) {
> sma1303_controls[index] = sma1303_snd_controls[index];
> name[index] = devm_kzalloc(sma1303->dev,
> - MAX_CONTROL_NAME, GFP_KERNEL);
> + MAX_CONTROL_NAME*sizeof(char), GFP_KERNEL);
sizeof(char) is not required. It's always zero.
> size = strlen(sma1303_snd_controls[index].name)
> + strlen(sma1303->dev->driver->name);
> if (!name[index] || size > MAX_CONTROL_NAME) {
regards,
dan carpenter
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH 14/14] Fixed the retry_cnt bug about being zero
2023-01-06 9:27 ` Dan Carpenter
@ 2023-01-06 9:30 ` Dan Carpenter
2023-01-06 9:59 ` Ki-Seok Jo
2023-01-06 9:55 ` Ki-Seok Jo
1 sibling, 1 reply; 26+ messages in thread
From: Dan Carpenter @ 2023-01-06 9:30 UTC (permalink / raw)
To: Kiseok Jo; +Cc: alsa-devel, Mark Brown, application, kernel test robot
On Fri, Jan 06, 2023 at 12:27:49PM +0300, Dan Carpenter wrote:
> > for (index = 0; index < ARRAY_SIZE(sma1303_snd_controls); index++) {
> > sma1303_controls[index] = sma1303_snd_controls[index];
> > name[index] = devm_kzalloc(sma1303->dev,
> > - MAX_CONTROL_NAME, GFP_KERNEL);
> > + MAX_CONTROL_NAME*sizeof(char), GFP_KERNEL);
>
> sizeof(char) is not required. It's always zero.
s/zero/one/ obviously.
regards,
dan carpenter
^ permalink raw reply [flat|nested] 26+ messages in thread* RE: [PATCH 14/14] Fixed the retry_cnt bug about being zero
2023-01-06 9:30 ` Dan Carpenter
@ 2023-01-06 9:59 ` Ki-Seok Jo
0 siblings, 0 replies; 26+ messages in thread
From: Ki-Seok Jo @ 2023-01-06 9:59 UTC (permalink / raw)
To: Dan Carpenter
Cc: alsa-devel@alsa-project.org, Mark Brown, Application,
kernel test robot
> On Fri, Jan 06, 2023 at 12:27:49PM +0300, Dan Carpenter wrote:
> > > for (index = 0; index < ARRAY_SIZE(sma1303_snd_controls); index++) {
> > > sma1303_controls[index] = sma1303_snd_controls[index];
> > > name[index] = devm_kzalloc(sma1303->dev,
> > > - MAX_CONTROL_NAME, GFP_KERNEL);
> > > + MAX_CONTROL_NAME*sizeof(char), GFP_KERNEL);
> >
> > sizeof(char) is not required. It's always zero.
> s/zero/one/ obviously.
I understand. I agree the value unnecessary. I'll remove it. Thanks
It was just put for the data type checking.
> regards,
> dan carpenter
Best regards,
Kiseok Jo
^ permalink raw reply [flat|nested] 26+ messages in thread
* RE: [PATCH 14/14] Fixed the retry_cnt bug about being zero
2023-01-06 9:27 ` Dan Carpenter
2023-01-06 9:30 ` Dan Carpenter
@ 2023-01-06 9:55 ` Ki-Seok Jo
2023-01-06 10:16 ` Dan Carpenter
2023-01-07 12:37 ` Dan Carpenter
1 sibling, 2 replies; 26+ messages in thread
From: Ki-Seok Jo @ 2023-01-06 9:55 UTC (permalink / raw)
To: Dan Carpenter
Cc: alsa-devel@alsa-project.org, Mark Brown, Application,
kernel test robot
Hi Dan,
I'm sorry. There was an opinion that the pach sent last time was inconvenient to look at because the entire patch aws modified at once.
I just misunderstood the patch system, so I re-edited it and sent it again.
I'll continue to use this patch later.
Thanks for your kindness. I'll get your description below.
-----Original Message-----
> Subject: Re: [PATCH 14/14] Fixed the retry_cnt bug about being zero
> There are a number of issues with this patch... :(
> The bug reports were from kbuild so you'll probably need to just resend the patch series from before as a v2 or something. It can't be [PATCH 14/14]. Where are the others in the series?
> If you do fix these issues as a separate patch:
> 1) It needs a subsystem prefix like "[PATCH] ASoC: sma1303: " or something.
> 2) It fixes 3 different issues so it should be 3 different patches.
> 3) It needs a commit description.
> 4) It needs a Fixes tag.
>> @@ -772,12 +772,13 @@ static int sma1303_add_component_controls(struct snd_soc_component *component)
>> sma1303_controls = devm_kzalloc(sma1303->dev,
>> sizeof(sma1303_snd_controls), GFP_KERNEL);
>> name = devm_kzalloc(sma1303->dev,
>> - ARRAY_SIZE(sma1303_snd_controls), GFP_KERNEL);
>> + ARRAY_SIZE(sma1303_snd_controls)*sizeof(char *),
>> + GFP_KERNEL);
>I am surprised checkpatch doesn't complain that spaces are required around the * operator. Please just use sizeof(sma1303_snd_controls).
Otherwise you have to use devm_kcalloc() to avoid checkers warning about integer overflows.
I lost space between * operator. Thanks. (why didn't checkpatch check it? :( )
But I don't understand why I use 'sizeof(sma1303_snd_controls)'.
I only need to know the number of 'sma1303_snd_controls'.
In 'sma1303_snd_controls', it has only 3.
So ARRAY_SIZE(sma1303_snd_controls) is 3, but sizeof(sma1303_snd_controls) has the value of 144.
I think it's not necessary. What's the best?
>>
>> for (index = 0; index < ARRAY_SIZE(sma1303_snd_controls); index++) {
>> sma1303_controls[index] = sma1303_snd_controls[index];
>> name[index] = devm_kzalloc(sma1303->dev,
>> - MAX_CONTROL_NAME, GFP_KERNEL);
>> + MAX_CONTROL_NAME*sizeof(char), GFP_KERNEL);
>sizeof(char) is not required. It's always zero.
>> size = strlen(sma1303_snd_controls[index].name)
>> + strlen(sma1303->dev->driver->name);
>> if (!name[index] || size > MAX_CONTROL_NAME) {
regards,
dan carpenter
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH 14/14] Fixed the retry_cnt bug about being zero
2023-01-06 9:55 ` Ki-Seok Jo
@ 2023-01-06 10:16 ` Dan Carpenter
2023-01-07 12:37 ` Dan Carpenter
1 sibling, 0 replies; 26+ messages in thread
From: Dan Carpenter @ 2023-01-06 10:16 UTC (permalink / raw)
To: Ki-Seok Jo
Cc: alsa-devel@alsa-project.org, Mark Brown, Application,
kernel test robot
On Fri, Jan 06, 2023 at 09:55:43AM +0000, Ki-Seok Jo wrote:
> >> @@ -772,12 +772,13 @@ static int sma1303_add_component_controls(struct snd_soc_component *component)
> >> sma1303_controls = devm_kzalloc(sma1303->dev,
> >> sizeof(sma1303_snd_controls), GFP_KERNEL);
> >> name = devm_kzalloc(sma1303->dev,
> >> - ARRAY_SIZE(sma1303_snd_controls), GFP_KERNEL);
> >> + ARRAY_SIZE(sma1303_snd_controls)*sizeof(char *),
> >> + GFP_KERNEL);
>
> >I am surprised checkpatch doesn't complain that spaces are required around the * operator. Please just use sizeof(sma1303_snd_controls).
> Otherwise you have to use devm_kcalloc() to avoid checkers warning about integer overflows.
>
> I lost space between * operator. Thanks. (why didn't checkpatch check it? :( )
>
> But I don't understand why I use 'sizeof(sma1303_snd_controls)'.
> I only need to know the number of 'sma1303_snd_controls'.
> In 'sma1303_snd_controls', it has only 3.
>
> So ARRAY_SIZE(sma1303_snd_controls) is 3, but sizeof(sma1303_snd_controls) has the value of 144.
> I think it's not necessary. What's the best?
>
Ah. Sorry, I didn't have enough context. But could you instead use
sizeof(*name) instead of (char *) (it's the standard kernel style and
not just my opinion):
name = devm_kcalloc(sma1303->dev, ARRAY_SIZE(sma1303_snd_controls),
sizeof(*name), GFP_KERNEL);
Also please declare name as char instead of unsigned char.
Also there needs to be some error checking for if the allocation fails.
This driver is going to need quite a bit of cleanup. :/
regards,
dan carpenter
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH 14/14] Fixed the retry_cnt bug about being zero
2023-01-06 9:55 ` Ki-Seok Jo
2023-01-06 10:16 ` Dan Carpenter
@ 2023-01-07 12:37 ` Dan Carpenter
2023-01-09 7:33 ` Ki-Seok Jo
1 sibling, 1 reply; 26+ messages in thread
From: Dan Carpenter @ 2023-01-07 12:37 UTC (permalink / raw)
To: Ki-Seok Jo
Cc: alsa-devel@alsa-project.org, Mark Brown, Application,
kernel test robot
On Fri, Jan 06, 2023 at 09:55:43AM +0000, Ki-Seok Jo wrote:
>
> Hi Dan,
>
> I'm sorry. There was an opinion that the pach sent last time was inconvenient to look at because the entire patch aws modified at once.
>
What you should have done was just fold everything into two patches:
patch 1: add the driver
patch 2: add the device tree bindings
Instead you did:
patch 1: add the driver
patch 2: add the device tree bindings
patch 3: re-write all of patch 1.
Re-writing everything is not allowed, but it's also not necessary. And
also it is against the rules to submit broken code and fix it later.
It's a new driver so just fix patch 1 and resend that as a v2 patch.
Same for the stuff I mentioned in my bug report.
https://staticthinking.wordpress.com/2022/07/27/how-to-send-a-v2-patch/
regards,
dan carpenter
^ permalink raw reply [flat|nested] 26+ messages in thread
* RE: [PATCH 14/14] Fixed the retry_cnt bug about being zero
2023-01-07 12:37 ` Dan Carpenter
@ 2023-01-09 7:33 ` Ki-Seok Jo
2023-01-09 8:17 ` Dan Carpenter
0 siblings, 1 reply; 26+ messages in thread
From: Ki-Seok Jo @ 2023-01-09 7:33 UTC (permalink / raw)
To: Dan Carpenter, Mark Brown
Cc: alsa-devel@alsa-project.org, Application, kernel test robot
>On Fri, Jan 06, 2023 at 09:55:43AM +0000, Ki-Seok Jo wrote:
> >
> > Hi Dan,
> >
> > I'm sorry. There was an opinion that the pach sent last time was inconvenient to look at because the entire patch aws modified at once.
> >
> What you should have done was just fold everything into two patches:
> patch 1: add the driver
> patch 2: add the device tree bindings
> Instead you did:
> patch 1: add the driver
> patch 2: add the device tree bindings
> patch 3: re-write all of patch 1.
> Re-writing everything is not allowed, but it's also not necessary. And also it is against the rules to submit broken code and fix it later.
> It's a new driver so just fix patch 1 and resend that as a v2 patch.
> Same for the stuff I mentioned in my bug report.
> https://staticthinking.wordpress.com/2022/07/27/how-to-send-a-v2-patch/
> regards,
> dan carpenter
Thank you for your kindly advise. I read your report and it was very helpful.
As I understand, I already sent it the wrong way. So I want to pick up the pieces.
First, I already sent the new driver code a few months ago.
After that, I got several feedbacks.
I've edit and test it. So a lot of things changed at once.
Since I changed so many things, I didn't know what to do, so I just updated it as a patch.
It's my mistake...
So I already sent about patch 1 and 2, if I get the feedback, should I send a lot of changes as v2 patch?(not patch 3)
For each change, should I send patch log per commit?
Like that:
Patch 1: add the driver
Patch 2: add the device tree bindings
(instead patch 3)
+ Patch v2 1: change 1 about feedback1
+ Patch v2 2: change 2 about feedback1
+ ...
+ Patch v2 10: change 3 about feedback1
Is it right?
Or should I revise it again and send it again from v2 patch 1?
(It's not registered with the kernel source yet..)
Patch v2 1: add the driver (applied the feedback)
Patch v2 2: add the device tree bindings
I'm writing this email first because I am worried that I might send it wrong again...
Thank you for your kindly help.
Best regards,
Kiseok Jo
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH 14/14] Fixed the retry_cnt bug about being zero
2023-01-09 7:33 ` Ki-Seok Jo
@ 2023-01-09 8:17 ` Dan Carpenter
2023-01-09 8:35 ` Ki-Seok Jo
0 siblings, 1 reply; 26+ messages in thread
From: Dan Carpenter @ 2023-01-09 8:17 UTC (permalink / raw)
To: Ki-Seok Jo
Cc: alsa-devel@alsa-project.org, Mark Brown, Application,
kernel test robot
On Mon, Jan 09, 2023 at 07:33:19AM +0000, Ki-Seok Jo wrote:
>
> >On Fri, Jan 06, 2023 at 09:55:43AM +0000, Ki-Seok Jo wrote:
> > >
> > > Hi Dan,
> > >
> > > I'm sorry. There was an opinion that the pach sent last time was inconvenient to look at because the entire patch aws modified at once.
> > >
>
> > What you should have done was just fold everything into two patches:
> > patch 1: add the driver
> > patch 2: add the device tree bindings
>
> > Instead you did:
> > patch 1: add the driver
> > patch 2: add the device tree bindings
> > patch 3: re-write all of patch 1.
>
> > Re-writing everything is not allowed, but it's also not necessary. And also it is against the rules to submit broken code and fix it later.
>
> > It's a new driver so just fix patch 1 and resend that as a v2 patch.
> > Same for the stuff I mentioned in my bug report.
>
> > https://staticthinking.wordpress.com/2022/07/27/how-to-send-a-v2-patch/
>
> > regards,
> > dan carpenter
>
>
> Thank you for your kindly advise. I read your report and it was very helpful.
> As I understand, I already sent it the wrong way. So I want to pick up the pieces.
>
> First, I already sent the new driver code a few months ago.
> After that, I got several feedbacks.
> I've edit and test it. So a lot of things changed at once.
>
> Since I changed so many things, I didn't know what to do, so I just updated it as a patch.
> It's my mistake...
>
> So I already sent about patch 1 and 2, if I get the feedback, should I send a lot of changes as v2 patch?(not patch 3)
> For each change, should I send patch log per commit?
>
> Like that:
> Patch 1: add the driver
> Patch 2: add the device tree bindings
>
> (instead patch 3)
> + Patch v2 1: change 1 about feedback1
> + Patch v2 2: change 2 about feedback1
> + ...
> + Patch v2 10: change 3 about feedback1
>
> Is it right?
No.
>
> Or should I revise it again and send it again from v2 patch 1?
> (It's not registered with the kernel source yet..)
> Patch v2 1: add the driver (applied the feedback)
> Patch v2 2: add the device tree bindings
>
Yes. Revise again and resend everything as two patches.
regards,
dan carpenter
^ permalink raw reply [flat|nested] 26+ messages in thread
* RE: [PATCH 14/14] Fixed the retry_cnt bug about being zero
2023-01-09 8:17 ` Dan Carpenter
@ 2023-01-09 8:35 ` Ki-Seok Jo
0 siblings, 0 replies; 26+ messages in thread
From: Ki-Seok Jo @ 2023-01-09 8:35 UTC (permalink / raw)
To: Dan Carpenter
Cc: alsa-devel@alsa-project.org, Mark Brown, Application,
kernel test robot
> On Mon, Jan 09, 2023 at 07:33:19AM +0000, Ki-Seok Jo wrote:
> >
> > >On Fri, Jan 06, 2023 at 09:55:43AM +0000, Ki-Seok Jo wrote:
> > > >
> > > > Hi Dan,
> > > >
> > > > I'm sorry. There was an opinion that the pach sent last time was inconvenient to look at because the entire patch aws modified at once.
> > > >
> >
> > > What you should have done was just fold everything into two patches:
> > > patch 1: add the driver
> > > patch 2: add the device tree bindings
> >
> > > Instead you did:
> > > patch 1: add the driver
> > > patch 2: add the device tree bindings patch 3: re-write all of patch
> > > 1.
> >
> > > Re-writing everything is not allowed, but it's also not necessary. And also it is against the rules to submit broken code and fix it later.
> >
> > > It's a new driver so just fix patch 1 and resend that as a v2 patch.
> > > Same for the stuff I mentioned in my bug report.
> >
> > > https://staticthinking.wordpress.com/2022/07/27/how-to-send-a-v2-pat
> > > ch/
> >
> > > regards,
> > > dan carpenter
> >
> >
> > Thank you for your kindly advise. I read your report and it was very helpful.
> > As I understand, I already sent it the wrong way. So I want to pick up the pieces.
> >
> > First, I already sent the new driver code a few months ago.
> > After that, I got several feedbacks.
> > I've edit and test it. So a lot of things changed at once.
> >
> > Since I changed so many things, I didn't know what to do, so I just updated it as a patch.
> > It's my mistake...
> >
> > So I already sent about patch 1 and 2, if I get the feedback, should I
> > send a lot of changes as v2 patch?(not patch 3) For each change, should I send patch log per commit?
> >
> > Like that:
> > Patch 1: add the driver
> > Patch 2: add the device tree bindings
> >
> > (instead patch 3)
> > + Patch v2 1: change 1 about feedback1 Patch v2 2: change 2 about
> > + feedback1 ...
> > + Patch v2 10: change 3 about feedback1
> >
> > Is it right?
> No.
> >
> > Or should I revise it again and send it again from v2 patch 1?
> > (It's not registered with the kernel source yet..) Patch v2 1: add the
> > driver (applied the feedback) Patch v2 2: add the device tree bindings
> >
> Yes. Revise again and resend everything as two patches.
> regards,
> dan carpenter
Thank you! I'll try again.
I only updates version like v2 patch as two patches(add driver & add device tree bindings) for registering a new driver.
Best regards,
Kiseok Jo
^ permalink raw reply [flat|nested] 26+ messages in thread