diff mbox

ARM: DTS: omap3-n900.dts: fix i2c bus numbering

Message ID 1423410536-16579-1-git-send-email-ivo.g.dimitrov.75@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Ivaylo Dimitrov Feb. 8, 2015, 3:48 p.m. UTC
With legacy boot i2c buses on Nokia N900 are numbered i2c1, i2c2 and i2c3.
Commit 20b80942ef4e ("ARM: dts: OMAP3+: Add i2c aliases") fixed the
numbering with DT boot, but introduced a regression on N900 - aliases
become i2c0, i2c1 and i2c2. Fix that by providing the correct aliases in
the board dts.

Signed-off-by: Ivaylo Dimitrov <ivo.g.dimitrov.75@gmail.com>
---
 arch/arm/boot/dts/omap3-n900.dts | 7 +++++++
 1 file changed, 7 insertions(+)

Comments

Pali Rohár Feb. 8, 2015, 6:37 p.m. UTC | #1
On Sunday 08 February 2015 16:48:56 Ivaylo Dimitrov wrote:
> With legacy boot i2c buses on Nokia N900 are numbered i2c1,
> i2c2 and i2c3. Commit 20b80942ef4e ("ARM: dts: OMAP3+: Add
> i2c aliases") fixed the numbering with DT boot, but
> introduced a regression on N900 - aliases become i2c0, i2c1
> and i2c2. Fix that by providing the correct aliases in the
> board dts.
> 
> Signed-off-by: Ivaylo Dimitrov <ivo.g.dimitrov.75@gmail.com>
> ---
>  arch/arm/boot/dts/omap3-n900.dts | 7 +++++++
>  1 file changed, 7 insertions(+)
> 

Works fine,

Tested-by: Pali Rohár <pali.rohar@gmail.com>
Nishanth Menon Feb. 9, 2015, 3:02 p.m. UTC | #2
On 17:48-20150208, Ivaylo Dimitrov wrote:
> With legacy boot i2c buses on Nokia N900 are numbered i2c1, i2c2 and i2c3.
> Commit 20b80942ef4e ("ARM: dts: OMAP3+: Add i2c aliases") fixed the
> numbering with DT boot, but introduced a regression on N900 - aliases
> become i2c0, i2c1 and i2c2. Fix that by providing the correct aliases in
> the board dts.
> 
> Signed-off-by: Ivaylo Dimitrov <ivo.g.dimitrov.75@gmail.com>
> ---
I suppose this is due to some legacy userspace breakage?
if yes, we do not intend to break userspace :), So:
Acked-by: Nishanth Menon <nm@ti.com>

>  arch/arm/boot/dts/omap3-n900.dts | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts
> index b550c41..68bf3cd 100644
> --- a/arch/arm/boot/dts/omap3-n900.dts
> +++ b/arch/arm/boot/dts/omap3-n900.dts
> @@ -16,6 +16,13 @@
>  	model = "Nokia N900";
>  	compatible = "nokia,omap3-n900", "ti,omap3430", "ti,omap3";
>  
> +	aliases {
> +		i2c0;
> +		i2c1 = &i2c1;
> +		i2c2 = &i2c2;
> +		i2c3 = &i2c3;
> +	};
> +
>  	cpus {
>  		cpu@0 {
>  			cpu0-supply = <&vcc>;
> -- 
> 1.9.1
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
Ivaylo Dimitrov Feb. 9, 2015, 4:03 p.m. UTC | #3
On  9.02.2015 17:02, Nishanth Menon wrote:
> On 17:48-20150208, Ivaylo Dimitrov wrote:
>> With legacy boot i2c buses on Nokia N900 are numbered i2c1, i2c2 and i2c3.
>> Commit 20b80942ef4e ("ARM: dts: OMAP3+: Add i2c aliases") fixed the
>> numbering with DT boot, but introduced a regression on N900 - aliases
>> become i2c0, i2c1 and i2c2. Fix that by providing the correct aliases in
>> the board dts.
>>
>> Signed-off-by: Ivaylo Dimitrov <ivo.g.dimitrov.75@gmail.com>
>> ---
> I suppose this is due to some legacy userspace breakage?
> if yes, we do not intend to break userspace :), So:

Yes, legacy userspace breakage :)

Regards,
Ivo
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Tony Lindgren Feb. 24, 2015, 6:02 p.m. UTC | #4
* Ivaylo Dimitrov <ivo.g.dimitrov.75@gmail.com> [150209 08:07]:
> 
> 
> On  9.02.2015 17:02, Nishanth Menon wrote:
> >On 17:48-20150208, Ivaylo Dimitrov wrote:
> >>With legacy boot i2c buses on Nokia N900 are numbered i2c1, i2c2 and i2c3.
> >>Commit 20b80942ef4e ("ARM: dts: OMAP3+: Add i2c aliases") fixed the
> >>numbering with DT boot, but introduced a regression on N900 - aliases
> >>become i2c0, i2c1 and i2c2. Fix that by providing the correct aliases in
> >>the board dts.
> >>
> >>Signed-off-by: Ivaylo Dimitrov <ivo.g.dimitrov.75@gmail.com>
> >>---
> >I suppose this is due to some legacy userspace breakage?
> >if yes, we do not intend to break userspace :), So:
> 
> Yes, legacy userspace breakage :)

Applying into omap-for-v4.0/fixes thanks,

Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts
index b550c41..68bf3cd 100644
--- a/arch/arm/boot/dts/omap3-n900.dts
+++ b/arch/arm/boot/dts/omap3-n900.dts
@@ -16,6 +16,13 @@ 
 	model = "Nokia N900";
 	compatible = "nokia,omap3-n900", "ti,omap3430", "ti,omap3";
 
+	aliases {
+		i2c0;
+		i2c1 = &i2c1;
+		i2c2 = &i2c2;
+		i2c3 = &i2c3;
+	};
+
 	cpus {
 		cpu@0 {
 			cpu0-supply = <&vcc>;