Currently, i2c1 and i2c5 defer probe due to pinctrl dependencies.
This changes the i2c ID each bus is registered with in i2c-dev
interface.
As a result of this, many userspace tools break and there is no
consistent manner to fix the same if the i2c dev interface have no
consistent numbering. Provide alias to allow ordering the i2c devices
correctly.
Signed-off-by: Nishanth Menon <[email protected]>
---
arch/arm/boot/dts/omap5.dtsi | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
index e18ee7e..8970deb 100644
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -21,6 +21,11 @@
interrupt-parent = <&gic>;
aliases {
+ i2c0 = &i2c1;
+ i2c1 = &i2c2;
+ i2c2 = &i2c3;
+ i2c3 = &i2c4;
+ i2c4 = &i2c5;
serial0 = &uart1;
serial1 = &uart2;
serial2 = &uart3;
--
1.7.9.5
On Tuesday 15 October 2013 10:30 PM, Nishanth Menon wrote:
> Currently, i2c1 and i2c5 defer probe due to pinctrl dependencies.
> This changes the i2c ID each bus is registered with in i2c-dev
> interface.
>
> As a result of this, many userspace tools break and there is no
> consistent manner to fix the same if the i2c dev interface have no
> consistent numbering. Provide alias to allow ordering the i2c devices
> correctly.
This looks good Nishanth. Shouldn't we just go ahead and fix these for
all OMAPs/AMxx devices which would have the same problem as OMAP5 ;)
Acked-by: Rajendra Nayak <[email protected]>
>
> Signed-off-by: Nishanth Menon <[email protected]>
> ---
>
> arch/arm/boot/dts/omap5.dtsi | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
> index e18ee7e..8970deb 100644
> --- a/arch/arm/boot/dts/omap5.dtsi
> +++ b/arch/arm/boot/dts/omap5.dtsi
> @@ -21,6 +21,11 @@
> interrupt-parent = <&gic>;
>
> aliases {
> + i2c0 = &i2c1;
> + i2c1 = &i2c2;
> + i2c2 = &i2c3;
> + i2c3 = &i2c4;
> + i2c4 = &i2c5;
> serial0 = &uart1;
> serial1 = &uart2;
> serial2 = &uart3;
>
On 10/16/2013 06:37 AM, Rajendra Nayak wrote:
> On Tuesday 15 October 2013 10:30 PM, Nishanth Menon wrote:
>> Currently, i2c1 and i2c5 defer probe due to pinctrl dependencies.
>> This changes the i2c ID each bus is registered with in i2c-dev
>> interface.
>>
>> As a result of this, many userspace tools break and there is no
>> consistent manner to fix the same if the i2c dev interface have no
>> consistent numbering. Provide alias to allow ordering the i2c devices
>> correctly.
>
> This looks good Nishanth. Shouldn't we just go ahead and fix these for
> all OMAPs/AMxx devices which would have the same problem as OMAP5 ;)
yes ofcourse. i can do a couple of patches:
1 - for all OMAPs
2 - for all AM platforms.
>
> Acked-by: Rajendra Nayak <[email protected]>
>>
>> Signed-off-by: Nishanth Menon <[email protected]>
>> ---
>>
>> arch/arm/boot/dts/omap5.dtsi | 5 +++++
>> 1 file changed, 5 insertions(+)
>>
>> diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
>> index e18ee7e..8970deb 100644
>> --- a/arch/arm/boot/dts/omap5.dtsi
>> +++ b/arch/arm/boot/dts/omap5.dtsi
>> @@ -21,6 +21,11 @@
>> interrupt-parent = <&gic>;
>>
>> aliases {
>> + i2c0 = &i2c1;
>> + i2c1 = &i2c2;
>> + i2c2 = &i2c3;
>> + i2c3 = &i2c4;
>> + i2c4 = &i2c5;
>> serial0 = &uart1;
>> serial1 = &uart2;
>> serial2 = &uart3;
>>
>
--
Regards,
Nishanth Menon
Provide alias to allow ordering the i2c devices correctly.
Signed-off-by: Nishanth Menon <[email protected]>
---
arch/arm/boot/dts/am33xx.dtsi | 3 +++
arch/arm/boot/dts/am4372.dtsi | 3 +++
2 files changed, 6 insertions(+)
diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index 09f16a0..defc0d5 100644
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -18,6 +18,9 @@
interrupt-parent = <&intc>;
aliases {
+ i2c0 = &i2c0;
+ i2c1 = &i2c1;
+ i2c2 = &i2c2;
serial0 = &uart0;
serial1 = &uart1;
serial2 = &uart2;
diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
index 4944b1a..c7c3160 100644
--- a/arch/arm/boot/dts/am4372.dtsi
+++ b/arch/arm/boot/dts/am4372.dtsi
@@ -18,6 +18,9 @@
aliases {
+ i2c0 = &i2c0;
+ i2c1 = &i2c1;
+ i2c2 = &i2c2;
serial0 = &uart0;
};
--
1.7.9.5
Currently, on OMAP5, i2c1 and i2c5 defer probe due to pinctrl
dependencies. This changes the i2c ID each bus is registered with in
i2c-dev interface. As a result of this, many userspace tools break and
there is no consistent manner to fix the same if the i2c dev interface
have no consistent numbering.
Since this could happen for other OMAP derivatives, provide i2c alias
for all OMAP3+ SoCs to allow ordering the i2c devices correctly.
Signed-off-by: Nishanth Menon <[email protected]>
---
arch/arm/boot/dts/dra7.dtsi | 5 +++++
arch/arm/boot/dts/omap3.dtsi | 3 +++
arch/arm/boot/dts/omap4.dtsi | 4 ++++
arch/arm/boot/dts/omap5.dtsi | 5 +++++
4 files changed, 17 insertions(+)
diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
index e723b52..f62f24a 100644
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@ -20,6 +20,11 @@
interrupt-parent = <&gic>;
aliases {
+ i2c0 = &i2c1;
+ i2c1 = &i2c2;
+ i2c2 = &i2c3;
+ i2c3 = &i2c4;
+ i2c4 = &i2c5;
serial0 = &uart1;
serial1 = &uart2;
serial2 = &uart3;
diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi
index 4f3778a..d9160e7 100644
--- a/arch/arm/boot/dts/omap3.dtsi
+++ b/arch/arm/boot/dts/omap3.dtsi
@@ -19,6 +19,9 @@
interrupt-parent = <&intc>;
aliases {
+ i2c0 = &i2c1;
+ i2c1 = &i2c2;
+ i2c2 = &i2c3;
serial0 = &uart1;
serial1 = &uart2;
serial2 = &uart3;
diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
index decff2a..269bf83 100644
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -17,6 +17,10 @@
interrupt-parent = <&gic>;
aliases {
+ i2c0 = &i2c1;
+ i2c1 = &i2c2;
+ i2c2 = &i2c3;
+ i2c3 = &i2c4;
serial0 = &uart1;
serial1 = &uart2;
serial2 = &uart3;
diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
index e18ee7e..8970deb 100644
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -21,6 +21,11 @@
interrupt-parent = <&gic>;
aliases {
+ i2c0 = &i2c1;
+ i2c1 = &i2c2;
+ i2c2 = &i2c3;
+ i2c3 = &i2c4;
+ i2c4 = &i2c5;
serial0 = &uart1;
serial1 = &uart2;
serial2 = &uart3;
--
1.7.9.5
Add i2c aliases for OMAP and AM processor dts nodes to ensure proper
i2c ordering. Based on Benoit's for_13/dts branch[1]
Changes in V2:
- Following Rajendra's suggestion, done for all OMAP and AM
series SoCs, where i2c is defined.
V1: https://patchwork.kernel.org/patch/3046671/
Nishanth Menon (2):
ARM: dts: OMAP3+: Add i2c aliases
ARM: dts: AM33xx+: Add i2c aliases
arch/arm/boot/dts/am33xx.dtsi | 3 +++
arch/arm/boot/dts/am4372.dtsi | 3 +++
arch/arm/boot/dts/dra7.dtsi | 5 +++++
arch/arm/boot/dts/omap3.dtsi | 3 +++
arch/arm/boot/dts/omap4.dtsi | 4 ++++
arch/arm/boot/dts/omap5.dtsi | 5 +++++
6 files changed, 23 insertions(+)
[1] https://git.kernel.org/cgit/linux/kernel/git/bcousson/linux-omap-dt.git/log/?h=for_3.13/dts
--
1.7.9.5
On Thursday 17 October 2013 01:51 AM, Nishanth Menon wrote:
> Add i2c aliases for OMAP and AM processor dts nodes to ensure proper
> i2c ordering. Based on Benoit's for_13/dts branch[1]
>
> Changes in V2:
> - Following Rajendra's suggestion, done for all OMAP and AM
> series SoCs, where i2c is defined.
Thanks Nishanth.
Acked-by: Rajendra Nayak <[email protected]>
>
> V1: https://patchwork.kernel.org/patch/3046671/
>
> Nishanth Menon (2):
> ARM: dts: OMAP3+: Add i2c aliases
> ARM: dts: AM33xx+: Add i2c aliases
>
> arch/arm/boot/dts/am33xx.dtsi | 3 +++
> arch/arm/boot/dts/am4372.dtsi | 3 +++
> arch/arm/boot/dts/dra7.dtsi | 5 +++++
> arch/arm/boot/dts/omap3.dtsi | 3 +++
> arch/arm/boot/dts/omap4.dtsi | 4 ++++
> arch/arm/boot/dts/omap5.dtsi | 5 +++++
> 6 files changed, 23 insertions(+)
>
> [1] https://git.kernel.org/cgit/linux/kernel/git/bcousson/linux-omap-dt.git/log/?h=for_3.13/dts
>