February 2023 - Alsa-devel - mailman.alsa-project.org

[PATCH v2 0/9] ASoC: SOF: core/ipc4/mtl: Add support for PCM delay reporting
by Peter Ujfalusi 02 Feb '23

02 Feb '23

Hi, Changes since v1: - The delay calculation updated to take into account the counter wrapping on both ends (host and link side). The following series adds support for the PCM delay reporting in SOF core level and implements the needed infrastructure with IPC4 to finally enable it for MTL. Currently this is only supported on MTL (and via IPC4), but with the infrastructure in place it will be possible to support other platforms with DeepBuffer. Regards, Peter --- Rander Wang (9): ASoC: SOF: add ipc4_fw_reg header file ASoC: SOF: add fw_info_box support ASoC: SOF: add time info structure for ipc4 path ASoC: SOF: ipc4-pcm: allocate time info for pcm delay feature ASoC: SOF: ipc4-pcm: add hw_params ASoC: SOF: add delay function support in sof framework ASoC: SOF: add get_stream_position ops for pcm delay ASoC: SOF: Intel: mtl: add get_stream_position support ASoC: SOF: ipc4-pcm: add delay function support sound/soc/sof/intel/mtl.c | 14 +++ sound/soc/sof/intel/mtl.h | 6 + sound/soc/sof/ipc4-fw-reg.h | 155 ++++++++++++++++++++++++ sound/soc/sof/ipc4-pcm.c | 232 ++++++++++++++++++++++++++++++++++++ sound/soc/sof/ipc4-priv.h | 15 +++ sound/soc/sof/ipc4.c | 3 + sound/soc/sof/ops.h | 10 ++ sound/soc/sof/pcm.c | 13 ++ sound/soc/sof/sof-audio.h | 6 + sound/soc/sof/sof-priv.h | 10 ++ 10 files changed, 464 insertions(+) create mode 100644 sound/soc/sof/ipc4-fw-reg.h -- 2.39.1

1 10

[PATCH] ASoC: dt-bindings: Drop broken irondevice,sma1303 binding
by Krzysztof Kozlowski 02 Feb '23

02 Feb '23

