ARM: dts: imx6 fsl-ssi and i2c4

PATCH New Markus Pargmann 2 participants 10 messages Apr 28, 2014 – Apr 30, 2014

Subsystems (2)

Device tree bindings Arm i.MX and Layerscape

lore

Share & tools

lore

Markus Pargmann

author

2014-04-28 14:12 UTC #0 lore raw

cover ARM: dts: imx6 fsl-ssi and i2c4

Hi,

here are some patches for imx6 dtsi files for fsl-ssi and i2c4. The first patch removes some unused properties (fsl,ssi-dma-events). The second patch adds clock-names for all imx6 ssi nodes. The third patch fixes i2c4.

Regards,

Markus

Markus Pargmann (3):
arm: dts: imx6qdl, remove fsl,ssi-dma-events
arm: dts: imx6* Add clock-names for all ssi nodes
ARM: dts: imx6dl, fix i2c4 device node

 arch/arm/boot/dts/imx6dl.dtsi  | 3 ++-
 arch/arm/boot/dts/imx6qdl.dtsi | 6 +++---
 arch/arm/boot/dts/imx6sl.dtsi  | 3 +++
 3 files changed, 8 insertions(+), 4 deletions(-)

Signature · 1 line

1.9.1

Markus Pargmann

author

2014-04-28 14:12 UTC #1 lore raw

PATCH 1/3 arm: dts: imx6qdl, remove fsl,ssi-dma-events

All dtsi files where already moved to generic dma bindings. Remove the old non-generic DMA properties.

Signed-off-by Markus Pargmann <[email protected]>

---
 arch/arm/boot/dts/imx6qdl.dtsi | 3 ---
 1 file changed, 3 deletions(-)

arch/arm/boot/dts/imx6qdl.dtsi +0 -3

index 947e463..b230c09 100644
@@ -261,7 +261,6 @@
 					       <&sdma 38 1 0>;
 					dma-names = "rx", "tx";
 					fsl,fifo-depth = <15>;
-					fsl,ssi-dma-events = <38 37>;
 					status = "disabled";
 				};

@@ -276,7 +275,6 @@
 					       <&sdma 42 1 0>;
 					dma-names = "rx", "tx";
 					fsl,fifo-depth = <15>;
-					fsl,ssi-dma-events = <42 41>;
 					status = "disabled";
 				};

@@ -291,7 +289,6 @@
 					       <&sdma 46 1 0>;
 					dma-names = "rx", "tx";
 					fsl,fifo-depth = <15>;
-					fsl,ssi-dma-events = <46 45>;
 					status = "disabled";
 				};

Signature · 1 line

1.9.1

Shawn Guo

2014-04-30 06:37 UTC #2 lore raw

PATCH 1/3 arm: dts: imx6qdl, remove fsl,ssi-dma-events

Quoted 2 lines · Markus Pargmann

All dtsi files where already moved to generic dma bindings. Remove the old non-generic DMA properties.

Yea, since we're not required to boot old kernel with new DTB, we can drop it. But can I ask you to clean it up globally for IMX dts files.

Shawn

Quoted 37 lines

Signed-off-by Markus Pargmann <[email protected]>

---
 arch/arm/boot/dts/imx6qdl.dtsi | 3 ---
 1 file changed, 3 deletions(-)

arch/arm/boot/dts/imx6qdl.dtsi +0 -3

index 947e463..b230c09 100644
@@ -261,7 +261,6 @@
 					       <&sdma 38 1 0>;
 					dma-names = "rx", "tx";
 					fsl,fifo-depth = <15>;
-					fsl,ssi-dma-events = <38 37>;
 					status = "disabled";
 				};

@@ -276,7 +275,6 @@
 					       <&sdma 42 1 0>;
 					dma-names = "rx", "tx";
 					fsl,fifo-depth = <15>;
-					fsl,ssi-dma-events = <42 41>;
 					status = "disabled";
 				};

@@ -291,7 +289,6 @@
 					       <&sdma 46 1 0>;
 					dma-names = "rx", "tx";
 					fsl,fifo-depth = <15>;
-					fsl,ssi-dma-events = <46 45>;
 					status = "disabled";
 				};

Signature · 1 line

1.9.1

Markus Pargmann

author

2014-04-30 07:01 UTC #3 lore raw

