diff options
Diffstat (limited to 'drivers/i2c/busses/i2c-tegra.c')
-rw-r--r-- | drivers/i2c/busses/i2c-tegra.c | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c index d56c0def65..f86f64f573 100644 --- a/drivers/i2c/busses/i2c-tegra.c +++ b/drivers/i2c/busses/i2c-tegra.c @@ -1,17 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) 2014 Lucas Stach <l.stach@pengutronix.de> * * Partly based on code Copyright (C) 2010 Google, Inc. - * - * This software is licensed under the terms of the GNU General Public - * License version 2, as published by the Free Software Foundation, and - * may be copied, distributed, and modified under those terms. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * */ #include <common.h> #include <clock.h> @@ -146,7 +137,7 @@ struct tegra_i2c_hw_feature { * @bus_clk_rate: current i2c bus clock rate */ struct tegra_i2c_dev { - struct device_d *dev; + struct device *dev; const struct tegra_i2c_hw_feature *hw; struct i2c_adapter adapter; struct clk *div_clk; @@ -603,7 +594,7 @@ static const struct tegra_i2c_hw_feature tegra114_i2c_hw = { .clk_divisor_std_fast_mode = 0x19, }; -static int tegra_i2c_probe(struct device_d *dev) +static int tegra_i2c_probe(struct device *dev) { struct resource *iores; struct tegra_i2c_dev *i2c_dev; @@ -632,18 +623,18 @@ static int tegra_i2c_probe(struct device_d *dev) i2c_dev->rst = reset_control_get(dev, "i2c"); if (IS_ERR(i2c_dev->rst)) { - dev_err(dev, "missing controller reset"); + dev_err(dev, "invalid controller reset"); return PTR_ERR(i2c_dev->rst); } - ret = of_property_read_u32(dev->device_node, "clock-frequency", + ret = of_property_read_u32(dev->of_node, "clock-frequency", &i2c_dev->bus_clk_rate); if (ret) i2c_dev->bus_clk_rate = 100000; /* default clock rate */ i2c_dev->hw = &tegra20_i2c_hw; dev_get_drvdata(dev, (const void **)&i2c_dev->hw); - i2c_dev->is_dvc = of_device_is_compatible(dev->device_node, + i2c_dev->is_dvc = of_device_is_compatible(dev->of_node, "nvidia,tegra20-i2c-dvc"); if (!i2c_dev->hw->has_single_clk_source) { @@ -664,7 +655,7 @@ static int tegra_i2c_probe(struct device_d *dev) i2c_dev->adapter.master_xfer = tegra_i2c_xfer; i2c_dev->adapter.dev.parent = dev; i2c_dev->adapter.nr = dev->id; - i2c_dev->adapter.dev.device_node = dev->device_node; + i2c_dev->adapter.dev.of_node = dev->of_node; ret = i2c_add_numbered_adapter(&i2c_dev->adapter); if (ret) { @@ -692,8 +683,9 @@ static __maybe_unused struct of_device_id tegra_i2c_compatible[] = { /* sentinel */ } }; +MODULE_DEVICE_TABLE(of, tegra_i2c_compatible); -static struct driver_d tegra_i2c_driver = { +static struct driver tegra_i2c_driver = { .name = "tegra-i2c", .probe = tegra_i2c_probe, .of_compatible = DRV_OF_COMPAT(tegra_i2c_compatible), |