This reverts entire SMA1303 submission: 1. commit 1c24d12b68fa ("ASoC: dt-bindings: irondevice,sma1303.yaml: Fix about breaking the checks") 2. commit dcf6d2ef0e82 ("ASoC: Modified the schema binding and added the vendor prefixes.") 3. commit 5b28c049ff53 ("ASoC: SMA1303: Fix spelling mistake "Invald" -> "Invalid"") 4. commit 68cd394efd0f ("ASoC: The Iron Device SMA1303 is a boosted Class-D audio amplifier.") Because the binding: 1. Was never tested, 2. Was never sent to Devicetree maintainers, 3. Is entirely broken and wrong, so it would have to be almost rewritten from scratch, 4. It does not match the driver, IOW, the binding is fake. We cannot accept drivers with broken bindings and make it an ABI. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> --- .../bindings/sound/irondevice,sma1303.yaml | 31 - .../devicetree/bindings/vendor-prefixes.yaml | 2 - sound/soc/codecs/Kconfig | 7 - sound/soc/codecs/Makefile | 2 - sound/soc/codecs/sma1303.c | 1804 ----------------- sound/soc/codecs/sma1303.h | 609 ------ 6 files changed, 2455 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/irondevice,sma1303.yaml delete mode 100644 sound/soc/codecs/sma1303.c delete mode 100644 sound/soc/codecs/sma1303.h diff --git a/Documentation/devicetree/bindings/sound/irondevice,sma1303.yaml b/Documentation/devicetree/bindings/sound/irondevice,sma1303.yaml deleted file mode 100644 index 162c52606635..000000000000 --- a/Documentation/devicetree/bindings/sound/irondevice,sma1303.yaml +++ /dev/null @@ -1,31 +0,0 @@ -# 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(a)irondevice.com> - -description: - SMA1303 digital class-D audio amplifier with an integrated boost converter. - -allOf: - - $ref: name-prefix.yaml# - -required: - - compatible - - reg - -additionalProperties: false - -examples: - - | - i2c_bus { - amplifier@1e { - compatible = "irondevice,sma1303"; - reg = <0x1e>; - }; - }; diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentation/devicetree/bindings/vendor-prefixes.yaml index 1f7a519a936f..4cf1749c8f45 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml @@ -645,8 +645,6 @@ patternProperties: description: Inverse Path "^iom,.*": description: Iomega Corporation - "^irondevice,.*": - description: Iron Device Corporation "^isee,.*": description: ISEE 2007 S.L. "^isil,.*": diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 6902628f0d10..6b4ee14640ab 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -206,7 +206,6 @@ 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 @@ -1493,12 +1492,6 @@ 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 89ffd06e9290..71d3ce5867e4 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -233,7 +233,6 @@ 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 @@ -589,7 +588,6 @@ 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 deleted file mode 100644 index 3d8e3900f5c3..000000000000 --- a/sound/soc/codecs/sma1303.c +++ /dev/null @@ -1,1804 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later -// -// sma1303.c -- sma1303 ALSA SoC Audio driver -// -// Copyright 2023 Iron Device Corporation -// -// Auther: Gyuhwa Park <gyuhwa.park(a)irondevice.com> -// Kiseok Jo <kiseok.jo(a)irondevice.com> - -#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 <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 MAX_CONTROL_NAME 48 - -#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 attribute_group *attr_grp; - struct delayed_work check_fault_work; - struct device *dev; - struct kobject *kobj; - 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; - 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; - 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; - break; - } - 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; - break; - } - 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; - break; - } - return result; -} - -static const DECLARE_TLV_DB_SCALE(sma1303_spk_tlv, -6000, 50, 0); - -static int sma1303_regmap_write(struct sma1303_priv *sma1303, - unsigned int reg, unsigned int val) -{ - int ret = 0; - int cnt = sma1303->retry_cnt; - - while (cnt--) { - ret = regmap_write(sma1303->regmap, reg, val); - if (ret < 0) { - dev_err(sma1303->dev, - "Failed to write [0x%02X]\n", reg); - } else - break; - } - return ret; -} - -static int sma1303_regmap_update_bits(struct sma1303_priv *sma1303, - unsigned int reg, unsigned int mask, unsigned int val, bool *change) -{ - int ret = 0; - int cnt = sma1303->retry_cnt; - - while (cnt--) { - ret = regmap_update_bits_check(sma1303->regmap, reg, - mask, val, change); - if (ret < 0) { - dev_err(sma1303->dev, - "Failed to update [0x%02X]\n", reg); - } else - break; - } - return ret; -} - -static int sma1303_regmap_read(struct sma1303_priv *sma1303, - unsigned int reg, unsigned int *val) -{ - int ret = 0; - 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); - } else - break; - } - return ret; -} - -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 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_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_dbg(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); - bool change = false, val = (bool)ucontrol->value.integer.value[0]; - - if (sma1303->force_mute_status == val) - change = false; - else { - change = true; - sma1303->force_mute_status = val; - } - dev_dbg(sma1303->dev, "%s : Force Mute %s\n", __func__, - sma1303->force_mute_status ? "ON" : "OFF"); - - return change; -} - -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); - if (ret < 0) - return -EINVAL; - - ucontrol->value.integer.value[0] = (val & 0x7E) >> 1; - - return 0; -} - -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, val = (int)ucontrol->value.integer.value[0]; - bool change; - - ret = sma1303_regmap_update_bits(sma1303, - SMA1303_90_POSTSCALER, 0x7E, (val << 1), &change); - if (ret < 0) - return -EINVAL; - - return change; -} - -static int sma1303_startup(struct snd_soc_component *component) -{ - struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component); - bool change = false, temp = false; - - sma1303_regmap_update_bits(sma1303, SMA1303_8E_PLL_CTRL, - SMA1303_PLL_PD2_MASK, SMA1303_PLL_OPERATION2, &temp); - if (temp == true) - change = true; - - sma1303_regmap_update_bits(sma1303, SMA1303_00_SYSTEM_CTRL, - SMA1303_POWER_MASK, SMA1303_POWER_ON, &temp); - if (temp == true) - change = true; - - if (sma1303->amp_mode == SMA1303_MONO) { - sma1303_regmap_update_bits(sma1303, - SMA1303_10_SYSTEM_CTRL1, - SMA1303_SPK_MODE_MASK, - SMA1303_SPK_MONO, - &temp); - if (temp == true) - change = true; - - } else { - sma1303_regmap_update_bits(sma1303, - SMA1303_10_SYSTEM_CTRL1, - SMA1303_SPK_MODE_MASK, - SMA1303_SPK_STEREO, - &temp); - if (temp == true) - change = true; - } - - 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); - } - - sma1303->amp_power_status = true; - - return change; -} - -static int sma1303_shutdown(struct snd_soc_component *component) -{ - struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component); - bool change = false, temp = false; - - cancel_delayed_work_sync(&sma1303->check_fault_work); - - sma1303_regmap_update_bits(sma1303, SMA1303_10_SYSTEM_CTRL1, - SMA1303_SPK_MODE_MASK, SMA1303_SPK_OFF, &temp); - if (temp == true) - change = true; - - sma1303_regmap_update_bits(sma1303, SMA1303_00_SYSTEM_CTRL, - SMA1303_POWER_MASK, SMA1303_POWER_OFF, &temp); - if (temp == true) - change = true; - sma1303_regmap_update_bits(sma1303, SMA1303_8E_PLL_CTRL, - SMA1303_PLL_PD2_MASK, SMA1303_PLL_PD2, &temp); - if (temp == true) - change = true; - - sma1303->amp_power_status = false; - - return change; -} - -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); - struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component); - unsigned int mux = dapm_kcontrol_get_value(w->kcontrols[0]); - int ret = 0; - bool change = false, temp = false; - - switch (event) { - case SND_SOC_DAPM_PRE_PMU: - switch (mux) { - case 0: - ret += sma1303_regmap_update_bits(sma1303, - SMA1303_11_SYSTEM_CTRL2, - SMA1303_MONOMIX_MASK, - SMA1303_MONOMIX_ON, - &change); - sma1303->amp_mode = SMA1303_MONO; - break; - case 1: - ret += sma1303_regmap_update_bits(sma1303, - SMA1303_11_SYSTEM_CTRL2, - SMA1303_MONOMIX_MASK, - SMA1303_MONOMIX_OFF, - &temp); - if (temp == true) - change = true; - ret += sma1303_regmap_update_bits(sma1303, - SMA1303_11_SYSTEM_CTRL2, - SMA1303_LR_DATA_SW_MASK, - SMA1303_LR_DATA_SW_NORMAL, - &temp); - if (temp == true) - change = true; - sma1303->amp_mode = SMA1303_STEREO; - break; - case 2: - ret += sma1303_regmap_update_bits(sma1303, - SMA1303_11_SYSTEM_CTRL2, - SMA1303_MONOMIX_MASK, - SMA1303_MONOMIX_OFF, - &temp); - if (temp == true) - change = true; - ret += sma1303_regmap_update_bits(sma1303, - SMA1303_11_SYSTEM_CTRL2, - SMA1303_LR_DATA_SW_MASK, - SMA1303_LR_DATA_SW_NORMAL, - &temp); - if (temp == true) - change = true; - sma1303->amp_mode = SMA1303_STEREO; - break; - default: - dev_err(sma1303->dev, "%s : Invalid value (%d)\n", - __func__, mux); - return -EINVAL; - } - - dev_dbg(sma1303->dev, "%s : Source : %s\n", __func__, - sma1303_aif_in_source_text[mux]); - break; - } - if (ret < 0) - return -EINVAL; - return change; -} - -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); - struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component); - unsigned int mux = dapm_kcontrol_get_value(w->kcontrols[0]); - int ret = 0; - bool change = false, temp = false; - - switch (event) { - case SND_SOC_DAPM_PRE_PMU: - switch (mux) { - case 0: - ret += sma1303_regmap_update_bits(sma1303, - SMA1303_A3_TOP_MAN2, - SMA1303_TEST_CLKO_EN_MASK, - SMA1303_NORMAL_SDO, - &temp); - if (temp == true) - change = true; - ret += sma1303_regmap_update_bits(sma1303, - SMA1303_09_OUTPUT_CTRL, - SMA1303_PORT_OUT_SEL_MASK, - SMA1303_OUT_SEL_DISABLE, - &temp); - if (temp == true) - change = true; - break; - case 1: - ret += sma1303_regmap_update_bits(sma1303, - SMA1303_A3_TOP_MAN2, - SMA1303_TEST_CLKO_EN_MASK, - SMA1303_NORMAL_SDO, - &temp); - if (temp == true) - change = true; - ret += sma1303_regmap_update_bits(sma1303, - SMA1303_09_OUTPUT_CTRL, - SMA1303_PORT_OUT_SEL_MASK, - SMA1303_FORMAT_CONVERTER, - &temp); - if (temp == true) - change = true; - break; - case 2: - ret += sma1303_regmap_update_bits(sma1303, - SMA1303_A3_TOP_MAN2, - SMA1303_TEST_CLKO_EN_MASK, - SMA1303_NORMAL_SDO, - &temp); - if (temp == true) - change = true; - ret += sma1303_regmap_update_bits(sma1303, - SMA1303_09_OUTPUT_CTRL, - SMA1303_PORT_OUT_SEL_MASK, - SMA1303_MIXER_OUTPUT, - &temp); - if (temp == true) - change = true; - break; - case 3: - ret += sma1303_regmap_update_bits(sma1303, - SMA1303_A3_TOP_MAN2, - SMA1303_TEST_CLKO_EN_MASK, - SMA1303_NORMAL_SDO, - &temp); - if (temp == true) - change = true; - ret += sma1303_regmap_update_bits(sma1303, - SMA1303_09_OUTPUT_CTRL, - SMA1303_PORT_OUT_SEL_MASK, - SMA1303_SPEAKER_PATH, - &temp); - if (temp == true) - change = true; - break; - case 4: - ret += sma1303_regmap_update_bits(sma1303, - SMA1303_A3_TOP_MAN2, - SMA1303_TEST_CLKO_EN_MASK, - SMA1303_NORMAL_SDO, - &temp); - if (temp == true) - change = true; - ret += sma1303_regmap_update_bits(sma1303, - SMA1303_09_OUTPUT_CTRL, - SMA1303_PORT_OUT_SEL_MASK, - SMA1303_POSTSCALER_OUTPUT, - &temp); - if (temp == true) - change = true; - break; - case 5: - ret += sma1303_regmap_update_bits(sma1303, - SMA1303_A3_TOP_MAN2, - SMA1303_TEST_CLKO_EN_MASK, - SMA1303_CLK_OUT_SDO, - &temp); - if (temp == true) - change = true; - ret += sma1303_regmap_update_bits(sma1303, - SMA1303_A3_TOP_MAN2, - SMA1303_MON_OSC_PLL_MASK, - SMA1303_PLL_SDO, - &temp); - if (temp == true) - change = true; - break; - case 6: - ret += sma1303_regmap_update_bits(sma1303, - SMA1303_A3_TOP_MAN2, - SMA1303_TEST_CLKO_EN_MASK, - SMA1303_CLK_OUT_SDO, - &temp); - if (temp == true) - change = true; - ret += sma1303_regmap_update_bits(sma1303, - SMA1303_A3_TOP_MAN2, - SMA1303_MON_OSC_PLL_MASK, - SMA1303_OSC_SDO, - &temp); - if (temp == true) - change = true; - break; - default: - dev_err(sma1303->dev, "%s : Invalid value (%d)\n", - __func__, mux); - return -EINVAL; - } - - dev_dbg(sma1303->dev, "%s : Source : %s\n", __func__, - sma1303_aif_out_source_text[mux]); - break; - } - if (ret < 0) - return -EINVAL; - return change; -} - -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); - struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component); - int ret = 0; - bool change = false, temp = false; - - switch (event) { - case SND_SOC_DAPM_PRE_PMU: - dev_dbg(sma1303->dev, - "%s : SND_SOC_DAPM_PRE_PMU\n", __func__); - ret += sma1303_regmap_update_bits(sma1303, - SMA1303_09_OUTPUT_CTRL, - SMA1303_PORT_CONFIG_MASK, - SMA1303_OUTPUT_PORT_ENABLE, - &temp); - if (temp == true) - change = true; - ret += sma1303_regmap_update_bits(sma1303, - SMA1303_A3_TOP_MAN2, - SMA1303_SDO_OUTPUT_MASK, - SMA1303_NORMAL_OUT, - &temp); - if (temp == true) - change = true; - break; - case SND_SOC_DAPM_POST_PMD: - dev_dbg(sma1303->dev, - "%s : SND_SOC_DAPM_POST_PMD\n", __func__); - ret += sma1303_regmap_update_bits(sma1303, - SMA1303_09_OUTPUT_CTRL, - SMA1303_PORT_CONFIG_MASK, - SMA1303_INPUT_PORT_ONLY, - &temp); - if (temp == true) - change = true; - ret += sma1303_regmap_update_bits(sma1303, - SMA1303_A3_TOP_MAN2, - SMA1303_SDO_OUTPUT_MASK, - SMA1303_HIGH_Z_OUT, - &temp); - if (temp == true) - change = true; - break; - } - if (ret < 0) - return -EINVAL; - return change; -} - -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); - int ret = 0; - bool change = false; - - switch (event) { - case SND_SOC_DAPM_PRE_PMU: - dev_dbg(sma1303->dev, - "%s : SND_SOC_DAPM_PRE_PMU\n", __func__); - ret += sma1303_regmap_update_bits(sma1303, - SMA1303_90_POSTSCALER, - SMA1303_BYP_POST_MASK, - SMA1303_EN_POST_SCALER, - &change); - break; - case SND_SOC_DAPM_POST_PMD: - dev_dbg(sma1303->dev, - "%s : SND_SOC_DAPM_POST_PMD\n", __func__); - ret += sma1303_regmap_update_bits(sma1303, - SMA1303_90_POSTSCALER, - SMA1303_BYP_POST_MASK, - SMA1303_BYP_POST_SCALER, - &change); - break; - } - if (ret < 0) - return -EINVAL; - return change; -} - -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_dbg(sma1303->dev, - "%s : SND_SOC_DAPM_POST_PMU\n", __func__); - ret = sma1303_startup(component); - break; - case SND_SOC_DAPM_PRE_PMD: - dev_dbg(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_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), - SOC_SINGLE_BOOL_EXT("Force Mute Switch", 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[] = { - /* 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_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), - 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[] = { - /* 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"}, - - {"Post Scaler", "Switch", "Entry"}, - {"AMP Power", NULL, "Entry"}, - {"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, - unsigned int bclk) -{ - struct sma1303_priv *sma1303 = snd_soc_component_get_drvdata(component); - - int i = 0, ret = 0; - - dev_dbg(component->dev, "%s : BCLK = %dHz\n", - __func__, bclk); - - if (sma1303->sys_clk_id == SMA1303_PLL_CLKIN_MCLK) { - dev_dbg(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_dbg(component->dev, "%s : No matching value between pll table and SCK\n", - __func__); - return -EINVAL; - } - - ret += sma1303_regmap_update_bits(sma1303, - SMA1303_A2_TOP_MAN1, - SMA1303_PLL_PD_MASK|SMA1303_PLL_REF_CLK_MASK, - SMA1303_PLL_OPERATION|SMA1303_PLL_SCK, - NULL); - } - - ret += sma1303_regmap_write(sma1303, - SMA1303_8B_PLL_POST_N, - sma1303->pll_matches[i].post_n); - - ret += sma1303_regmap_write(sma1303, - SMA1303_8C_PLL_N, - sma1303->pll_matches[i].n); - - ret += sma1303_regmap_write(sma1303, - SMA1303_8D_PLL_A_SETTING, - sma1303->pll_matches[i].vco); - - ret += sma1303_regmap_write(sma1303, - SMA1303_8F_PLL_P_CP, - sma1303->pll_matches[i].p_cp); - if (ret < 0) - return -EINVAL; - - return 0; -} - -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 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_dbg(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->sys_clk_id == SMA1303_PLL_CLKIN_MCLK - || sma1303->sys_clk_id == SMA1303_PLL_CLKIN_BCLK) { - - if (sma1303->last_bclk != bclk) { - 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, - SMA1303_A2_TOP_MAN1, - SMA1303_DAC_DN_CONV_MASK, - SMA1303_DAC_DN_CONV_DISABLE, - NULL); - - ret += sma1303_regmap_update_bits(sma1303, - SMA1303_01_INPUT1_CTRL1, - SMA1303_LEFTPOL_MASK, - SMA1303_LOW_FIRST_CH, - NULL); - break; - - case 192000: - ret += sma1303_regmap_update_bits(sma1303, - SMA1303_A2_TOP_MAN1, - SMA1303_DAC_DN_CONV_MASK, - SMA1303_DAC_DN_CONV_ENABLE, - NULL); - - ret += sma1303_regmap_update_bits(sma1303, - SMA1303_01_INPUT1_CTRL1, - SMA1303_LEFTPOL_MASK, - SMA1303_HIGH_FIRST_CH, - NULL); - 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_dbg(component->dev, - "%s set format SNDRV_PCM_FORMAT_S16_LE\n", - __func__); - ret += sma1303_regmap_update_bits(sma1303, - SMA1303_A4_TOP_MAN3, - SMA1303_SCK_RATE_MASK, - SMA1303_SCK_32FS, - NULL); - break; - - case SNDRV_PCM_FORMAT_S24_LE: - dev_dbg(component->dev, - "%s set format SNDRV_PCM_FORMAT_S24_LE\n", - __func__); - ret += sma1303_regmap_update_bits(sma1303, - SMA1303_A4_TOP_MAN3, - SMA1303_SCK_RATE_MASK, - SMA1303_SCK_64FS, - NULL); - break; - case SNDRV_PCM_FORMAT_S32_LE: - dev_dbg(component->dev, - "%s set format SNDRV_PCM_FORMAT_S32_LE\n", - __func__); - ret += sma1303_regmap_update_bits(sma1303, - SMA1303_A4_TOP_MAN3, - SMA1303_SCK_RATE_MASK, - SMA1303_SCK_64FS, - NULL); - break; - default: - dev_err(component->dev, - "%s not support data bit : %d\n", __func__, - params_format(params)); - return -EINVAL; - } - } - - 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, - NULL); - ret += sma1303_regmap_update_bits(sma1303, - SMA1303_A4_TOP_MAN3, - SMA1303_O_FORMAT_MASK, - SMA1303_O_FMT_I2S, - NULL); - break; - case SND_SOC_DAIFMT_LEFT_J: - ret += sma1303_regmap_update_bits(sma1303, - SMA1303_01_INPUT1_CTRL1, - SMA1303_I2S_MODE_MASK, - SMA1303_LJ, - NULL); - ret += sma1303_regmap_update_bits(sma1303, - SMA1303_A4_TOP_MAN3, - SMA1303_O_FORMAT_MASK, - SMA1303_O_FMT_LJ, - NULL); - 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, - NULL); - break; - case 24: - case 32: - ret += sma1303_regmap_update_bits(sma1303, - SMA1303_01_INPUT1_CTRL1, - SMA1303_I2S_MODE_MASK, - SMA1303_RJ_24BIT, - NULL); - 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, - NULL); - ret += sma1303_regmap_update_bits(sma1303, - SMA1303_A4_TOP_MAN3, - SMA1303_O_FORMAT_MASK, - SMA1303_O_FMT_TDM, - NULL); - break; - } - - switch (params_width(params)) { - case 16: - case 24: - case 32: - break; - default: - dev_err(component->dev, - "%s not support data bit : %d\n", __func__, - params_format(params)); - return -EINVAL; - } - if (ret < 0) - return -EINVAL; - - return 0; -} - -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 (mute) { - dev_dbg(component->dev, "%s : %s\n", __func__, "MUTE"); - - ret += sma1303_regmap_update_bits(sma1303, - SMA1303_0E_MUTE_VOL_CTRL, - SMA1303_SPK_MUTE_MASK, - SMA1303_SPK_MUTE, - NULL); - - /* Need to wait time for mute slope */ - msleep(55); - } else { - if (!sma1303->force_mute_status) { - dev_dbg(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, - NULL); - } else { - dev_dbg(sma1303->dev, - "%s : FORCE MUTE!!!\n", __func__); - } - } - - if (ret < 0) - return -EINVAL; - return 0; -} - -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_CBC_CFC: - dev_dbg(component->dev, - "%s : %s\n", __func__, "I2S/TDM Device mode"); - ret += sma1303_regmap_update_bits(sma1303, - SMA1303_01_INPUT1_CTRL1, - SMA1303_CONTROLLER_DEVICE_MASK, - SMA1303_DEVICE_MODE, - NULL); - break; - - case SND_SOC_DAIFMT_CBP_CFP: - dev_dbg(component->dev, - "%s : %s\n", __func__, "I2S/TDM Controller mode"); - ret += sma1303_regmap_update_bits(sma1303, - SMA1303_01_INPUT1_CTRL1, - SMA1303_CONTROLLER_DEVICE_MASK, - SMA1303_CONTROLLER_MODE, - NULL); - 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_dbg(component->dev, "%s : %s\n", - __func__, "Invert BCLK + Normal Frame"); - ret += sma1303_regmap_update_bits(sma1303, - SMA1303_01_INPUT1_CTRL1, - SMA1303_SCK_RISING_MASK, - SMA1303_SCK_RISING_EDGE, - NULL); - break; - case SND_SOC_DAIFMT_IB_IF: - dev_dbg(component->dev, "%s : %s\n", - __func__, "Invert BCLK + Invert Frame"); - ret += sma1303_regmap_update_bits(sma1303, - SMA1303_01_INPUT1_CTRL1, - SMA1303_LEFTPOL_MASK|SMA1303_SCK_RISING_MASK, - SMA1303_HIGH_FIRST_CH|SMA1303_SCK_RISING_EDGE, - NULL); - break; - case SND_SOC_DAIFMT_NB_IF: - dev_dbg(component->dev, "%s : %s\n", - __func__, "Normal BCLK + Invert Frame"); - ret += sma1303_regmap_update_bits(sma1303, - SMA1303_01_INPUT1_CTRL1, - SMA1303_LEFTPOL_MASK, - SMA1303_HIGH_FIRST_CH, - NULL); - break; - case SND_SOC_DAIFMT_NB_NF: - dev_dbg(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; - } - - if (ret < 0) - return -EINVAL; - return 0; -} - -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_dbg(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, - SMA1303_A4_TOP_MAN3, - SMA1303_O_FORMAT_MASK, - SMA1303_O_FMT_TDM, - NULL); - - switch (slot_width) { - case 16: - ret += sma1303_regmap_update_bits(sma1303, - SMA1303_A6_TDM2, - SMA1303_TDM_DL_MASK, - SMA1303_TDM_DL_16, - NULL); - break; - case 32: - ret += sma1303_regmap_update_bits(sma1303, - SMA1303_A6_TDM2, - SMA1303_TDM_DL_MASK, - SMA1303_TDM_DL_32, - NULL); - break; - default: - dev_err(component->dev, "%s not support TDM %d slot_width\n", - __func__, slot_width); - break; - } - - switch (slots) { - case 4: - ret += sma1303_regmap_update_bits(sma1303, - SMA1303_A6_TDM2, - SMA1303_TDM_N_SLOT_MASK, - SMA1303_TDM_N_SLOT_4, - NULL); - break; - case 8: - ret += sma1303_regmap_update_bits(sma1303, - SMA1303_A6_TDM2, - SMA1303_TDM_N_SLOT_MASK, - SMA1303_TDM_N_SLOT_8, - NULL); - break; - default: - dev_err(component->dev, "%s not support TDM %d slots\n", - __func__, slots); - break; - } - - if (sma1303->tdm_slot_rx < slots) - ret += sma1303_regmap_update_bits(sma1303, - SMA1303_A5_TDM1, - SMA1303_TDM_SLOT1_RX_POS_MASK, - (sma1303->tdm_slot_rx) << 3, - NULL); - else - dev_err(component->dev, "%s Incorrect tdm-slot-rx %d set\n", - __func__, sma1303->tdm_slot_rx); - - ret += sma1303_regmap_update_bits(sma1303, - SMA1303_A5_TDM1, - SMA1303_TDM_CLK_POL_MASK, - SMA1303_TDM_CLK_POL_RISE, - NULL); - - ret += sma1303_regmap_update_bits(sma1303, - SMA1303_A5_TDM1, - SMA1303_TDM_TX_MODE_MASK, - SMA1303_TDM_TX_MONO, - NULL); - - if (sma1303->tdm_slot_tx < slots) - ret += sma1303_regmap_update_bits(sma1303, - SMA1303_A6_TDM2, - SMA1303_TDM_SLOT1_TX_POS_MASK, - (sma1303->tdm_slot_tx) << 3, - NULL); - else - dev_err(component->dev, "%s Incorrect tdm-slot-tx %d set\n", - __func__, sma1303->tdm_slot_tx); - - if (ret < 0) - return -EINVAL; - return 0; -} - -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; - - if (sma1303->tsdw_cnt) - ret = sma1303_regmap_read(sma1303, - SMA1303_0A_SPK_VOL, &sma1303->cur_vol); - else - ret = sma1303_regmap_read(sma1303, - SMA1303_0A_SPK_VOL, &sma1303->init_vol); - - if (ret != 0) { - dev_err(sma1303->dev, - "failed to read SMA1303_0A_SPK_VOL : %d\n", ret); - return; - } - - 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); - return; - } - - 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); - return; - } - - 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); - return; - } - - if (~over_temp & SMA1303_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, - SMA1303_0A_SPK_VOL, sma1303->cur_vol + 6); - - sma1303->tsdw_cnt++; - } else if (sma1303->tsdw_cnt) { - sma1303_regmap_write(sma1303, - SMA1303_0A_SPK_VOL, sma1303->init_vol); - sma1303->tsdw_cnt = 0; - sma1303->cur_vol = sma1303->init_vol; - } - - if (~over_temp & SMA1303_OT2_OK_STATUS) { - dev_crit(sma1303->dev, - "%s : OT2(Over Temperature Level 2)\n", __func__); - } - if (ocp_val & SMA1303_OCP_SPK_STATUS) { - dev_crit(sma1303->dev, - "%s : OCP_SPK(Over Current Protect SPK)\n", __func__); - } - if (ocp_val & SMA1303_OCP_BST_STATUS) { - dev_crit(sma1303->dev, - "%s : OCP_BST(Over Current Protect Boost)\n", __func__); - } - 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 & SMA1303_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_dbg(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 & 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)) { - } -} - -static int sma1303_probe(struct snd_soc_component *component) -{ - struct snd_soc_dapm_context *dapm = - snd_soc_component_get_dapm(component); - - snd_soc_dapm_sync(dapm); - - return 0; -} - -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, - .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); - - return sysfs_emit(buf, "%ld\n", sma1303->check_fault_period); -} - -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); - - return sysfs_emit(buf, "%ld\n", sma1303->check_fault_status); -} - -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, i = 0; - u32 value = 0; - 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, - "Failed to allocate register map: %d\n", ret); - - return ret; - } - - if (np) { - if (!of_property_read_u32(np, "i2c-retry", &value)) { - if (value > 50 || value <= 0) { - sma1303->retry_cnt = SMA1303_I2C_RETRY_COUNT; - dev_dbg(&client->dev, "%s : %s\n", __func__, - "i2c-retry out of range (up to 50)"); - } else { - sma1303->retry_cnt = value; - dev_dbg(&client->dev, "%s : %s = %u\n", - __func__, "i2c-retry count", value); - } - } else { - dev_dbg(&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_dbg(&client->dev, - "tdm slot rx is '%d' from DT\n", value); - sma1303->tdm_slot_rx = value; - } else { - dev_dbg(&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_dbg(&client->dev, - "tdm slot tx is '%u' from DT\n", value); - sma1303->tdm_slot_tx = value; - } else { - dev_dbg(&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_dbg(&client->dev, "MCLK is not supported\n"); - break; - case SMA1303_PLL_CLKIN_BCLK: - dev_dbg(&client->dev, - "Take an BCLK(SCK) and covert it to an internal PLL for use\n"); - break; - default: - dev_err(&client->dev, - "Invalid sys-clk-id: %u\n", value); - return -EINVAL; - } - sma1303->sys_clk_id = value; - } else { - dev_dbg(&client->dev, "Use the internal PLL clock by default\n"); - sma1303->sys_clk_id = SMA1303_PLL_CLKIN_BCLK; - } - } else { - dev_err(&client->dev, - "device node initialization error\n"); - devm_kfree(&client->dev, sma1303); - return -ENODEV; - } - - ret = sma1303_regmap_read(sma1303, - SMA1303_FF_DEVICE_INDEX, &device_info); - - if ((ret != 0) || ((device_info & 0xF8) != SMA1303_DEVICE_ID)) { - dev_err(&client->dev, "device initialization error (%d 0x%02X)", - ret, device_info); - } - dev_dbg(&client->dev, "chip version 0x%02X\n", device_info); - - ret += sma1303_regmap_update_bits(sma1303, - SMA1303_00_SYSTEM_CTRL, - SMA1303_RESETBYI2C_MASK, SMA1303_RESETBYI2C_RESET, - NULL); - - 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_dbg(&client->dev, "SMA1303 Trimming Version 0\n"); - else if (sma1303->rev_num == SMA1303_REV_NUM_TV1) - dev_dbg(&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_dbg(&client->dev, "SMA1303 OTP Status Successful\n"); - else - dev_dbg(&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; - - 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->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"); - - 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); -} - -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, -}; - -module_i2c_driver(sma1303_i2c_driver); - -MODULE_DESCRIPTION("ALSA SoC SMA1303 driver"); -MODULE_AUTHOR("Gyuhwa Park, <gyuhwa.park(a)irondevice.com>"); -MODULE_AUTHOR("Kiseok Jo, <kiseok.jo(a)irondevice.com>"); -MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/codecs/sma1303.h b/sound/soc/codecs/sma1303.h deleted file mode 100644 index ae70f207adde..000000000000 --- a/sound/soc/codecs/sma1303.h +++ /dev/null @@ -1,609 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ -/* - * sma1303.h -- sma1303 ALSA SoC Audio driver - * - * Copyright 2023 Iron Device Corporation - * - * Author: Kiseok Jo <kiseok.jo(a)irondevice.com> - * - */ - -#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 SMA1303_MONO 0x00 -#define SMA1303_STEREO 0x01 - -#define SMA1303_I2C_RETRY_COUNT 3 - -/* - * 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 SMA1303_RESETBYI2C_MASK (1<<1) -#define SMA1303_RESETBYI2C_NORMAL (0<<1) -#define SMA1303_RESETBYI2C_RESET (1<<1) - -#define SMA1303_POWER_MASK (1<<0) -#define SMA1303_POWER_OFF (0<<0) -#define SMA1303_POWER_ON (1<<0) - -/* INTPUT CTRL1 : 0x01 */ -#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 SMA1303_IMODE_MASK (3<<6) -#define SMA1303_I2S (0<<6) -#define SMA1303_PCM_SHORT (1<<6) -#define SMA1303_PCM_LONG (2<<6) - -#define RSMA1303_IGHT_FIRST_MASK (1<<5) -#define SMA1303_LEFT_NORMAL (0<<5) -#define SMA1303_RIGHT_INVERTED (1<<5) - -#define SMA1303_PCM_ALAW_MASK (1<<4) -#define SMA1303_PCM_U_DECODING (0<<4) -#define SMA1303_PCM_A_DECODING (1<<4) - -#define SMA1303_PCM_COMP_MASK (1<<3) -#define SMA1303_PCM_LINEAR (0<<3) -#define SMA1303_PCM_COMPANDING (1<<3) - -#define SMA1303_INPUTSEL_MASK (1<<2) -#define SMA1303_PCM_8KHZ (0<<2) -#define SMA1303_PCM_16KHZ (1<<2) - -#define SMA1303_PCM_STEREO_MASK (1<<1) -#define SMA1303_PCM_MONO (0<<1) -#define SMA1303_PCM_STEREO (1<<1) - -#define SMA1303_PCM_DL_MASK (1<<0) -#define SMA1303_PCM_8BIT (0<<0) -#define SMA1303_PCM_16BIT (1<<0) - -/* INTPUT CTRL3 : 0x03 */ -#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 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 SMA1303_PORT_CONFIG_MASK (3<<5) -#define SMA1303_INPUT_PORT_ONLY (0<<5) -#define SMA1303_OUTPUT_PORT_ENABLE (2<<5) - -#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 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 SMA1303_OCP_TEST_MASK (1<<5) -#define SMA1303_OCP_NORMAL_MODE (0<<5) -#define SMA1303_OCP_TEST_MODE (1<<5) - -#define SMA1303_BST_FAST_LEBN_MASK (1<<4) -#define SMA1303_BST_SHORT_LEB (0<<4) -#define SMA1303_BST_LONG_LEB (1<<4) - -#define SMA1303_HIGH_PGAIN_MASK (1<<3) -#define SMA1303_NORMAL_P_GAIN (0<<3) -#define SMA1303_HIGH_P_GAIN (1<<3) - -#define SMA1303_VCOMP_MASK (1<<2) -#define SMA1303_VCOMP_NORMAL_MODE (0<<2) -#define SMA1303_VCOMP_V_MON_MODE (1<<2) - -#define SMA1303_PMOS_ON_MASK (1<<1) -#define SMA1303_PMOS_NORMAL_MODE (0<<1) -#define SMA1303_PMOS_TEST_MODE (1<<1) - -#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 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 SMA1303_OCL_TEST_MASK (1<<5) -#define SMA1303_OCL_NORMAL_MODE (0<<5) -#define SMA1303_OCL_TEST_MODE (1<<5) - -#define SMA1303_LOOP_CHECK_MASK (1<<4) -#define SMA1303_BST_LOOP_NORMAL_MODE (0<<4) -#define SMA1303_BST_LOOP_CHECK_MODE (1<<4) - -#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 SMA1303_VREF_MON_MASK (1<<3) -#define SMA1303_VREF_NORMAL_MODE (0<<3) -#define SMA1303_VREF_V_MON_MODE (1<<3) - -#define SMA1303_SPK_OCP_DLYN_MASK (1<<2) -#define SMA1303_SPK_OCP_LONG_DELAY (0<<2) -#define SMA1303_SPK_OCP_NORMAL (1<<2) - -#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 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 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 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 SMA1303_LR_DATA_SW_MASK (1<<4) -#define SMA1303_LR_DATA_SW_NORMAL (0<<4) -#define SMA1303_LR_DATA_SW_SWAP (1<<4) - -#define SMA1303_MONOMIX_MASK (1<<0) -#define SMA1303_MONOMIX_OFF (0<<0) -#define SMA1303_MONOMIX_ON (1<<0) - -/* SYSTEM_CTRL3 : 0x12 */ -#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 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 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 SMA1303_OTP_LVL_MASK (1<<5) -#define SMA1303_OTP_LVL_NORMAL (0<<5) -#define SMA1303_OTP_LVL_LOW (1<<5) - -/* PROTECTION : 0x36 */ -#define SMA1303_EDGE_DIS_MASK (1<<7) -#define SMA1303_EDGE_DIS_ENABLE (0<<7) -#define SMA1303_EDGE_DIS_DISABLE (1<<7) - -#define SMA1303_SPK_OCP_DIS_MASK (1<<3) -#define SMA1303_SPK_OCP_ENABLE (0<<3) -#define SMA1303_SPK_OCP_DISABLE (1<<3) - -#define SMA1303_OCP_MODE_MASK (1<<2) -#define SMA1303_AUTO_RECOVER (0<<2) -#define SMA1303_SHUT_DOWN_PERMANENT (1<<2) - -#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 SMA1303_SPK_HSDM_BP_MASK (1<<4) -#define SMA1303_SPK_HSDM_ENABLE (0<<4) -#define SMA1303_SPK_HSDM_BYPASS (1<<4) - -#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 SMA1303_SPK_OUT_FREQ_MASK (1<<2) -#define SMA1303_SPK_OUT_FREQ_360K (0<<2) -#define SMA1303_SPK_OUT_FREQ_410K (1<<2) - -#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 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 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 SMA1303_TRM_LVL_MASK (1<<4) -#define SMA1303_TRM_LVL_NORMAL (0<<4) -#define SMA1303_TRM_LVL_LOW (1<<4) - -#define SMA1303_LOW_OCL_MODE_MASK (1<<3) -#define SMA1303_LOW_OCL_MODE (0<<3) -#define SMA1303_NORMAL_OCL_MODE (1<<3) - -#define SMA1303_PLL_PD2_MASK (7<<0) -#define SMA1303_PLL_PD2 (7<<0) -#define SMA1303_PLL_OPERATION2 (0<<0) - -/* POSTSCALER : 0x90 */ -#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 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 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 SMA1303_PLL_LOCK_SKIP_MASK (1<<7) -#define SMA1303_PLL_LOCK_ENABLE (0<<7) -#define SMA1303_PLL_LOCK_DISABLE (1<<7) - -#define SMA1303_PLL_PD_MASK (1<<6) -#define SMA1303_PLL_OPERATION (0<<6) -#define SMA1303_PLL_PD (1<<6) - -#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 SMA1303_PLL_REF_CLK_MASK (1<<3) -#define SMA1303_PLL_REF_CLK1 (0<<3) -#define SMA1303_PLL_SCK (1<<3) - -#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 SMA1303_SDO_IO_MASK (1<<1) -#define SMA1303_HIGH_Z_LRCK_H (0<<1) -#define SMA1303_HIGH_Z_LRCK_L (1<<1) - -#define SMA1303_SDO_OUTPUT2_MASK (1<<0) -#define SMA1303_SDO_NORMAL (0<<0) -#define SMA1303_SDO_OUTPUT_ONLY (1<<0) - -/* TOP_MAN2 : 0xA3 */ -#define SMA1303_MON_OSC_PLL_MASK (1<<7) -#define SMA1303_PLL_SDO (0<<7) -#define SMA1303_OSC_SDO (1<<7) - -#define SMA1303_TEST_CLKO_EN_MASK (1<<6) -#define SMA1303_NORMAL_SDO (0<<6) -#define SMA1303_CLK_OUT_SDO (1<<6) - -#define SMA1303_SDO_OUTPUT_MASK (1<<3) -#define SMA1303_NORMAL_OUT (0<<3) -#define SMA1303_HIGH_Z_OUT (1<<3) - -#define SMA1303_CLOCK_MON_MASK (1<<1) -#define SMA1303_CLOCK_MON (0<<1) -#define SMA1303_CLOCK_NOT_MON (1<<1) - -#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 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 SMA1303_SCK_RATE_MASK (1<<3) -#define SMA1303_SCK_64FS (0<<3) -#define SMA1303_SCK_32FS (2<<3) - -#define SMA1303_LRCK_POL_MASK (1<<0) -#define SMA1303_L_VALID (0<<0) -#define SMA1303_R_VALID (1<<0) - -/* TDM1 FORMAT : 0xA5 */ -#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 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 SMA1303_OT1_OK_STATUS (1<<7) -#define SMA1303_OT2_OK_STATUS (1<<6) - -/* STATUS2 : 0xFB */ -#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 SMA1303_CLK_MON_STATUS (1<<0) - -/* DEVICE_INFO : 0xFF */ -#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.34.1