PATCH 1/3 arm: dts: imx6qdl, remove fsl,ssi-dma-events

Quoted 6 lines · Shawn Guo

Quoted 2 lines · Markus Pargmann
All dtsi files where already moved to generic dma bindings. Remove the old non-generic DMA properties.
Yea, since we're not required to boot old kernel with new DTB, we can drop it. But can I ask you to clean it up globally for IMX dts files.

Yes sure, I already have those patches for all other dtsi files. I will send them soon.

Regards,

Markus

Signature · 11 lines

Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140430/ce4d70b7/attachment.sig>

Markus Pargmann

author

2014-04-28 14:12 UTC #4 lore raw

PATCH 2/3 arm: dts: imx6* Add clock-names for all ssi nodes

In reply to Markus Pargmann

There are two possible clocks now, baud and ipg. To avoid any issues, add clock-names to all ssi device nodes.

Signed-off-by Markus Pargmann <[email protected]>

---
 arch/arm/boot/dts/imx6qdl.dtsi | 3 +++
 arch/arm/boot/dts/imx6sl.dtsi  | 3 +++
 2 files changed, 6 insertions(+)

arch/arm/boot/dts/imx6qdl.dtsi +3 -0

index b230c09..288c76e 100644
@@ -257,6 +257,7 @@
 					reg = <0x02028000 0x4000>;
 					interrupts = <0 46 IRQ_TYPE_LEVEL_HIGH>;
 					clocks = <&clks 178>;
+					clock-names = "ipg";
 					dmas = <&sdma 37 1 0>,
 					       <&sdma 38 1 0>;
 					dma-names = "rx", "tx";

@@ -271,6 +272,7 @@
 					reg = <0x0202c000 0x4000>;
 					interrupts = <0 47 IRQ_TYPE_LEVEL_HIGH>;
 					clocks = <&clks 179>;
+					clock-names = "ipg";
 					dmas = <&sdma 41 1 0>,
 					       <&sdma 42 1 0>;
 					dma-names = "rx", "tx";

@@ -285,6 +287,7 @@
 					reg = <0x02030000 0x4000>;
 					interrupts = <0 48 IRQ_TYPE_LEVEL_HIGH>;
 					clocks = <&clks 180>;
+					clock-names = "ipg";
 					dmas = <&sdma 45 1 0>,
 					       <&sdma 46 1 0>;
 					dma-names = "rx", "tx";

arch/arm/boot/dts/imx6sl.dtsi +3 -0

index 3cb4941..36da35c 100644
@@ -231,6 +231,7 @@
 					reg = <0x02028000 0x4000>;
 					interrupts = <0 46 IRQ_TYPE_LEVEL_HIGH>;
 					clocks = <&clks IMX6SL_CLK_SSI1>;
+					clock-names = "ipg";
 					dmas = <&sdma 37 1 0>,
 					       <&sdma 38 1 0>;
 					dma-names = "rx", "tx";

@@ -245,6 +246,7 @@
 					reg = <0x0202c000 0x4000>;
 					interrupts = <0 47 IRQ_TYPE_LEVEL_HIGH>;
 					clocks = <&clks IMX6SL_CLK_SSI2>;
+					clock-names = "ipg";
 					dmas = <&sdma 41 1 0>,
 					       <&sdma 42 1 0>;
 					dma-names = "rx", "tx";

@@ -259,6 +261,7 @@
 					reg = <0x02030000 0x4000>;
 					interrupts = <0 48 IRQ_TYPE_LEVEL_HIGH>;
 					clocks = <&clks IMX6SL_CLK_SSI3>;
+					clock-names = "ipg";
 					dmas = <&sdma 45 1 0>,
 					       <&sdma 46 1 0>;
 					dma-names = "rx", "tx";

Signature · 1 line

1.9.1

Shawn Guo

2014-04-30 06:41 UTC #5 lore raw

PATCH 2/3 arm: dts: imx6* Add clock-names for all ssi nodes

Quoted 14 lines · Markus Pargmann

There are two possible clocks now, baud and ipg. To avoid any issues, add clock-names to all ssi device nodes.
Signed-off-by Markus Pargmann <[email protected]>
---
 arch/arm/boot/dts/imx6qdl.dtsi | 3 +++
 arch/arm/boot/dts/imx6sl.dtsi  | 3 +++
 2 files changed, 6 insertions(+)
