i2c: tegra: Remove non device-tree support
authorJon Hunter <jonathanh@nvidia.com>
Fri, 26 Aug 2016 13:09:01 +0000 (14:09 +0100)
committerWolfram Sang <wsa@the-dreams.de>
Tue, 30 Aug 2016 19:59:06 +0000 (21:59 +0200)
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>
drivers/i2c/busses/i2c-tegra.c

index 7f31a103c04a36cd8b26b6bc50412126bec0c0d3..e5c8c67a2491b4b61449f1f00378760cd774091a 100644 (file)
@@ -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) {