rtc: at91sam9: drop platform_data support

ARCH_AT91 is DT only for a while, drop platform data support.

Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>

diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 805e4ac..dc0d66e 100644 (file)
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -1432,7 +1432,7 @@ config RTC_DRV_AT91RM9200
 config RTC_DRV_AT91SAM9
        tristate "AT91SAM9 RTT as RTC"
        depends on ARCH_AT91 || COMPILE_TEST
-       depends on HAS_IOMEM
+       depends on OF && HAS_IOMEM
        select MFD_SYSCON
        help
          Some AT91SAM9 SoCs provide an RTT (Real Time Timer) block which

diff --git a/drivers/rtc/rtc-at91sam9.c b/drivers/rtc/rtc-at91sam9.c
index 1d31c0a..7ec114b 100644 (file)
--- a/drivers/rtc/rtc-at91sam9.c
+++ b/drivers/rtc/rtc-at91sam9.c
@@ -340,13 +340,6 @@ static const struct rtc_class_ops at91_rtc_ops = {
        .alarm_irq_enable = at91_rtc_alarm_irq_enable,
 };
 
-static const struct regmap_config gpbr_regmap_config = {
-       .name = "gpbr",
-       .reg_bits = 32,
-       .val_bits = 32,
-       .reg_stride = 4,
-};
-
 /*
  * Initialize and install RTC driver
  */
@@ -357,6 +350,7 @@ static int at91_rtc_probe(struct platform_device *pdev)
        int             ret, irq;
        u32             mr;
        unsigned int    sclk_rate;
+       struct of_phandle_args args;
 
        irq = platform_get_irq(pdev, 0);
        if (irq < 0) {
@@ -382,34 +376,14 @@ static int at91_rtc_probe(struct platform_device *pdev)
        if (IS_ERR(rtc->rtt))
                return PTR_ERR(rtc->rtt);
 
-       if (!pdev->dev.of_node) {
-               /*
-                * TODO: Remove this code chunk when removing non DT board
-                * support. Remember to remove the gpbr_regmap_config
-                * variable too.
-                */
-               void __iomem *gpbr;
-
-               r = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-               gpbr = devm_ioremap_resource(&pdev->dev, r);
-               if (IS_ERR(gpbr))
-                       return PTR_ERR(gpbr);
-
-               rtc->gpbr = regmap_init_mmio(NULL, gpbr,
-                                            &gpbr_regmap_config);
-       } else {
-               struct of_phandle_args args;
-
-               ret = of_parse_phandle_with_fixed_args(pdev->dev.of_node,
-                                               "atmel,rtt-rtc-time-reg", 1, 0,
-                                               &args);
-               if (ret)
-                       return ret;
-
-               rtc->gpbr = syscon_node_to_regmap(args.np);
-               rtc->gpbr_offset = args.args[0];
-       }
+       ret = of_parse_phandle_with_fixed_args(pdev->dev.of_node,
+                                       "atmel,rtt-rtc-time-reg", 1, 0,
+                                       &args);
+       if (ret)
+               return ret;
 
+       rtc->gpbr = syscon_node_to_regmap(args.np);
+       rtc->gpbr_offset = args.args[0];
        if (IS_ERR(rtc->gpbr)) {
                dev_err(&pdev->dev, "failed to retrieve gpbr regmap, aborting.\n");
                return -ENOMEM;
@@ -561,13 +535,11 @@ static int at91_rtc_resume(struct device *dev)
 
 static SIMPLE_DEV_PM_OPS(at91_rtc_pm_ops, at91_rtc_suspend, at91_rtc_resume);
 
-#ifdef CONFIG_OF
 static const struct of_device_id at91_rtc_dt_ids[] = {
        { .compatible = "atmel,at91sam9260-rtt" },
        { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, at91_rtc_dt_ids);
-#endif
 
 static struct platform_driver at91_rtc_driver = {
        .probe          = at91_rtc_probe,