| Message ID | 1324189772-26914-2-git-send-email-swarren@nvidia.com |
|---|---|
| State | New, archived |
| Headers | show |
On Sat, Dec 17, 2011 at 11:29:30PM -0700, Stephen Warren wrote: > One of the Tegra I2C blocks is inside the DVC (Digital Voltage Controller) > block. This block is identical to the rest of the I2C blocks, except that > it only supports master mode, it has registers moved around, and it needs > some extra init to get it into I2C mode. The register moves are handled > by i2c_readl and i2c_writel > > This patch adds a new compatible value for controllers of this "DVC" > type; I figured that this approach was reasonable, as opposed to adding > an is-dvc property under the existing compatible value, since the HW > truly is different. > > v2: Call of_device_is_compatible() to determine is_dvc, instead of storing > the flag in tegra_i2c_of_match[]'s .data field. > > Signed-off-by: Stephen Warren <swarren@nvidia.com> > --- I've applied this one as well to the tegra for-3.3/drivers. Ben, let me know if you want it through your tree but since it mostly fixes device tree usage I figured it's OK for us to take. -Olof -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c index e8560ed..6381604 100644 --- a/drivers/i2c/busses/i2c-tegra.c +++ b/drivers/i2c/busses/i2c-tegra.c @@ -636,7 +636,10 @@ static int __devinit tegra_i2c_probe(struct platform_device *pdev) 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; init_completion(&i2c_dev->msg_complete); @@ -742,6 +745,7 @@ static int tegra_i2c_resume(struct platform_device *pdev) /* Match table for of_platform binding */ static const struct of_device_id tegra_i2c_of_match[] __devinitconst = { { .compatible = "nvidia,tegra20-i2c", }, + { .compatible = "nvidia,tegra20-i2c-dvc", }, {}, }; MODULE_DEVICE_TABLE(of, tegra_i2c_of_match);
One of the Tegra I2C blocks is inside the DVC (Digital Voltage Controller) block. This block is identical to the rest of the I2C blocks, except that it only supports master mode, it has registers moved around, and it needs some extra init to get it into I2C mode. The register moves are handled by i2c_readl and i2c_writel This patch adds a new compatible value for controllers of this "DVC" type; I figured that this approach was reasonable, as opposed to adding an is-dvc property under the existing compatible value, since the HW truly is different. v2: Call of_device_is_compatible() to determine is_dvc, instead of storing the flag in tegra_i2c_of_match[]'s .data field. Signed-off-by: Stephen Warren <swarren@nvidia.com> --- drivers/i2c/busses/i2c-tegra.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)