| Message ID | 1309897306-22953-1-git-send-email-swarren@nvidia.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Jul 05, 2011 at 02:21:46PM -0600, Stephen Warren wrote: > Engineering names are more stable than marketing names. Hence, use them > for Device Tree compatible properties instead. > > Signed-off-by: Stephen Warren <swarren@nvidia.com> > --- > Grant, this is against devicetree/arm and also makes sense for > devicetree/test. Acked-by: Grant Likely <grant.likely@secretlab.ca> Ben is the one to pick up this patch. g. > > drivers/i2c/busses/i2c-tegra.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c > index 8914bd1..99b1b6d 100644 > --- a/drivers/i2c/busses/i2c-tegra.c > +++ b/drivers/i2c/busses/i2c-tegra.c > @@ -716,7 +716,7 @@ static int tegra_i2c_resume(struct platform_device *pdev) > #if defined(CONFIG_OF) > /* Match table for of_platform binding */ > static const struct of_device_id tegra_i2c_of_match[] __devinitconst = { > - { .compatible = "nvidia,tegra250-i2c", }, > + { .compatible = "nvidia,tegra20-i2c", }, > {}, > }; > MODULE_DEVICE_TABLE(of, tegra_i2c_of_match); > -- > 1.7.0.4 >
Grant Likely wrote at Tuesday, July 05, 2011 11:40 PM: > On Tue, Jul 05, 2011 at 02:21:46PM -0600, Stephen Warren wrote: > > Engineering names are more stable than marketing names. Hence, use them > > for Device Tree compatible properties instead. > > > > Signed-off-by: Stephen Warren <swarren@nvidia.com> > > --- > > Grant, this is against devicetree/arm and also makes sense for > > devicetree/test. > > Acked-by: Grant Likely <grant.likely@secretlab.ca> > > Ben is the one to pick up this patch. I don't believe anyone ever sent a patch to Ben to add tegra_i2c_of_match to the driver; the OF support patch didn't include that part of the code. As such, Ben can't yet apply this to his tree. (Although I note this patch is in Grant's /arm and /test trees, which is probably good enough for now). > > drivers/i2c/busses/i2c-tegra.c | 2 +- > > 1 files changed, 1 insertions(+), 1 deletions(-) > > > > diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c > > index 8914bd1..99b1b6d 100644 > > --- a/drivers/i2c/busses/i2c-tegra.c > > +++ b/drivers/i2c/busses/i2c-tegra.c > > @@ -716,7 +716,7 @@ static int tegra_i2c_resume(struct platform_device *pdev) > > #if defined(CONFIG_OF) > > /* Match table for of_platform binding */ > > static const struct of_device_id tegra_i2c_of_match[] __devinitconst = { > > - { .compatible = "nvidia,tegra250-i2c", }, > > + { .compatible = "nvidia,tegra20-i2c", }, > > {}, > > }; > > MODULE_DEVICE_TABLE(of, tegra_i2c_of_match); > > -- > > 1.7.0.4 > >
On Thu, Jul 14, 2011 at 2:59 AM, Stephen Warren <swarren@nvidia.com> wrote: > Grant Likely wrote at Tuesday, July 05, 2011 11:40 PM: >> On Tue, Jul 05, 2011 at 02:21:46PM -0600, Stephen Warren wrote: >> > Engineering names are more stable than marketing names. Hence, use them >> > for Device Tree compatible properties instead. >> > >> > Signed-off-by: Stephen Warren <swarren@nvidia.com> >> > --- >> > Grant, this is against devicetree/arm and also makes sense for >> > devicetree/test. >> >> Acked-by: Grant Likely <grant.likely@secretlab.ca> >> >> Ben is the one to pick up this patch. > > I don't believe anyone ever sent a patch to Ben to add tegra_i2c_of_match > to the driver; the OF support patch didn't include that part of the code. > As such, Ben can't yet apply this to his tree. (Although I note this patch > is in Grant's /arm and /test trees, which is probably good enough for now). Hmmm, I thought it had been done. It certainly is ready to go in. Do you want to put together a roll-up patch that includes all the required changes and post it again? (although double check linux-next first). g. > >> > drivers/i2c/busses/i2c-tegra.c | 2 +- >> > 1 files changed, 1 insertions(+), 1 deletions(-) >> > >> > diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c >> > index 8914bd1..99b1b6d 100644 >> > --- a/drivers/i2c/busses/i2c-tegra.c >> > +++ b/drivers/i2c/busses/i2c-tegra.c >> > @@ -716,7 +716,7 @@ static int tegra_i2c_resume(struct platform_device *pdev) >> > #if defined(CONFIG_OF) >> > /* Match table for of_platform binding */ >> > static const struct of_device_id tegra_i2c_of_match[] __devinitconst = { >> > - { .compatible = "nvidia,tegra250-i2c", }, >> > + { .compatible = "nvidia,tegra20-i2c", }, >> > {}, >> > }; >> > MODULE_DEVICE_TABLE(of, tegra_i2c_of_match); >> > -- >> > 1.7.0.4 >> > > > -- > nvpublic > >
Grant Likely wrote at Wednesday, July 13, 2011 5:34 PM: > On Thu, Jul 14, 2011 at 2:59 AM, Stephen Warren <swarren@nvidia.com> wrote: ... > > I don't believe anyone ever sent a patch to Ben to add tegra_i2c_of_match > > to the driver; the OF support patch didn't include that part of the code. > > As such, Ben can't yet apply this to his tree. (Although I note this patch > > is in Grant's /arm and /test trees, which is probably good enough for now). > > Hmmm, I thought it had been done. It certainly is ready to go in. Do > you want to put together a roll-up patch that includes all the > required changes and post it again? (although double check linux-next > first). When John Bonesio posted the patch to add DT support to i2c-tegra.c, the first version of the patch was missing the match table chunk. A few days later, an updated version was posted that added the missing chunk; see: http://groups.google.com/group/linux.kernel/browse_thread/thread/d2596e8dee819b0f/c8aa04183ea2331e?show_docid=c8aa04183ea2331e It looks like the first version of the patch has actually been applied to Ben's next-i2c branch rather than the updated version. I guess it's simplest if I just post a patch that adds the missing chunk based on the latest next-i2c tree. I'll go do that.
diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c index 8914bd1..99b1b6d 100644 --- a/drivers/i2c/busses/i2c-tegra.c +++ b/drivers/i2c/busses/i2c-tegra.c @@ -716,7 +716,7 @@ static int tegra_i2c_resume(struct platform_device *pdev) #if defined(CONFIG_OF) /* Match table for of_platform binding */ static const struct of_device_id tegra_i2c_of_match[] __devinitconst = { - { .compatible = "nvidia,tegra250-i2c", }, + { .compatible = "nvidia,tegra20-i2c", }, {}, }; MODULE_DEVICE_TABLE(of, tegra_i2c_of_match);
Engineering names are more stable than marketing names. Hence, use them for Device Tree compatible properties instead. Signed-off-by: Stephen Warren <swarren@nvidia.com> --- Grant, this is against devicetree/arm and also makes sense for devicetree/test. drivers/i2c/busses/i2c-tegra.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)