[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAJKOXPfF7+Qp1DLR_YJJOXH-YMQqWbxr0Hp=cKU+7mc9oKTUtA@mail.gmail.com>
Date: Mon, 18 Feb 2019 12:00:19 +0100
From: Krzysztof Kozlowski <krzk@...nel.org>
To: Sylwester Nawrocki <s.nawrocki@...sung.com>
Cc: broonie@...nel.org, lgirdwood@...il.com, sbkim73@...sung.com,
Marek Szyprowski <m.szyprowski@...sung.com>,
alsa-devel@...a-project.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH 2/2] ASoC: samsung: i2s: Fix multiple "IIS multi" devices initialization
On Fri, 15 Feb 2019 at 15:48, Sylwester Nawrocki <s.nawrocki@...sung.com> wrote:
>
> On some SoCs (e.g. Exynos5433) there are multiple "IIS multi audio
> interfaces" and the driver will try to register there multiple times
> same platform device for the secondary FIFO, which of course fails
> miserably. To fix this we derive the secondary platform device name
> from the primary device name. The secondary device name will now
> be <primary_dev_name>-sec instead of fixed "samsung-i2s-sec".
>
> The fixed platform_device_id table entry is removed as the secondary
> device name is now dynamic and device/driver matching is done through
> driver_override.
>
> Reported-by: Marek Szyprowski <m.szyprowski@...sung.com>
> Suggested-by: Marek Szyprowski <m.szyprowski@...sung.com>
> Signed-off-by: Sylwester Nawrocki <s.nawrocki@...sung.com>
> ---
> sound/soc/samsung/i2s.c | 49 +++++++++++++++++++++++++-------------
> sound/soc/samsung/odroid.c | 2 +-
> 2 files changed, 33 insertions(+), 18 deletions(-)
>
> diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c
> index e36c44e2f1bb..4a6dd86459bc 100644
> --- a/sound/soc/samsung/i2s.c
> +++ b/sound/soc/samsung/i2s.c
> @@ -1339,20 +1339,34 @@ static int i2s_register_clock_provider(struct samsung_i2s_priv *priv)
> /* Create platform device for the secondary PCM */
> static int i2s_create_secondary_device(struct samsung_i2s_priv *priv)
> {
> - struct platform_device *pdev;
> + struct platform_device *pdev_sec;
> + const char *devname;
> int ret;
>
> - pdev = platform_device_register_simple("samsung-i2s-sec", -1, NULL, 0);
> - if (!pdev)
> + devname = devm_kasprintf(&priv->pdev->dev, GFP_KERNEL, "%s-sec",
> + dev_name(&priv->pdev->dev));
> + if (!devname)
> return -ENOMEM;
>
> - ret = device_attach(&pdev->dev);
> + pdev_sec = platform_device_alloc(devname, -1);
> + if (!pdev_sec)
> + return -ENOMEM;
> +
> + pdev_sec->driver_override = "samsung-i2s";
> +
> + ret = platform_device_add(pdev_sec);
> if (ret < 0) {
> - dev_info(&pdev->dev, "device_attach() failed\n");
> + platform_device_put(pdev_sec);
> return ret;
> }
>
> - priv->pdev_sec = pdev;
> + priv->pdev_sec = pdev_sec;
> +
> + ret = device_attach(&pdev_sec->dev);
> + if (ret < 0) {
> + dev_info(&pdev_sec->dev, "device_attach() failed\n");
Don't you need here platform_device_unregister()?
Best regards,
Krzysztof
Powered by blists - more mailing lists