arch/arm/boot/dts/imx6qdl.dtsi +0 -0
index b230c09..288c76e 100644

arch/arm/boot/dts/imx6qdl.dtsi line 260

Quoted 4 lines

arch/arm/boot/dts/imx6qdl.dtsi +1 -0

@@ -257,6 +257,7 @@
 					reg = <0x02028000 0x4000>;
 					interrupts = <0 46 IRQ_TYPE_LEVEL_HIGH>;
 					clocks = <&clks 178>;
+					clock-names = "ipg";

I'd like to make such change at the time when we have multiple clocks to define here.

Shawn

Quoted 50 lines

arch/arm/boot/dts/imx6qdl.dtsi +2 -0

 					dmas = <&sdma 37 1 0>,
 					       <&sdma 38 1 0>;
 					dma-names = "rx", "tx";

@@ -271,6 +272,7 @@
 					reg = <0x0202c000 0x4000>;
 					interrupts = <0 47 IRQ_TYPE_LEVEL_HIGH>;
 					clocks = <&clks 179>;
+					clock-names = "ipg";
 					dmas = <&sdma 41 1 0>,
 					       <&sdma 42 1 0>;
 					dma-names = "rx", "tx";

@@ -285,6 +287,7 @@
 					reg = <0x02030000 0x4000>;
 					interrupts = <0 48 IRQ_TYPE_LEVEL_HIGH>;
 					clocks = <&clks 180>;
+					clock-names = "ipg";
 					dmas = <&sdma 45 1 0>,
 					       <&sdma 46 1 0>;
 					dma-names = "rx", "tx";

arch/arm/boot/dts/imx6sl.dtsi +3 -0

index 3cb4941..36da35c 100644
@@ -231,6 +231,7 @@
 					reg = <0x02028000 0x4000>;
 					interrupts = <0 46 IRQ_TYPE_LEVEL_HIGH>;
 					clocks = <&clks IMX6SL_CLK_SSI1>;
+					clock-names = "ipg";
 					dmas = <&sdma 37 1 0>,
 					       <&sdma 38 1 0>;
 					dma-names = "rx", "tx";

@@ -245,6 +246,7 @@
 					reg = <0x0202c000 0x4000>;
 					interrupts = <0 47 IRQ_TYPE_LEVEL_HIGH>;
 					clocks = <&clks IMX6SL_CLK_SSI2>;
+					clock-names = "ipg";
 					dmas = <&sdma 41 1 0>,
 					       <&sdma 42 1 0>;
 					dma-names = "rx", "tx";

@@ -259,6 +261,7 @@
 					reg = <0x02030000 0x4000>;
 					interrupts = <0 48 IRQ_TYPE_LEVEL_HIGH>;
 					clocks = <&clks IMX6SL_CLK_SSI3>;
+					clock-names = "ipg";
 					dmas = <&sdma 45 1 0>,
 					       <&sdma 46 1 0>;
 					dma-names = "rx", "tx";

Signature · 1 line

1.9.1

Markus Pargmann

author

2014-04-30 07:10 UTC #6 lore raw

PATCH 2/3 arm: dts: imx6* Add clock-names for all ssi nodes

Quoted 10 lines · Shawn Guo

Quoted 9 lines · Markus Pargmann
There are two possible clocks now, baud and ipg. To avoid any issues, add clock-names to all ssi device nodes.
Signed-off-by Markus Pargmann <[email protected]>
---
 arch/arm/boot/dts/imx6qdl.dtsi | 3 +++
 arch/arm/boot/dts/imx6sl.dtsi  | 3 +++
 2 files changed, 6 insertions(+)

Quoted 12 lines

arch/arm/boot/dts/imx6qdl.dtsi line 260
Quoted 9 lines
arch/arm/boot/dts/imx6qdl.dtsi +1 -0
index b230c09..288c76e 100644
@@ -257,6 +257,7 @@
 					reg = <0x02028000 0x4000>;
 					interrupts = <0 46 IRQ_TYPE_LEVEL_HIGH>;
 					clocks = <&clks 178>;
+					clock-names = "ipg";
I'd like to make such change at the time when we have multiple clocks to define here.

