Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <20230804085648.3721416-1-ajye_huang@compal.corp-partner.google.com>
In-Reply-To: <20230804085648.3721416-1-ajye_huang@compal.corp-partner.google.com>
From:   Ajye Huang <ajye_huang@compal.corp-partner.google.com>
Date:   Mon, 14 Aug 2023 10:55:30 +0800
Message-ID: <CALprXBaxhSiDdX49vtUrw6d5cLh+Qv5cTUBHM_c8VBABmEujGQ@mail.gmail.com>
Subject: Re: [PATCH v1] ASoC: Intel: Add rpl_nau8318_8825 driver
To:     linux-kernel@vger.kernel.org
Cc:     Mark Brown <broonie@kernel.org>,
        Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>,
        Bard Liao <yung-chuan.liao@linux.intel.com>,
        Peter Ujfalusi <peter.ujfalusi@linux.intel.com>,
        Liam Girdwood <liam.r.girdwood@linux.intel.com>,
        Akihiko Odaki <akihiko.odaki@gmail.com>,
        Yong Zhi <yong.zhi@intel.com>,
        ye xingchen <ye.xingchen@zte.com.cn>,
        "balamurugan . c" <balamurugan.c@intel.com>,
        Libin Yang <libin.yang@intel.com>,
        Jaroslav Kysela <perex@perex.cz>,
        Ranjani Sridharan <ranjani.sridharan@linux.intel.com>,
        Cezary Rojewski <cezary.rojewski@intel.com>,
        David Lin <CTLIN0@nuvoton.com>, Brent Lu <brent.lu@intel.com>,
        Takashi Iwai <tiwai@suse.com>,
        Terry Cheong <htcheong@chromium.org>,
        Kai Vehmanen <kai.vehmanen@linux.intel.com>,
        Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>,
        Gongjun Song <gongjun.song@intel.com>,
        Arnd Bergmann <arnd@arndb.de>, apoorv <apoorv@intel.com>,
        alsa-devel@alsa-project.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

Hi Pierre,

Could we have your reviews?

Before we had your reviews on "adl_nau8318_nau8825" driver name last year.
And now the adl and rpl ids were split, so add "rpl_nau8318_8825" back
to maintain support.

Thanks

On Fri, Aug 4, 2023 at 4:57=E2=80=AFPM Ajye Huang
<ajye_huang@compal.corp-partner.google.com> wrote:
>
> Boards were using this in older kernels before adl and rpl ids were
> split. Add this back to maintain support.
>
> Signed-off-by: Ajye Huang <ajye_huang@compal.corp-partner.google.com>
> ---
>  sound/soc/intel/boards/sof_nau8825.c              | 10 ++++++++++
>  sound/soc/intel/common/soc-acpi-intel-rpl-match.c | 12 ++++++++++++
>  2 files changed, 22 insertions(+)
>
> diff --git a/sound/soc/intel/boards/sof_nau8825.c b/sound/soc/intel/board=
s/sof_nau8825.c
> index 4fc6e1c6aef3..46b7ecf6f9f1 100644
> --- a/sound/soc/intel/boards/sof_nau8825.c
> +++ b/sound/soc/intel/boards/sof_nau8825.c
> @@ -684,6 +684,16 @@ static const struct platform_device_id board_ids[] =
=3D {
>                                         SOF_BT_OFFLOAD_SSP(2) |
>                                         SOF_SSP_BT_OFFLOAD_PRESENT),
>         },
> +       {
> +               .name =3D "rpl_nau8318_8825",
> +               .driver_data =3D (kernel_ulong_t)(SOF_NAU8825_SSP_CODEC(0=
) |
> +                                       SOF_SPEAKER_AMP_PRESENT |
> +                                       SOF_NAU8318_SPEAKER_AMP_PRESENT |
> +                                       SOF_NAU8825_SSP_AMP(1) |
> +                                       SOF_NAU8825_NUM_HDMIDEV(4) |
> +                                       SOF_BT_OFFLOAD_SSP(2) |
> +                                       SOF_SSP_BT_OFFLOAD_PRESENT),
> +       },
>         { }
>  };
>  MODULE_DEVICE_TABLE(platform, board_ids);
> diff --git a/sound/soc/intel/common/soc-acpi-intel-rpl-match.c b/sound/so=
c/intel/common/soc-acpi-intel-rpl-match.c
> index 4eefdb2dd45c..1dd699181765 100644
> --- a/sound/soc/intel/common/soc-acpi-intel-rpl-match.c
> +++ b/sound/soc/intel/common/soc-acpi-intel-rpl-match.c
> @@ -351,6 +351,11 @@ static const struct snd_soc_acpi_codecs rpl_rt1019p_=
amp =3D {
>         .codecs =3D {"RTL1019"}
>  };
>
> +static const struct snd_soc_acpi_codecs rpl_nau8318_amp =3D {
> +       .num_codecs =3D 1,
> +       .codecs =3D {"NVTN2012"}
> +};
> +
>  struct snd_soc_acpi_mach snd_soc_acpi_intel_rpl_machines[] =3D {
>         {
>                 .comp_ids =3D &rpl_rt5682_hp,
> @@ -373,6 +378,13 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_rpl_mach=
ines[] =3D {
>                 .quirk_data =3D &rpl_max98373_amp,
>                 .sof_tplg_filename =3D "sof-rpl-max98373-nau8825.tplg",
>         },
> +       {
> +               .id =3D "10508825",
> +               .drv_name =3D "rpl_nau8318_8825",
> +               .machine_quirk =3D snd_soc_acpi_codec_list,
> +               .quirk_data =3D &rpl_nau8318_amp,
> +               .sof_tplg_filename =3D "sof-rpl-nau8318-nau8825.tplg",
> +       },
>         {
>                 .comp_ids =3D &rpl_rt5682_hp,
>                 .drv_name =3D "rpl_rt1019_rt5682",
> --
> 2.25.1
>