rtc: mxc: Convert the driver to DT-only
authorFabio Estevam <festevam@gmail.com>
Mon, 16 Nov 2020 18:03:26 +0000 (15:03 -0300)
committerAlexandre Belloni <alexandre.belloni@bootlin.com>
Tue, 17 Nov 2020 19:33:29 +0000 (20:33 +0100)
Since 5.10-rc1 i.MX is a devicetree-only platform, so simplify the code
by removing the unused non-DT support.

Signed-off-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Link: https://lore.kernel.org/r/20201116180326.5199-1-festevam@gmail.com
drivers/rtc/rtc-mxc.c

index a8cfbde048f42fe71ef9d9c8df50b231cc58c3ee..018bfa952d66e54e282fb0835e159c6fa6e5fa01 100644 (file)
@@ -70,27 +70,12 @@ struct rtc_plat_data {
        enum imx_rtc_type devtype;
 };
 
-static const struct platform_device_id imx_rtc_devtype[] = {
-       {
-               .name = "imx1-rtc",
-               .driver_data = IMX1_RTC,
-       }, {
-               .name = "imx21-rtc",
-               .driver_data = IMX21_RTC,
-       }, {
-               /* sentinel */
-       }
-};
-MODULE_DEVICE_TABLE(platform, imx_rtc_devtype);
-
-#ifdef CONFIG_OF
 static const struct of_device_id imx_rtc_dt_ids[] = {
        { .compatible = "fsl,imx1-rtc", .data = (const void *)IMX1_RTC },
        { .compatible = "fsl,imx21-rtc", .data = (const void *)IMX21_RTC },
        {}
 };
 MODULE_DEVICE_TABLE(of, imx_rtc_dt_ids);
-#endif
 
 static inline int is_imx1_rtc(struct rtc_plat_data *data)
 {
@@ -329,10 +314,7 @@ static int mxc_rtc_probe(struct platform_device *pdev)
                return -ENOMEM;
 
        of_id = of_match_device(imx_rtc_dt_ids, &pdev->dev);
-       if (of_id)
-               pdata->devtype = (enum imx_rtc_type)of_id->data;
-       else
-               pdata->devtype = pdev->id_entry->driver_data;
+       pdata->devtype = (enum imx_rtc_type)of_id->data;
 
        pdata->ioaddr = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(pdata->ioaddr))
@@ -438,7 +420,6 @@ static struct platform_driver mxc_rtc_driver = {
                   .name        = "mxc_rtc",
                   .of_match_table = of_match_ptr(imx_rtc_dt_ids),
        },
-       .id_table = imx_rtc_devtype,
        .probe = mxc_rtc_probe,
 };