3 9

[PATCH] ALSA: hda: Fix the control element identification for multiple codecs
by Jaroslav Kysela 02 Feb '23

02 Feb '23

Some motherboards have multiple HDA codecs connected to the serial bus. The current code may create multiple mixer controls with the almost identical identification. The current code use id.device field from the control element structure to store the codec address to avoid such clashes for multiple codecs. Unfortunately, the user space do not handle this correctly. For mixer controls, only name and index are used for the identifiers. This patch fixes this problem to compose the index using the codec address as an offset in case, when the control already exists. It is really unlikely that one codec will create 10 similar controls. This patch adds new kernel module parameter 'ctl_dev_id' to allow select the old behaviour, too. The CONFIG_SND_HDA_CTL_DEV_ID Kconfig option sets the default value. BugLink: https://github.com/alsa-project/alsa-lib/issues/294 BugLink: https://github.com/alsa-project/alsa-lib/issues/205 Fixes: 54d174031576 ("[ALSA] hda-codec - Fix connection list parsing") Fixes: 1afe206ab699 ("ALSA: hda - Try to find an empty control index when it's occupied") Signed-off-by: Jaroslav Kysela <perex(a)perex.cz> -- rfc..v1: - added CONFIG_SND_HDA_CTL_DEV_ID Kconfig option --- include/sound/hda_codec.h | 1 + sound/pci/hda/Kconfig | 14 ++++++++++++++ sound/pci/hda/hda_codec.c | 13 ++++++++++--- sound/pci/hda/hda_controller.c | 1 + sound/pci/hda/hda_controller.h | 1 + sound/pci/hda/hda_intel.c | 6 ++++++ 6 files changed, 33 insertions(+), 3 deletions(-) diff --git a/include/sound/hda_codec.h b/include/sound/hda_codec.h index eba23daf2c29..bbb7805e85d8 100644 --- a/include/sound/hda_codec.h +++ b/include/sound/hda_codec.h @@ -259,6 +259,7 @@ struct hda_codec { unsigned int relaxed_resume:1; /* don't resume forcibly for jack */ unsigned int forced_resume:1; /* forced resume for jack */ unsigned int no_stream_clean_at_suspend:1; /* do not clean streams at suspend */ + unsigned int ctl_dev_id:1; /* old control element id build behaviour */ #ifdef CONFIG_PM unsigned long power_on_acct; diff --git a/sound/pci/hda/Kconfig b/sound/pci/hda/Kconfig index 06d304db4183..886255a03e8b 100644 --- a/sound/pci/hda/Kconfig +++ b/sound/pci/hda/Kconfig @@ -302,6 +302,20 @@ config SND_HDA_INTEL_HDMI_SILENT_STREAM This feature can impact power consumption as resources are kept reserved both at transmitter and receiver. +config SND_HDA_CTL_DEV_ID + bool "Use the device identifier field for controls" + depends on SND_HDA_INTEL + help + Say Y to use the device identifier field for (mixer) + controls (old behaviour until this option is available). + + When enabled, the multiple HDA codecs may set the device + field in control (mixer) element identifiers. The use + of this field is not recommended and defined for mixer controls. + + The old behaviour (Y) is obsolete and will be removed. Consider + to not enable this option. + endif endmenu diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index edd653ece70d..8f20abc036bf 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -3390,7 +3390,12 @@ int snd_hda_add_new_ctls(struct hda_codec *codec, kctl = snd_ctl_new1(knew, codec); if (!kctl) return -ENOMEM; - if (addr > 0) + /* Do not use the id.device field for MIXER elements. + * This field is for real device numbers (like PCM) but codecs + * are hidden components from the user space view (unrelated + * to the mixer element identification). + */ + if (addr > 0 && codec->ctl_dev_id) kctl->id.device = addr; if (idx > 0) kctl->id.index = idx; @@ -3401,9 +3406,11 @@ int snd_hda_add_new_ctls(struct hda_codec *codec, * the codec addr; if it still fails (or it's the * primary codec), then try another control index */ - if (!addr && codec->core.addr) + if (!addr && codec->core.addr) { addr = codec->core.addr; - else if (!idx && !knew->index) { + if (!codec->ctl_dev_id) + idx += 10 * addr; + } else if (!idx && !knew->index) { idx = find_empty_mixer_ctl_idx(codec, knew->name, 0); if (idx <= 0) diff --git a/sound/pci/hda/hda_controller.c b/sound/pci/hda/hda_controller.c index 0ff286b7b66b..083df287c1a4 100644 --- a/sound/pci/hda/hda_controller.c +++ b/sound/pci/hda/hda_controller.c @@ -1231,6 +1231,7 @@ int azx_probe_codecs(struct azx *chip, unsigned int max_slots) continue; codec->jackpoll_interval = chip->jackpoll_interval; codec->beep_mode = chip->beep_mode; + codec->ctl_dev_id = chip->ctl_dev_id; codecs++; } } diff --git a/sound/pci/hda/hda_controller.h b/sound/pci/hda/hda_controller.h index f5bf295eb830..8556031bcd68 100644 --- a/sound/pci/hda/hda_controller.h +++ b/sound/pci/hda/hda_controller.h @@ -124,6 +124,7 @@ struct azx { /* HD codec */ int codec_probe_mask; /* copied from probe_mask option */ unsigned int beep_mode; + bool ctl_dev_id; #ifdef CONFIG_SND_HDA_PATCH_LOADER const struct firmware *fw; diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 87002670c0c9..048656234280 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -119,6 +119,8 @@ static bool beep_mode[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)] = CONFIG_SND_HDA_INPUT_BEEP_MODE}; #endif static bool dmic_detect = 1; +static bool ctl_dev_id[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)] = + CONFIG_SND_HDA_CTL_DEV_ID}; module_param_array(index, int, NULL, 0444); MODULE_PARM_DESC(index, "Index value for Intel HD audio interface."); @@ -157,6 +159,8 @@ module_param(dmic_detect, bool, 0444); MODULE_PARM_DESC(dmic_detect, "Allow DSP driver selection (bypass this driver) " "(0=off, 1=on) (default=1); " "deprecated, use snd-intel-dspcfg.dsp_driver option instead"); +module_param_array(ctl_dev_id, bool, NULL, 0444); +MODULE_PARM_DESC(ctl_dev_id, "Use control device identifier (based on codec address)."); #ifdef CONFIG_PM static int param_set_xint(const char *val, const struct kernel_param *kp); @@ -2278,6 +2282,8 @@ static int azx_probe_continue(struct azx *chip) chip->beep_mode = beep_mode[dev]; #endif + chip->ctl_dev_id = ctl_dev_id[dev]; + /* create codec instances */ if (bus->codec_mask) { err = azx_probe_codecs(chip, azx_max_codecs[chip->driver_type]); -- 2.39.0

