[PATCH 0/3] ARM: dts: imx6 fsl-ssi and i2c4

[PATCH 0/3] ARM: dts: imx6 fsl-ssi and i2c4

[Markus Pargmann]

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(-)

-- 
1.9.1

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

[Markus Pargmann]

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

Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
---
 arch/arm/boot/dts/imx6qdl.dtsi | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index 947e463..b230c09 100644
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -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";
 				};
 
-- 
1.9.1

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

[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 <mpa@pengutronix.de>
---
 arch/arm/boot/dts/imx6qdl.dtsi | 3 +++
 arch/arm/boot/dts/imx6sl.dtsi  | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index b230c09..288c76e 100644
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -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";
diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi
index 3cb4941..36da35c 100644
--- a/arch/arm/boot/dts/imx6sl.dtsi
+++ b/arch/arm/boot/dts/imx6sl.dtsi
@@ -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";
-- 
1.9.1

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

[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 <mpa@pengutronix.de>
---
 arch/arm/boot/dts/imx6dl.dtsi | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/imx6dl.dtsi b/arch/arm/boot/dts/imx6dl.dtsi
index 9c4942f..a48a542 100644
--- a/arch/arm/boot/dts/imx6dl.dtsi
+++ b/arch/arm/boot/dts/imx6dl.dtsi
@@ -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";
 			};
 		};
-- 
1.9.1

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

[Shawn Guo]

On Mon, Apr 28, 2014 at 04:12:34PM +0200, Markus Pargmann wrote:
> 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

> 
> Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
> ---
>  arch/arm/boot/dts/imx6qdl.dtsi | 3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
> index 947e463..b230c09 100644
> --- a/arch/arm/boot/dts/imx6qdl.dtsi
> +++ b/arch/arm/boot/dts/imx6qdl.dtsi
> @@ -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";
>  				};
>  
> -- 
> 1.9.1
> 

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

[Shawn Guo]

On Mon, Apr 28, 2014 at 04:12:35PM +0200, Markus Pargmann wrote:
> 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 <mpa@pengutronix.de>
> ---
>  arch/arm/boot/dts/imx6qdl.dtsi | 3 +++
>  arch/arm/boot/dts/imx6sl.dtsi  | 3 +++
>  2 files changed, 6 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
> index b230c09..288c76e 100644
> --- a/arch/arm/boot/dts/imx6qdl.dtsi
> +++ b/arch/arm/boot/dts/imx6qdl.dtsi
> @@ -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

>  					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";
> diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi
> index 3cb4941..36da35c 100644
> --- a/arch/arm/boot/dts/imx6sl.dtsi
> +++ b/arch/arm/boot/dts/imx6sl.dtsi
> @@ -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";
> -- 
> 1.9.1
> 

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

[Shawn Guo]

On Mon, Apr 28, 2014 at 04:12:36PM +0200, Markus Pargmann wrote:
> 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 <mpa@pengutronix.de>
> ---
>  arch/arm/boot/dts/imx6dl.dtsi | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/arm/boot/dts/imx6dl.dtsi b/arch/arm/boot/dts/imx6dl.dtsi
> index 9c4942f..a48a542 100644
> --- a/arch/arm/boot/dts/imx6dl.dtsi
> +++ b/arch/arm/boot/dts/imx6dl.dtsi
> @@ -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

>  				status = "disabled";
>  			};
>  		};
> -- 
> 1.9.1
> 

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

[Markus Pargmann]

On Wed, Apr 30, 2014 at 02:37:46PM +0800, Shawn Guo wrote:
> On Mon, Apr 28, 2014 at 04:12:34PM +0200, Markus Pargmann wrote:
> > 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

-- 
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>

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

[Markus Pargmann]

On Wed, Apr 30, 2014 at 02:42:01PM +0800, Shawn Guo wrote:
> On Mon, Apr 28, 2014 at 04:12:36PM +0200, Markus Pargmann wrote:
> > 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 <mpa@pengutronix.de>
> > ---
> >  arch/arm/boot/dts/imx6dl.dtsi | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> > 
> > diff --git a/arch/arm/boot/dts/imx6dl.dtsi b/arch/arm/boot/dts/imx6dl.dtsi
> > index 9c4942f..a48a542 100644
> > --- a/arch/arm/boot/dts/imx6dl.dtsi
> > +++ b/arch/arm/boot/dts/imx6dl.dtsi
> > @@ -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

-- 
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>

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

[Markus Pargmann]

On Wed, Apr 30, 2014 at 02:41:06PM +0800, Shawn Guo wrote:
> On Mon, Apr 28, 2014 at 04:12:35PM +0200, Markus Pargmann wrote:
> > 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 <mpa@pengutronix.de>
> > ---
> >  arch/arm/boot/dts/imx6qdl.dtsi | 3 +++
> >  arch/arm/boot/dts/imx6sl.dtsi  | 3 +++
> >  2 files changed, 6 insertions(+)
> > 
> > diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
> > index b230c09..288c76e 100644
> > --- a/arch/arm/boot/dts/imx6qdl.dtsi
> > +++ b/arch/arm/boot/dts/imx6qdl.dtsi
> > @@ -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

-- 
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>