Commit 2f5d6fe3 authored by Henning Schild's avatar Henning Schild Committed by Lee Jones
Browse files

leds: simatic-ipc-leds-gpio: Split up into multiple drivers 



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: default avatarHenning Schild <henning.schild@siemens.com>
Acked-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarLee Jones <lee@kernel.org>
Link: https://lore.kernel.org/r/20230524124628.32295-4-henning.schild@siemens.com
parent 799c0197

drivers/leds/simple/Makefile

+3 −1
Original line number Diff line number Diff line 
# 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

drivers/leds/simple/simatic-ipc-leds-gpio-apollolake.c

0 → 100644
+66 −0
Original line number Diff line number Diff line 
// 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>");

drivers/leds/simple/simatic-ipc-leds-gpio.c→drivers/leds/simple/simatic-ipc-leds-gpio-core.c

+104 −0
Original line number Diff line number Diff line
@@ -2,9 +2,9 @@ 
/*

 * Siemens SIMATIC IPC driver for GPIO based LEDs

 *

 * Copyright (c) Siemens AG, 2022

 * Copyright (c) Siemens AG, 2023

 *

 * Authors:

 * Author:

 *  Henning Schild <henning.schild@siemens.com>

 */
@@ -15,52 +15,9 @@ 
#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 */

	},

};

#include "simatic-ipc-leds-gpio.h"



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 struct platform_device *simatic_leds_pdev;



static const struct gpio_led simatic_ipc_gpio_leds[] = {

	{ .name = "red:" LED_FUNCTION_STATUS "-1" },
@@ -76,18 +33,21 @@ static const struct gpio_led_platform_data simatic_ipc_gpio_leds_pdata = { 
	.leds		= simatic_ipc_gpio_leds,

};



static struct platform_device *simatic_leds_pdev;



static int simatic_ipc_leds_gpio_remove(struct platform_device *pdev)

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(simatic_ipc_led_gpio_table);

	gpiod_remove_lookup_table(simatic_ipc_led_gpio_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);



static int simatic_ipc_leds_gpio_probe(struct platform_device *pdev)

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;
@@ -96,23 +56,13 @@ static int simatic_ipc_leds_gpio_probe(struct platform_device *pdev) 


	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);

	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,
@@ -122,8 +72,8 @@ static int simatic_ipc_leds_gpio_probe(struct platform_device *pdev) 
		goto out;

	}



	simatic_ipc_led_gpio_table_extra->dev_id = dev_name(dev);

	gpiod_add_lookup_table(simatic_ipc_led_gpio_table_extra);

	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);
@@ -143,21 +93,12 @@ static int simatic_ipc_leds_gpio_probe(struct platform_device *pdev) 


	return 0;

out:

	simatic_ipc_leds_gpio_remove(pdev);

	simatic_ipc_leds_gpio_remove(pdev, table, table_extra);



	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);

EXPORT_SYMBOL_GPL(simatic_ipc_leds_gpio_probe);



MODULE_LICENSE("GPL v2");

MODULE_ALIAS("platform:" KBUILD_MODNAME);

MODULE_SOFTDEP("pre: platform:leds-gpio");

MODULE_AUTHOR("Henning Schild <henning.schild@siemens.com>");

drivers/leds/simple/simatic-ipc-leds-gpio-f7188x.c

0 → 100644
+66 −0
Original line number Diff line number Diff line 
// 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>");

drivers/leds/simple/simatic-ipc-leds-gpio.h

0 → 100644
+22 −0
Original line number Diff line number Diff line 
// 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 */