summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJon Hunter <jonathanh@nvidia.com>2016-08-26 14:09:01 +0100
committerWolfram Sang <wsa@the-dreams.de>2016-08-30 21:59:06 +0200
commita9e32cd81624faf4deb7c850f846efc00a3d36b4 (patch)
tree3485a7301f8c2a88c9abe1c54cccab5b5dff2dd4 /drivers
parente8e999cbe725a4403ac771b1e4c8a5de7e0031f3 (diff)
downloadlinux-stable-a9e32cd81624faf4deb7c850f846efc00a3d36b4.tar.gz
linux-stable-a9e32cd81624faf4deb7c850f846efc00a3d36b4.tar.bz2
linux-stable-a9e32cd81624faf4deb7c850f846efc00a3d36b4.zip
i2c: tegra: Remove non device-tree support
Tegra has only supported device-tree for platform/board configuration for quite some time now and so simplify the Tegra I2C driver by dropping code for non device-tree platforms/boards. Signed-off-by: Jon Hunter <jonathanh@nvidia.com> Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/i2c/busses/i2c-tegra.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
index 7f31a103c04a..e5c8c67a2491 100644
--- a/drivers/i2c/busses/i2c-tegra.c
+++ b/drivers/i2c/busses/i2c-tegra.c
@@ -857,15 +857,9 @@ static int tegra_i2c_probe(struct platform_device *pdev)
tegra_i2c_parse_dt(i2c_dev);
- i2c_dev->hw = &tegra20_i2c_hw;
-
- if (pdev->dev.of_node) {
- i2c_dev->hw = of_device_get_match_data(&pdev->dev);
- i2c_dev->is_dvc = of_device_is_compatible(pdev->dev.of_node,
- "nvidia,tegra20-i2c-dvc");
- } else if (pdev->id == 3) {
- i2c_dev->is_dvc = 1;
- }
+ i2c_dev->hw = of_device_get_match_data(&pdev->dev);
+ i2c_dev->is_dvc = of_device_is_compatible(pdev->dev.of_node,
+ "nvidia,tegra20-i2c-dvc");
init_completion(&i2c_dev->msg_complete);
if (!i2c_dev->hw->has_single_clk_source) {