Commit 3e891e93 authored by Hans de Goede's avatar Hans de Goede
Browse files

Merge tag 'platform-drivers-x86-simatec-1' into review-hans 

Tag (immutable branch) for:
v6.0-rc1 + "[PATCH v6 0/7] add support for another simatic board" series
for merging into the gpio, leds and pdx86 subsystems.
parents f81fead0 8f5c9858

drivers/gpio/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -874,10 +874,11 @@ config GPIO_104_IDI_48 
	  module parameter.



config GPIO_F7188X

	tristate "F71869, F71869A, F71882FG, F71889F and F81866 GPIO support"

	tristate "Fintek and Nuvoton Super-I/O GPIO support"

	help

	  This option enables support for GPIOs found on Fintek Super-I/O

	  chips F71869, F71869A, F71882FG, F71889F and F81866.

	  As well as Nuvoton Super-I/O chip NCT6116D.



	  To compile this driver as a module, choose M here: the module will

	  be called f7188x-gpio.

drivers/gpio/gpio-f7188x.c

+165 −110
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-or-later

/*

 * GPIO driver for Fintek Super-I/O F71869, F71869A, F71882, F71889 and F81866

 * GPIO driver for Fintek and Nuvoton Super-I/O chips

 *

 * Copyright (C) 2010-2013 LaCie

 *

 * Author: Simon Guinot <simon.guinot@sequanux.org>

 */



#define DRVNAME "gpio-f7188x"

#define pr_fmt(fmt) DRVNAME ": " fmt



#include <linux/module.h>

#include <linux/init.h>

#include <linux/platform_device.h>
@@ -14,30 +17,41 @@ 
#include <linux/gpio/driver.h>

#include <linux/bitops.h>



#define DRVNAME "gpio-f7188x"



/*

 * Super-I/O registers

 */

#define SIO_LDSEL		0x07	/* Logical device select */

#define SIO_DEVID		0x20	/* Device ID (2 bytes) */

#define SIO_DEVREV		0x22	/* Device revision */

#define SIO_MANID		0x23	/* Fintek ID (2 bytes) */



#define SIO_LD_GPIO		0x06	/* GPIO logical device */

#define SIO_UNLOCK_KEY		0x87	/* Key to enable Super-I/O */

#define SIO_LOCK_KEY		0xAA	/* Key to disable Super-I/O */



/*

 * Fintek devices.

 */

#define SIO_FINTEK_DEVREV	0x22	/* Fintek Device revision */

#define SIO_FINTEK_MANID	0x23    /* Fintek ID (2 bytes) */



#define SIO_FINTEK_ID		0x1934  /* Manufacturer ID */



#define SIO_F71869_ID		0x0814	/* F71869 chipset ID */

#define SIO_F71869A_ID		0x1007	/* F71869A chipset ID */

#define SIO_F71882_ID		0x0541	/* F71882 chipset ID */

#define SIO_F71889_ID		0x0909	/* F71889 chipset ID */

#define SIO_F71889A_ID		0x1005	/* F71889A chipset ID */

#define SIO_F81866_ID		0x1010	/* F81866 chipset ID */

#define SIO_F81804_ID		0x1502  /* F81804 chipset ID, same for f81966 */

#define SIO_F81804_ID		0x1502  /* F81804 chipset ID, same for F81966 */

#define SIO_F81865_ID		0x0704	/* F81865 chipset ID */



#define SIO_LD_GPIO_FINTEK	0x06	/* GPIO logical device */



/*

 * Nuvoton devices.

 */

#define SIO_NCT6116D_ID		0xD283  /* NCT6116D chipset ID */



#define SIO_LD_GPIO_NUVOTON	0x07	/* GPIO logical device */





enum chips {