Currently the fsl-ssi code acquires the clock using "devm_clk_get(dev, NULL)" and later another clock using a clock name "baud". I would like to have a clock-names property so that it does not depend on the order of the clocks in the "clocks" property.

However I will have a look at the clocks and add a correct baudclock and send a new version.

Thanks,

Markus

Signature · 11 lines

Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140430/2fdeb098/attachment.sig>

Markus Pargmann

author

2014-04-28 14:12 UTC #7 lore raw

PATCH 3/3 ARM: dts: imx6dl, fix i2c4 device node

In reply to Markus Pargmann

i2c4 is exactly the same hardware module as i2c 1 to 3. The compatible property is wrong and the appropriate clock was missing.

Signed-off-by Markus Pargmann <[email protected]>

---
 arch/arm/boot/dts/imx6dl.dtsi | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

arch/arm/boot/dts/imx6dl.dtsi +2 -1

index 9c4942f..a48a542 100644
@@ -84,9 +84,10 @@
 			i2c4: i2c at 021f8000 {
 				#address-cells = <1>;
 				#size-cells = <0>;
-				compatible = "fsl,imx1-i2c";
+				compatible = "fsl,imx6q-i2c", "fsl,imx21-i2c";
 				reg = <0x021f8000 0x4000>;
 				interrupts = <0 35 IRQ_TYPE_LEVEL_HIGH>;
+				clocks = <&clks 209>;
 				status = "disabled";
 			};
 		};

Signature · 1 line

1.9.1

Shawn Guo

2014-04-30 06:42 UTC #8 lore raw

PATCH 3/3 ARM: dts: imx6dl, fix i2c4 device node

Quoted 13 lines · Markus Pargmann

i2c4 is exactly the same hardware module as i2c 1 to 3. The compatible property is wrong and the appropriate clock was missing.
Signed-off-by Markus Pargmann <[email protected]>
---
 arch/arm/boot/dts/imx6dl.dtsi | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm/boot/dts/imx6dl.dtsi +0 -0
index 9c4942f..a48a542 100644

arch/arm/boot/dts/imx6dl.dtsi line 90

Quoted 8 lines

arch/arm/boot/dts/imx6dl.dtsi +2 -1

@@ -84,9 +84,10 @@
 			i2c4: i2c at 021f8000 {
 				#address-cells = <1>;
 				#size-cells = <0>;
-				compatible = "fsl,imx1-i2c";
+				compatible = "fsl,imx6q-i2c", "fsl,imx21-i2c";
 				reg = <0x021f8000 0x4000>;
 				interrupts = <0 35 IRQ_TYPE_LEVEL_HIGH>;
+				clocks = <&clks 209>;

It needs to be a different number when you rebase the patch on my branch.

Shawn

Quoted 6 lines

arch/arm/boot/dts/imx6dl.dtsi +0 -0
 				status = "disabled";
 			};
 		};
Signature · 1 line
1.9.1

Markus Pargmann

author

2014-04-30 07:02 UTC #9 lore raw

PATCH 3/3 ARM: dts: imx6dl, fix i2c4 device node

Quoted 9 lines · Shawn Guo

Quoted 8 lines · Markus Pargmann
i2c4 is exactly the same hardware module as i2c 1 to 3. The compatible property is wrong and the appropriate clock was missing.
Signed-off-by Markus Pargmann <[email protected]>
---
 arch/arm/boot/dts/imx6dl.dtsi | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Quoted 16 lines

arch/arm/boot/dts/imx6dl.dtsi line 90

Quoted 13 lines

arch/arm/boot/dts/imx6dl.dtsi +2 -1

index 9c4942f..a48a542 100644
@@ -84,9 +84,10 @@
 			i2c4: i2c at 021f8000 {
 				#address-cells = <1>;
 				#size-cells = <0>;
-				compatible = "fsl,imx1-i2c";
+				compatible = "fsl,imx6q-i2c", "fsl,imx21-i2c";
 				reg = <0x021f8000 0x4000>;
 				interrupts = <0 35 IRQ_TYPE_LEVEL_HIGH>;
+				clocks = <&clks 209>;

It needs to be a different number when you rebase the patch on my branch.

I will rebase this patch and resend with the correct clock number.

Regards,

Markus

Signature · 11 lines

Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140430/7510daeb/attachment.sig>