watchdog: ux500_wdt: Drop platform data
authorLinus Walleij <linus.walleij@linaro.org>
Wed, 22 Sep 2021 23:09:45 +0000 (01:09 +0200)
committerWim Van Sebroeck <wim@linux-watchdog.org>
Mon, 1 Nov 2021 19:18:08 +0000 (20:18 +0100)
Drop the platform data passing from the PRCMU driver. This platform
data was part of the ambition to support more SoCs, which in turn
were never mass produced.

Only a name remains of the MFD cell so switch to MFD_CELL_NAME().

Cc: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20210922230947.1864357-1-linus.walleij@linaro.org
Acked-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
drivers/mfd/db8500-prcmu.c
drivers/watchdog/ux500_wdt.c
include/linux/platform_data/ux500_wdt.h [deleted file]

index c1d3e7c116cf82d2ff48a6124a9cd551945c44fc..ccf6be922b39142985420045fc43cf1d805ebc66 100644 (file)
@@ -36,7 +36,6 @@
 #include <linux/mfd/abx500/ab8500.h>
 #include <linux/regulator/db8500-prcmu.h>
 #include <linux/regulator/machine.h>
-#include <linux/platform_data/ux500_wdt.h>
 #include "db8500-prcmu-regs.h"
 
 /* Index of different voltages to be used when accessing AVSData */
@@ -2939,18 +2938,8 @@ static struct regulator_init_data db8500_regulators[DB8500_NUM_REGULATORS] = {
        },
 };
 
-static struct ux500_wdt_data db8500_wdt_pdata = {
-       .timeout = 600, /* 10 minutes */
-       .has_28_bits_resolution = true,
-};
-
 static const struct mfd_cell common_prcmu_devs[] = {
-       {
-               .name = "ux500_wdt",
-               .platform_data = &db8500_wdt_pdata,
-               .pdata_size = sizeof(db8500_wdt_pdata),
-               .id = -1,
-       },
+       MFD_CELL_NAME("ux500_wdt"),
        MFD_CELL_NAME("db8500-cpuidle"),
 };
 
index 072758106865dd7ba088c2bc914330a9bd69e978..40f8cf1cb234595dc44346751abcb28bd70ce123 100644 (file)
@@ -15,7 +15,6 @@
 #include <linux/uaccess.h>
 #include <linux/watchdog.h>
 #include <linux/platform_device.h>
-#include <linux/platform_data/ux500_wdt.h>
 
 #include <linux/mfd/dbx500-prcmu.h>
 
@@ -23,7 +22,6 @@
 
 #define WATCHDOG_MIN   0
 #define WATCHDOG_MAX28 268435  /* 28 bit resolution in ms == 268435.455 s */
-#define WATCHDOG_MAX32 4294967 /* 32 bit resolution in ms == 4294967.295 s */
 
 static unsigned int timeout = WATCHDOG_TIMEOUT;
 module_param(timeout, uint, 0);
@@ -80,22 +78,15 @@ static struct watchdog_device ux500_wdt = {
        .info = &ux500_wdt_info,
        .ops = &ux500_wdt_ops,
        .min_timeout = WATCHDOG_MIN,
-       .max_timeout = WATCHDOG_MAX32,
+       .max_timeout = WATCHDOG_MAX28,
 };
 
 static int ux500_wdt_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
        int ret;
-       struct ux500_wdt_data *pdata = dev_get_platdata(dev);
-
-       if (pdata) {
-               if (pdata->timeout > 0)
-                       timeout = pdata->timeout;
-               if (pdata->has_28_bits_resolution)
-                       ux500_wdt.max_timeout = WATCHDOG_MAX28;
-       }
 
+       timeout = 600; /* Default to 10 minutes */
        ux500_wdt.parent = dev;
        watchdog_set_nowayout(&ux500_wdt, nowayout);
 
diff --git a/include/linux/platform_data/ux500_wdt.h b/include/linux/platform_data/ux500_wdt.h
deleted file mode 100644 (file)
index de6a4ad..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * Copyright (C) ST Ericsson SA 2011
- *
- * STE Ux500 Watchdog platform data
- */
-#ifndef __UX500_WDT_H
-#define __UX500_WDT_H
-
-/**
- * struct ux500_wdt_data
- */
-struct ux500_wdt_data {
-       unsigned int timeout;
-       bool has_28_bits_resolution;
-};
-
-#endif /* __UX500_WDT_H */