3 2

Test - empty posts
by M. Armsby 02 Feb '23

02 Feb '23

1 0

[PATCH] Sound: pci/hda: Add quirk for HP Envy x360 ey0xxx
by Fae 02 Feb '23

02 Feb '23

This patch fixes speaker output on the HP Envy x360 ey0xxx The mic/speaker mute LEDs are still non-functional but they aren't required for basic funtionality Also the quirk is labeled ALC287_FIXUP_CS35L41_I2C_2 however it does not only apply to ALC287 Its function is the generic cs35l41 fixup telling the driver that there's 2 i2c speakers. It isn't actually specific to ALC287 I did have a bit of luck getting the mic mute LED to work but it was to finicky to submit ( I used the ALC245_FIXUP_HP_GPIO_LED quirk ) I had no luck getting the speaker mute LED to work Signed-off-by: Fae <faenkhauser(a)gmail.com> --- sound/pci/hda/cs35l41_hda.c | 3 ++- sound/pci/hda/patch_realtek.c | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sound/pci/hda/cs35l41_hda.c b/sound/pci/hda/cs35l41_hda.c index 129bffb431c22..21d8c2de128ff 100644 --- a/sound/pci/hda/cs35l41_hda.c +++ b/sound/pci/hda/cs35l41_hda.c @@ -1156,7 +1156,8 @@ static int cs35l41_no_acpi_dsd(struct cs35l41_hda *cs35l41, struct device *physd hw_cfg->valid = true; put_device(physdev); - if (strncmp(hid, "CLSA0100", 8) == 0) { + if ((strncmp(hid, "CLSA0100", 8) == 0) || + (strncmp(hid, "CSC3551", 7) == 0)) { hw_cfg->bst_type = CS35L41_EXT_BOOST_NO_VSPK_SWITCH; } else if (strncmp(hid, "CLSA0101", 8) == 0) { hw_cfg->bst_type = CS35L41_EXT_BOOST; diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 8a57636f622e9..e7053cbc6bb6e 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -9179,6 +9179,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x103c, 0x83b9, "HP Spectre x360", ALC269_FIXUP_HP_MUTE_LED_MIC3), SND_PCI_QUIRK(0x103c, 0x841c, "HP Pavilion 15-CK0xx", ALC269_FIXUP_HP_MUTE_LED_MIC3), SND_PCI_QUIRK(0x103c, 0x8497, "HP Envy x360", ALC269_FIXUP_HP_MUTE_LED_MIC3), + SND_PCI_QUIRK(0x103c, 0x8a31, "HP ENVY x360 2-in-1 Laptop 15-ey0xxx", ALC287_FIXUP_CS35L41_I2C_2), SND_PCI_QUIRK(0x103c, 0x84da, "HP OMEN dc0019-ur", ALC295_FIXUP_HP_OMEN), SND_PCI_QUIRK(0x103c, 0x84e7, "HP Pavilion 15", ALC269_FIXUP_HP_MUTE_LED_MIC3), SND_PCI_QUIRK(0x103c, 0x8519, "HP Spectre x360 15-df0xxx", ALC285_FIXUP_HP_SPECTRE_X360), -- 2.37.1

