Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <20201202141326.32645-1-festevam@gmail.com>
In-Reply-To: <20201202141326.32645-1-festevam@gmail.com>
From:   Andy Shevchenko <andy.shevchenko@gmail.com>
Date:   Wed, 2 Dec 2020 16:38:56 +0200
Message-ID: <CAHp75VfZ7LGCKnBXXyyAXf5a+W3s4rWP=OMe8=LbAj2qeqXnQQ@mail.gmail.com>
Subject: Re: [PATCH v4] media: coda: Convert the driver to DT-only
To:     Fabio Estevam <festevam@gmail.com>
Cc:     Philipp Zabel <p.zabel@pengutronix.de>,
        Mauro Carvalho Chehab <mchehab@kernel.org>,
        Linux Media Mailing List <linux-media@vger.kernel.org>,
        Hans Verkuil <hverkuil-cisco@xs4all.nl>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Wed, Dec 2, 2020 at 4:15 PM Fabio Estevam <festevam@gmail.com> wrote:
>
> Since 5.10-rc1 i.MX is a devicetree-only platform, so simplify the code
> by removing the unused non-DT support.

I haven't checked full context but from what I see the patch looks
good to me, FWIW,
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>

>
> Signed-off-by: Fabio Estevam <festevam@gmail.com>
> ---
> Changes since v3:
> - Add a explicit OF dependency - Andy
>
>  drivers/media/platform/Kconfig            |  2 +-
>  drivers/media/platform/coda/coda-common.c | 27 ++---------------------
>  include/linux/platform_data/media/coda.h  | 14 ------------
>  3 files changed, 3 insertions(+), 40 deletions(-)
>  delete mode 100644 include/linux/platform_data/media/coda.h
>
> diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
> index ffffef2267f4..9fdbfea06087 100644
> --- a/drivers/media/platform/Kconfig
> +++ b/drivers/media/platform/Kconfig
> @@ -201,7 +201,7 @@ if V4L_MEM2MEM_DRIVERS
>
>  config VIDEO_CODA
>         tristate "Chips&Media Coda multi-standard codec IP"
> -       depends on VIDEO_DEV && VIDEO_V4L2 && (ARCH_MXC || COMPILE_TEST)
> +       depends on VIDEO_DEV && VIDEO_V4L2 && OF && (ARCH_MXC || COMPILE_TEST)
>         select SRAM
>         select VIDEOBUF2_DMA_CONTIG
>         select VIDEOBUF2_VMALLOC
> diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c
> index d30eafea701d..995e95272e51 100644
> --- a/drivers/media/platform/coda/coda-common.c
> +++ b/drivers/media/platform/coda/coda-common.c
> @@ -25,7 +25,6 @@
>  #include <linux/slab.h>
>  #include <linux/videodev2.h>
>  #include <linux/of.h>
> -#include <linux/platform_data/media/coda.h>
>  #include <linux/ratelimit.h>
>  #include <linux/reset.h>
>
> @@ -3102,13 +3101,6 @@ static const struct coda_devtype coda_devdata[] = {
>         },
>  };
>
> -static const struct platform_device_id coda_platform_ids[] = {
> -       { .name = "coda-imx27", .driver_data = CODA_IMX27 },
> -       { /* sentinel */ }
> -};
> -MODULE_DEVICE_TABLE(platform, coda_platform_ids);
> -
> -#ifdef CONFIG_OF
>  static const struct of_device_id coda_dt_ids[] = {
>         { .compatible = "fsl,imx27-vpu", .data = &coda_devdata[CODA_IMX27] },
>         { .compatible = "fsl,imx51-vpu", .data = &coda_devdata[CODA_IMX51] },
> @@ -3118,14 +3110,9 @@ static const struct of_device_id coda_dt_ids[] = {
>         { /* sentinel */ }
>  };
>  MODULE_DEVICE_TABLE(of, coda_dt_ids);
> -#endif
>
>  static int coda_probe(struct platform_device *pdev)
>  {
> -       const struct of_device_id *of_id =
> -                       of_match_device(of_match_ptr(coda_dt_ids), &pdev->dev);
> -       const struct platform_device_id *pdev_id;
> -       struct coda_platform_data *pdata = pdev->dev.platform_data;
>         struct device_node *np = pdev->dev.of_node;
>         struct gen_pool *pool;
>         struct coda_dev *dev;
> @@ -3135,14 +3122,7 @@ static int coda_probe(struct platform_device *pdev)
>         if (!dev)
>                 return -ENOMEM;
>
> -       pdev_id = of_id ? of_id->data : platform_get_device_id(pdev);
> -
> -       if (of_id)
> -               dev->devtype = of_id->data;
> -       else if (pdev_id)
> -               dev->devtype = &coda_devdata[pdev_id->driver_data];
> -       else
> -               return -EINVAL;
> +       dev->devtype = of_device_get_match_data(&pdev->dev);
>
>         dev->dev = &pdev->dev;
>         dev->clk_per = devm_clk_get(&pdev->dev, "per");
> @@ -3200,10 +3180,8 @@ static int coda_probe(struct platform_device *pdev)
>                 return ret;
>         }
>
> -       /* Get IRAM pool from device tree or platform data */
> +       /* Get IRAM pool from device tree */
>         pool = of_gen_pool_get(np, "iram", 0);
> -       if (!pool && pdata)
> -               pool = gen_pool_get(pdata->iram_dev, NULL);
>         if (!pool) {
>                 dev_err(&pdev->dev, "iram pool not available\n");
>                 return -ENOMEM;
> @@ -3342,7 +3320,6 @@ static struct platform_driver coda_driver = {
>                 .of_match_table = of_match_ptr(coda_dt_ids),
>                 .pm     = &coda_pm_ops,
>         },
> -       .id_table = coda_platform_ids,
>  };
>
>  module_platform_driver(coda_driver);
> diff --git a/include/linux/platform_data/media/coda.h b/include/linux/platform_data/media/coda.h
> deleted file mode 100644
> index 293b61b60c9d..000000000000
> --- a/include/linux/platform_data/media/coda.h
> +++ /dev/null
> @@ -1,14 +0,0 @@
> -/* SPDX-License-Identifier: GPL-2.0-or-later */
> -/*
> - * Copyright (C) 2013 Philipp Zabel, Pengutronix
> - */
> -#ifndef PLATFORM_CODA_H
> -#define PLATFORM_CODA_H
> -
> -struct device;
> -
> -struct coda_platform_data {
> -       struct device *iram_dev;
> -};
> -
> -#endif
> --
> 2.17.1
>


-- 
With Best Regards,
Andy Shevchenko