Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

mfd: stmpe: Probe properly from the Device Tree 



The current STMPE I2C probing code does not really match the
compatible strings - it matches node names happening to give
the right device name. Instead, let's introduce some real
compatible matching, more complex, more accurate. Make the
driver depend on OF since all platforms using it are DT-only.

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

drivers/mfd/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -675,6 +675,7 @@ config MFD_DB8500_PRCMU 
config MFD_STMPE

	bool "STMicroelectronics STMPE"

	depends on (I2C=y || SPI_MASTER=y)

	depends on OF

	select MFD_CORE

	help

	  Support for the STMPE family of I/O Expanders from

drivers/mfd/stmpe-i2c.c

+29 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/types.h>

#include <linux/of_device.h>

#include "stmpe.h"



static int i2c_reg_read(struct stmpe *stmpe, u8 reg)
@@ -52,15 +53,41 @@ static struct stmpe_client_info i2c_ci = { 
	.write_block = i2c_block_write,

};



static const struct of_device_id stmpe_of_match[] = {

	{ .compatible = "st,stmpe610", .data = (void *)STMPE610, },

	{ .compatible = "st,stmpe801", .data = (void *)STMPE801, },

	{ .compatible = "st,stmpe811", .data = (void *)STMPE811, },

	{ .compatible = "st,stmpe1601", .data = (void *)STMPE1601, },

	{ .compatible = "st,stmpe1801", .data = (void *)STMPE1801, },

	{ .compatible = "st,stmpe2401", .data = (void *)STMPE2401, },

	{ .compatible = "st,stmpe2403", .data = (void *)STMPE2403, },

	{},

};

MODULE_DEVICE_TABLE(of, stmpe_of_match);



static int

stmpe_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id)

{

	int partnum;

	const struct of_device_id *of_id;



	i2c_ci.data = (void *)id;

	i2c_ci.irq = i2c->irq;

	i2c_ci.client = i2c;

	i2c_ci.dev = &i2c->dev;



	return stmpe_probe(&i2c_ci, id->driver_data);

	of_id = of_match_device(stmpe_of_match, &i2c->dev);

	if (!of_id) {

		/*

		 * This happens when the I2C ID matches the node name

		 * but no real compatible string has been given.

		 */

		dev_info(&i2c->dev, "matching on node name, compatible is preferred\n");

		partnum = id->driver_data;

	} else

		partnum = (int)of_id->data;



	return stmpe_probe(&i2c_ci, partnum);

}



static int stmpe_i2c_remove(struct i2c_client *i2c)
@@ -89,6 +116,7 @@ static struct i2c_driver stmpe_i2c_driver = { 
#ifdef CONFIG_PM

		.pm = &stmpe_dev_pm_ops,

#endif

		.of_match_table = stmpe_of_match,

	},

	.probe		= stmpe_i2c_probe,

	.remove		= stmpe_i2c_remove,