Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1212704 > unrolled thread

[PATCH] mfd: cros_ec: i2c: Add OF match table

Back to article view | Back to linux.kernel

Contents

  [PATCH] mfd: cros_ec: i2c: Add OF match table Javier Martinez Canillas <javier@osg.samsung.com> - 2015-08-25 07:50 +0200
    Re: [PATCH] mfd: cros_ec: i2c: Add OF match table Lee Jones <lee.jones@linaro.org> - 2015-08-25 09:40 +0200

#1212704 — [PATCH] mfd: cros_ec: i2c: Add OF match table

The Documentation/devicetree/bindings/mfd/cros-ec.txt DT binding doc lists
"google,cros-ec-i2c" as a compatible string but the corresponding driver
does not have an OF match table. Add the table to the driver so the I2C
core can do an OF style match.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>

---

 drivers/mfd/cros_ec_i2c.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/drivers/mfd/cros_ec_i2c.c b/drivers/mfd/cros_ec_i2c.c
index d06e4b46db80..56a466469664 100644
--- a/drivers/mfd/cros_ec_i2c.c
+++ b/drivers/mfd/cros_ec_i2c.c
@@ -344,6 +344,12 @@ static int cros_ec_i2c_resume(struct device *dev)
 static SIMPLE_DEV_PM_OPS(cros_ec_i2c_pm_ops, cros_ec_i2c_suspend,
 			  cros_ec_i2c_resume);
 
+static const struct of_device_id cros_ec_i2c_of_match[] = {
+	{ .compatible = "google,cros-ec-i2c", },
+	{ /* sentinel */ },
+};
+MODULE_DEVICE_TABLE(of, cros_ec_i2c_of_match);
+
 static const struct i2c_device_id cros_ec_i2c_id[] = {
 	{ "cros-ec-i2c", 0 },
 	{ }
@@ -353,6 +359,7 @@ MODULE_DEVICE_TABLE(i2c, cros_ec_i2c_id);
 static struct i2c_driver cros_ec_driver = {
 	.driver	= {
 		.name	= "cros-ec-i2c",
+		.of_match_table = of_match_ptr(cros_ec_i2c_of_match),
 		.pm	= &cros_ec_i2c_pm_ops,
 	},
 	.probe		= cros_ec_i2c_probe,
-- 
2.4.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [next] | [standalone]

#1212762

On Tue, 25 Aug 2015, Javier Martinez Canillas wrote:

> The Documentation/devicetree/bindings/mfd/cros-ec.txt DT binding doc lists
> "google,cros-ec-i2c" as a compatible string but the corresponding driver
> does not have an OF match table. Add the table to the driver so the I2C
> core can do an OF style match.
> 
> Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
> 
> ---
> 
>  drivers/mfd/cros_ec_i2c.c | 7 +++++++
>  1 file changed, 7 insertions(+)

Applied, thanks.

> diff --git a/drivers/mfd/cros_ec_i2c.c b/drivers/mfd/cros_ec_i2c.c
> index d06e4b46db80..56a466469664 100644
> --- a/drivers/mfd/cros_ec_i2c.c
> +++ b/drivers/mfd/cros_ec_i2c.c
> @@ -344,6 +344,12 @@ static int cros_ec_i2c_resume(struct device *dev)
>  static SIMPLE_DEV_PM_OPS(cros_ec_i2c_pm_ops, cros_ec_i2c_suspend,
>  			  cros_ec_i2c_resume);
>  
> +static const struct of_device_id cros_ec_i2c_of_match[] = {
> +	{ .compatible = "google,cros-ec-i2c", },
> +	{ /* sentinel */ },
> +};
> +MODULE_DEVICE_TABLE(of, cros_ec_i2c_of_match);
> +
>  static const struct i2c_device_id cros_ec_i2c_id[] = {
>  	{ "cros-ec-i2c", 0 },
>  	{ }
> @@ -353,6 +359,7 @@ MODULE_DEVICE_TABLE(i2c, cros_ec_i2c_id);
>  static struct i2c_driver cros_ec_driver = {
>  	.driver	= {
>  		.name	= "cros-ec-i2c",
> +		.of_match_table = of_match_ptr(cros_ec_i2c_of_match),
>  		.pm	= &cros_ec_i2c_pm_ops,
>  	},
>  	.probe		= cros_ec_i2c_probe,

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web