From patchwork Wed Dec 28 12:22:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tongjian X-Patchwork-Id: 13082891 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 18A16C4167B for ; Wed, 28 Dec 2022 12:24:21 +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:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=A9G2tW1knPG+yYUQJr6ANkkDl7JF1YkU4wB4jDGiujY=; b=k7b9o/gBjEEtIA 1+CfUpEha5s+iVmU0lT9hIWBX8cCvEX0Ss6DJu/bV+AltzL2ihxakrj5rNFiC4ZkEk8XTvxmKTnDf lEpW29iAqqoNkXwqDGRXOLxZYBuI9ZTNxRcMoh9kV0MpYwvQyEe33v6bCnpZ8WvxuDze8Pf8PiBmu 2eUYd9bFefH447gW+wz02Eb5z9ejwZI1uZc+m8yyhg6TaVGfFtRKDDHvA02Q0+WKcmS1nwVlReiZr iMajECiCiatmr3D020NUKAFeMck7FDuSUDl5LZCTkIygcDLiBxGcaaHCioZZPKfJI9sD/DU0k/aNc hDid2HpYD9Z2/LVnxfyw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pAVSY-004lWt-9Q; Wed, 28 Dec 2022 12:23:02 +0000 Received: from mail-pj1-x102e.google.com ([2607:f8b0:4864:20::102e]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pAVSS-004lRv-9n for linux-arm-kernel@lists.infradead.org; Wed, 28 Dec 2022 12:22:57 +0000 Received: by mail-pj1-x102e.google.com with SMTP id o1-20020a17090a678100b00219cf69e5f0so19936850pjj.2 for ; Wed, 28 Dec 2022 04:22:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=huaqin-corp-partner-google-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9X91Fnadk2T2IXBmaaCHcqGD55dHXQIcw8hnKRyjWdc=; b=8ATAjlMSvH64+WHo5TfeKLy/9iwXrYE8/B0YTdIfYIbO5BQINeQDS9114Ih2LQcH4a oXtlbx2wf+omFT99UgiMZHnatKZ4sQfsMymZ+OVOz3wATCMcKeaLSaHFtraywPp7zjNA vqiKIK67C9KVKhqT5L2FmmjPnNeH7jaJJfOozT6FOAHxNSRYSYMTasIieCUx+gJQymeF GamizVymKLPex/aowlguGu4BSxVkhe75Hrh01m0AAGOVQDplWliLtNdkdzazWdF+xuHA bXiAI06dLc+TL1zkSHjg/PT3eipglJY2ffb9YeGdzHK1o0H+GvTYkbQaKJUHgeqneBWH PZcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9X91Fnadk2T2IXBmaaCHcqGD55dHXQIcw8hnKRyjWdc=; b=Y8xbPOyjT5eg33iKIbfb7AaWZCb1year8XNb4QbPeInbRJZFoh998Dn5+CvQBiiF0o ZhvSc/pWssj82LWqEh09V0lkunRKjt0TNAAq4TVnx90xOZP2/T2CHl+CqEQzrACG64Is Y3yzmngD136cZnNL+CDsCdoSCaFo8H1uhLBLO5W9wm84xgvWnbCJf9CM50gZ0/rvQxIw 9zb4mYm4ypjgOtZ1TD33BOfaPaP0T+ugHPwKllGLg5aCvs3ZlCZmbBw4Xj4HohM020A6 bUhp1aupYF7zpsz8mHKKG6PeH4ZZM01qFlhSukgiOcOE+j14PW1N+Jj+LdjrAOEltBoT HVQQ== X-Gm-Message-State: AFqh2krS+TF01iYNd254IeGPdVBtlGU/6AWbOXV/QIStitGEervrBN2Y YwJRoRzi66AezKCAQ2c9PCVW2Q== X-Google-Smtp-Source: AMrXdXt0gVyGT9VaSwJVm9bxkdZzyN9aQyXLpHP3077wingZFW4PqgWXO63Kj2x5OqBxtEC9qIw/cQ== X-Received: by 2002:a05:6a21:3949:b0:a7:9022:5d5e with SMTP id ac9-20020a056a21394900b000a790225d5emr31532687pzc.2.1672230173418; Wed, 28 Dec 2022 04:22:53 -0800 (PST) Received: from localhost.localdomain (202.60.225.077.static.cyberec.com. [202.60.225.77]) by smtp.gmail.com with ESMTPSA id h1-20020a056a00000100b0058124f92399sm5236074pfk.219.2022.12.28.04.22.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Dec 2022 04:22:53 -0800 (PST) From: tongjian To: lgirdwood@gmail.com, broonie@kernel.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, matthias.bgg@gmail.com, perex@perex.cz, tiwai@suse.com, angelogioacchino.delregno@collabora.com, nfraprado@collabora.com, jiaxin.yu@mediatek.com, chunxu.li@mediatek.com, ajye_huang@compal.corp-partner.google.com, tongjian@huaqin.corp-partner.google.com Cc: alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] ASoC: mediatek: mt8186: support rt5682s_max98360 Date: Wed, 28 Dec 2022 20:22:29 +0800 Message-Id: <20221228122230.3818533-2-tongjian@huaqin.corp-partner.google.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221228122230.3818533-1-tongjian@huaqin.corp-partner.google.com> References: <20221228122230.3818533-1-tongjian@huaqin.corp-partner.google.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221228_042256_427726_43D2C039 X-CRM114-Status: GOOD ( 13.06 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add support for using the rt5682s codec together with max98360a on MT8186-MT6366-RT1019-RT5682S machines. Signed-off-by: tongjian --- .../mt8186/mt8186-mt6366-rt1019-rt5682s.c | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/sound/soc/mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c b/sound/soc/mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c index 8f77a0bc1dc8..af44e331dae8 100644 --- a/sound/soc/mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c +++ b/sound/soc/mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c @@ -1083,6 +1083,21 @@ static struct snd_soc_card mt8186_mt6366_rt1019_rt5682s_soc_card = { .num_configs = ARRAY_SIZE(mt8186_mt6366_rt1019_rt5682s_codec_conf), }; +static struct snd_soc_card mt8186_mt6366_rt5682s_max98360_soc_card = { + .name = "mt8186_rt5682s_max98360", + .owner = THIS_MODULE, + .dai_link = mt8186_mt6366_rt1019_rt5682s_dai_links, + .num_links = ARRAY_SIZE(mt8186_mt6366_rt1019_rt5682s_dai_links), + .controls = mt8186_mt6366_rt1019_rt5682s_controls, + .num_controls = ARRAY_SIZE(mt8186_mt6366_rt1019_rt5682s_controls), + .dapm_widgets = mt8186_mt6366_rt1019_rt5682s_widgets, + .num_dapm_widgets = ARRAY_SIZE(mt8186_mt6366_rt1019_rt5682s_widgets), + .dapm_routes = mt8186_mt6366_rt1019_rt5682s_routes, + .num_dapm_routes = ARRAY_SIZE(mt8186_mt6366_rt1019_rt5682s_routes), + .codec_conf = mt8186_mt6366_rt1019_rt5682s_codec_conf, + .num_configs = ARRAY_SIZE(mt8186_mt6366_rt1019_rt5682s_codec_conf), +}; + static int mt8186_mt6366_rt1019_rt5682s_dev_probe(struct platform_device *pdev) { struct snd_soc_card *card; @@ -1232,9 +1247,14 @@ static int mt8186_mt6366_rt1019_rt5682s_dev_probe(struct platform_device *pdev) #if IS_ENABLED(CONFIG_OF) static const struct of_device_id mt8186_mt6366_rt1019_rt5682s_dt_match[] = { - { .compatible = "mediatek,mt8186-mt6366-rt1019-rt5682s-sound", + { + .compatible = "mediatek,mt8186-mt6366-rt1019-rt5682s-sound", .data = &mt8186_mt6366_rt1019_rt5682s_soc_card, }, + { + .compatible = "mediatek,mt8186-mt6366-rt5682s-max98360-sound", + .data = &mt8186_mt6366_rt5682s_max98360_soc_card, + }, {} }; MODULE_DEVICE_TABLE(of, mt8186_mt6366_rt1019_rt5682s_dt_match); From patchwork Wed Dec 28 12:22:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tongjian X-Patchwork-Id: 13082892 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 AB17BC4167B for ; Wed, 28 Dec 2022 12:24:35 +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:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=g29H+0Ilepp/f4jdwn2izx9cHrAwBqQjHUfVb0El6JA=; b=JCuPxD4sTVyvoR L6Z8vfEE7jV53o6aAd748I0lwWblCo9hdHzZks639yDkJFhrNHHICjoCWv51tEXGWqTNzxQatCxkH 981mV69woLq91iNilMUR7h0ilkR/MMWb7D+wFvid3pDZWr/qgMFmqcxNPb4TybUxg3PJU+JGFWly2 yaF/L3MLJ6jiTch92iV55si4XSJqmWoOkf3UD3IoFiCY01O8f1+PnlnwYwUEQAfftSZj71Elk1Alg 0SmqiMHwhHiTOHBVsrnrFHCNYrxqZUq8Bh4VkbebVCSf7ED0ui2M7zWtKWYJUaFxPl2vgRViiHtSg 2utSgAlxVcUeLVxZky2Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pAVSu-004lfF-QU; Wed, 28 Dec 2022 12:23:25 +0000 Received: from mail-pg1-x530.google.com ([2607:f8b0:4864:20::530]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pAVSZ-004lXs-D7 for linux-arm-kernel@lists.infradead.org; Wed, 28 Dec 2022 12:23:04 +0000 Received: by mail-pg1-x530.google.com with SMTP id r18so10461644pgr.12 for ; Wed, 28 Dec 2022 04:23:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=huaqin-corp-partner-google-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=F0LQcrjzcqyHGx/EG+ZxulY1MidQR+dP6F+oRvG3vQs=; b=x/ZSlQ8pHG3xkV8dK6KyzVm22eyZhu3j80eOGMvGPMwCebW/JYa9bvXGKtSFn8vbV5 5aC30qO+FGeVDqa6hM3f99d42d8Y+EUt0EWm8TFlq/4TkyPTXHubCPe6BK6txdD2JPJ/ cYErJ2c2Ye/cFe9UA9HJlFki7EhknDZ7YBu+183MID3AA4U4OWc421E+CU5jvpKL53Wq SkMh7FCqoS9IAMN7cCNgH84NXgJcgvj083upOmOktH6ErMszWA+rp4ftCOeuQOWRWfUg VRaZLGm0Ka0jC0o/RtTXruMlZ0UTjdD0si5vTQceCk80DTEva2K3MqCzm6l5oU4u0gWG SGmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=F0LQcrjzcqyHGx/EG+ZxulY1MidQR+dP6F+oRvG3vQs=; b=Nu8VYMP5OGZQzx7mVY3bEhUpzXDF6jehxdQcTEprpCWhe90DCeyhAlxpTDV/4CRuZZ AAIa+bVl8faoe8GfCvAYLvMTsBfWRxQ60hWZqyZhkdO0HMv3Nmz+HL866dzCuJd1Ud8l oveejMlcy3D1RxodZ3ehOUb6FFLDy/reoSJ//eWh28CPd4bkbDtpi4EJHpxfpY6WQX4y 3/Th8mdloypFOa+Fy+Fyr6A/JQeYF27Mzz7OG3fWkx23yctgNbG8dG5E7ezrnr5Qsy0x MPD7b8kTeMVGeNFHZebjxI2XYov31VS7W2r8QKbBEs7HNIZ01i5ENLaeVLXc9GbPX4ti 4CPA== X-Gm-Message-State: AFqh2krbOlVL80LX0aHJEKpZsjP3h8bBK5NzyiGOcBl1RO8cIB4LS+7I j5n/e8fv1u0P9zKJRp31XTlM1Q== X-Google-Smtp-Source: AMrXdXudRa1wP9H6e6vGFfQm6qY0zfkdkBMEcZaDW22e10mqSIjt3bIqPJ0YRH0r2IRG0HPaz0kP6g== X-Received: by 2002:a62:16d5:0:b0:580:f58f:efb3 with SMTP id 204-20020a6216d5000000b00580f58fefb3mr14897592pfw.15.1672230182928; Wed, 28 Dec 2022 04:23:02 -0800 (PST) Received: from localhost.localdomain (202.60.225.077.static.cyberec.com. [202.60.225.77]) by smtp.gmail.com with ESMTPSA id h1-20020a056a00000100b0058124f92399sm5236074pfk.219.2022.12.28.04.22.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Dec 2022 04:23:02 -0800 (PST) From: tongjian To: lgirdwood@gmail.com, broonie@kernel.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, matthias.bgg@gmail.com, perex@perex.cz, tiwai@suse.com, angelogioacchino.delregno@collabora.com, nfraprado@collabora.com, jiaxin.yu@mediatek.com, chunxu.li@mediatek.com, ajye_huang@compal.corp-partner.google.com, tongjian@huaqin.corp-partner.google.com Cc: alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] ASoC: dt-bindings: mt8186-mt6366: add new compatible for max98360a Date: Wed, 28 Dec 2022 20:22:30 +0800 Message-Id: <20221228122230.3818533-3-tongjian@huaqin.corp-partner.google.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221228122230.3818533-1-tongjian@huaqin.corp-partner.google.com> References: <20221228122230.3818533-1-tongjian@huaqin.corp-partner.google.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221228_042303_560739_C95D875B X-CRM114-Status: UNSURE ( 8.34 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Adds new compatible string "mt8186-mt6366-rt5682s-max98360-sound" for machines with max98360a and rt5682s. Signed-off-by: tongjian Acked-by: Krzysztof Kozlowski --- .../devicetree/bindings/sound/mt8186-mt6366-rt1019-rt5682s.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/sound/mt8186-mt6366-rt1019-rt5682s.yaml b/Documentation/devicetree/bindings/sound/mt8186-mt6366-rt1019-rt5682s.yaml index 9d3139990237..aa23b0024c46 100644 --- a/Documentation/devicetree/bindings/sound/mt8186-mt6366-rt1019-rt5682s.yaml +++ b/Documentation/devicetree/bindings/sound/mt8186-mt6366-rt1019-rt5682s.yaml @@ -16,6 +16,7 @@ properties: compatible: enum: - mediatek,mt8186-mt6366-rt1019-rt5682s-sound + - mediatek,mt8186-mt6366-rt5682s-max98360-sound mediatek,platform: $ref: "/schemas/types.yaml#/definitions/phandle"