2 2

Re: [Bug 216859] New: PCI bridge to bus boot hang at enumeration
by Bjorn Helgaas 01 Feb '23

01 Feb '23

[+cc sound folks] On Wed, Dec 28, 2022 at 06:02:48AM -0600, Bjorn Helgaas wrote: > On Wed, Dec 28, 2022 at 08:37:52AM +0000, bugzilla-daemon(a)kernel.org wrote: > > https://bugzilla.kernel.org/show_bug.cgi?id=216859 > > > Summary: PCI bridge to bus boot hang at enumeration > > Kernel Version: 6.1-rc1 > > ... > > > With Kernel 6.1-rc1 the enumeration process stopped working for me, > > see attachments. > > > > The enumeration works fine with Kernel 6.0 and below. > > > > Same problem still exists with v6.1. and v6.2.-rc1 > > Thank you very much for your report, Zeno! > > v6.0 works, v6.1-rc1 fails. Would you mind booting v6.1-rc1 with the > "ignore_loglevel initcall_debug" kernel parameters and taking a photo > when it hangs? > > How did you conclude that the hang is related to a PCI bridge? I see > recent PCI messages in the photo, but it looks like the last message > is from NFS, so I'm wondering if I'm missing some context. The v6.0 > dmesg shows several other ntfs, fuse, JFS, etc messages before more > PCI-related things. Anyway, the "initcall_debug" might help us narrow > it down a bit. Thanks very much for the bisection (complete log at [1])! The bisection claims the first bad commit is: 833477fce7a1 ("Merge tag 'sound-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound") with parents: 7e6739b9336e ("Merge tag 'drm-next-2022-10-05' of git://anongit.freedesktop.org/drm/drm") 86a4d29e7554 ("Merge tag 'asoc-v6.1' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus") Both 7e6739b9336e and 86a4d29e7554 tested "good" during the bisection. There is a minor conflict when merging 86a4d29e7554 into the upstream, but I can't imagine that being resolved incorrectly. Would you mind turning off CONFIG_SOUND in your .config and testing 833477fce7a1 again? I'm a little skeptical that the hang would be sound-related, but I guess it's a place to start. Bjorn [1] https://bugzilla.kernel.org/show_bug.cgi?id=216859#c35

