diff options
author | John Bonesio <bones@secretlab.ca> | 2011-08-30 13:46:08 -0400 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2011-09-06 19:11:46 -0400 |
commit | 406bd18a7a39ef69f1d60a41d9de74932bcb98d4 (patch) | |
tree | 3b62c927ebaaa1cc1d013021c0e75c024b234895 /drivers/i2c | |
parent | 7a703aded97e01d7f4a6b8440a431117399666ba (diff) |
i2c-tegra: Add of_match_table
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@secretlab.ca>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'drivers/i2c')
-rw-r--r-- | 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 2440b7411978..126b4f060231 100644 --- a/drivers/i2c/busses/i2c-tegra.c +++ b/drivers/i2c/busses/i2c-tegra.c | |||
@@ -719,6 +719,17 @@ static int tegra_i2c_resume(struct platform_device *pdev) | |||
719 | } | 719 | } |
720 | #endif | 720 | #endif |
721 | 721 | ||
722 | #if defined(CONFIG_OF) | ||
723 | /* Match table for of_platform binding */ | ||
724 | static const struct of_device_id tegra_i2c_of_match[] __devinitconst = { | ||
725 | { .compatible = "nvidia,tegra20-i2c", }, | ||
726 | {}, | ||
727 | }; | ||
728 | MODULE_DEVICE_TABLE(of, tegra_i2c_of_match); | ||
729 | #else | ||
730 | #define tegra_i2c_of_match NULL | ||
731 | #endif | ||
732 | |||
722 | static struct platform_driver tegra_i2c_driver = { | 733 | static struct platform_driver tegra_i2c_driver = { |
723 | .probe = tegra_i2c_probe, | 734 | .probe = tegra_i2c_probe, |
724 | .remove = tegra_i2c_remove, | 735 | .remove = tegra_i2c_remove, |
@@ -729,6 +740,7 @@ static struct platform_driver tegra_i2c_driver = { | |||
729 | .driver = { | 740 | .driver = { |
730 | .name = "tegra-i2c", | 741 | .name = "tegra-i2c", |
731 | .owner = THIS_MODULE, | 742 | .owner = THIS_MODULE, |
743 | .of_match_table = tegra_i2c_of_match, | ||
732 | }, | 744 | }, |
733 | }; | 745 | }; |
734 | 746 | ||