From patchwork Wed Sep 27 22:47:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 13401730 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8006AE80ABD for ; Wed, 27 Sep 2023 22:47:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=yyuxkXsnWpWaUfd6eiMTQ7adp81znpGy1jadj4hwkoM=; b=WSo0n8kPXCPOYy wmSWqOzXvBzNshQRkLvbkXofVG0T3/iVOt/YfUQ+5/3uRdm7oJwrabuWPEdC9bMMZqbrt4k044G23 hmUQB980zqN5jIKW6NswsXEMYUjmWA7KIgr/69zzU1K5dhSQyPhDulriNvWX9s6yz+NMCKES/VGE8 ez/CbOuCDtr+ZdBMMidRERhYykKwLKDipQfusiC945jhsM2u5Z7OjcgnPICImqHRuVb4J5x6Eaf9q jdEFqyqcsRPw1L8GFGiaemO8gyZX9kx6CLHqBop8HX+MpqbPgm4i+ZMy2sLRWfSH3/Wf8SsHJCNT8 kqAP1gbTTWsYSPWCYaaQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qldJT-001rnC-1x; Wed, 27 Sep 2023 22:47:23 +0000 Received: from mail-lf1-x134.google.com ([2a00:1450:4864:20::134]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qldJP-001rks-2m for linux-rockchip@lists.infradead.org; Wed, 27 Sep 2023 22:47:21 +0000 Received: by mail-lf1-x134.google.com with SMTP id 2adb3069b0e04-5044dd5b561so14470068e87.1 for ; Wed, 27 Sep 2023 15:47:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1695854836; x=1696459636; darn=lists.infradead.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=OpV1FPJ6dyO8NC9vUuzjI6C6mCi6OEhOeoX88LtgNes=; b=gj+qem7CJsAViptTRw74BHSjp9qc3uxtEv9g0/qWVMAByByjI5Ygj6fBp/FD6WRDB7 0AR5/cNoumHnneDj/PXB03aQiaKqXLfaRw6HwsD3TguBK0zWH7mif20fkqUOcwADsPZt W/jZS+P1+5N4hGFhr331XsfdjR+QRRXIayEqbE8P70wm/66+dhcELl+8aS/50kqlyb/W 8ljZ2d2vuz/Yx84n/cdbiU3mHF0jlNEfgmw9gJLxOdC7+jSokuvxDSTo1M1F/cdEX5+m Znf6eCg9YJtvXPcuSgg8je9pYt0HYP4u4XFUPuq1C3tYJIukqAyVOzgDjm7jUTNy6S37 mVVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695854836; x=1696459636; 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=OpV1FPJ6dyO8NC9vUuzjI6C6mCi6OEhOeoX88LtgNes=; b=Wh/OUZ/RRfl9wRY/ekI2De1BXq6WSUfHPhd52ZBL16F11Hg1ZD1scZEuNT0OP7yzIy /vyZvTX2g3rbPQvFEKY2pN5VExUpJTcAWeiC44Mx06xFTm8tckXO9bLSABQ1ufR6xVQL cCjnSOJtlPTsrvqa8OkTXRimwQi7FDyKq6+9kxYAiHN+bMC1qOA9iWZwq429KYvsiE03 nUZ8BrrTmamzkj7eqQ8mNO3zkCJF9AVQnhupKivTbW0tpAlgcLYzgKjpf2nrMEfNy5Qh MHiRnixrPaZ2rwEeWYN1n8TB5df/O8KpJyllFmg93LPmH5ntj2tfOt4OrXQEKbiRKgen SM5Q== X-Gm-Message-State: AOJu0YwIUQd9SHwCbcH9hykmruhrg3ZsPQDMWSdZqMQYkhHg7CDoKeci d2KuPNsUW9FKf5OSgTqvS6uqmA== X-Google-Smtp-Source: AGHT+IFnmsvK1nxU2ZWigAtiHCfvQZQxWBNESo/oxRorRUK1l2swAncu+UDIFedYPQJbRbubcGQzmA== X-Received: by 2002:a05:6512:159c:b0:500:8fc1:8aba with SMTP id bp28-20020a056512159c00b005008fc18abamr3338721lfb.26.1695854835883; Wed, 27 Sep 2023 15:47:15 -0700 (PDT) Received: from [127.0.1.1] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id ep14-20020a056512484e00b0050296068a12sm2801746lfb.30.2023.09.27.15.47.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Sep 2023 15:47:15 -0700 (PDT) From: Linus Walleij Date: Thu, 28 Sep 2023 00:47:14 +0200 Subject: [PATCH 1/4] ASoC: rockchip: Convert RK3288 HDMI to GPIO descriptors MIME-Version: 1.0 Message-Id: <20230928-descriptors-asoc-rockchip-v1-1-a142a42d4787@linaro.org> References: <20230928-descriptors-asoc-rockchip-v1-0-a142a42d4787@linaro.org> In-Reply-To: <20230928-descriptors-asoc-rockchip-v1-0-a142a42d4787@linaro.org> To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Heiko Stuebner Cc: alsa-devel@alsa-project.org, linux-gpio@vger.kernel.org, linux-rockchip@lists.infradead.org, Linus Walleij X-Mailer: b4 0.12.3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230927_154719_975360_E97BECFF X-CRM114-Status: GOOD ( 18.90 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org This converts the Rockchip RK3288 HDMI driver to use GPIO descriptors: - Look up the HP EN GPIO as a descriptor and handle it directly. - Let the Jack detection core obtain and handle the HP detection GPIO, just pass the right name and gpiod_dev and it will do the job. - As the probe() code is very insistent on getting valid GPIOs out of the device before it will continue, there is no point to carry all the code handling the GPIOs as optional, drop all these checks. Signed-off-by: Linus Walleij --- sound/soc/rockchip/rk3288_hdmi_analog.c | 54 +++++++++++---------------------- 1 file changed, 17 insertions(+), 37 deletions(-) diff --git a/sound/soc/rockchip/rk3288_hdmi_analog.c b/sound/soc/rockchip/rk3288_hdmi_analog.c index 0c6bd9a019db..7199f991ec26 100644 --- a/sound/soc/rockchip/rk3288_hdmi_analog.c +++ b/sound/soc/rockchip/rk3288_hdmi_analog.c @@ -12,8 +12,7 @@ #include #include #include -#include -#include +#include #include #include #include @@ -26,8 +25,7 @@ #define DRV_NAME "rk3288-snd-hdmi-analog" struct rk_drvdata { - int gpio_hp_en; - int gpio_hp_det; + struct gpio_desc *gpio_hp_en; }; static int rk_hp_power(struct snd_soc_dapm_widget *w, @@ -35,11 +33,8 @@ static int rk_hp_power(struct snd_soc_dapm_widget *w, { struct rk_drvdata *machine = snd_soc_card_get_drvdata(w->dapm->card); - if (!gpio_is_valid(machine->gpio_hp_en)) - return 0; - - gpio_set_value_cansleep(machine->gpio_hp_en, - SND_SOC_DAPM_EVENT_ON(event)); + gpiod_set_value_cansleep(machine->gpio_hp_en, + SND_SOC_DAPM_EVENT_ON(event)); return 0; } @@ -113,24 +108,23 @@ static int rk_hw_params(struct snd_pcm_substream *substream, } static struct snd_soc_jack_gpio rk_hp_jack_gpio = { - .name = "Headphone detection", + .name = "rockchip,hp-det", .report = SND_JACK_HEADPHONE, .debounce_time = 150 }; static int rk_init(struct snd_soc_pcm_runtime *runtime) { - struct rk_drvdata *machine = snd_soc_card_get_drvdata(runtime->card); + struct snd_soc_card *card = runtime->card; + struct device *dev = card->dev; /* Enable Headset Jack detection */ - if (gpio_is_valid(machine->gpio_hp_det)) { - snd_soc_card_jack_new_pins(runtime->card, "Headphone Jack", - SND_JACK_HEADPHONE, &headphone_jack, - headphone_jack_pins, - ARRAY_SIZE(headphone_jack_pins)); - rk_hp_jack_gpio.gpio = machine->gpio_hp_det; - snd_soc_jack_add_gpios(&headphone_jack, 1, &rk_hp_jack_gpio); - } + rk_hp_jack_gpio.gpiod_dev = dev; + snd_soc_card_jack_new_pins(runtime->card, "Headphone Jack", + SND_JACK_HEADPHONE, &headphone_jack, + headphone_jack_pins, + ARRAY_SIZE(headphone_jack_pins)); + snd_soc_jack_add_gpios(&headphone_jack, 1, &rk_hp_jack_gpio); return 0; } @@ -182,24 +176,10 @@ static int snd_rk_mc_probe(struct platform_device *pdev) card->dev = &pdev->dev; - machine->gpio_hp_det = of_get_named_gpio(np, - "rockchip,hp-det-gpios", 0); - if (!gpio_is_valid(machine->gpio_hp_det) && machine->gpio_hp_det != -ENODEV) - return machine->gpio_hp_det; - - machine->gpio_hp_en = of_get_named_gpio(np, - "rockchip,hp-en-gpios", 0); - if (!gpio_is_valid(machine->gpio_hp_en) && machine->gpio_hp_en != -ENODEV) - return machine->gpio_hp_en; - - if (gpio_is_valid(machine->gpio_hp_en)) { - ret = devm_gpio_request_one(&pdev->dev, machine->gpio_hp_en, - GPIOF_OUT_INIT_LOW, "hp_en"); - if (ret) { - dev_err(card->dev, "cannot get hp_en gpio\n"); - return ret; - } - } + machine->gpio_hp_en = devm_gpiod_get(&pdev->dev, "rockchip,hp-en", GPIOD_OUT_LOW); + if (IS_ERR(machine->gpio_hp_en)) + return PTR_ERR(machine->gpio_hp_en); + gpiod_set_consumer_name(machine->gpio_hp_en, "hp_en"); ret = snd_soc_of_parse_card_name(card, "rockchip,model"); if (ret) { From patchwork Wed Sep 27 22:47:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 13401728 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 829DFE7F14F for ; Wed, 27 Sep 2023 22:47:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=OAJbtRV1WY9kfJy0F/FV9k8H3jYA8hyIjc8rM4CvueQ=; b=VMHVuXy6hiG27q 4K9gWrC5/NLb6JB5GIg5/JthJ+6ze4Az+Cmnfbjz7KnD4pixygjBtVaFtGNCjcxyu9QPMmX2m7xK2 qw4IBuBEWqNgbbClu5DaqcQXZmUzCDmJJ07NUM6afWNrtkKriwx36xsBYGt2zyNK62MF4wu7IimsQ FsiMr+fHVuPuZSm94XzOc+Gnr5D42qOKd/P70UqYuW0fVi/2+kIy0WngzaD2qKdZ1advfX63kwhY0 0duvnP8x66QvQ0mX0jhn6Jx/s3x8txTnyIYptNjcwN/vrbCOp8Zt4aNjk2ReYHeq+jfjLvqgNh/Z6 Edmgu61ijLrS5f65tafg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qldJV-001rnh-1r; Wed, 27 Sep 2023 22:47:25 +0000 Received: from mail-lf1-x12b.google.com ([2a00:1450:4864:20::12b]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qldJQ-001rkw-1o for linux-rockchip@lists.infradead.org; Wed, 27 Sep 2023 22:47:22 +0000 Received: by mail-lf1-x12b.google.com with SMTP id 2adb3069b0e04-50435ad51bbso17762034e87.2 for ; Wed, 27 Sep 2023 15:47:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1695854837; x=1696459637; darn=lists.infradead.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=dq20wAX7KyYyuxOCj/4NvQoVluqusmWSS2hLsMjGcCE=; b=NQ7Zmmpzo7gQg2BI6bU59MiydrYcLYOKT3bhlKueQTREaJIGT2Cgnxq2y5y7ivq4iU 9Ywfqql/mXZzExRmIko8wl4BHduHO8y0dxMdU4/FKFgt86+xMpngCUUS9Zr89uU+GAyL s4JrP+v3ZzXb/C83sThmPrR6cwGNKjChuvi0acPO5/XqX02DTEMKMO8OOqNCrZB0X9GD SaWm0ljEjXwTyE6MjPL6NQxrQlcbP3R7+3aucXLVpSnT40bhLAf+9duSaNTwO/tyZVCi F/uEq/GyDCUb8NX9XJyyqjESJRl0/DpkYQB+kFBSkWxuK8oCIufOKHMCJtt7M+o2ambE YCSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695854837; x=1696459637; 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=dq20wAX7KyYyuxOCj/4NvQoVluqusmWSS2hLsMjGcCE=; b=C8CR/m637WKrvzIQd0rVNlT8lH9XjSeHVzBZf8+jAbL/IloVECAZ5gl8n+fQCYcO+o SRxzZM8dX8yEQFLbyF+q3AhAAtTSeYDai8+YPeTZApgepIyVcie5n+0qYYjfYj3QFvUo 0JNsCEEhhR3A19RJG8/mGIid5m0UDm02GjTGb/KR3n/XW6hHNeKTkD5oIm49O0KYAIMK yDGz8iTAX6pHlUOG7ljTrBPoVzRc/JvaxW+L34hSNKnPMOxAkhyBXvv6jdvidcCLHZGG rh+VtBM9n3I7om2j0S8ej+QVhVXQwxoQ39QzB48vy1gBp/BcLqUuJWhNN/SOOPYlfOwu 06YQ== X-Gm-Message-State: AOJu0YwWmjDDPpMYDD7h1kTdngdLqhwlhyRHhs/OKGwOndDvzHnVE2a+ LlczFiNiStZiEucKumUOF1NeIQ== X-Google-Smtp-Source: AGHT+IEfC0+hlBUj1Yf/W2nh73lfyeNcEfUcYf/ZYF/GatTdBOlrH90LckfUV5sGFYU2vNlRmcj12Q== X-Received: by 2002:a05:6512:324e:b0:503:264b:efc9 with SMTP id c14-20020a056512324e00b00503264befc9mr2509397lfr.18.1695854836814; Wed, 27 Sep 2023 15:47:16 -0700 (PDT) Received: from [127.0.1.1] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id ep14-20020a056512484e00b0050296068a12sm2801746lfb.30.2023.09.27.15.47.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Sep 2023 15:47:16 -0700 (PDT) From: Linus Walleij Date: Thu, 28 Sep 2023 00:47:15 +0200 Subject: [PATCH 2/4] ASoC: rockchip: Drop includes from RK3399 MIME-Version: 1.0 Message-Id: <20230928-descriptors-asoc-rockchip-v1-2-a142a42d4787@linaro.org> References: <20230928-descriptors-asoc-rockchip-v1-0-a142a42d4787@linaro.org> In-Reply-To: <20230928-descriptors-asoc-rockchip-v1-0-a142a42d4787@linaro.org> To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Heiko Stuebner Cc: alsa-devel@alsa-project.org, linux-gpio@vger.kernel.org, linux-rockchip@lists.infradead.org, Linus Walleij X-Mailer: b4 0.12.3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230927_154720_598781_B2D8113E X-CRM114-Status: UNSURE ( 9.89 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org The RK3399 ASoC driver includes two legacy GPIO headers but doesn't use symbols from any of them. Delete the includes. Signed-off-by: Linus Walleij --- sound/soc/rockchip/rk3399_gru_sound.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sound/soc/rockchip/rk3399_gru_sound.c b/sound/soc/rockchip/rk3399_gru_sound.c index 0f704d22d21b..a178fcd94d88 100644 --- a/sound/soc/rockchip/rk3399_gru_sound.c +++ b/sound/soc/rockchip/rk3399_gru_sound.c @@ -8,8 +8,6 @@ #include #include #include -#include -#include #include #include #include From patchwork Wed Sep 27 22:47:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 13401731 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5D0ABE80A8A for ; Wed, 27 Sep 2023 22:47:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=/i+avrFzHnUz50Df21ykEDYtlJ/mC0rn5T1U9vVhIhY=; b=Db6iJi7NpZeFHn 9PimV9SpzfKLlwG1p6Hwun8YCrazm/4hkwQdQhomybf5r4OcY2BmyK9+laZn94/ZY7Ys8OVZXWDQh YiHGvjhYQb8ZaGV+jt0QfNOjTdcW8ey+CvllAfmx/79ZURXXvMW2YcSuDfP/R6c08HbLwL9ygXBvQ +6E7B+gqgR0yZc7V2gMzKZA3fM2Fz6KmBFWHAAx5Q6VLvA3sknY6LLNtIVOg7JFgrs2cnWQPOfibh 6ZuLUVO+r5zMb6eFciIbcTGBJd5v2KtC1+QeOFyQFVZy0MAeqcy0v10yDR+PxJLjKL/+Du4wemvd8 sqCLeshWra+49oBx5XFA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qldJV-001rno-37; Wed, 27 Sep 2023 22:47:25 +0000 Received: from mail-lf1-x130.google.com ([2a00:1450:4864:20::130]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qldJT-001rlD-0G for linux-rockchip@lists.infradead.org; Wed, 27 Sep 2023 22:47:24 +0000 Received: by mail-lf1-x130.google.com with SMTP id 2adb3069b0e04-504427aae4fso11782594e87.1 for ; Wed, 27 Sep 2023 15:47:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1695854838; x=1696459638; darn=lists.infradead.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=CY0vsjcVCBgE58w9UR6SBm++3xKyQBSwPNYicIzid6s=; b=BVFPxKw1GiHs4XiGuoPWG4ChbbSkKK6U6hSyGau/z4DTKEOf8FRrmkaTW1sID2KaOK R/e4mXHBpL3djilswoJKDjdcoMi53n05BClOl0snkOVUZVZe1U/I5PQzt9/uAMJsIc9y k/+MDYVU9mOa/RcboAk1O1jHHfRNeQvZBf0HI41ymW0WBC3K0LQNSQjBZE5kfoPM1eeh X1LheYd3Ndfqc/o8C0pjxLr764OAqtGe1Hlg45xxyIxV91SmGAgHE8H4XJiXFw8JGFdn KhJ8aDld+GzbeimJLUtfmjpk4WsC3L0zKuX+bC4V9juxKW97OqjquycKCrYrOEtEO279 uf3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695854838; x=1696459638; 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=CY0vsjcVCBgE58w9UR6SBm++3xKyQBSwPNYicIzid6s=; b=rPjPpciu9dzo/+aTOkdOPJzu5LJF74td+GAsN0xTcGJ9nzEcNWsjj1eTicXw/Tv5Xz UDpPt5IvitvD9pYjRXhHHGEPQlL0IqizTf8v0QrDACLnQouvdIHR86sVY8OYvQuGjjL/ VE87YCmDAyfsB7C+/NcmAP5O0pjDRqrQJQxnofvbRm4PSaOUrFJsSSXhyZhjfyl8LR2z eVt0cPddiM+ohVCQBrmEasFFSoFlKZ0ZgwvBrqTtktOTHkPPEFM4TAr8rYK0qY85m6v4 f4MXjqbfINl0AbJB3zoxpNid7HBpzt6Jy9iDzcrFaDHSWz+wbtLv+SQ46StiAyNDuFUh aSwA== X-Gm-Message-State: AOJu0YyTjWlb+SfxKOWoFldsTzal4P8i8pz2kZ3EuhOlxjQIwdd4pvOR ktp/P7wJnSZdPHEsEupoyLTfg5j0BQ0zj76pSFY= X-Google-Smtp-Source: AGHT+IEX4yAeJVMQ9xLxRU+QUVQR8aPJSks9x5s8hY6YWkQ+B5BI90m9BXzskEw8JTnRLhnt+p9GEg== X-Received: by 2002:a05:6512:110d:b0:501:bf37:1fb3 with SMTP id l13-20020a056512110d00b00501bf371fb3mr2796624lfg.24.1695854837664; Wed, 27 Sep 2023 15:47:17 -0700 (PDT) Received: from [127.0.1.1] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id ep14-20020a056512484e00b0050296068a12sm2801746lfb.30.2023.09.27.15.47.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Sep 2023 15:47:17 -0700 (PDT) From: Linus Walleij Date: Thu, 28 Sep 2023 00:47:16 +0200 Subject: [PATCH 3/4] ASoC: rockchip: Drop includes from Rockchip MAX98090 MIME-Version: 1.0 Message-Id: <20230928-descriptors-asoc-rockchip-v1-3-a142a42d4787@linaro.org> References: <20230928-descriptors-asoc-rockchip-v1-0-a142a42d4787@linaro.org> In-Reply-To: <20230928-descriptors-asoc-rockchip-v1-0-a142a42d4787@linaro.org> To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Heiko Stuebner Cc: alsa-devel@alsa-project.org, linux-gpio@vger.kernel.org, linux-rockchip@lists.infradead.org, Linus Walleij X-Mailer: b4 0.12.3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230927_154723_118459_949D43C3 X-CRM114-Status: UNSURE ( 9.83 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org The Rockchip MAX98090 ASoC driver includes two legacy GPIO headers but doesn't use symbols from any of them. Delete the includes. Signed-off-by: Linus Walleij --- sound/soc/rockchip/rockchip_max98090.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sound/soc/rockchip/rockchip_max98090.c b/sound/soc/rockchip/rockchip_max98090.c index 150ac524a590..8e48eb8aa7ad 100644 --- a/sound/soc/rockchip/rockchip_max98090.c +++ b/sound/soc/rockchip/rockchip_max98090.c @@ -9,8 +9,6 @@ #include #include #include -#include -#include #include #include #include From patchwork Wed Sep 27 22:47:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 13401727 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8F9B3E80ABD for ; Wed, 27 Sep 2023 22:47:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=IFXV9Gz4aiaiCo/PqrSVJioXbKntyhYKEw8m01TBLec=; b=ZaptSauZyDSG2p b1rgjpBYBUQEcoBIaLaw/NVvwZQVIqxlKezy8WpL+8qx7tXV5OPD+mULAhtU0Cfz+uNASXO+8+Cve M52ooJ+EzBWinxCweZKVeYAfCyy3Sw8fFT0E6JpHlPS9R7/5I7EEUmnWC0wjCYMsSAegwqcFXuEVM JC3YfG01Wx3WCwtpKR7ER4gjBdHrPT716LDBDKuKLj6byHMF4+WNYNa8W23IJQqz5WvJhIyIKonAv 6dhVlrVEYIv4skTVCdYQIqtRNHJ1zk3XDKOQYYtEE6C7TIMwAv3zNXQjG/XW7y6DFUVSQmctfSCok 3CtOIR61piqm50dbDT8Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qldJX-001ro9-1M; Wed, 27 Sep 2023 22:47:27 +0000 Received: from mail-lf1-x12e.google.com ([2a00:1450:4864:20::12e]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qldJT-001rlH-0r for linux-rockchip@lists.infradead.org; Wed, 27 Sep 2023 22:47:24 +0000 Received: by mail-lf1-x12e.google.com with SMTP id 2adb3069b0e04-5041cc983f9so19809706e87.3 for ; Wed, 27 Sep 2023 15:47:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1695854838; x=1696459638; darn=lists.infradead.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=hm24NpX94JBemDRTScZMK9z0G78Go8UKUQZ7xueoWyk=; b=KeuAeyO7XcY0HFlB6FKaWcglwiaxC59A2R/c9a6QnSrYrD4vTYjtfIz3fIDLD/Y6vB V6Up3IbKOyJ3mRip59lPXVZMbZBtEHGzNhphN/mnRRNKnUCAFS4iAQwgAKHSnGTChoNY RYmQOlDoZcHTMtqO4MYPK63lgctKhnHD5Ohnx0qTO0fA7qqlGdaN54Vd34Sta+lKjWny VpqB1HLGflkgtXQJOhPAhWFEPMKxCV4mzB36dLtlWVpP5L19eBJ8ai0+mr6pzg5YQl6I 4pnNo9RzvTKBkIjloDq4WKLvvyZrbyml7ECzATPxuLTPpHiuRqsevwEnN0kYC3i3FW8L JYvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695854838; x=1696459638; 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=hm24NpX94JBemDRTScZMK9z0G78Go8UKUQZ7xueoWyk=; b=DKzrYLLHY+2EKzDWYS8GZyByPi50mpT/Vo5vCqtrLEDcAvyHH1np1pvOhQa3z4G16h QLFaP3F3TN+hxz12F8aiaul4d/CLaEKcL4SPm2MKgQ3VS6ExGuBsmsMpD/iaBjEJbA8a FkuuGDd6JbHp+fAEGc7m5kWMvn5sOMF20OTzO/1+T5fJ0VC+qqTK6V4w6rrwxjDqab5s mFMKZjdq7AuktkgGBN+GKNmPqGbF9gVxhVlQyznmibXBJZCYbArASNKjbqPlqp8kDVel LH/UE9d8eD1KxNj3Oas4XQfEp/42PvlMDVIeYXQRWRYFpuu+NaiA2BKHAI7Q5usEdwC9 2O3w== X-Gm-Message-State: AOJu0Ywe3ZOSWhYoaL+UnR2UlJ8G7IAlm72SMzJ0OfhxgKIoYbwzr1dv hLfWs20SmFPtimF/0Qg5rzOEdg== X-Google-Smtp-Source: AGHT+IHIPAOySo0YwjWaGIBqSx3zAKxnJQ1KilKVhhF1C+VnLfsmaRRx1osw7z8l9ymMS10PvpQvMg== X-Received: by 2002:a05:6512:3b06:b0:503:364d:b93d with SMTP id f6-20020a0565123b0600b00503364db93dmr3348450lfv.20.1695854838581; Wed, 27 Sep 2023 15:47:18 -0700 (PDT) Received: from [127.0.1.1] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id ep14-20020a056512484e00b0050296068a12sm2801746lfb.30.2023.09.27.15.47.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Sep 2023 15:47:18 -0700 (PDT) From: Linus Walleij Date: Thu, 28 Sep 2023 00:47:17 +0200 Subject: [PATCH 4/4] ASoC: rockchip: Drop includes from Rockchip RT5645 MIME-Version: 1.0 Message-Id: <20230928-descriptors-asoc-rockchip-v1-4-a142a42d4787@linaro.org> References: <20230928-descriptors-asoc-rockchip-v1-0-a142a42d4787@linaro.org> In-Reply-To: <20230928-descriptors-asoc-rockchip-v1-0-a142a42d4787@linaro.org> To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Heiko Stuebner Cc: alsa-devel@alsa-project.org, linux-gpio@vger.kernel.org, linux-rockchip@lists.infradead.org, Linus Walleij X-Mailer: b4 0.12.3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230927_154723_331498_400CD456 X-CRM114-Status: UNSURE ( 9.84 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org The Rockchip RT5645 ASoC driver includes two legacy GPIO headers but doesn't use symbols from any of them. Delete the includes. Signed-off-by: Linus Walleij --- sound/soc/rockchip/rockchip_rt5645.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sound/soc/rockchip/rockchip_rt5645.c b/sound/soc/rockchip/rockchip_rt5645.c index ef9fdf0386cb..7d4d3a0ac5fd 100644 --- a/sound/soc/rockchip/rockchip_rt5645.c +++ b/sound/soc/rockchip/rockchip_rt5645.c @@ -8,8 +8,6 @@ #include #include #include -#include -#include #include #include #include