2 3

[PATCH] ASoC: codecs/jz4760: add digital gain controls
by Christophe Branchereau 01 Feb '23

01 Feb '23

Both the DAC and ADC have digital gain controls available for their mixers, which go from -31 to 0db by step of 1db. Signed-off-by: Christophe Branchereau <cbranchereau(a)gmail.com> --- sound/soc/codecs/jz4760.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sound/soc/codecs/jz4760.c b/sound/soc/codecs/jz4760.c index d96a4f6c9183..9df58e23d360 100644 --- a/sound/soc/codecs/jz4760.c +++ b/sound/soc/codecs/jz4760.c @@ -287,6 +287,7 @@ static const DECLARE_TLV_DB_MINMAX_MUTE(dac_tlv, -3100, 100); static const DECLARE_TLV_DB_SCALE(adc_tlv, 0, 100, 0); static const DECLARE_TLV_DB_MINMAX(out_tlv, -2500, 100); static const DECLARE_TLV_DB_SCALE(linein_tlv, -2500, 100, 0); +static const DECLARE_TLV_DB_MINMAX(mixer_tlv, -3100, 0); /* Unconditional controls. */ static const struct snd_kcontrol_new jz4760_codec_snd_controls[] = { @@ -299,6 +300,14 @@ static const struct snd_kcontrol_new jz4760_codec_snd_controls[] = { JZ4760_CODEC_REG_GCR4, JZ4760_CODEC_REG_GCR3, REG_GCR_GAIN_OFFSET, REG_GCR_GAIN_MAX, 1, linein_tlv), + SOC_SINGLE_TLV("Mixer Capture Volume", + JZ4760_CODEC_REG_MIX1, + REG_GCR_GAIN_OFFSET, REG_GCR_GAIN_MAX, 1, mixer_tlv), + + SOC_SINGLE_TLV("Mixer Playback Volume", + JZ4760_CODEC_REG_MIX2, + REG_GCR_GAIN_OFFSET, REG_GCR_GAIN_MAX, 1, mixer_tlv), + SOC_SINGLE("High-Pass Filter Capture Switch", JZ4760_CODEC_REG_CR4, REG_CR4_ADC_HPF_OFFSET, 1, 0), -- 2.39.0

2 1

[PATCH] ALSA: hda/realtek: Fix the speaker output on Samsung Galaxy Book2 Pro 360
by Guillaume Pinot 01 Feb '23

01 Feb '23

Samsung Galaxy Book2 Pro 360 (13" 2022 NP930QED-KA1FR) with codec SSID 144d:ca03 requires the same workaround for enabling the speaker amp like other Samsung models with ALC298 codec. Cc: <stable(a)vger.kernel.org> Signed-off-by: Guillaume Pinot <texitoi(a)texitoi.eu> --- I've tested this fix on my laptop with success. I've took "inspiration" from https://lore.kernel.org/all/20221115170235.18875-1-tiwai@suse.de/ This is my first contribution, so feel free to give me feedbacks! sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 6fab7c8fc19a..c4496206c3e7 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -9521,6 +9521,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x144d, 0xc812, "Samsung Notebook Pen S (NT950SBE-X58)", ALC298_FIXUP_SAMSUNG_AMP), SND_PCI_QUIRK(0x144d, 0xc830, "Samsung Galaxy Book Ion (NT950XCJ-X716A)", ALC298_FIXUP_SAMSUNG_AMP), SND_PCI_QUIRK(0x144d, 0xc832, "Samsung Galaxy Book Flex Alpha (NP730QCJ)", ALC256_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET), + SND_PCI_QUIRK(0x144d, 0xca03, "Samsung Galaxy Book2 Pro 360 (NP930QED)", ALC298_FIXUP_SAMSUNG_AMP), SND_PCI_QUIRK(0x1458, 0xfa53, "Gigabyte BXBT-2807", ALC283_FIXUP_HEADSET_MIC), SND_PCI_QUIRK(0x1462, 0xb120, "MSI Cubi MS-B120", ALC283_FIXUP_HEADSET_MIC), SND_PCI_QUIRK(0x1462, 0xb171, "Cubi N 8GL (MS-B171)", ALC283_FIXUP_HEADSET_MIC), -- 2.30.2

2 1

[PATCH] ASoC: dt-bindings: irondevice, sma1303.yaml: Fix about breaking the checks
by Kiseok Jo 01 Feb '23

01 Feb '23

Fix the bindings checks like syntax error. Signed-off-by: Kiseok Jo <kiseok.jo(a)irondevice.com> Reported-by: Rob Herring <robh(a)kernel.org> --- .../bindings/sound/irondevice,sma1303.yaml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/irondevice,sma1303.yaml b/Documentation/devicetree/bindings/sound/irondevice,sma1303.yaml index eb87374cc812..162c52606635 100644 --- a/Documentation/devicetree/bindings/sound/irondevice,sma1303.yaml +++ b/Documentation/devicetree/bindings/sound/irondevice,sma1303.yaml @@ -19,14 +19,13 @@ required: - compatible - reg -additionalProperties: true +additionalProperties: false examples: - | - #include <dt-bindings/gpio/gpio.h> i2c_bus { - sma1303_amp: sma1303@1e { - compatible = "irondevice,sma1303"; - reg = <0x1e>; - }; - }; + amplifier@1e { + compatible = "irondevice,sma1303"; + reg = <0x1e>; + }; + }; base-commit: eeb6b0feb597e8fb88c4e1459323060e17350752 -- 2.20.1

3 3

[PATCH v2] ALSA: pci: lx6464es: fix a debug loop
by Dan Carpenter 01 Feb '23

01 Feb '23

This loop accidentally reuses the "i" iterator for both the inside and the outside loop. The value of MAX_STREAM_BUFFER is 5. I believe that chip->rmh.stat_len is in the 2-12 range. If the value of .stat_len is 4 or more then it will loop exactly one time, but if it's less then it is a forever loop. It looks like it was supposed to combined into one loop where conditions are checked. Fixes: 8e6320064c33 ("ALSA: lx_core: Remove useless #if 0 .. #endif") Signed-off-by: Dan Carpenter <error27(a)gmail.com> --- v2: In the first version I just deleted the outside loop but that was not the correct fix. Combine the conditions instead. sound/pci/lx6464es/lx_core.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/sound/pci/lx6464es/lx_core.c b/sound/pci/lx6464es/lx_core.c index d3f58a3d17fb..b5b0d43bb8dc 100644 --- a/sound/pci/lx6464es/lx_core.c +++ b/sound/pci/lx6464es/lx_core.c @@ -493,12 +493,11 @@ int lx_buffer_ask(struct lx6464es *chip, u32 pipe, int is_capture, dev_dbg(chip->card->dev, "CMD_08_ASK_BUFFERS: needed %d, freed %d\n", *r_needed, *r_freed); - for (i = 0; i < MAX_STREAM_BUFFER; ++i) { - for (i = 0; i != chip->rmh.stat_len; ++i) - dev_dbg(chip->card->dev, - " stat[%d]: %x, %x\n", i, - chip->rmh.stat[i], - chip->rmh.stat[i] & MASK_DATA_SIZE); + for (i = 0; i < MAX_STREAM_BUFFER && i < chip->rmh.stat_len; + ++i) { + dev_dbg(chip->card->dev, " stat[%d]: %x, %x\n", i, + chip->rmh.stat[i], + chip->rmh.stat[i] & MASK_DATA_SIZE); } } -- 2.35.1

2 1