]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ASoC: Intel: sof_es8336: make gpio optional
authorPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Tue, 8 Mar 2022 19:26:01 +0000 (13:26 -0600)
committerMark Brown <broonie@kernel.org>
Wed, 9 Mar 2022 13:30:24 +0000 (13:30 +0000)
Do not fail if the GPIO used for speakers is not present, at least the
headphone, headset and internal mics should work.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Link: https://lore.kernel.org/r/20220308192610.392950-12-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/intel/boards/sof_es8336.c

index e6d599f0cd26a4af6699af610787359591b07e92..eb792bd911fa1ba98bfff825f6a56b4f65880523 100644 (file)
@@ -523,11 +523,10 @@ static int sof_es8336_probe(struct platform_device *pdev)
        if (ret)
                dev_warn(codec_dev, "unable to add GPIO mapping table\n");
 
-       priv->gpio_pa = gpiod_get(codec_dev, "pa-enable", GPIOD_OUT_LOW);
+       priv->gpio_pa = gpiod_get_optional(codec_dev, "pa-enable", GPIOD_OUT_LOW);
        if (IS_ERR(priv->gpio_pa)) {
-               ret = PTR_ERR(priv->gpio_pa);
-               dev_err(codec_dev, "%s, could not get pa-enable: %d\n",
-                       __func__, ret);
+               ret = dev_err_probe(dev, PTR_ERR(priv->gpio_pa),
+                                   "could not get pa-enable GPIO\n");
                goto err;
        }