evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'for-3.3/drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra into tegra/drivers

Browse source
This commit is contained in:
Arnd Bergmann 2011-12-27 23:10:44 +00:00
commit 635bca2885
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/i2c/busses/i2c-tegra.c
View file

@ -558,7 +558,7 @@ static const struct i2c_algorithm tegra_i2c_algo = {
.functionality = tegra_i2c_func, .functionality = tegra_i2c_func,
}; };
static int tegra_i2c_probe(struct platform_device *pdev) static int __devinit tegra_i2c_probe(struct platform_device *pdev)
{ {
struct tegra_i2c_dev *i2c_dev; struct tegra_i2c_dev *i2c_dev;
struct tegra_i2c_platform_data *pdata = pdev->dev.platform_data; struct tegra_i2c_platform_data *pdata = pdev->dev.platform_data;
@ -636,7 +636,10 @@ static int tegra_i2c_probe(struct platform_device *pdev)
i2c_dev->bus_clk_rate = be32_to_cpup(prop); i2c_dev->bus_clk_rate = be32_to_cpup(prop);
} }
if (pdev->id == 3) if (pdev->dev.of_node)
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->is_dvc = 1;
init_completion(&i2c_dev->msg_complete); init_completion(&i2c_dev->msg_complete);
@ -690,7 +693,7 @@ err_iounmap:
return ret; return ret;
} }
static int tegra_i2c_remove(struct platform_device *pdev) static int __devexit tegra_i2c_remove(struct platform_device *pdev)
{ {
struct tegra_i2c_dev *i2c_dev = platform_get_drvdata(pdev); struct tegra_i2c_dev *i2c_dev = platform_get_drvdata(pdev);
i2c_del_adapter(&i2c_dev->adapter); i2c_del_adapter(&i2c_dev->adapter);
@ -742,6 +745,7 @@ static int tegra_i2c_resume(struct platform_device *pdev)
/* Match table for of_platform binding */ /* Match table for of_platform binding */
static const struct of_device_id tegra_i2c_of_match[] __devinitconst = { static const struct of_device_id tegra_i2c_of_match[] __devinitconst = {
{ .compatible = "nvidia,tegra20-i2c", }, { .compatible = "nvidia,tegra20-i2c", },
{ .compatible = "nvidia,tegra20-i2c-dvc", },
{}, {},
}; };
MODULE_DEVICE_TABLE(of, tegra_i2c_of_match); MODULE_DEVICE_TABLE(of, tegra_i2c_of_match);