leds: simatic-ipc-leds-gpio: Split up into multiple drivers
authorHenning Schild <henning.schild@siemens.com>
Wed, 24 May 2023 12:46:27 +0000 (14:46 +0200)
committerLee Jones <lee@kernel.org>
Thu, 8 Jun 2023 17:29:44 +0000 (18:29 +0100)
In order to clearly describe the dependencies between the GPIO
controller drivers and the users the driver is split up into a core,
two drivers and a common header.

Signed-off-by: Henning Schild <henning.schild@siemens.com>
Acked-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Lee Jones <lee@kernel.org>
Link: https://lore.kernel.org/r/20230524124628.32295-4-henning.schild@siemens.com
drivers/leds/simple/Makefile
drivers/leds/simple/simatic-ipc-leds-gpio-apollolake.c [new file with mode: 0644]
drivers/leds/simple/simatic-ipc-leds-gpio-core.c [new file with mode: 0644]
drivers/leds/simple/simatic-ipc-leds-gpio-f7188x.c [new file with mode: 0644]
drivers/leds/simple/simatic-ipc-leds-gpio.c [deleted file]
drivers/leds/simple/simatic-ipc-leds-gpio.h [new file with mode: 0644]
drivers/leds/simple/simatic-ipc-leds.c
drivers/platform/x86/simatic-ipc.c

