From patchwork Mon Jul 1 07:02:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 13717598 Received: from mail-ed1-f53.google.com (mail-ed1-f53.google.com [209.85.208.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BFE9853365 for ; Mon, 1 Jul 2024 07:02:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719817360; cv=none; b=QV42FLhaEMi94n2OuI97KILlhwPrse79Qr8MRXeEKmRV17Vt40N6BvSwKbwkradVj0qfk4vyT/kgJuZdOYDjq6jmuG6BqUjIUpl1x65i9j08VdBC//keH0a9MUXzjedDikZ+glF5LweSm69GY38/XTlmrdPxVQZRsHQgbAuJhC0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719817360; c=relaxed/simple; bh=HoYOZ5VZZSoT1oPQmsk8ALI7brrvFdAyk8iW+8VaR4M=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=UC+zoQ4HskFdsAVaVPE1P0dFQVdQ/H2oNNl4+rftUzX5VSBTKhI4cAlw0jnMtLr0eELYQrpVilVoHisLM3gRFCGR1RVSwi1gZpkBCiF6FAMFtbFuXhrYSmEpwZVwJ50fmwPsRoFL1JFkm0LZJiqq5S7PdqWrbYLjWkd7e+xZ2GM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=kvd6i+a/; arc=none smtp.client-ip=209.85.208.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="kvd6i+a/" Received: by mail-ed1-f53.google.com with SMTP id 4fb4d7f45d1cf-57d06101d76so2839157a12.3 for ; Mon, 01 Jul 2024 00:02:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1719817357; x=1720422157; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=G0uxixe8SRdEtYS3hYnA/51z5ZCVTziscEpNL0ARHP8=; b=kvd6i+a/8KSSu0NKX5Qvd7b+ppJhT5FrDmuIKUHmKBGHhieikiXrm2al7Lj4b8vDBj nohdvVhGFBVNSw2U1q1V4QR/BDqKj9ll26StvJWYV/CQQI9i3m6YXG0/Y7oyQxz2f7to DBcscjENTIycKvdzyMd9k9l660kaaF0MaeCXsg27wcUf9Jrsqz19ubGKmj+v/foojqLN lxCJ8LNsIJX0KOQQMMjmRcl50YfWQlCWaeVuwMpc5Z3xKs0v5mbyy31oi1HFhs5OKPOW W8qhZnY8wGHL4yoY9mKwq5F5fHJierlkrCYrzZFie+JS62MzwwzX1bbi40e0a3RiUVJg 4wag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719817357; x=1720422157; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=G0uxixe8SRdEtYS3hYnA/51z5ZCVTziscEpNL0ARHP8=; b=XC5yDCdLTFlJfsDx7Vy75zAzz4qrmoUzgbGr4MEHenBHFUqNmS+mPrRreUu6q6jH7k p/ESu+h7YUbuSPQ+6mf+Vl9+zu7XJsze/P8m1LYeLOYmNI3oM14cef2bNiOkpqMAnp9d jMbcgH6iXqlAltjlRXqCSgGNX6N/8cslLUsHztTV7k4dQqTn/XWsjtsIlgb+8UMcwu83 W2pqqr7n1wMlo+QBqUR+51GgejG7GoKoR9uMkv9zTx4i3S8scDmXC1RkW/bcvlfwvXvQ jqgpITZJX9lwhn9FwHB/5GI1sz1zzC07/EnqCAuYChpiVWrZ/TGd51eXbHxsPrNoMdKb 7A5Q== X-Gm-Message-State: AOJu0YzA5zJsh1HBQnBoh7YYvu1EqxgIrrAsnt2qwBG7zDWMD2xgDuC5 8JAXImalecNVcQD0o5RK7AeTLbSw+HNvq6Sc9Cc6Z6zaJwfTu/p0jPv6APE5IUFVazoppa+h42v i X-Google-Smtp-Source: AGHT+IFpmkqFIW4SYt5Bywcq02sj5OIw8F3oMcyUDj7GJ0VoQuAFnMl+7gJ97FBtnoFNiB+QfU/AHA== X-Received: by 2002:a05:6402:2547:b0:57d:f9f:133b with SMTP id 4fb4d7f45d1cf-5879f0c4da6mr3053720a12.2.1719817357206; Mon, 01 Jul 2024 00:02:37 -0700 (PDT) Received: from lino.lan ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5861324f036sm4034383a12.34.2024.07.01.00.02.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jul 2024 00:02:36 -0700 (PDT) From: Linus Walleij Date: Mon, 01 Jul 2024 09:02:12 +0200 Subject: [PATCH 1/4] ASoC: tas5086: Convert to GPIO descriptors Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240701-asoc-tas-gpios-v1-1-d69ec5d79939@linaro.org> References: <20240701-asoc-tas-gpios-v1-0-d69ec5d79939@linaro.org> In-Reply-To: <20240701-asoc-tas-gpios-v1-0-d69ec5d79939@linaro.org> To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Shenghao Ding , Kevin Lu , Baojun Xu Cc: linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, Shenghao Ding <13916275206@139.com>, alsa-devel@alsa-project.org, Linus Walleij X-Mailer: b4 0.14.0 Switch the driver to use GPIO descriptors. Notice that we let the gpiolib handle line inversion for the active low reset line (nreset !reset). There are no upstream device trees using the tas5086 compatible string, if there were, we would need to ascertain that they all set the GPIO_ACTIVE_LOW flag on their GPIO lines. Signed-off-by: Linus Walleij --- sound/soc/codecs/tas5086.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/sound/soc/codecs/tas5086.c b/sound/soc/codecs/tas5086.c index 6d45df3b9ba4..4bc1fdd232bb 100644 --- a/sound/soc/codecs/tas5086.c +++ b/sound/soc/codecs/tas5086.c @@ -24,14 +24,13 @@ #include #include #include -#include +#include #include #include #include #include #include #include -#include #include #include #include @@ -246,7 +245,7 @@ struct tas5086_private { /* Current sample rate for de-emphasis control */ int rate; /* GPIO driving Reset pin, if any */ - int gpio_nreset; + struct gpio_desc *reset; struct regulator_bulk_data supplies[ARRAY_SIZE(supply_names)]; }; @@ -462,11 +461,11 @@ static int tas5086_mute_stream(struct snd_soc_dai *dai, int mute, int stream) static void tas5086_reset(struct tas5086_private *priv) { - if (gpio_is_valid(priv->gpio_nreset)) { + if (priv->reset) { /* Reset codec - minimum assertion time is 400ns */ - gpio_direction_output(priv->gpio_nreset, 0); + gpiod_direction_output(priv->reset, 1); udelay(1); - gpio_set_value(priv->gpio_nreset, 1); + gpiod_set_value(priv->reset, 0); /* Codec needs ~15ms to wake up */ msleep(15); @@ -867,9 +866,9 @@ static void tas5086_remove(struct snd_soc_component *component) { struct tas5086_private *priv = snd_soc_component_get_drvdata(component); - if (gpio_is_valid(priv->gpio_nreset)) + if (priv->reset) /* Set codec to the reset state */ - gpio_set_value(priv->gpio_nreset, 0); + gpiod_set_value(priv->reset, 1); regulator_bulk_disable(ARRAY_SIZE(priv->supplies), priv->supplies); }; @@ -914,7 +913,6 @@ static int tas5086_i2c_probe(struct i2c_client *i2c) { struct tas5086_private *priv; struct device *dev = &i2c->dev; - int gpio_nreset = -EINVAL; int i, ret; priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); @@ -940,12 +938,11 @@ static int tas5086_i2c_probe(struct i2c_client *i2c) i2c_set_clientdata(i2c, priv); - gpio_nreset = of_get_named_gpio(dev->of_node, "reset-gpio", 0); - if (gpio_is_valid(gpio_nreset)) - if (devm_gpio_request(dev, gpio_nreset, "TAS5086 Reset")) - gpio_nreset = -EINVAL; - - priv->gpio_nreset = gpio_nreset; + /* Request line asserted */ + priv->reset = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_HIGH); + if (IS_ERR(priv->reset)) + return PTR_ERR(priv->reset); + gpiod_set_consumer_name(priv->reset, "TAS5086 Reset"); ret = regulator_bulk_enable(ARRAY_SIZE(priv->supplies), priv->supplies); if (ret < 0) { From patchwork Mon Jul 1 07:02:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 13717599 Received: from mail-lj1-f170.google.com (mail-lj1-f170.google.com [209.85.208.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 803707406D for ; Mon, 1 Jul 2024 07:02:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719817363; cv=none; b=jJuJ91C953zja0yY8/3ZmkOTlL3ZamxJCax0Io1Qs0H6T4ZzI18ykzMzR28Rsi5H+I/VoHseX4ThQV13mDdfkkd8KqkVQCO0tYi5nlHbrbpxODADARUe1XqGupnN5k1x7OMuzNQIzBan/q8ho5UjvDQC5sTaeoYAvsiP1XBkipw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719817363; c=relaxed/simple; bh=UjmSitKNlQ2nMJN5qYvwS/7oolUMY8paivqWw2tn+Vk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=CpZNhHlgLSAChlLyi/UNq1NVaJVXtiyslTYuSxIi98VNRxc9ecUltED13i2SddNmIR26WCBekcEnHyRMb6ufYZJ45hYG5MXriuEck10GoMlljPW3qttq2MKVeOgYbIPovwyfTj+tX+TSOHWWuCmxQkXG0gvRrJU42sW9MAakEAU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=JOKbS/nO; arc=none smtp.client-ip=209.85.208.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="JOKbS/nO" Received: by mail-lj1-f170.google.com with SMTP id 38308e7fff4ca-2ebe6495aedso27113791fa.0 for ; Mon, 01 Jul 2024 00:02:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1719817360; x=1720422160; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=E3/s/Nj4HWsI125zUFb7bumgBHzMcSwoiGKdlWH04Ns=; b=JOKbS/nOF1dXgoOYPiBBnuJoaWbbG76ToIuUnRNHWFIqWnlFUO3ez5oedK+Hh3HGON yZkXNvfJk75hqG7W1G5sgeymUCkbd91eOK4wJev/Ywt0xE4F2JB6utKmeyg7AvHyNpT3 obrxtrpe4hJUmZcBB/NtBRb/cw5SdeLIPI3rYet8q0mR0Y1axk5cLtr0Zbl6cu7wyzpS HxAJA8AYTAt91fWIUGb3Bq44HOHSAUgYkbAE5BT2w+XeTzBRRrpw4kAwmhYTRZPJ7Am7 lClggFlao2Did+z2WG2vGrEWWj33YeLfh06giTfDkDkP9QI7p/jNQh8MLbTf25lVPfoO hLkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719817360; x=1720422160; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=E3/s/Nj4HWsI125zUFb7bumgBHzMcSwoiGKdlWH04Ns=; b=adCH1EROGugv2z49wW7qVh3zVAokIJVtWQONi3IgsET92RG1AQ9B+v/9+Yj/hCaBjZ 09UaVqd2N0tCCKna8ZvGSqldRh/sgMRGx77Ad4TfZDk9SLo1CLIJ6nfaYTmjt/3B98z9 TnRNT64OJrwMQJhYSUvPZa9QVPOmtjpEmKyyqBlgEJ+gDwOHsLPgKZrjYIckMvubJw5I jEeW5qHukWiaQFf2Hqjt8NZl46Fkd9YA/BqpXjdRFuCkvgaHP7f4R+RVp8Jz4HdP5eLE Qf0r+4l6ekO382z4igAU7cuErLl1yJwdzOSIuSqw4O7tA9gmngxoE0D5BbfRgqBVlHwM bd+A== X-Gm-Message-State: AOJu0YyMbrjy9xwLPt5V1rQic/brG3wKX6qhfVGgMVlrnAs54NHnnVa1 gEcAkKf9HGszkQWBQdvnd0f+6V6chR2FXAK6Szh8jSkVhB37uePXzl+HFmZQ8gQ= X-Google-Smtp-Source: AGHT+IHlLNCx+HzW4mye2WD6CgheWVhB4SQOz1Cwyrm10zDOUU5da2YKF7YBflsCQSH6asfQe2IxGA== X-Received: by 2002:a2e:300e:0:b0:2ee:5d45:b191 with SMTP id 38308e7fff4ca-2ee5e37de87mr31439981fa.8.1719817359222; Mon, 01 Jul 2024 00:02:39 -0700 (PDT) Received: from lino.lan ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5861324f036sm4034383a12.34.2024.07.01.00.02.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jul 2024 00:02:37 -0700 (PDT) From: Linus Walleij Date: Mon, 01 Jul 2024 09:02:13 +0200 Subject: [PATCH 2/4] ASoC: tas2781-i2c: Drop weird GPIO code Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240701-asoc-tas-gpios-v1-2-d69ec5d79939@linaro.org> References: <20240701-asoc-tas-gpios-v1-0-d69ec5d79939@linaro.org> In-Reply-To: <20240701-asoc-tas-gpios-v1-0-d69ec5d79939@linaro.org> To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Shenghao Ding , Kevin Lu , Baojun Xu Cc: linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, Shenghao Ding <13916275206@139.com>, alsa-devel@alsa-project.org, Linus Walleij X-Mailer: b4 0.14.0 The tas2781-i2c driver gets an IRQ from either ACPI or device tree, then proceeds to check if the IRQ has a corresponding GPIO and in case it does enforce the GPIO as input and set a label on it. This is abuse of the API: - First we cannot guarantee that the numberspaces of the GPIOs and the IRQs are the same, i.e that an IRQ number corresponds to a GPIO number like that. - Second, GPIO chips and IRQ chips should be treated as orthogonal APIs, the irqchip needs to ascertain that the backing GPIO line is set to input etc just using the irqchip. - Third it is using the legacy API which should not be used in new code yet this was added just a year ago. Delete the offending code. If this creates problems the GPIO and irqchip maintainers can help to fix the issues. It *should* not create any problems, because the irq isn't used anywhere in the driver, it's just obtained and then left unused. Fixes: ef3bcde75d06 ("ASoC: tas2781: Add tas2781 driver") Signed-off-by: Linus Walleij --- include/sound/tas2781.h | 7 +------ sound/pci/hda/tas2781_hda_i2c.c | 2 +- sound/soc/codecs/tas2781-comlib.c | 3 --- sound/soc/codecs/tas2781-fmwlib.c | 1 - sound/soc/codecs/tas2781-i2c.c | 24 +++--------------------- 5 files changed, 5 insertions(+), 32 deletions(-) diff --git a/include/sound/tas2781.h b/include/sound/tas2781.h index 99ca3e401fd1..6f6e3e2f652c 100644 --- a/include/sound/tas2781.h +++ b/include/sound/tas2781.h @@ -80,11 +80,6 @@ struct tasdevice { bool is_loaderr; }; -struct tasdevice_irqinfo { - int irq_gpio; - int irq; -}; - struct calidata { unsigned char *data; unsigned long total_sz; @@ -92,7 +87,6 @@ struct calidata { struct tasdevice_priv { struct tasdevice tasdevice[TASDEVICE_MAX_CHANNELS]; - struct tasdevice_irqinfo irq_info; struct tasdevice_rca rcabin; struct calidata cali_data; struct tasdevice_fw *fmw; @@ -113,6 +107,7 @@ struct tasdevice_priv { unsigned int chip_id; unsigned int sysclk; + int irq; int cur_prog; int cur_conf; int fw_state; diff --git a/sound/pci/hda/tas2781_hda_i2c.c b/sound/pci/hda/tas2781_hda_i2c.c index 75f7674c66ee..c5ace7216ecb 100644 --- a/sound/pci/hda/tas2781_hda_i2c.c +++ b/sound/pci/hda/tas2781_hda_i2c.c @@ -818,7 +818,7 @@ static int tas2781_hda_i2c_probe(struct i2c_client *clt) } else return -ENODEV; - tas_hda->priv->irq_info.irq = clt->irq; + tas_hda->priv->irq = clt->irq; ret = tas2781_read_acpi(tas_hda->priv, device_name); if (ret) return dev_err_probe(tas_hda->dev, ret, diff --git a/sound/soc/codecs/tas2781-comlib.c b/sound/soc/codecs/tas2781-comlib.c index 3aa81514dad7..0444cf90c511 100644 --- a/sound/soc/codecs/tas2781-comlib.c +++ b/sound/soc/codecs/tas2781-comlib.c @@ -14,7 +14,6 @@ #include #include #include -#include #include #include #include @@ -406,8 +405,6 @@ EXPORT_SYMBOL_GPL(tasdevice_dsp_remove); void tasdevice_remove(struct tasdevice_priv *tas_priv) { - if (gpio_is_valid(tas_priv->irq_info.irq_gpio)) - gpio_free(tas_priv->irq_info.irq_gpio); mutex_destroy(&tas_priv->codec_lock); } EXPORT_SYMBOL_GPL(tasdevice_remove); diff --git a/sound/soc/codecs/tas2781-fmwlib.c b/sound/soc/codecs/tas2781-fmwlib.c index 265a8ca25cbb..d6afab542da7 100644 --- a/sound/soc/codecs/tas2781-fmwlib.c +++ b/sound/soc/codecs/tas2781-fmwlib.c @@ -13,7 +13,6 @@ #include #include #include -#include #include #include #include diff --git a/sound/soc/codecs/tas2781-i2c.c b/sound/soc/codecs/tas2781-i2c.c index 9350972dfefe..1542915b83a2 100644 --- a/sound/soc/codecs/tas2781-i2c.c +++ b/sound/soc/codecs/tas2781-i2c.c @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include @@ -605,7 +604,7 @@ static void tasdevice_parse_dt(struct tasdevice_priv *tas_priv) { struct i2c_client *client = (struct i2c_client *)tas_priv->client; unsigned int dev_addrs[TASDEVICE_MAX_CHANNELS]; - int rc, i, ndev = 0; + int i, ndev = 0; if (tas_priv->isacpi) { ndev = device_property_read_u32_array(&client->dev, @@ -620,7 +619,7 @@ static void tasdevice_parse_dt(struct tasdevice_priv *tas_priv) "ti,audio-slots", dev_addrs, ndev); } - tas_priv->irq_info.irq_gpio = + tas_priv->irq = acpi_dev_gpio_irq_get(ACPI_COMPANION(&client->dev), 0); } else { struct device_node *np = tas_priv->dev->of_node; @@ -648,7 +647,7 @@ static void tasdevice_parse_dt(struct tasdevice_priv *tas_priv) ndev = 1; dev_addrs[0] = client->addr; #endif - tas_priv->irq_info.irq_gpio = of_irq_get(np, 0); + tas_priv->irq = of_irq_get(np, 0); } tas_priv->ndev = ndev; for (i = 0; i < ndev; i++) @@ -661,23 +660,6 @@ static void tasdevice_parse_dt(struct tasdevice_priv *tas_priv) __func__); strcpy(tas_priv->dev_name, tasdevice_id[tas_priv->chip_id].name); - - if (gpio_is_valid(tas_priv->irq_info.irq_gpio)) { - rc = gpio_request(tas_priv->irq_info.irq_gpio, - "AUDEV-IRQ"); - if (!rc) { - gpio_direction_input( - tas_priv->irq_info.irq_gpio); - - tas_priv->irq_info.irq = - gpio_to_irq(tas_priv->irq_info.irq_gpio); - } else - dev_err(tas_priv->dev, "%s: GPIO %d request error\n", - __func__, tas_priv->irq_info.irq_gpio); - } else - dev_err(tas_priv->dev, - "Looking up irq-gpio property failed %d\n", - tas_priv->irq_info.irq_gpio); } static int tasdevice_i2c_probe(struct i2c_client *i2c) From patchwork Mon Jul 1 07:02:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 13717600 Received: from mail-lj1-f172.google.com (mail-lj1-f172.google.com [209.85.208.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1BE087C086 for ; Mon, 1 Jul 2024 07:02:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719817364; cv=none; b=CCC6aeJ+QwbGQiOeE7G+omdPZ1qQWJZLudwCq4Cp+767W9YQX/ZKZgTvtYyaI3WHDcoDBcS7VYpSne5mosrF83kBeo5tSHJ3qHwJZ9R0JKrsCzYYuSYo21rsNiNabPLApZl7eVOs6cMZH79pJk/+2ePooi62ueBV6hb16TMBqKc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719817364; c=relaxed/simple; bh=pcOvFSy9mqnG9tdnejsIswIHJuVcxQ0Q95HAQWqfY2Q=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Xj46ijqMubwp6sI37qoklxnjjul//djv3dFqM/cIiB+zkDaNfsjX6WmZaTJgJtIpdl2AizTjAW8JRJE//xYfWZ5uOewDMcUofy7HdXHu58k2LvogSuVxkdg4scwYLoPWBpFVtNHnZ08QwRFVcBQsOMsBc3VWm/byS1uBmz5YKco= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=oSA4RBaT; arc=none smtp.client-ip=209.85.208.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="oSA4RBaT" Received: by mail-lj1-f172.google.com with SMTP id 38308e7fff4ca-2ebed33cb65so27940081fa.2 for ; Mon, 01 Jul 2024 00:02:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1719817361; x=1720422161; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=pWt7xul9gaEWvRdXPJZ452zrHt44xP6eq1TOlG30kGE=; b=oSA4RBaTJCLVkTNLkMcohSiSe9qnXixHSiIAQlAgPpi0C/yxy2sLFIvKiukccxoEy3 PFFCDnUo5MbW+mdqoPPBSUlu6+8AQFI9DhQzCZLfbGcGoUa7O2X24RBFZrzDWb18J2tV yPmYmAnjYDplRK1NEXrDAOPqBrcF8CxkvQBHXeaXFtO3pyVAZV+qHU8hybUf00UDPCjf ZqJndefvhluHRLd2FLnCrTiXFqdMi1Sn297sv7QOcYzyDWKF1OY5VPdYNunVBnpJsPv4 STg+BFnKD5VYUVd9bxj3VpSsZwjCGJ1ZSR3CSekIwJOUZIIoSlcm4GhF1UaVyliFGoJW D5Ug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719817361; x=1720422161; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pWt7xul9gaEWvRdXPJZ452zrHt44xP6eq1TOlG30kGE=; b=RKTXoANhln1L96jlwYu5mmc5VoYE5QM9Q0KxweU6tu91fgmGVQjJ0q3ny1OxdcpoAU ZzPB8qrpzFlJJ6wsziWHPjni4kApaNUCsWoMV0aDjccPjyrTOEvVHnTY8prVfUopKCrn EJwCzduj6y/cbyN8FdVsYJSGXGzSIYduxThiDqeDXgFnuPM8erIcLEP4WMUvwlmSOsXA EhSk+5XTbcwoxFplv+MgFnzug3GW9WGkZ/8SDIsHIwPFgKD/NS23AiMrDHQSFBpjvwj3 eHx6RXjVU22Ptm8H83cluOe9J+eoDhbLQTk4HAHdK5oARuuEsvwQIHFMbxqGYzUgiHl4 QD5w== X-Gm-Message-State: AOJu0YxyGJ4mjeC/1mpomqQqNmmpN1QGFhcrEIfAImxU6hMmQhUGL1Eq 1DF8GxiW+uKxCH44g59Zoc8jK2/1B8rMny/RwcMIoQ1v7fgGd7EBiLV5EZQoFTw= X-Google-Smtp-Source: AGHT+IGPE6k3N5wdR11ZQ2KZFoj1Q7gGsWsY0UPRVz0U0AfRSYWIhLPL3AI9jKB/vygyWqnZmYfNvQ== X-Received: by 2002:a2e:a801:0:b0:2ee:4c2e:3d3b with SMTP id 38308e7fff4ca-2ee5e390286mr44525361fa.4.1719817361254; Mon, 01 Jul 2024 00:02:41 -0700 (PDT) Received: from lino.lan ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5861324f036sm4034383a12.34.2024.07.01.00.02.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jul 2024 00:02:39 -0700 (PDT) From: Linus Walleij Date: Mon, 01 Jul 2024 09:02:14 +0200 Subject: [PATCH 3/4] ASoC: tas2781-i2c: Get the right GPIO line Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240701-asoc-tas-gpios-v1-3-d69ec5d79939@linaro.org> References: <20240701-asoc-tas-gpios-v1-0-d69ec5d79939@linaro.org> In-Reply-To: <20240701-asoc-tas-gpios-v1-0-d69ec5d79939@linaro.org> To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Shenghao Ding , Kevin Lu , Baojun Xu Cc: linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, Shenghao Ding <13916275206@139.com>, alsa-devel@alsa-project.org, Linus Walleij X-Mailer: b4 0.14.0 The code is obtaining a GPIO reset using the reset GPIO name "reset-gpios", but the gpiolib is already adding the suffix "-gpios" to anything passed to this function and will be looking for "reset-gpios-gpios" which is most certainly not what the author desired. Fix it up. Fixes: ef3bcde75d06 ("ASoC: tas2781: Add tas2781 driver") Signed-off-by: Linus Walleij --- sound/soc/codecs/tas2781-i2c.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/tas2781-i2c.c b/sound/soc/codecs/tas2781-i2c.c index 1542915b83a2..256f2e8f1ba9 100644 --- a/sound/soc/codecs/tas2781-i2c.c +++ b/sound/soc/codecs/tas2781-i2c.c @@ -654,7 +654,7 @@ static void tasdevice_parse_dt(struct tasdevice_priv *tas_priv) tas_priv->tasdevice[i].dev_addr = dev_addrs[i]; tas_priv->reset = devm_gpiod_get_optional(&client->dev, - "reset-gpios", GPIOD_OUT_HIGH); + "reset", GPIOD_OUT_HIGH); if (IS_ERR(tas_priv->reset)) dev_err(tas_priv->dev, "%s Can't get reset GPIO\n", __func__); From patchwork Mon Jul 1 07:02:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 13717601 Received: from mail-ed1-f44.google.com (mail-ed1-f44.google.com [209.85.208.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 864DA8002A for ; Mon, 1 Jul 2024 07:02:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719817367; cv=none; b=nuwozr5wlRVLm78JN3SpZb8n2xxEQi7KNxAU6FrqVN9gLsM8TOJ0gOWrItWrlHU1C87L5eB1QmiBLwmXPng/29UZ8vKp34vsKZftsg0bKj2Jv4bqfeiCcLIDMwF9N9xMNWXaSDcWZ/2hX+yRw3jgzsq1idOS/0ICYC5NG7IK7EM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719817367; c=relaxed/simple; bh=aJ1LZosClX5NnP0cJXhnk/NVUavVqkeU0v2SDbbuCfI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=M02uSm2u3OcKG5/a7aMJelFASIk4xaV5adVsgEXcU2RvPFFyKjKDS3zMWtf+IYh6N5vUzGGc9ekv1A03TRr/nfdv+zCY3V+eJxl7YeJAi90AoAHFD3qaSsV6Mu661fCOQoqdKCBTsQYnzp2Mcp1I0a35i7D+eYAVguN63sy0cig= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=tJGwj9c/; arc=none smtp.client-ip=209.85.208.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="tJGwj9c/" Received: by mail-ed1-f44.google.com with SMTP id 4fb4d7f45d1cf-57d20d89748so2835819a12.0 for ; Mon, 01 Jul 2024 00:02:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1719817363; x=1720422163; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=GMJ9ytIbd8fpZ+zpiTVxchehIRD6mB7COwsKFHn30yI=; b=tJGwj9c/tqICWraCp9z0ytaRnu5yRSRO2tZA4+tV2bv6v47mm3jY3Rr+LFy1gr7Sxq kvCgySZSfVNadga8gX8ALZLHA1A9YJ5A+YpOkRkE25vICgjVMugcsLRjEv9Y/Oa3fm08 gJkErZq+n0M1wpZOJxelR/jmabSt3ZPCVf9yrfYmMVdCmpdbF0ObayUT87M0rtVtMa2b R4lJh2/HMY4Pn4klHSCJRPgq1ReUb0dV5GLtRix04fNxutYJLPLXaMa+bv4xnbsW/ri2 tvAfl4C5gxGsDZZm2aXfHhHOlP9uW/sQiBAlybDBoT877lyszein7KsqL/58ePEqyjUk l6UA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719817363; x=1720422163; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GMJ9ytIbd8fpZ+zpiTVxchehIRD6mB7COwsKFHn30yI=; b=cNFCPiORi2YRCw3YvTNe34BrAQwaxyqDY0in6I0d/pr9+LElsYSB9M51YAQzsoqaOI yZngOHO6BM1+A9zG8UnNfoLpZe6ZHjyNkKQnbeDtKl1FM5qvzjvWPzX7AY8ZgULSYcmC v6Q5yd3SzJ9wHn4qoStVDkriOaq2X/QSqH2SewVNlucR9Ebz+kkjfahEIrjlWs+xdbIJ fS5nBNf9J+dVhewyASTOGyMGRHRGpp3pQPSjomDfgOR1apyHv4PPP22ISi5QT3rRdjVC 6/k4ADCKo4Sm2e01WlabeZnFMMy+idPt5MXv25YpywcOX2Q74HoeQAQIMbX39LtpTVIv wC3w== X-Gm-Message-State: AOJu0Ywq+HsHzEOu0gTUwk1qnyq+32cXa6Lju4MV2BTd0sDbN3E/A7NJ /CtoLLdzWT9dU8QErvWJ8uOETsGH4Cc4X20vYfINM7T4TX+kPSeMCqlSN5wO7qs= X-Google-Smtp-Source: AGHT+IHR5yOOsqPZFJrRu7Wk8J8cXhauusw1meNRgDWk7XLLZNs2DncjjI+qUlPMsRkkGHRfGt2GEw== X-Received: by 2002:a05:6402:5cd:b0:57c:c10c:eee8 with SMTP id 4fb4d7f45d1cf-5879fa7f71emr2584654a12.19.1719817362830; Mon, 01 Jul 2024 00:02:42 -0700 (PDT) Received: from lino.lan ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5861324f036sm4034383a12.34.2024.07.01.00.02.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jul 2024 00:02:42 -0700 (PDT) From: Linus Walleij Date: Mon, 01 Jul 2024 09:02:15 +0200 Subject: [PATCH 4/4] ASoC: tas*: Drop unused GPIO includes Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240701-asoc-tas-gpios-v1-4-d69ec5d79939@linaro.org> References: <20240701-asoc-tas-gpios-v1-0-d69ec5d79939@linaro.org> In-Reply-To: <20240701-asoc-tas-gpios-v1-0-d69ec5d79939@linaro.org> To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Shenghao Ding , Kevin Lu , Baojun Xu Cc: linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, Shenghao Ding <13916275206@139.com>, alsa-devel@alsa-project.org, Linus Walleij X-Mailer: b4 0.14.0 These drivers all use and has no business including the legacy headers or . Drop the surplus includes. Signed-off-by: Linus Walleij --- sound/soc/codecs/tas2552.c | 2 -- sound/soc/codecs/tas2764.c | 2 -- sound/soc/codecs/tas2770.c | 2 -- sound/soc/codecs/tas2780.c | 2 -- 4 files changed, 8 deletions(-) diff --git a/sound/soc/codecs/tas2552.c b/sound/soc/codecs/tas2552.c index a7ed59ec49a6..684d52ec6600 100644 --- a/sound/soc/codecs/tas2552.c +++ b/sound/soc/codecs/tas2552.c @@ -12,8 +12,6 @@ #include #include #include -#include -#include #include #include #include diff --git a/sound/soc/codecs/tas2764.c b/sound/soc/codecs/tas2764.c index 1dc719d726ab..d482cd194c08 100644 --- a/sound/soc/codecs/tas2764.c +++ b/sound/soc/codecs/tas2764.c @@ -10,12 +10,10 @@ #include #include #include -#include #include #include #include #include -#include #include #include #include diff --git a/sound/soc/codecs/tas2770.c b/sound/soc/codecs/tas2770.c index 67bc1c8b0131..9f93b230652a 100644 --- a/sound/soc/codecs/tas2770.c +++ b/sound/soc/codecs/tas2770.c @@ -14,13 +14,11 @@ #include #include #include -#include #include #include #include #include #include -#include #include #include #include diff --git a/sound/soc/codecs/tas2780.c b/sound/soc/codecs/tas2780.c index a18ccf5fb7ad..a1963415c931 100644 --- a/sound/soc/codecs/tas2780.c +++ b/sound/soc/codecs/tas2780.c @@ -7,11 +7,9 @@ #include #include #include -#include #include #include #include -#include #include #include #include