	f71869,
@@ -48,6 +62,7 @@ enum chips { 
	f81866,

	f81804,

	f81865,

	nct6116d,

};



static const char * const f7188x_names[] = {
@@ -59,10 +74,12 @@ static const char * const f7188x_names[] = { 
	"f81866",

	"f81804",

	"f81865",

	"nct6116d",

};



struct f7188x_sio {

	int addr;

	int device;

	enum chips type;

};
@@ -110,7 +127,7 @@ static inline int superio_enter(int base) 
{

	/* Don't step on other drivers' I/O space by accident. */

	if (!request_muxed_region(base, 2, DRVNAME)) {

		pr_err(DRVNAME "I/O address 0x%04x already in use\n", base);

		pr_err("I/O address 0x%04x already in use\n", base);

		return -EBUSY;

	}
@@ -146,10 +163,10 @@ static void f7188x_gpio_set(struct gpio_chip *chip, unsigned offset, int value); 
static int f7188x_gpio_set_config(struct gpio_chip *chip, unsigned offset,

				  unsigned long config);



#define F7188X_GPIO_BANK(_base, _ngpio, _regbase)			\

#define F7188X_GPIO_BANK(_base, _ngpio, _regbase, _label)			\

	{								\

		.chip = {						\

			.label            = DRVNAME,			\

			.label            = _label,			\

			.owner            = THIS_MODULE,		\

			.get_direction    = f7188x_gpio_get_direction,	\

			.direction_input  = f7188x_gpio_direction_in,	\
@@ -164,94 +181,108 @@ static int f7188x_gpio_set_config(struct gpio_chip *chip, unsigned offset, 
		.regbase = _regbase,					\

	}



#define gpio_dir(base) (base + 0)

#define gpio_data_out(base) (base + 1)

#define gpio_data_in(base) (base + 2)

#define f7188x_gpio_dir(base) ((base) + 0)

#define f7188x_gpio_data_out(base) ((base) + 1)

#define f7188x_gpio_data_in(base) ((base) + 2)

/* Output mode register (0:open drain 1:push-pull). */

#define gpio_out_mode(base) (base + 3)

#define f7188x_gpio_out_mode(base) ((base) + 3)



#define f7188x_gpio_dir_invert(type)	((type) == nct6116d)

#define f7188x_gpio_data_single(type)	((type) == nct6116d)



static struct f7188x_gpio_bank f71869_gpio_bank[] = {

	F7188X_GPIO_BANK(0, 6, 0xF0),

	F7188X_GPIO_BANK(10, 8, 0xE0),

	F7188X_GPIO_BANK(20, 8, 0xD0),

	F7188X_GPIO_BANK(30, 8, 0xC0),

	F7188X_GPIO_BANK(40, 8, 0xB0),

	F7188X_GPIO_BANK(50, 5, 0xA0),

	F7188X_GPIO_BANK(60, 6, 0x90),

	F7188X_GPIO_BANK(0, 6, 0xF0, DRVNAME "-0"),

	F7188X_GPIO_BANK(10, 8, 0xE0, DRVNAME "-1"),

	F7188X_GPIO_BANK(20, 8, 0xD0, DRVNAME "-2"),

	F7188X_GPIO_BANK(30, 8, 0xC0, DRVNAME "-3"),

	F7188X_GPIO_BANK(40, 8, 0xB0, DRVNAME "-4"),

	F7188X_GPIO_BANK(50, 5, 0xA0, DRVNAME "-5"),

	F7188X_GPIO_BANK(60, 6, 0x90, DRVNAME "-6"),

};



static struct f7188x_gpio_bank f71869a_gpio_bank[] = {

	F7188X_GPIO_BANK(0, 6, 0xF0),

	F7188X_GPIO_BANK(10, 8, 0xE0),

	F7188X_GPIO_BANK(20, 8, 0xD0),

	F7188X_GPIO_BANK(30, 8, 0xC0),

	F7188X_GPIO_BANK(40, 8, 0xB0),

	F7188X_GPIO_BANK(50, 5, 0xA0),

	F7188X_GPIO_BANK(60, 8, 0x90),

	F7188X_GPIO_BANK(70, 8, 0x80),

	F7188X_GPIO_BANK(0, 6, 0xF0, DRVNAME "-0"),

	F7188X_GPIO_BANK(10, 8, 0xE0, DRVNAME "-1"),

	F7188X_GPIO_BANK(20, 8, 0xD0, DRVNAME "-2"),

	F7188X_GPIO_BANK(30, 8, 0xC0, DRVNAME "-3"),

	F7188X_GPIO_BANK(40, 8, 0xB0, DRVNAME "-4"),

	F7188X_GPIO_BANK(50, 5, 0xA0, DRVNAME "-5"),

	F7188X_GPIO_BANK(60, 8, 0x90, DRVNAME "-6"),

	F7188X_GPIO_BANK(70, 8, 0x80, DRVNAME "-7"),

};



static struct f7188x_gpio_bank f71882_gpio_bank[] = {

	F7188X_GPIO_BANK(0, 8, 0xF0),

	F7188X_GPIO_BANK(10, 8, 0xE0),

	F7188X_GPIO_BANK(20, 8, 0xD0),

	F7188X_GPIO_BANK(30, 4, 0xC0),

	F7188X_GPIO_BANK(40, 4, 0xB0),

	F7188X_GPIO_BANK(0, 8, 0xF0, DRVNAME "-0"),

	F7188X_GPIO_BANK(10, 8, 0xE0, DRVNAME "-1"),

	F7188X_GPIO_BANK(20, 8, 0xD0, DRVNAME "-2"),

	F7188X_GPIO_BANK(30, 4, 0xC0, DRVNAME "-3"),

	F7188X_GPIO_BANK(40, 4, 0xB0, DRVNAME "-4"),

};



static struct f7188x_gpio_bank f71889a_gpio_bank[] = {

	F7188X_GPIO_BANK(0, 7, 0xF0),

	F7188X_GPIO_BANK(10, 7, 0xE0),

	F7188X_GPIO_BANK(20, 8, 0xD0),

	F7188X_GPIO_BANK(30, 8, 0xC0),

	F7188X_GPIO_BANK(40, 8, 0xB0),

	F7188X_GPIO_BANK(50, 5, 0xA0),

	F7188X_GPIO_BANK(60, 8, 0x90),

	F7188X_GPIO_BANK(70, 8, 0x80),

	F7188X_GPIO_BANK(0, 7, 0xF0, DRVNAME "-0"),

	F7188X_GPIO_BANK(10, 7, 0xE0, DRVNAME "-1"),

	F7188X_GPIO_BANK(20, 8, 0xD0, DRVNAME "-2"),

	F7188X_GPIO_BANK(30, 8, 0xC0, DRVNAME "-3"),

	F7188X_GPIO_BANK(40, 8, 0xB0, DRVNAME "-4"),

	F7188X_GPIO_BANK(50, 5, 0xA0, DRVNAME "-5"),

	F7188X_GPIO_BANK(60, 8, 0x90, DRVNAME "-6"),

	F7188X_GPIO_BANK(70, 8, 0x80, DRVNAME "-7"),

};



static struct f7188x_gpio_bank f71889_gpio_bank[] = {

	F7188X_GPIO_BANK(0, 7, 0xF0),

	F7188X_GPIO_BANK(10, 7, 0xE0),

	F7188X_GPIO_BANK(20, 8, 0xD0),

	F7188X_GPIO_BANK(30, 8, 0xC0),

	F7188X_GPIO_BANK(40, 8, 0xB0),

	F7188X_GPIO_BANK(50, 5, 0xA0),

	F7188X_GPIO_BANK(60, 8, 0x90),

	F7188X_GPIO_BANK(70, 8, 0x80),

	F7188X_GPIO_BANK(0, 7, 0xF0, DRVNAME "-0"),

	F7188X_GPIO_BANK(10, 7, 0xE0, DRVNAME "-1"),

	F7188X_GPIO_BANK(20, 8, 0xD0, DRVNAME "-2"),

	F7188X_GPIO_BANK(30, 8, 0xC0, DRVNAME "-3"),

	F7188X_GPIO_BANK(40, 8, 0xB0, DRVNAME "-4"),

	F7188X_GPIO_BANK(50, 5, 0xA0, DRVNAME "-5"),

	F7188X_GPIO_BANK(60, 8, 0x90, DRVNAME "-6"),

	F7188X_GPIO_BANK(70, 8, 0x80, DRVNAME "-7"),

};



static struct f7188x_gpio_bank f81866_gpio_bank[] = {

	F7188X_GPIO_BANK(0, 8, 0xF0),

	F7188X_GPIO_BANK(10, 8, 0xE0),

	F7188X_GPIO_BANK(20, 8, 0xD0),

	F7188X_GPIO_BANK(30, 8, 0xC0),

	F7188X_GPIO_BANK(40, 8, 0xB0),

	F7188X_GPIO_BANK(50, 8, 0xA0),

	F7188X_GPIO_BANK(60, 8, 0x90),

	F7188X_GPIO_BANK(70, 8, 0x80),

	F7188X_GPIO_BANK(80, 8, 0x88),

	F7188X_GPIO_BANK(0, 8, 0xF0, DRVNAME "-0"),

	F7188X_GPIO_BANK(10, 8, 0xE0, DRVNAME "-1"),

	F7188X_GPIO_BANK(20, 8, 0xD0, DRVNAME "-2"),

	F7188X_GPIO_BANK(30, 8, 0xC0, DRVNAME "-3"),

	F7188X_GPIO_BANK(40, 8, 0xB0, DRVNAME "-4"),

	F7188X_GPIO_BANK(50, 8, 0xA0, DRVNAME "-5"),

	F7188X_GPIO_BANK(60, 8, 0x90, DRVNAME "-6"),

	F7188X_GPIO_BANK(70, 8, 0x80, DRVNAME "-7"),

	F7188X_GPIO_BANK(80, 8, 0x88, DRVNAME "-8"),

};





static struct f7188x_gpio_bank f81804_gpio_bank[] = {

	F7188X_GPIO_BANK(0, 8, 0xF0),

	F7188X_GPIO_BANK(10, 8, 0xE0),

	F7188X_GPIO_BANK(20, 8, 0xD0),

	F7188X_GPIO_BANK(50, 8, 0xA0),

	F7188X_GPIO_BANK(60, 8, 0x90),

	F7188X_GPIO_BANK(70, 8, 0x80),

	F7188X_GPIO_BANK(90, 8, 0x98),

	F7188X_GPIO_BANK(0, 8, 0xF0, DRVNAME "-0"),

	F7188X_GPIO_BANK(10, 8, 0xE0, DRVNAME "-1"),

	F7188X_GPIO_BANK(20, 8, 0xD0, DRVNAME "-2"),

	F7188X_GPIO_BANK(50, 8, 0xA0, DRVNAME "-3"),

	F7188X_GPIO_BANK(60, 8, 0x90, DRVNAME "-4"),

	F7188X_GPIO_BANK(70, 8, 0x80, DRVNAME "-5"),

	F7188X_GPIO_BANK(90, 8, 0x98, DRVNAME "-6"),

};



static struct f7188x_gpio_bank f81865_gpio_bank[] = {

	F7188X_GPIO_BANK(0, 8, 0xF0),

	F7188X_GPIO_BANK(10, 8, 0xE0),

	F7188X_GPIO_BANK(20, 8, 0xD0),

	F7188X_GPIO_BANK(30, 8, 0xC0),

	F7188X_GPIO_BANK(40, 8, 0xB0),

	F7188X_GPIO_BANK(50, 8, 0xA0),

	F7188X_GPIO_BANK(60, 5, 0x90),

	F7188X_GPIO_BANK(0, 8, 0xF0, DRVNAME "-0"),

	F7188X_GPIO_BANK(10, 8, 0xE0, DRVNAME "-1"),

	F7188X_GPIO_BANK(20, 8, 0xD0, DRVNAME "-2"),

	F7188X_GPIO_BANK(30, 8, 0xC0, DRVNAME "-3"),

	F7188X_GPIO_BANK(40, 8, 0xB0, DRVNAME "-4"),

	F7188X_GPIO_BANK(50, 8, 0xA0, DRVNAME "-5"),

	F7188X_GPIO_BANK(60, 5, 0x90, DRVNAME "-6"),

};



static struct f7188x_gpio_bank nct6116d_gpio_bank[] = {

	F7188X_GPIO_BANK(0, 8, 0xE0, DRVNAME "-0"),

	F7188X_GPIO_BANK(10, 8, 0xE4, DRVNAME "-1"),

	F7188X_GPIO_BANK(20, 8, 0xE8, DRVNAME "-2"),

	F7188X_GPIO_BANK(30, 8, 0xEC, DRVNAME "-3"),

	F7188X_GPIO_BANK(40, 8, 0xF0, DRVNAME "-4"),

	F7188X_GPIO_BANK(50, 8, 0xF4, DRVNAME "-5"),

	F7188X_GPIO_BANK(60, 8, 0xF8, DRVNAME "-6"),

	F7188X_GPIO_BANK(70, 1, 0xFC, DRVNAME "-7"),

};



static int f7188x_gpio_get_direction(struct gpio_chip *chip, unsigned offset)
@@ -264,13 +295,16 @@ static int f7188x_gpio_get_direction(struct gpio_chip *chip, unsigned offset) 
	err = superio_enter(sio->addr);

	if (err)

		return err;

	superio_select(sio->addr, SIO_LD_GPIO);

	superio_select(sio->addr, sio->device);



	dir = superio_inb(sio->addr, gpio_dir(bank->regbase));

	dir = superio_inb(sio->addr, f7188x_gpio_dir(bank->regbase));



	superio_exit(sio->addr);



	if (dir & 1 << offset)

	if (f7188x_gpio_dir_invert(sio->type))

		dir = ~dir;



	if (dir & BIT(offset))

		return GPIO_LINE_DIRECTION_OUT;



	return GPIO_LINE_DIRECTION_IN;
@@ -286,11 +320,15 @@ static int f7188x_gpio_direction_in(struct gpio_chip *chip, unsigned offset) 
	err = superio_enter(sio->addr);

	if (err)

		return err;

	superio_select(sio->addr, SIO_LD_GPIO);

	superio_select(sio->addr, sio->device);



	dir = superio_inb(sio->addr, f7188x_gpio_dir(bank->regbase));



	dir = superio_inb(sio->addr, gpio_dir(bank->regbase));

	if (f7188x_gpio_dir_invert(sio->type))

		dir |= BIT(offset);

	else

		dir &= ~BIT(offset);

	superio_outb(sio->addr, gpio_dir(bank->regbase), dir);

	superio_outb(sio->addr, f7188x_gpio_dir(bank->regbase), dir);



	superio_exit(sio->addr);
@@ -307,14 +345,14 @@ static int f7188x_gpio_get(struct gpio_chip *chip, unsigned offset) 
	err = superio_enter(sio->addr);

	if (err)

		return err;

	superio_select(sio->addr, SIO_LD_GPIO);

	superio_select(sio->addr, sio->device);



	dir = superio_inb(sio->addr, gpio_dir(bank->regbase));

	dir = superio_inb(sio->addr, f7188x_gpio_dir(bank->regbase));

	dir = !!(dir & BIT(offset));

	if (dir)

		data = superio_inb(sio->addr, gpio_data_out(bank->regbase));

	if (f7188x_gpio_data_single(sio->type) || dir)

		data = superio_inb(sio->addr, f7188x_gpio_data_out(bank->regbase));

	else

		data = superio_inb(sio->addr, gpio_data_in(bank->regbase));

		data = superio_inb(sio->addr, f7188x_gpio_data_in(bank->regbase));



	superio_exit(sio->addr);
@@ -332,18 +370,21 @@ static int f7188x_gpio_direction_out(struct gpio_chip *chip, 
	err = superio_enter(sio->addr);

	if (err)

		return err;

	superio_select(sio->addr, SIO_LD_GPIO);

	superio_select(sio->addr, sio->device);



	data_out = superio_inb(sio->addr, gpio_data_out(bank->regbase));

	data_out = superio_inb(sio->addr, f7188x_gpio_data_out(bank->regbase));

	if (value)

		data_out |= BIT(offset);

	else

		data_out &= ~BIT(offset);

	superio_outb(sio->addr, gpio_data_out(bank->regbase), data_out);

	superio_outb(sio->addr, f7188x_gpio_data_out(bank->regbase), data_out);



	dir = superio_inb(sio->addr, gpio_dir(bank->regbase));

	dir = superio_inb(sio->addr, f7188x_gpio_dir(bank->regbase));

	if (f7188x_gpio_dir_invert(sio->type))

		dir &= ~BIT(offset);

	else

		dir |= BIT(offset);

	superio_outb(sio->addr, gpio_dir(bank->regbase), dir);

	superio_outb(sio->addr, f7188x_gpio_dir(bank->regbase), dir);



	superio_exit(sio->addr);
@@ -360,14 +401,14 @@ static void f7188x_gpio_set(struct gpio_chip *chip, unsigned offset, int value) 
	err = superio_enter(sio->addr);

	if (err)

		return;

	superio_select(sio->addr, SIO_LD_GPIO);

	superio_select(sio->addr, sio->device);



	data_out = superio_inb(sio->addr, gpio_data_out(bank->regbase));

	data_out = superio_inb(sio->addr, f7188x_gpio_data_out(bank->regbase));

	if (value)

		data_out |= BIT(offset);

	else

		data_out &= ~BIT(offset);

	superio_outb(sio->addr, gpio_data_out(bank->regbase), data_out);

	superio_outb(sio->addr, f7188x_gpio_data_out(bank->regbase), data_out);



	superio_exit(sio->addr);

}
@@ -388,14 +429,14 @@ static int f7188x_gpio_set_config(struct gpio_chip *chip, unsigned offset, 
	err = superio_enter(sio->addr);

	if (err)

		return err;

	superio_select(sio->addr, SIO_LD_GPIO);

	superio_select(sio->addr, sio->device);



	data = superio_inb(sio->addr, gpio_out_mode(bank->regbase));

	data = superio_inb(sio->addr, f7188x_gpio_out_mode(bank->regbase));

	if (param == PIN_CONFIG_DRIVE_OPEN_DRAIN)

		data &= ~BIT(offset);

	else

		data |= BIT(offset);

	superio_outb(sio->addr, gpio_out_mode(bank->regbase), data);

	superio_outb(sio->addr, f7188x_gpio_out_mode(bank->regbase), data);



	superio_exit(sio->addr);

	return 0;
@@ -449,6 +490,10 @@ static int f7188x_gpio_probe(struct platform_device *pdev) 
		data->nr_bank = ARRAY_SIZE(f81865_gpio_bank);

		data->bank = f81865_gpio_bank;

		break;

	case nct6116d:

		data->nr_bank = ARRAY_SIZE(nct6116d_gpio_bank);

		data->bank = nct6116d_gpio_bank;

		break;

	default:

		return -ENODEV;

	}
@@ -479,18 +524,15 @@ static int __init f7188x_find(int addr, struct f7188x_sio *sio) 
{

	int err;

	u16 devid;

	u16 manid;



	err = superio_enter(addr);

	if (err)

		return err;



	err = -ENODEV;

	devid = superio_inw(addr, SIO_MANID);

	if (devid != SIO_FINTEK_ID) {

		pr_debug(DRVNAME ": Not a Fintek device at 0x%08x\n", addr);

		goto err;

	}



	sio->device = SIO_LD_GPIO_FINTEK;

	devid = superio_inw(addr, SIO_DEVID);

	switch (devid) {

	case SIO_F71869_ID:
@@ -517,17 +559,30 @@ static int __init f7188x_find(int addr, struct f7188x_sio *sio) 
	case SIO_F81865_ID:

		sio->type = f81865;

		break;

	case SIO_NCT6116D_ID:

		sio->device = SIO_LD_GPIO_NUVOTON;

		sio->type = nct6116d;

		break;

	default:

		pr_info(DRVNAME ": Unsupported Fintek device 0x%04x\n", devid);

		pr_info("Unsupported Fintek device 0x%04x\n", devid);

		goto err;

	}



	/* double check manufacturer where possible */

	if (sio->type != nct6116d) {

		manid = superio_inw(addr, SIO_FINTEK_MANID);

		if (manid != SIO_FINTEK_ID) {

			pr_debug("Not a Fintek device at 0x%08x\n", addr);

			goto err;

		}

	}



	sio->addr = addr;

	err = 0;



	pr_info(DRVNAME ": Found %s at %#x, revision %d\n",

		f7188x_names[sio->type],

		(unsigned int) addr,

		(int) superio_inb(addr, SIO_DEVREV));

	pr_info("Found %s at %#x\n", f7188x_names[sio->type], (unsigned int)addr);

	if (sio->type != nct6116d)

		pr_info("   revision %d\n", superio_inb(addr, SIO_FINTEK_DEVREV));



err:

	superio_exit(addr);
@@ -548,13 +603,13 @@ f7188x_gpio_device_add(const struct f7188x_sio *sio) 
	err = platform_device_add_data(f7188x_gpio_pdev,

				       sio, sizeof(*sio));

	if (err) {

		pr_err(DRVNAME "Platform data allocation failed\n");

		pr_err("Platform data allocation failed\n");

		goto err;

	}



	err = platform_device_add(f7188x_gpio_pdev);

	if (err) {

		pr_err(DRVNAME "Device addition failed\n");

		pr_err("Device addition failed\n");

		goto err;

	}

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

+37 −5
Original line number Diff line number Diff line
@@ -13,28 +13,45 @@ 
#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 = {

struct gpiod_lookup_table *simatic_ipc_led_gpio_table;



static struct gpiod_lookup_table simatic_ipc_led_gpio_table_127e = {

	.dev_id = "leds-gpio",

	.table = {

		GPIO_LOOKUP_IDX("apollolake-pinctrl.0", 51, NULL, 0, GPIO_ACTIVE_LOW),

		GPIO_LOOKUP_IDX("apollolake-pinctrl.0", 52, NULL, 1, GPIO_ACTIVE_LOW),

		GPIO_LOOKUP_IDX("apollolake-pinctrl.0", 53, NULL, 2, GPIO_ACTIVE_LOW),

		GPIO_LOOKUP_IDX("apollolake-pinctrl.0", 57, NULL, 3, GPIO_ACTIVE_LOW),

		GPIO_LOOKUP_IDX("apollolake-pinctrl.0", 58, NULL, 4, GPIO_ACTIVE_LOW),

		GPIO_LOOKUP_IDX("apollolake-pinctrl.0", 60, NULL, 5, GPIO_ACTIVE_LOW),

		GPIO_LOOKUP_IDX("apollolake-pinctrl.0", 51, NULL, 0, GPIO_ACTIVE_LOW),

		GPIO_LOOKUP_IDX("apollolake-pinctrl.0", 56, NULL, 6, GPIO_ACTIVE_LOW),

		GPIO_LOOKUP_IDX("apollolake-pinctrl.0", 59, NULL, 7, GPIO_ACTIVE_HIGH),

	},

};



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

		GPIO_LOOKUP_IDX("gpio-f7188x-3", 6, NULL, 6, GPIO_ACTIVE_HIGH),

		GPIO_LOOKUP_IDX("gpio-f7188x-3", 7, NULL, 7, GPIO_ACTIVE_HIGH),

	}

};



static const struct gpio_led simatic_ipc_gpio_leds[] = {

	{ .name = "green:" LED_FUNCTION_STATUS "-3" },

	{ .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 = {
@@ -46,7 +63,7 @@ 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);

	platform_device_unregister(simatic_leds_pdev);



	return 0;
@@ -54,10 +71,25 @@ static int simatic_ipc_leds_gpio_remove(struct platform_device *pdev) 


static int simatic_ipc_leds_gpio_probe(struct platform_device *pdev)

{

	const struct simatic_ipc_platform *plat = pdev->dev.platform_data;

	struct gpio_desc *gpiod;

	int err;



	gpiod_add_lookup_table(&simatic_ipc_led_gpio_table);

	switch (plat->devmode) {

	case SIMATIC_IPC_DEVICE_127E:

		simatic_ipc_led_gpio_table = &simatic_ipc_led_gpio_table_127e;

		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;

		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,

drivers/platform/x86/simatic-ipc.c

+9 −1
Original line number Diff line number Diff line
@@ -41,10 +41,12 @@ static struct { 
	{SIMATIC_IPC_IPC127E, SIMATIC_IPC_DEVICE_127E, SIMATIC_IPC_DEVICE_NONE},

	{SIMATIC_IPC_IPC227D, SIMATIC_IPC_DEVICE_227D, SIMATIC_IPC_DEVICE_NONE},

	{SIMATIC_IPC_IPC227E, SIMATIC_IPC_DEVICE_427E, SIMATIC_IPC_DEVICE_227E},

	{SIMATIC_IPC_IPC227G, SIMATIC_IPC_DEVICE_227G, SIMATIC_IPC_DEVICE_227G},

	{SIMATIC_IPC_IPC277E, SIMATIC_IPC_DEVICE_NONE, SIMATIC_IPC_DEVICE_227E},

	{SIMATIC_IPC_IPC427D, SIMATIC_IPC_DEVICE_427E, SIMATIC_IPC_DEVICE_NONE},

	{SIMATIC_IPC_IPC427E, SIMATIC_IPC_DEVICE_427E, SIMATIC_IPC_DEVICE_427E},

	{SIMATIC_IPC_IPC477E, SIMATIC_IPC_DEVICE_NONE, SIMATIC_IPC_DEVICE_427E},

	{SIMATIC_IPC_IPC427G, SIMATIC_IPC_DEVICE_227G, SIMATIC_IPC_DEVICE_227G},

};



static int register_platform_devices(u32 station_id)
@@ -65,7 +67,8 @@ static int register_platform_devices(u32 station_id) 
	}



	if (ledmode != SIMATIC_IPC_DEVICE_NONE) {

		if (ledmode == SIMATIC_IPC_DEVICE_127E)

		if (ledmode == SIMATIC_IPC_DEVICE_127E ||

		    ledmode == SIMATIC_IPC_DEVICE_227G)

			pdevname = KBUILD_MODNAME "_leds_gpio";

		platform_data.devmode = ledmode;

		ipc_led_platform_device =
@@ -80,6 +83,11 @@ static int register_platform_devices(u32 station_id) 
			 ipc_led_platform_device->name);

	}



	if (wdtmode == SIMATIC_IPC_DEVICE_227G) {

		request_module("w83627hf_wdt");

		return 0;

	}



	if (wdtmode != SIMATIC_IPC_DEVICE_NONE) {

		platform_data.devmode = wdtmode;

		ipc_wdt_platform_device =

include/linux/platform_data/x86/simatic-ipc-base.h

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#define SIMATIC_IPC_DEVICE_427E 2

#define SIMATIC_IPC_DEVICE_127E 3

#define SIMATIC_IPC_DEVICE_227E 4

#define SIMATIC_IPC_DEVICE_227G 5



struct simatic_ipc_platform {

	u8	devmode;