index 1c7ef5e1324ba37ba9232ce532178ab52bc5b8cd..ed9057f7b6da59d8716c578e8088a5b58edacde6 100644 (file)
@@ -1,3 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_LEDS_SIEMENS_SIMATIC_IPC) += simatic-ipc-leds.o
-obj-$(CONFIG_LEDS_SIEMENS_SIMATIC_IPC) += simatic-ipc-leds-gpio.o
+obj-$(CONFIG_LEDS_SIEMENS_SIMATIC_IPC)  += simatic-ipc-leds-gpio-core.o
+obj-$(CONFIG_LEDS_SIEMENS_SIMATIC_IPC) += simatic-ipc-leds-gpio-apollolake.o
+obj-$(CONFIG_LEDS_SIEMENS_SIMATIC_IPC) += simatic-ipc-leds-gpio-f7188x.o
diff --git a/drivers/leds/simple/simatic-ipc-leds-gpio-apollolake.c b/drivers/leds/simple/simatic-ipc-leds-gpio-apollolake.c
new file mode 100644 (file)
index 0000000..e1c7127
--- /dev/null
@@ -0,0 +1,66 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Siemens SIMATIC IPC driver for GPIO based LEDs
+ *
+ * Copyright (c) Siemens AG, 2023
+ *
+ * Author:
+ *  Henning Schild <henning.schild@siemens.com>
+ */
+
+#include <linux/gpio/machine.h>
+#include <linux/gpio/consumer.h>
+#include <linux/leds.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/platform_data/x86/simatic-ipc-base.h>
+
+#include "simatic-ipc-leds-gpio.h"
+
+static struct gpiod_lookup_table simatic_ipc_led_gpio_table = {
+       .dev_id = "leds-gpio",
+       .table = {
+               GPIO_LOOKUP_IDX("apollolake-pinctrl.0", 52, NULL, 0, GPIO_ACTIVE_LOW),
+               GPIO_LOOKUP_IDX("apollolake-pinctrl.0", 53, NULL, 1, GPIO_ACTIVE_LOW),
+               GPIO_LOOKUP_IDX("apollolake-pinctrl.0", 57, NULL, 2, GPIO_ACTIVE_LOW),
+               GPIO_LOOKUP_IDX("apollolake-pinctrl.0", 58, NULL, 3, GPIO_ACTIVE_LOW),
+               GPIO_LOOKUP_IDX("apollolake-pinctrl.0", 60, NULL, 4, GPIO_ACTIVE_LOW),
+               GPIO_LOOKUP_IDX("apollolake-pinctrl.0", 51, NULL, 5, GPIO_ACTIVE_LOW),
+               {} /* Terminating entry */
+       },
+};
+
+static struct gpiod_lookup_table simatic_ipc_led_gpio_table_extra = {
+       .dev_id = NULL, /* Filled during initialization */
+       .table = {
+               GPIO_LOOKUP_IDX("apollolake-pinctrl.0", 56, NULL, 6, GPIO_ACTIVE_LOW),
+               GPIO_LOOKUP_IDX("apollolake-pinctrl.0", 59, NULL, 7, GPIO_ACTIVE_HIGH),
+               {} /* Terminating entry */
+       },
+};
+
+static int simatic_ipc_leds_gpio_apollolake_probe(struct platform_device *pdev)
+{
+       return simatic_ipc_leds_gpio_probe(pdev, &simatic_ipc_led_gpio_table,
+                                          &simatic_ipc_led_gpio_table_extra);
+}
+
+static int simatic_ipc_leds_gpio_apollolake_remove(struct platform_device *pdev)
+{
+       return simatic_ipc_leds_gpio_remove(pdev, &simatic_ipc_led_gpio_table,
+                                           &simatic_ipc_led_gpio_table_extra);
+}
+
+static struct platform_driver simatic_ipc_led_gpio_apollolake_driver = {
+       .probe = simatic_ipc_leds_gpio_apollolake_probe,
+       .remove = simatic_ipc_leds_gpio_apollolake_remove,
+       .driver = {
+               .name = KBUILD_MODNAME,
+       },
+};
+module_platform_driver(simatic_ipc_led_gpio_apollolake_driver);
+
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:" KBUILD_MODNAME);
+MODULE_SOFTDEP("pre: simatic-ipc-leds-gpio-core platform:apollolake-pinctrl");
+MODULE_AUTHOR("Henning Schild <henning.schild@siemens.com>");
diff --git a/drivers/leds/simple/simatic-ipc-leds-gpio-core.c b/drivers/leds/simple/simatic-ipc-leds-gpio-core.c
new file mode 100644 (file)
index 0000000..2a21b66
--- /dev/null
@@ -0,0 +1,104 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Siemens SIMATIC IPC driver for GPIO based LEDs
+ *
+ * Copyright (c) Siemens AG, 2023
+ *
+ * Author:
+ *  Henning Schild <henning.schild@siemens.com>
+ */
+
+#include <linux/gpio/machine.h>
+#include <linux/gpio/consumer.h>
+#include <linux/leds.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/platform_data/x86/simatic-ipc-base.h>
+
+#include "simatic-ipc-leds-gpio.h"
+
+static struct platform_device *simatic_leds_pdev;
+
+static const struct gpio_led simatic_ipc_gpio_leds[] = {
+       { .name = "red:" LED_FUNCTION_STATUS "-1" },
+       { .name = "green:" LED_FUNCTION_STATUS "-1" },
+       { .name = "red:" LED_FUNCTION_STATUS "-2" },
+       { .name = "green:" LED_FUNCTION_STATUS "-2" },
+       { .name = "red:" LED_FUNCTION_STATUS "-3" },
+       { .name = "green:" LED_FUNCTION_STATUS "-3" },
+};
+
+static const struct gpio_led_platform_data simatic_ipc_gpio_leds_pdata = {
+       .num_leds       = ARRAY_SIZE(simatic_ipc_gpio_leds),
+       .leds           = simatic_ipc_gpio_leds,
+};
+
+int simatic_ipc_leds_gpio_remove(struct platform_device *pdev,
+                                struct gpiod_lookup_table *table,
+                                struct gpiod_lookup_table *table_extra)
+{
+       gpiod_remove_lookup_table(table);
+       gpiod_remove_lookup_table(table_extra);
+       platform_device_unregister(simatic_leds_pdev);
+
+       return 0;
+}
+EXPORT_SYMBOL_GPL(simatic_ipc_leds_gpio_remove);
+
+int simatic_ipc_leds_gpio_probe(struct platform_device *pdev,
+                               struct gpiod_lookup_table *table,
+                               struct gpiod_lookup_table *table_extra)
+{
+       const struct simatic_ipc_platform *plat = pdev->dev.platform_data;
+       struct device *dev = &pdev->dev;
+       struct gpio_desc *gpiod;
+       int err;
+
+       switch (plat->devmode) {
+       case SIMATIC_IPC_DEVICE_127E:
+       case SIMATIC_IPC_DEVICE_227G:
+               break;
+       default:
+               return -ENODEV;
+       }
+
+       gpiod_add_lookup_table(table);
+       simatic_leds_pdev = platform_device_register_resndata(NULL,
+               "leds-gpio", PLATFORM_DEVID_NONE, NULL, 0,
+               &simatic_ipc_gpio_leds_pdata,
+               sizeof(simatic_ipc_gpio_leds_pdata));
+       if (IS_ERR(simatic_leds_pdev)) {
+               err = PTR_ERR(simatic_leds_pdev);
+               goto out;
+       }
+
+       table_extra->dev_id = dev_name(dev);
+       gpiod_add_lookup_table(table_extra);
+
+       /* PM_BIOS_BOOT_N */
+       gpiod = gpiod_get_index(dev, NULL, 6, GPIOD_OUT_LOW);
+       if (IS_ERR(gpiod)) {
+               err = PTR_ERR(gpiod);
+               goto out;
+       }
+       gpiod_put(gpiod);
+
+       /* PM_WDT_OUT */
+       gpiod = gpiod_get_index(dev, NULL, 7, GPIOD_OUT_LOW);
+       if (IS_ERR(gpiod)) {
+               err = PTR_ERR(gpiod);
+               goto out;
+       }
+       gpiod_put(gpiod);
+
+       return 0;
+out:
+       simatic_ipc_leds_gpio_remove(pdev, table, table_extra);
+
+       return err;
+}
+EXPORT_SYMBOL_GPL(simatic_ipc_leds_gpio_probe);
+
+MODULE_LICENSE("GPL v2");
+MODULE_SOFTDEP("pre: platform:leds-gpio");
+MODULE_AUTHOR("Henning Schild <henning.schild@siemens.com>");
diff --git a/drivers/leds/simple/simatic-ipc-leds-gpio-f7188x.c b/drivers/leds/simple/simatic-ipc-leds-gpio-f7188x.c
new file mode 100644 (file)
index 0000000..583a6b6
--- /dev/null
@@ -0,0 +1,66 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Siemens SIMATIC IPC driver for GPIO based LEDs
+ *
+ * Copyright (c) Siemens AG, 2023
+ *
+ * Author:
+ *  Henning Schild <henning.schild@siemens.com>
+ */
+
+#include <linux/gpio/machine.h>
+#include <linux/gpio/consumer.h>
+#include <linux/leds.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/platform_data/x86/simatic-ipc-base.h>
+
+#include "simatic-ipc-leds-gpio.h"
+
+static struct gpiod_lookup_table simatic_ipc_led_gpio_table = {
+       .dev_id = "leds-gpio",
+       .table = {
+               GPIO_LOOKUP_IDX("gpio-f7188x-2", 0, NULL, 0, GPIO_ACTIVE_LOW),
+               GPIO_LOOKUP_IDX("gpio-f7188x-2", 1, NULL, 1, GPIO_ACTIVE_LOW),
+               GPIO_LOOKUP_IDX("gpio-f7188x-2", 2, NULL, 2, GPIO_ACTIVE_LOW),
+               GPIO_LOOKUP_IDX("gpio-f7188x-2", 3, NULL, 3, GPIO_ACTIVE_LOW),
+               GPIO_LOOKUP_IDX("gpio-f7188x-2", 4, NULL, 4, GPIO_ACTIVE_LOW),
+               GPIO_LOOKUP_IDX("gpio-f7188x-2", 5, NULL, 5, GPIO_ACTIVE_LOW),
+               {} /* Terminating entry */
+       },
+};
+
+static struct gpiod_lookup_table simatic_ipc_led_gpio_table_extra = {
+       .dev_id = NULL, /* Filled during initialization */
+       .table = {
+               GPIO_LOOKUP_IDX("gpio-f7188x-3", 6, NULL, 6, GPIO_ACTIVE_HIGH),
+               GPIO_LOOKUP_IDX("gpio-f7188x-3", 7, NULL, 7, GPIO_ACTIVE_HIGH),
+               {} /* Terminating entry */
+       },
+};
+
+static int simatic_ipc_leds_gpio_f7188x_probe(struct platform_device *pdev)
+{
+       return simatic_ipc_leds_gpio_probe(pdev, &simatic_ipc_led_gpio_table,
+                                          &simatic_ipc_led_gpio_table_extra);
+}
+
+static int simatic_ipc_leds_gpio_f7188x_remove(struct platform_device *pdev)
+{
+       return simatic_ipc_leds_gpio_remove(pdev, &simatic_ipc_led_gpio_table,
+                                           &simatic_ipc_led_gpio_table_extra);
+}
+
+static struct platform_driver simatic_ipc_led_gpio_driver = {
+       .probe = simatic_ipc_leds_gpio_f7188x_probe,
+       .remove = simatic_ipc_leds_gpio_f7188x_remove,
+       .driver = {
+               .name = KBUILD_MODNAME,
+       },
+};
+module_platform_driver(simatic_ipc_led_gpio_driver);
+
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:" KBUILD_MODNAME);
+MODULE_SOFTDEP("pre: simatic-ipc-leds-gpio-core gpio_f7188x");
+MODULE_AUTHOR("Henning Schild <henning.schild@siemens.com>");
diff --git a/drivers/leds/simple/simatic-ipc-leds-gpio.c b/drivers/leds/simple/simatic-ipc-leds-gpio.c
deleted file mode 100644 (file)
index 0f1fde4..0000000
+++ /dev/null
@@ -1,163 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Siemens SIMATIC IPC driver for GPIO based LEDs
- *
- * Copyright (c) Siemens AG, 2022
- *
- * Authors:
- *  Henning Schild <henning.schild@siemens.com>
- */
-
-#include <linux/gpio/machine.h>
-#include <linux/gpio/consumer.h>
-#include <linux/leds.h>
-#include <linux/module.h>
-#include <linux/platform_device.h>
-#include <linux/platform_data/x86/simatic-ipc-base.h>
-
-static struct gpiod_lookup_table *simatic_ipc_led_gpio_table;
-static struct gpiod_lookup_table *simatic_ipc_led_gpio_table_extra;
-
-static struct gpiod_lookup_table simatic_ipc_led_gpio_table_127e = {
-       .dev_id = "leds-gpio",
-       .table = {
-               GPIO_LOOKUP_IDX("apollolake-pinctrl.0", 52, NULL, 0, GPIO_ACTIVE_LOW),
-               GPIO_LOOKUP_IDX("apollolake-pinctrl.0", 53, NULL, 1, GPIO_ACTIVE_LOW),
-               GPIO_LOOKUP_IDX("apollolake-pinctrl.0", 57, NULL, 2, GPIO_ACTIVE_LOW),
-               GPIO_LOOKUP_IDX("apollolake-pinctrl.0", 58, NULL, 3, GPIO_ACTIVE_LOW),
-               GPIO_LOOKUP_IDX("apollolake-pinctrl.0", 60, NULL, 4, GPIO_ACTIVE_LOW),
-               GPIO_LOOKUP_IDX("apollolake-pinctrl.0", 51, NULL, 5, GPIO_ACTIVE_LOW),
-               {} /* Terminating entry */
-       },
-};
-
-static struct gpiod_lookup_table simatic_ipc_led_gpio_table_127e_extra = {
-       .dev_id = NULL, /* Filled during initialization */
-       .table = {
-               GPIO_LOOKUP_IDX("apollolake-pinctrl.0", 56, NULL, 6, GPIO_ACTIVE_LOW),
-               GPIO_LOOKUP_IDX("apollolake-pinctrl.0", 59, NULL, 7, GPIO_ACTIVE_HIGH),
-               {} /* Terminating entry */
-       },
-};
-
-static struct gpiod_lookup_table simatic_ipc_led_gpio_table_227g = {
-       .dev_id = "leds-gpio",
-       .table = {
-               GPIO_LOOKUP_IDX("gpio-f7188x-2", 0, NULL, 0, GPIO_ACTIVE_LOW),
-               GPIO_LOOKUP_IDX("gpio-f7188x-2", 1, NULL, 1, GPIO_ACTIVE_LOW),
-               GPIO_LOOKUP_IDX("gpio-f7188x-2", 2, NULL, 2, GPIO_ACTIVE_LOW),
-               GPIO_LOOKUP_IDX("gpio-f7188x-2", 3, NULL, 3, GPIO_ACTIVE_LOW),
-               GPIO_LOOKUP_IDX("gpio-f7188x-2", 4, NULL, 4, GPIO_ACTIVE_LOW),
-               GPIO_LOOKUP_IDX("gpio-f7188x-2", 5, NULL, 5, GPIO_ACTIVE_LOW),
-               {} /* Terminating entry */
-       },
-};
-
-static struct gpiod_lookup_table simatic_ipc_led_gpio_table_227g_extra = {
-       .dev_id = NULL, /* Filled during initialization */
-       .table = {
-               GPIO_LOOKUP_IDX("gpio-f7188x-3", 6, NULL, 6, GPIO_ACTIVE_HIGH),
-               GPIO_LOOKUP_IDX("gpio-f7188x-3", 7, NULL, 7, GPIO_ACTIVE_HIGH),
-               {} /* Terminating entry */
-       },
-};
-
-static const struct gpio_led simatic_ipc_gpio_leds[] = {
-       { .name = "red:" LED_FUNCTION_STATUS "-1" },
-       { .name = "green:" LED_FUNCTION_STATUS "-1" },
-       { .name = "red:" LED_FUNCTION_STATUS "-2" },
-       { .name = "green:" LED_FUNCTION_STATUS "-2" },
-       { .name = "red:" LED_FUNCTION_STATUS "-3" },
-       { .name = "green:" LED_FUNCTION_STATUS "-3" },
-};
-
-static const struct gpio_led_platform_data simatic_ipc_gpio_leds_pdata = {
-       .num_leds       = ARRAY_SIZE(simatic_ipc_gpio_leds),
-       .leds           = simatic_ipc_gpio_leds,
-};
-
-static struct platform_device *simatic_leds_pdev;
-
-static int simatic_ipc_leds_gpio_remove(struct platform_device *pdev)
-{
-       gpiod_remove_lookup_table(simatic_ipc_led_gpio_table);
-       gpiod_remove_lookup_table(simatic_ipc_led_gpio_table_extra);
-       platform_device_unregister(simatic_leds_pdev);
-
-       return 0;
-}
-
-static int simatic_ipc_leds_gpio_probe(struct platform_device *pdev)
-{
-       const struct simatic_ipc_platform *plat = pdev->dev.platform_data;
-       struct device *dev = &pdev->dev;
-       struct gpio_desc *gpiod;
-       int err;
-
-       switch (plat->devmode) {
-       case SIMATIC_IPC_DEVICE_127E:
-               if (!IS_ENABLED(CONFIG_PINCTRL_BROXTON))
-                       return -ENODEV;
-               simatic_ipc_led_gpio_table = &simatic_ipc_led_gpio_table_127e;
-               simatic_ipc_led_gpio_table_extra = &simatic_ipc_led_gpio_table_127e_extra;
-               break;
-       case SIMATIC_IPC_DEVICE_227G:
-               if (!IS_ENABLED(CONFIG_GPIO_F7188X))
-                       return -ENODEV;
-               request_module("gpio-f7188x");
-               simatic_ipc_led_gpio_table = &simatic_ipc_led_gpio_table_227g;
-               simatic_ipc_led_gpio_table_extra = &simatic_ipc_led_gpio_table_227g_extra;
-               break;
-       default:
-               return -ENODEV;
-       }
-
-       gpiod_add_lookup_table(simatic_ipc_led_gpio_table);
-       simatic_leds_pdev = platform_device_register_resndata(NULL,
-               "leds-gpio", PLATFORM_DEVID_NONE, NULL, 0,
-               &simatic_ipc_gpio_leds_pdata,
-               sizeof(simatic_ipc_gpio_leds_pdata));
-       if (IS_ERR(simatic_leds_pdev)) {
-               err = PTR_ERR(simatic_leds_pdev);
-               goto out;
-       }
-
-       simatic_ipc_led_gpio_table_extra->dev_id = dev_name(dev);
-       gpiod_add_lookup_table(simatic_ipc_led_gpio_table_extra);
-
-       /* PM_BIOS_BOOT_N */
-       gpiod = gpiod_get_index(dev, NULL, 6, GPIOD_OUT_LOW);
-       if (IS_ERR(gpiod)) {
-               err = PTR_ERR(gpiod);
-               goto out;
-       }
-       gpiod_put(gpiod);
-
-       /* PM_WDT_OUT */
-       gpiod = gpiod_get_index(dev, NULL, 7, GPIOD_OUT_LOW);
-       if (IS_ERR(gpiod)) {
-               err = PTR_ERR(gpiod);
-               goto out;
-       }
-       gpiod_put(gpiod);
-
-       return 0;
-out:
-       simatic_ipc_leds_gpio_remove(pdev);
-
-       return err;
-}
-
-static struct platform_driver simatic_ipc_led_gpio_driver = {
-       .probe = simatic_ipc_leds_gpio_probe,
-       .remove = simatic_ipc_leds_gpio_remove,
-       .driver = {
-               .name = KBUILD_MODNAME,
-       }
-};
-module_platform_driver(simatic_ipc_led_gpio_driver);
-
-MODULE_LICENSE("GPL v2");
-MODULE_ALIAS("platform:" KBUILD_MODNAME);
-MODULE_SOFTDEP("pre: platform:leds-gpio");
-MODULE_AUTHOR("Henning Schild <henning.schild@siemens.com>");
diff --git a/drivers/leds/simple/simatic-ipc-leds-gpio.h b/drivers/leds/simple/simatic-ipc-leds-gpio.h
new file mode 100644 (file)
index 0000000..bf258c3
--- /dev/null
@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Siemens SIMATIC IPC driver for GPIO based LEDs
+ *
+ * Copyright (c) Siemens AG, 2023
+ *
+ * Author:
+ *  Henning Schild <henning.schild@siemens.com>
+ */
+
+#ifndef _SIMATIC_IPC_LEDS_GPIO_H
+#define _SIMATIC_IPC_LEDS_GPIO_H
+
+int simatic_ipc_leds_gpio_probe(struct platform_device *pdev,
+                               struct gpiod_lookup_table *table,
+                               struct gpiod_lookup_table *table_extra);
+
+int simatic_ipc_leds_gpio_remove(struct platform_device *pdev,
+                                struct gpiod_lookup_table *table,
+                                struct gpiod_lookup_table *table_extra);
+
+#endif /* _SIMATIC_IPC_LEDS_GPIO_H */
index 4894c228c165f89dc48f9934b46f4002643e1520..2124f6d09930b2fbafc098b111cd454259c88612 100644 (file)
@@ -126,7 +126,6 @@ static struct platform_driver simatic_ipc_led_driver = {
                .name = KBUILD_MODNAME,
        }
 };
-
 module_platform_driver(simatic_ipc_led_driver);
 
 MODULE_LICENSE("GPL v2");
index b3622419cd1a4860b31f053c4f27ec57ded772b5..c773995b230d4daf797ff6580e65e1edc8b616e7 100644 (file)
@@ -68,9 +68,10 @@ static int register_platform_devices(u32 station_id)
        }
 
        if (ledmode != SIMATIC_IPC_DEVICE_NONE) {
-               if (ledmode == SIMATIC_IPC_DEVICE_127E ||
-                   ledmode == SIMATIC_IPC_DEVICE_227G)
-                       pdevname = KBUILD_MODNAME "_leds_gpio";
+               if (ledmode == SIMATIC_IPC_DEVICE_127E)
+                       pdevname = KBUILD_MODNAME "_leds_gpio_apollolake";
+               if (ledmode == SIMATIC_IPC_DEVICE_227G)
+                       pdevname = KBUILD_MODNAME "_leds_gpio_f7188x";
                platform_data.devmode = ledmode;
                ipc_led_platform_device =
                        platform_device_register_data(NULL,