On Thursday, July 14, 2011, Stephen Warren <swarren@xxxxxxxxxx> wrote:
> From: John Bonesio <bones@xxxxxxxxxxxx>
>
> This patch was intended to be part of 7ca2d1a105a239e300b937e9c41a10a4bd08f569
> "i2c: Tegra: Add DeviceTree support". However, an early version of that patch,
> which was missing a chunk, was applied to next-i2c. This change is that
> missing chunk.
>
> Signed-off-by: John Bonesio <bones@xxxxxxxxxxxx>
> Signed-off-by: Stephen Warren <swarren@xxxxxxxxxx>
Acked-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
> ---
> drivers/i2c/busses/i2c-tegra.c | 12 ++++++++++++
> 1 files changed, 12 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
> index 5a18d6d..f2156de 100644
> --- a/drivers/i2c/busses/i2c-tegra.c
> +++ b/drivers/i2c/busses/i2c-tegra.c
> @@ -722,6 +722,17 @@ static int tegra_i2c_resume(struct platform_device *pdev)
> }
> #endif
>
> +#if defined(CONFIG_OF)
> +/* Match table for of_platform binding */
> +static const struct of_device_id tegra_i2c_of_match[] __devinitconst = {
> + { .compatible = "nvidia,tegra20-i2c", },
> + {},
> +};
> +MODULE_DEVICE_TABLE(of, tegra_i2c_of_match);
> +#else
> +#define tegra_i2c_of_match NULL
> +#endif
> +
> static struct platform_driver tegra_i2c_driver = {
> .probe = tegra_i2c_probe,
> .remove = tegra_i2c_remove,
> @@ -732,6 +743,7 @@ static struct platform_driver tegra_i2c_driver = {
> .driver = {
> .name = "tegra-i2c",
> .owner = THIS_MODULE,
> + .of_match_table = tegra_i2c_of_match,
> },
> };
>
> --
> 1.7.0.4
>
>
--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
--
To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
