ASoC: cs35l56: Add support for CS35L54 and CS35L57

The CS35L54 and CS35L57 are Boosted Smart Amplifiers. The CS35L54 has
I2C/SPI control and I2S/TDM audio. The CS35L57 also has SoundWire
control and audio.

The hardware differences between L54, L56 and L57 do not affect the
driver control interface so they can all be handled by the same driver.

Signed-off-by: Simon Trimmer <simont@opensource.cirrus.com>
Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Acked-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Message-ID: <20240308135900.603192-2-rf@opensource.cirrus.com>

diff --git a/include/sound/cs35l56.h b/include/sound/cs35l56.h
index b24716ab27504bdfa17f221a39053dd21dd961d9..5fda814776b952f23dc236e251955c16da255b71 100644 (file)
--- a/include/sound/cs35l56.h
+++ b/include/sound/cs35l56.h
@@ -257,6 +257,7 @@ struct cs35l56_base {
        struct regmap *regmap;
        int irq;
        struct mutex irq_lock;
+       u8 type;
        u8 rev;
        bool init_done;
        bool fw_patched;

diff --git a/sound/soc/codecs/cs35l56-sdw.c b/sound/soc/codecs/cs35l56-sdw.c
index ab960a1c171e629e4becb57c653fdc4b917b026b..abd296da6dbd89c7fc2359272a2a77545135ec85 100644 (file)
--- a/sound/soc/codecs/cs35l56-sdw.c
+++ b/sound/soc/codecs/cs35l56-sdw.c
@@ -366,7 +366,7 @@ static int cs35l56_sdw_bus_config(struct sdw_slave *peripheral,
        dev_dbg(cs35l56->base.dev, "%s: sclk=%u c=%u r=%u\n",
                __func__, sclk, params->col, params->row);
 
-       if (cs35l56->base.rev < 0xb0)
+       if ((cs35l56->base.type == 0x56) && (cs35l56->base.rev < 0xb0))
                return cs35l56_a1_kick_divider(cs35l56, peripheral);
 
        return 0;
@@ -543,6 +543,7 @@ static const struct dev_pm_ops cs35l56_sdw_pm = {
 
 static const struct sdw_device_id cs35l56_sdw_id[] = {
        SDW_SLAVE_ENTRY(0x01FA, 0x3556, 0),
+       SDW_SLAVE_ENTRY(0x01FA, 0x3557, 0),
        {},
 };
 MODULE_DEVICE_TABLE(sdw, cs35l56_sdw_id);

diff --git a/sound/soc/codecs/cs35l56-shared.c b/sound/soc/codecs/cs35l56-shared.c
index 995d979b6d87e7e889a4cf326e1477399f742650..aa550db02c16dd255ac385e38f821e508cfa641b 100644 (file)
--- a/sound/soc/codecs/cs35l56-shared.c
+++ b/sound/soc/codecs/cs35l56-shared.c
@@ -692,13 +692,17 @@ int cs35l56_hw_init(struct cs35l56_base *cs35l56_base)
        devid &= CS35L56_DEVID_MASK;
 
        switch (devid) {
+       case 0x35A54:
        case 0x35A56:
+       case 0x35A57:
                break;
        default:
                dev_err(cs35l56_base->dev, "Unknown device %x\n", devid);
                return ret;
        }
 
+       cs35l56_base->type = devid & 0xFF;
+
        ret = regmap_read(cs35l56_base->regmap, CS35L56_DSP_RESTRICT_STS1, &secured);
        if (ret) {
                dev_err(cs35l56_base->dev, "Get Secure status failed\n");
@@ -719,8 +723,8 @@ int cs35l56_hw_init(struct cs35l56_base *cs35l56_base)
        if (ret)
                return ret;
 
-       dev_info(cs35l56_base->dev, "Cirrus Logic CS35L56%s Rev %02X OTP%d fw:%d.%d.%d (patched=%u)\n",
-                cs35l56_base->secured ? "s" : "", cs35l56_base->rev, otpid,
+       dev_info(cs35l56_base->dev, "Cirrus Logic CS35L%02X%s Rev %02X OTP%d fw:%d.%d.%d (patched=%u)\n",
+                cs35l56_base->type, cs35l56_base->secured ? "s" : "", cs35l56_base->rev, otpid,
                 fw_ver >> 16, (fw_ver >> 8) & 0xff, fw_ver & 0xff, !fw_missing);
 
        /* Wake source and *_BLOCKED interrupts default to unmasked, so mask them */

diff --git a/sound/soc/codecs/cs35l56.c b/sound/soc/codecs/cs35l56.c
index 2c1313e34cce4969ca393ef774e305a4d18198b5..beb51c87c6e9752041e053f1df209c37dba316e7 100644 (file)
--- a/sound/soc/codecs/cs35l56.c
+++ b/sound/soc/codecs/cs35l56.c
@@ -972,6 +972,10 @@ static int cs35l56_component_probe(struct snd_soc_component *component)
                return -ENODEV;
        }
 
+       cs35l56->dsp.part = kasprintf(GFP_KERNEL, "cs35l%02x", cs35l56->base.type);
+       if (!cs35l56->dsp.part)
+               return -ENOMEM;
+
        cs35l56->component = component;
        wm_adsp2_component_probe(&cs35l56->dsp, component);
 
@@ -1002,6 +1006,9 @@ static void cs35l56_component_remove(struct snd_soc_component *component)
 
        wm_adsp2_component_remove(&cs35l56->dsp, component);
 
+       kfree(cs35l56->dsp.part);
+       cs35l56->dsp.part = NULL;
+
        kfree(cs35l56->dsp.fwf_name);
        cs35l56->dsp.fwf_name = NULL;
 
@@ -1221,7 +1228,12 @@ static int cs35l56_dsp_init(struct cs35l56_private *cs35l56)
 
        dsp = &cs35l56->dsp;
        cs35l56_init_cs_dsp(&cs35l56->base, &dsp->cs_dsp);
-       dsp->part = "cs35l56";
+
+       /*
+        * dsp->part is filled in later as it is based on the DEVID. In a
+        * SoundWire system that cannot be read until enumeration has occurred
+        * and the device has attached.
+        */
        dsp->fw = 12;
        dsp->wmfw_optional = true;