Commit fc1882dc authored by Linus Walleij's avatar Linus Walleij Committed by Lee Jones
Browse files

mfd: stmpe: Move platform data into MFD driver 



The STMPE platform data is only populated from the device tree
in all existing users, so push the struct and make the OF case
the norm.

Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 59a9b273

drivers/mfd/stmpe.c

+28 −12
Original line number Diff line number Diff line
@@ -23,6 +23,27 @@ 
#include <linux/regulator/consumer.h>

#include "stmpe.h"



/**

 * struct stmpe_platform_data - STMPE platform data

 * @id: device id to distinguish between multiple STMPEs on the same board

 * @blocks: bitmask of blocks to enable (use STMPE_BLOCK_*)

 * @irq_trigger: IRQ trigger to use for the interrupt to the host

 * @autosleep: bool to enable/disable stmpe autosleep

 * @autosleep_timeout: inactivity timeout in milliseconds for autosleep

 * @irq_over_gpio: true if gpio is used to get irq

 * @irq_gpio: gpio number over which irq will be requested (significant only if

 *	      irq_over_gpio is true)

 */

struct stmpe_platform_data {

	int id;

	unsigned int blocks;

	unsigned int irq_trigger;

	bool autosleep;

	bool irq_over_gpio;

	int irq_gpio;

	int autosleep_timeout;

};



static int __stmpe_enable(struct stmpe *stmpe, unsigned int blocks)

{

	return stmpe->variant->enable(stmpe, blocks, true);
@@ -1187,15 +1208,11 @@ static void stmpe_of_probe(struct stmpe_platform_data *pdata, 
/* Called from client specific probe routines */

int stmpe_probe(struct stmpe_client_info *ci, enum stmpe_partnum partnum)

{

	struct stmpe_platform_data *pdata = dev_get_platdata(ci->dev);

	struct stmpe_platform_data *pdata;

	struct device_node *np = ci->dev->of_node;

	struct stmpe *stmpe;

	int ret;



	if (!pdata) {

		if (!np)

			return -EINVAL;



	pdata = devm_kzalloc(ci->dev, sizeof(*pdata), GFP_KERNEL);

	if (!pdata)

		return -ENOMEM;
@@ -1204,7 +1221,6 @@ int stmpe_probe(struct stmpe_client_info *ci, enum stmpe_partnum partnum) 


	if (of_find_property(np, "interrupts", NULL) == NULL)

		ci->irq = -1;

	}



	stmpe = devm_kzalloc(ci->dev, sizeof(struct stmpe), GFP_KERNEL);

	if (!stmpe)

include/linux/mfd/stmpe.h

+1 −21
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ enum { 


struct stmpe_variant_info;

struct stmpe_client_info;

struct stmpe_platform_data;



/**

 * struct stmpe - STMPE MFD structure
@@ -117,25 +118,4 @@ extern int stmpe_disable(struct stmpe *stmpe, unsigned int blocks); 


#define STMPE_GPIO_NOREQ_811_TOUCH	(0xf0)



/**

 * struct stmpe_platform_data - STMPE platform data

 * @id: device id to distinguish between multiple STMPEs on the same board

 * @blocks: bitmask of blocks to enable (use STMPE_BLOCK_*)

 * @irq_trigger: IRQ trigger to use for the interrupt to the host

 * @autosleep: bool to enable/disable stmpe autosleep

 * @autosleep_timeout: inactivity timeout in milliseconds for autosleep

 * @irq_over_gpio: true if gpio is used to get irq

 * @irq_gpio: gpio number over which irq will be requested (significant only if

 *	      irq_over_gpio is true)

 */

struct stmpe_platform_data {

	int id;

	unsigned int blocks;

	unsigned int irq_trigger;

	bool autosleep;

	bool irq_over_gpio;

	int irq_gpio;

	int autosleep_timeout;

};



#endif