[PATCH 0/5] ARM: mvebu: misc Device Tree fixes and updates

[PATCH 0/5] ARM: mvebu: misc Device Tree fixes and updates

[Thomas Petazzoni]

Jason, Gregory, Andrew, Sebastian,

Here are five patches making misc Device Tree fixes and updates for
mvebu platforms:

 * The first patch is really a fix, that makes audio actually work on
   Armada 370 DB. It should be merged as part of 3.15-rc.

 * The second patch enables the SATA interface on Armada 375 DB,
   apparently something we forgot to do when submitting the initial
   Armada 375 DB Device Tree. Not sure whether it's 3.15 or 3.16
   material.

 * The last three patches are improvements to the Device Tree to use
   the 'clocks' property for UART controllers instead of an hard-coded
   'clock-frequency' property. This is clearly cleanup stuff, so 3.16
   is in order.

Thanks!

Thomas

Thomas Petazzoni (5):
  ARM: mvebu: specify I2C bus frequency on Armada 370 DB
  ARM: mvebu: enable the SATA interface on Armada 375 DB
  ARM: mvebu: use clocks property for serial ports
  ARM: mvebu: remove clock-frequency of serial port Device Tree nodes
  ARM: mvebu: don't use clocks property in UART node for Netgear RN2120

 arch/arm/boot/dts/armada-370-db.dts              | 2 +-
 arch/arm/boot/dts/armada-370-mirabox.dts         | 1 -
 arch/arm/boot/dts/armada-370-netgear-rn102.dts   | 1 -
 arch/arm/boot/dts/armada-370-netgear-rn104.dts   | 1 -
 arch/arm/boot/dts/armada-370-rd.dts              | 1 -
 arch/arm/boot/dts/armada-370-xp.dtsi             | 2 ++
 arch/arm/boot/dts/armada-375-db.dts              | 6 +++++-
 arch/arm/boot/dts/armada-375.dtsi                | 2 ++
 arch/arm/boot/dts/armada-385-db.dts              | 1 -
 arch/arm/boot/dts/armada-385-rd.dts              | 1 -
 arch/arm/boot/dts/armada-38x.dtsi                | 2 ++
 arch/arm/boot/dts/armada-xp-axpwifiap.dts        | 2 --
 arch/arm/boot/dts/armada-xp-db.dts               | 4 ----
 arch/arm/boot/dts/armada-xp-gp.dts               | 4 ----
 arch/arm/boot/dts/armada-xp-matrix.dts           | 4 ----
 arch/arm/boot/dts/armada-xp-netgear-rn2120.dts   | 1 -
 arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 2 --
 arch/arm/boot/dts/armada-xp.dtsi                 | 2 ++
 18 files changed, 14 insertions(+), 25 deletions(-)

-- 
1.9.2

[PATCH 1/5] ARM: mvebu: specify I2C bus frequency on Armada 370 DB

[Thomas Petazzoni]

In commit 249f3822509b74f8c8d0731aeb7ccea065376c9b ('ARM: mvebu: add
audio support to Armada 370 DB'), the I2C bus 0 was enabled on the
Armada 370 DB board, and an I2C codec was described as being connected
on this bus.

However, this commit forgot to define the I2C bus frequency, which
leads the i2c-mv64xxx to fail probing, as it cannot calculate the baud
rate multiplier/divisor to derive the I2C bus frequency from the core
SoC frequency. It makes audio completely unusable, as the I2C bus is
not probed, and therefore the audio codec is not probed either.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
The audio support was merged in 3.15-rc1, so there's no need to
backport this change into stable trees. However, it needs to go in the
3.15-rc cycle.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 arch/arm/boot/dts/armada-370-db.dts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/boot/dts/armada-370-db.dts b/arch/arm/boot/dts/armada-370-db.dts
index 82f238a..3383c4b 100644
--- a/arch/arm/boot/dts/armada-370-db.dts
+++ b/arch/arm/boot/dts/armada-370-db.dts
@@ -67,6 +67,7 @@
 			i2c at 11000 {
 				pinctrl-0 = <&i2c0_pins>;
 				pinctrl-names = "default";
+				clock-frequency = <100000>;
 				status = "okay";
 				audio_codec: audio-codec at 4a {
 					compatible = "cirrus,cs42l51";
-- 
1.9.2

[PATCH 2/5] ARM: mvebu: enable the SATA interface on Armada 375 DB

[Thomas Petazzoni]

The Armada 375 SoC has a dual-port SATA interface, which is exposed on
the Armada 375 DB board. This commit therefore enables this interface
on the Armada 375 DB board.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 arch/arm/boot/dts/armada-375-db.dts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/arch/arm/boot/dts/armada-375-db.dts b/arch/arm/boot/dts/armada-375-db.dts
index 9378d31..0451124 100644
--- a/arch/arm/boot/dts/armada-375-db.dts
+++ b/arch/arm/boot/dts/armada-375-db.dts
@@ -79,6 +79,11 @@
 				};
 			};
 
+			sata at a0000 {
+				status = "okay";
+				nr-ports = <2>;
+			};
+
 			nand: nand at d0000 {
 				pinctrl-0 = <&nand_pins>;
 				pinctrl-names = "default";
-- 
1.9.2

[PATCH 3/5] ARM: mvebu: use clocks property for serial ports

[Thomas Petazzoni]

Back when the Armada 370 and Armada XP initial support was introduced,
the only way to pass the clock frequency to the of_serial driver was
through a clock-frequency Device Tree property.

Thanks to 0bbeb3c3e84bc963d1c66661e082d207023b0e5c ('of serial port
driver - add clk_get_rate() support'), it is possible to use the
standard 'clocks' DT property to reference the clock used for a
particular UART controller. This clock is then used by the of_serial
driver to retrieve the clock rate.

This commit modifies the SoC-level Device Tree files of Armada 370,
Armada XP, Armada 375 and Armada 38x to use this possibility. Since
there is no gatable clock for the UART controllers, we simply
reference the TCLK, which is the main SoC clock for the peripherals.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 arch/arm/boot/dts/armada-370-xp.dtsi | 2 ++
 arch/arm/boot/dts/armada-375.dtsi    | 2 ++
 arch/arm/boot/dts/armada-38x.dtsi    | 2 ++
 arch/arm/boot/dts/armada-xp.dtsi     | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi
index bbb40f6..3bc1fa80 100644
--- a/arch/arm/boot/dts/armada-370-xp.dtsi
+++ b/arch/arm/boot/dts/armada-370-xp.dtsi
@@ -157,6 +157,7 @@
 				reg-shift = <2>;
 				interrupts = <41>;
 				reg-io-width = <1>;
+				clocks = <&coreclk 0>;
 				status = "disabled";
 			};
 			serial at 12100 {
@@ -165,6 +166,7 @@
 				reg-shift = <2>;
 				interrupts = <42>;
 				reg-io-width = <1>;
+				clocks = <&coreclk 0>;
 				status = "disabled";
 			};
 
diff --git a/arch/arm/boot/dts/armada-375.dtsi b/arch/arm/boot/dts/armada-375.dtsi
index 3877693..0c50c44 100644
--- a/arch/arm/boot/dts/armada-375.dtsi
+++ b/arch/arm/boot/dts/armada-375.dtsi
@@ -194,6 +194,7 @@
 				reg-shift = <2>;
 				interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;
 				reg-io-width = <1>;
+				clocks = <&coreclk 0>;
 				status = "disabled";
 			};
 
@@ -203,6 +204,7 @@
 				reg-shift = <2>;
 				interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>;
 				reg-io-width = <1>;
+				clocks = <&coreclk 0>;
 				status = "disabled";
 			};
 
diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi
index a064f59..63fdf2d 100644
--- a/arch/arm/boot/dts/armada-38x.dtsi
+++ b/arch/arm/boot/dts/armada-38x.dtsi
@@ -174,6 +174,7 @@
 				reg-shift = <2>;
 				interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;
 				reg-io-width = <1>;
+				clocks = <&coreclk 0>;
 				status = "disabled";
 			};
 
@@ -183,6 +184,7 @@
 				reg-shift = <2>;
 				interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>;
 				reg-io-width = <1>;
+				clocks = <&coreclk 0>;
 				status = "disabled";
 			};
 
diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi
index abb9f9d..a9fff62 100644
--- a/arch/arm/boot/dts/armada-xp.dtsi
+++ b/arch/arm/boot/dts/armada-xp.dtsi
@@ -58,6 +58,7 @@
 				reg-shift = <2>;
 				interrupts = <43>;
 				reg-io-width = <1>;
+				clocks = <&coreclk 0>;
 				status = "disabled";
 			};
 			serial at 12300 {
@@ -66,6 +67,7 @@
 				reg-shift = <2>;
 				interrupts = <44>;
 				reg-io-width = <1>;
+				clocks = <&coreclk 0>;
 				status = "disabled";
 			};
 
-- 
1.9.2

[PATCH 4/5] ARM: mvebu: remove clock-frequency of serial port Device Tree nodes

[Thomas Petazzoni]

Now that the Armada 370/375/38x/XP SoC-level Device Tree files have
the proper "clocks" property in their UART controllers node, it is no
longer useful to have the clock-frequency property defined in the
board-level Device Tree files.

Therefore, this commit gets rid of all the useless 'clock-frequency'
properties.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 arch/arm/boot/dts/armada-370-db.dts              | 1 -
 arch/arm/boot/dts/armada-370-mirabox.dts         | 1 -
 arch/arm/boot/dts/armada-370-netgear-rn102.dts   | 1 -
 arch/arm/boot/dts/armada-370-netgear-rn104.dts   | 1 -
 arch/arm/boot/dts/armada-370-rd.dts              | 1 -
 arch/arm/boot/dts/armada-375-db.dts              | 1 -
 arch/arm/boot/dts/armada-385-db.dts              | 1 -
 arch/arm/boot/dts/armada-385-rd.dts              | 1 -
 arch/arm/boot/dts/armada-xp-axpwifiap.dts        | 2 --
 arch/arm/boot/dts/armada-xp-db.dts               | 4 ----
 arch/arm/boot/dts/armada-xp-gp.dts               | 4 ----
 arch/arm/boot/dts/armada-xp-matrix.dts           | 4 ----
 arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 2 --
 13 files changed, 24 deletions(-)

diff --git a/arch/arm/boot/dts/armada-370-db.dts b/arch/arm/boot/dts/armada-370-db.dts
index 3383c4b..416f4e5 100644
--- a/arch/arm/boot/dts/armada-370-db.dts
+++ b/arch/arm/boot/dts/armada-370-db.dts
@@ -35,7 +35,6 @@
 
 		internal-regs {
 			serial at 12000 {
-				clock-frequency = <200000000>;
 				status = "okay";
 			};
 			sata at a0000 {
diff --git a/arch/arm/boot/dts/armada-370-mirabox.dts b/arch/arm/boot/dts/armada-370-mirabox.dts
index 2354fe0..097df7d8 100644
--- a/arch/arm/boot/dts/armada-370-mirabox.dts
+++ b/arch/arm/boot/dts/armada-370-mirabox.dts
@@ -47,7 +47,6 @@
 
 		internal-regs {
 			serial at 12000 {
-				clock-frequency = <200000000>;
 				status = "okay";
 			};
 			timer at 20300 {
diff --git a/arch/arm/boot/dts/armada-370-netgear-rn102.dts b/arch/arm/boot/dts/armada-370-netgear-rn102.dts
index 651aeb5..d6d572e 100644
--- a/arch/arm/boot/dts/armada-370-netgear-rn102.dts
+++ b/arch/arm/boot/dts/armada-370-netgear-rn102.dts
@@ -50,7 +50,6 @@
 
 		internal-regs {
 			serial at 12000 {
-				clock-frequency = <200000000>;
 				status = "okay";
 			};
 
diff --git a/arch/arm/boot/dts/armada-370-netgear-rn104.dts b/arch/arm/boot/dts/armada-370-netgear-rn104.dts
index 4e27587..c5fe8b5 100644
--- a/arch/arm/boot/dts/armada-370-netgear-rn104.dts
+++ b/arch/arm/boot/dts/armada-370-netgear-rn104.dts
@@ -50,7 +50,6 @@
 
 		internal-regs {
 			serial at 12000 {
-				clock-frequency = <200000000>;
 				status = "okay";
 			};
 
diff --git a/arch/arm/boot/dts/armada-370-rd.dts b/arch/arm/boot/dts/armada-370-rd.dts
index 3e2c857..4169f40 100644
--- a/arch/arm/boot/dts/armada-370-rd.dts
+++ b/arch/arm/boot/dts/armada-370-rd.dts
@@ -51,7 +51,6 @@
 
 		internal-regs {
 			serial at 12000 {
-				clock-frequency = <200000000>;
 				status = "okay";
 			};
 			sata at a0000 {
diff --git a/arch/arm/boot/dts/armada-375-db.dts b/arch/arm/boot/dts/armada-375-db.dts
index 0451124..20f1f33 100644
--- a/arch/arm/boot/dts/armada-375-db.dts
+++ b/arch/arm/boot/dts/armada-375-db.dts
@@ -68,7 +68,6 @@
 			};
 
 			serial at 12000 {
-				clock-frequency = <200000000>;
 				status = "okay";
 			};
 
diff --git a/arch/arm/boot/dts/armada-385-db.dts b/arch/arm/boot/dts/armada-385-db.dts
index 6828d77..de778c6 100644
--- a/arch/arm/boot/dts/armada-385-db.dts
+++ b/arch/arm/boot/dts/armada-385-db.dts
@@ -55,7 +55,6 @@
 			};
 
 			serial at 12000 {
-				clock-frequency = <200000000>;
 				status = "okay";
 			};
 
diff --git a/arch/arm/boot/dts/armada-385-rd.dts b/arch/arm/boot/dts/armada-385-rd.dts
index 45250c8..4b39bed 100644
--- a/arch/arm/boot/dts/armada-385-rd.dts
+++ b/arch/arm/boot/dts/armada-385-rd.dts
@@ -51,7 +51,6 @@
 			};
 
 			serial at 12000 {
-				clock-frequency = <200000000>;
 				status = "okay";
 			};
 
diff --git a/arch/arm/boot/dts/armada-xp-axpwifiap.dts b/arch/arm/boot/dts/armada-xp-axpwifiap.dts
index d83d7d6..a55a97a 100644
--- a/arch/arm/boot/dts/armada-xp-axpwifiap.dts
+++ b/arch/arm/boot/dts/armada-xp-axpwifiap.dts
@@ -95,12 +95,10 @@
 			};
 
 			serial at 12000 {
-				clock-frequency = <250000000>;
 				status = "okay";
 			};
 
 			serial at 12100 {
-				clock-frequency = <250000000>;
 				status = "okay";
 			};
 
diff --git a/arch/arm/boot/dts/armada-xp-db.dts b/arch/arm/boot/dts/armada-xp-db.dts
index 448373c..2b598ef 100644
--- a/arch/arm/boot/dts/armada-xp-db.dts
+++ b/arch/arm/boot/dts/armada-xp-db.dts
@@ -106,19 +106,15 @@
 
 		internal-regs {
 			serial at 12000 {
-				clock-frequency = <250000000>;
 				status = "okay";
 			};
 			serial at 12100 {
-				clock-frequency = <250000000>;
 				status = "okay";
 			};
 			serial at 12200 {
-				clock-frequency = <250000000>;
 				status = "okay";
 			};
 			serial at 12300 {
-				clock-frequency = <250000000>;
 				status = "okay";
 			};
 
diff --git a/arch/arm/boot/dts/armada-xp-gp.dts b/arch/arm/boot/dts/armada-xp-gp.dts
index 61bda68..eb0013f 100644
--- a/arch/arm/boot/dts/armada-xp-gp.dts
+++ b/arch/arm/boot/dts/armada-xp-gp.dts
@@ -104,19 +104,15 @@
 
 		internal-regs {
 			serial at 12000 {
-				clock-frequency = <250000000>;
 				status = "okay";
 			};
 			serial at 12100 {
-				clock-frequency = <250000000>;
 				status = "okay";
 			};
 			serial at 12200 {
-				clock-frequency = <250000000>;
 				status = "okay";
 			};
 			serial at 12300 {
-				clock-frequency = <250000000>;
 				status = "okay";
 			};
 
diff --git a/arch/arm/boot/dts/armada-xp-matrix.dts b/arch/arm/boot/dts/armada-xp-matrix.dts
index c224274..25674fe 100644
--- a/arch/arm/boot/dts/armada-xp-matrix.dts
+++ b/arch/arm/boot/dts/armada-xp-matrix.dts
@@ -37,19 +37,15 @@
 
 		internal-regs {
 			serial at 12000 {
-				clock-frequency = <250000000>;
 				status = "okay";
 			};
 			serial at 12100 {
-				clock-frequency = <250000000>;
 				status = "okay";
 			};
 			serial at 12200 {
-				clock-frequency = <250000000>;
 				status = "okay";
 			};
 			serial at 12300 {
-				clock-frequency = <250000000>;
 				status = "okay";
 			};
 
diff --git a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
index 985948c..cf26d13 100644
--- a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
+++ b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
@@ -72,11 +72,9 @@
 
 		internal-regs {
 			serial at 12000 {
-				clock-frequency = <250000000>;
 				status = "okay";
 			};
 			serial at 12100 {
-				clock-frequency = <250000000>;
 				status = "okay";
 			};
 			pinctrl {
-- 
1.9.2

[PATCH 5/5] ARM: mvebu: don't use clocks property in UART node for Netgear RN2120

[Thomas Petazzoni]

The Netgear RN2120 was not using the same strategy as the other Armada
370/375/38x/XP boards: it was using a 'clocks' property and not the
'clock-frequency' property in its UART controller Device Tree node.

However, now that this clock reference is present at the SoC-level,
there is no point in duplicating it at the board-level.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts b/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts
index ff049ee..0cf999a 100644
--- a/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts
+++ b/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts
@@ -138,7 +138,6 @@
 			};
 
 			serial at 12000 {
-				clocks = <&coreclk 0>;
 				status = "okay";
 			};
 
-- 
1.9.2

[PATCH 1/5] ARM: mvebu: specify I2C bus frequency on Armada 370 DB

[Gregory CLEMENT]

On 18/04/2014 09:41, Thomas Petazzoni wrote:
> In commit 249f3822509b74f8c8d0731aeb7ccea065376c9b ('ARM: mvebu: add
> audio support to Armada 370 DB'), the I2C bus 0 was enabled on the
> Armada 370 DB board, and an I2C codec was described as being connected
> on this bus.
> 
> However, this commit forgot to define the I2C bus frequency, which
> leads the i2c-mv64xxx to fail probing, as it cannot calculate the baud
> rate multiplier/divisor to derive the I2C bus frequency from the core
> SoC frequency. It makes audio completely unusable, as the I2C bus is
> not probed, and therefore the audio codec is not probed either.
> 
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>


> ---
> The audio support was merged in 3.15-rc1, so there's no need to
> backport this change into stable trees. However, it needs to go in the
> 3.15-rc cycle.
> 
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> ---
>  arch/arm/boot/dts/armada-370-db.dts | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/arch/arm/boot/dts/armada-370-db.dts b/arch/arm/boot/dts/armada-370-db.dts
> index 82f238a..3383c4b 100644
> --- a/arch/arm/boot/dts/armada-370-db.dts
> +++ b/arch/arm/boot/dts/armada-370-db.dts
> @@ -67,6 +67,7 @@
>  			i2c at 11000 {
>  				pinctrl-0 = <&i2c0_pins>;
>  				pinctrl-names = "default";
> +				clock-frequency = <100000>;
>  				status = "okay";
>  				audio_codec: audio-codec at 4a {
>  					compatible = "cirrus,cs42l51";
> 


-- 
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[PATCH 2/5] ARM: mvebu: enable the SATA interface on Armada 375 DB

[Gregory CLEMENT]

On 18/04/2014 09:41, Thomas Petazzoni wrote:
> The Armada 375 SoC has a dual-port SATA interface, which is exposed on
> the Armada 375 DB board. This commit therefore enables this interface
> on the Armada 375 DB board.
> 
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>


Thanks,

Gregory

> ---
>  arch/arm/boot/dts/armada-375-db.dts | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/armada-375-db.dts b/arch/arm/boot/dts/armada-375-db.dts
> index 9378d31..0451124 100644
> --- a/arch/arm/boot/dts/armada-375-db.dts
> +++ b/arch/arm/boot/dts/armada-375-db.dts
> @@ -79,6 +79,11 @@
>  				};
>  			};
>  
> +			sata at a0000 {
> +				status = "okay";
> +				nr-ports = <2>;
> +			};
> +
>  			nand: nand at d0000 {
>  				pinctrl-0 = <&nand_pins>;
>  				pinctrl-names = "default";
> 


-- 
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[PATCH 3/5] ARM: mvebu: use clocks property for serial ports

[Gregory CLEMENT]

On 18/04/2014 09:41, Thomas Petazzoni wrote:
> Back when the Armada 370 and Armada XP initial support was introduced,
> the only way to pass the clock frequency to the of_serial driver was
> through a clock-frequency Device Tree property.
> 
> Thanks to 0bbeb3c3e84bc963d1c66661e082d207023b0e5c ('of serial port
> driver - add clk_get_rate() support'), it is possible to use the
> standard 'clocks' DT property to reference the clock used for a
> particular UART controller. This clock is then used by the of_serial
> driver to retrieve the clock rate.
> 
> This commit modifies the SoC-level Device Tree files of Armada 370,
> Armada XP, Armada 375 and Armada 38x to use this possibility. Since
> there is no gatable clock for the UART controllers, we simply
> reference the TCLK, which is the main SoC clock for the peripherals.
> 
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>


Thanks,

Gregory

> ---
>  arch/arm/boot/dts/armada-370-xp.dtsi | 2 ++
>  arch/arm/boot/dts/armada-375.dtsi    | 2 ++
>  arch/arm/boot/dts/armada-38x.dtsi    | 2 ++
>  arch/arm/boot/dts/armada-xp.dtsi     | 2 ++
>  4 files changed, 8 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi
> index bbb40f6..3bc1fa80 100644
> --- a/arch/arm/boot/dts/armada-370-xp.dtsi
> +++ b/arch/arm/boot/dts/armada-370-xp.dtsi
> @@ -157,6 +157,7 @@
>  				reg-shift = <2>;
>  				interrupts = <41>;
>  				reg-io-width = <1>;
> +				clocks = <&coreclk 0>;
>  				status = "disabled";
>  			};
>  			serial at 12100 {
> @@ -165,6 +166,7 @@
>  				reg-shift = <2>;
>  				interrupts = <42>;
>  				reg-io-width = <1>;
> +				clocks = <&coreclk 0>;
>  				status = "disabled";
>  			};
>  
> diff --git a/arch/arm/boot/dts/armada-375.dtsi b/arch/arm/boot/dts/armada-375.dtsi
> index 3877693..0c50c44 100644
> --- a/arch/arm/boot/dts/armada-375.dtsi
> +++ b/arch/arm/boot/dts/armada-375.dtsi
> @@ -194,6 +194,7 @@
>  				reg-shift = <2>;
>  				interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;
>  				reg-io-width = <1>;
> +				clocks = <&coreclk 0>;
>  				status = "disabled";
>  			};
>  
> @@ -203,6 +204,7 @@
>  				reg-shift = <2>;
>  				interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>;
>  				reg-io-width = <1>;
> +				clocks = <&coreclk 0>;
>  				status = "disabled";
>  			};
>  
> diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi
> index a064f59..63fdf2d 100644
> --- a/arch/arm/boot/dts/armada-38x.dtsi
> +++ b/arch/arm/boot/dts/armada-38x.dtsi
> @@ -174,6 +174,7 @@
>  				reg-shift = <2>;
>  				interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;
>  				reg-io-width = <1>;
> +				clocks = <&coreclk 0>;
>  				status = "disabled";
>  			};
>  
> @@ -183,6 +184,7 @@
>  				reg-shift = <2>;
>  				interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>;
>  				reg-io-width = <1>;
> +				clocks = <&coreclk 0>;
>  				status = "disabled";
>  			};
>  
> diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi
> index abb9f9d..a9fff62 100644
> --- a/arch/arm/boot/dts/armada-xp.dtsi
> +++ b/arch/arm/boot/dts/armada-xp.dtsi
> @@ -58,6 +58,7 @@
>  				reg-shift = <2>;
>  				interrupts = <43>;
>  				reg-io-width = <1>;
> +				clocks = <&coreclk 0>;
>  				status = "disabled";
>  			};
>  			serial at 12300 {
> @@ -66,6 +67,7 @@
>  				reg-shift = <2>;
>  				interrupts = <44>;
>  				reg-io-width = <1>;
> +				clocks = <&coreclk 0>;
>  				status = "disabled";
>  			};
>  
> 


-- 
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[PATCH 4/5] ARM: mvebu: remove clock-frequency of serial port Device Tree nodes

[Gregory CLEMENT]

On 18/04/2014 09:41, Thomas Petazzoni wrote:
> Now that the Armada 370/375/38x/XP SoC-level Device Tree files have
> the proper "clocks" property in their UART controllers node, it is no
> longer useful to have the clock-frequency property defined in the
> board-level Device Tree files.
> 
> Therefore, this commit gets rid of all the useless 'clock-frequency'
> properties.
> 
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>


Thanks,

Gregory

> ---
>  arch/arm/boot/dts/armada-370-db.dts              | 1 -
>  arch/arm/boot/dts/armada-370-mirabox.dts         | 1 -
>  arch/arm/boot/dts/armada-370-netgear-rn102.dts   | 1 -
>  arch/arm/boot/dts/armada-370-netgear-rn104.dts   | 1 -
>  arch/arm/boot/dts/armada-370-rd.dts              | 1 -
>  arch/arm/boot/dts/armada-375-db.dts              | 1 -
>  arch/arm/boot/dts/armada-385-db.dts              | 1 -
>  arch/arm/boot/dts/armada-385-rd.dts              | 1 -
>  arch/arm/boot/dts/armada-xp-axpwifiap.dts        | 2 --
>  arch/arm/boot/dts/armada-xp-db.dts               | 4 ----
>  arch/arm/boot/dts/armada-xp-gp.dts               | 4 ----
>  arch/arm/boot/dts/armada-xp-matrix.dts           | 4 ----
>  arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 2 --
>  13 files changed, 24 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/armada-370-db.dts b/arch/arm/boot/dts/armada-370-db.dts
> index 3383c4b..416f4e5 100644
> --- a/arch/arm/boot/dts/armada-370-db.dts
> +++ b/arch/arm/boot/dts/armada-370-db.dts
> @@ -35,7 +35,6 @@
>  
>  		internal-regs {
>  			serial at 12000 {
> -				clock-frequency = <200000000>;
>  				status = "okay";
>  			};
>  			sata at a0000 {
> diff --git a/arch/arm/boot/dts/armada-370-mirabox.dts b/arch/arm/boot/dts/armada-370-mirabox.dts
> index 2354fe0..097df7d8 100644
> --- a/arch/arm/boot/dts/armada-370-mirabox.dts
> +++ b/arch/arm/boot/dts/armada-370-mirabox.dts
> @@ -47,7 +47,6 @@
>  
>  		internal-regs {
>  			serial at 12000 {
> -				clock-frequency = <200000000>;
>  				status = "okay";
>  			};
>  			timer at 20300 {
> diff --git a/arch/arm/boot/dts/armada-370-netgear-rn102.dts b/arch/arm/boot/dts/armada-370-netgear-rn102.dts
> index 651aeb5..d6d572e 100644
> --- a/arch/arm/boot/dts/armada-370-netgear-rn102.dts
> +++ b/arch/arm/boot/dts/armada-370-netgear-rn102.dts
> @@ -50,7 +50,6 @@
>  
>  		internal-regs {
>  			serial at 12000 {
> -				clock-frequency = <200000000>;
>  				status = "okay";
>  			};
>  
> diff --git a/arch/arm/boot/dts/armada-370-netgear-rn104.dts b/arch/arm/boot/dts/armada-370-netgear-rn104.dts
> index 4e27587..c5fe8b5 100644
> --- a/arch/arm/boot/dts/armada-370-netgear-rn104.dts
> +++ b/arch/arm/boot/dts/armada-370-netgear-rn104.dts
> @@ -50,7 +50,6 @@
>  
>  		internal-regs {
>  			serial at 12000 {
> -				clock-frequency = <200000000>;
>  				status = "okay";
>  			};
>  
> diff --git a/arch/arm/boot/dts/armada-370-rd.dts b/arch/arm/boot/dts/armada-370-rd.dts
> index 3e2c857..4169f40 100644
> --- a/arch/arm/boot/dts/armada-370-rd.dts
> +++ b/arch/arm/boot/dts/armada-370-rd.dts
> @@ -51,7 +51,6 @@
>  
>  		internal-regs {
>  			serial at 12000 {
> -				clock-frequency = <200000000>;
>  				status = "okay";
>  			};
>  			sata at a0000 {
> diff --git a/arch/arm/boot/dts/armada-375-db.dts b/arch/arm/boot/dts/armada-375-db.dts
> index 0451124..20f1f33 100644
> --- a/arch/arm/boot/dts/armada-375-db.dts
> +++ b/arch/arm/boot/dts/armada-375-db.dts
> @@ -68,7 +68,6 @@
>  			};
>  
>  			serial at 12000 {
> -				clock-frequency = <200000000>;
>  				status = "okay";
>  			};
>  
> diff --git a/arch/arm/boot/dts/armada-385-db.dts b/arch/arm/boot/dts/armada-385-db.dts
> index 6828d77..de778c6 100644
> --- a/arch/arm/boot/dts/armada-385-db.dts
> +++ b/arch/arm/boot/dts/armada-385-db.dts
> @@ -55,7 +55,6 @@
>  			};
>  
>  			serial at 12000 {
> -				clock-frequency = <200000000>;
>  				status = "okay";
>  			};
>  
> diff --git a/arch/arm/boot/dts/armada-385-rd.dts b/arch/arm/boot/dts/armada-385-rd.dts
> index 45250c8..4b39bed 100644
> --- a/arch/arm/boot/dts/armada-385-rd.dts
> +++ b/arch/arm/boot/dts/armada-385-rd.dts
> @@ -51,7 +51,6 @@
>  			};
>  
>  			serial at 12000 {
> -				clock-frequency = <200000000>;
>  				status = "okay";
>  			};
>  
> diff --git a/arch/arm/boot/dts/armada-xp-axpwifiap.dts b/arch/arm/boot/dts/armada-xp-axpwifiap.dts
> index d83d7d6..a55a97a 100644
> --- a/arch/arm/boot/dts/armada-xp-axpwifiap.dts
> +++ b/arch/arm/boot/dts/armada-xp-axpwifiap.dts
> @@ -95,12 +95,10 @@
>  			};
>  
>  			serial at 12000 {
> -				clock-frequency = <250000000>;
>  				status = "okay";
>  			};
>  
>  			serial at 12100 {
> -				clock-frequency = <250000000>;
>  				status = "okay";
>  			};
>  
> diff --git a/arch/arm/boot/dts/armada-xp-db.dts b/arch/arm/boot/dts/armada-xp-db.dts
> index 448373c..2b598ef 100644
> --- a/arch/arm/boot/dts/armada-xp-db.dts
> +++ b/arch/arm/boot/dts/armada-xp-db.dts
> @@ -106,19 +106,15 @@
>  
>  		internal-regs {
>  			serial at 12000 {
> -				clock-frequency = <250000000>;
>  				status = "okay";
>  			};
>  			serial at 12100 {
> -				clock-frequency = <250000000>;
>  				status = "okay";
>  			};
>  			serial at 12200 {
> -				clock-frequency = <250000000>;
>  				status = "okay";
>  			};
>  			serial at 12300 {
> -				clock-frequency = <250000000>;
>  				status = "okay";
>  			};
>  
> diff --git a/arch/arm/boot/dts/armada-xp-gp.dts b/arch/arm/boot/dts/armada-xp-gp.dts
> index 61bda68..eb0013f 100644
> --- a/arch/arm/boot/dts/armada-xp-gp.dts
> +++ b/arch/arm/boot/dts/armada-xp-gp.dts
> @@ -104,19 +104,15 @@
>  
>  		internal-regs {
>  			serial at 12000 {
> -				clock-frequency = <250000000>;
>  				status = "okay";
>  			};
>  			serial at 12100 {
> -				clock-frequency = <250000000>;
>  				status = "okay";
>  			};
>  			serial at 12200 {
> -				clock-frequency = <250000000>;
>  				status = "okay";
>  			};
>  			serial at 12300 {
> -				clock-frequency = <250000000>;
>  				status = "okay";
>  			};
>  
> diff --git a/arch/arm/boot/dts/armada-xp-matrix.dts b/arch/arm/boot/dts/armada-xp-matrix.dts
> index c224274..25674fe 100644
> --- a/arch/arm/boot/dts/armada-xp-matrix.dts
> +++ b/arch/arm/boot/dts/armada-xp-matrix.dts
> @@ -37,19 +37,15 @@
>  
>  		internal-regs {
>  			serial at 12000 {
> -				clock-frequency = <250000000>;
>  				status = "okay";
>  			};
>  			serial at 12100 {
> -				clock-frequency = <250000000>;
>  				status = "okay";
>  			};
>  			serial at 12200 {
> -				clock-frequency = <250000000>;
>  				status = "okay";
>  			};
>  			serial at 12300 {
> -				clock-frequency = <250000000>;
>  				status = "okay";
>  			};
>  
> diff --git a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
> index 985948c..cf26d13 100644
> --- a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
> +++ b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
> @@ -72,11 +72,9 @@
>  
>  		internal-regs {
>  			serial at 12000 {
> -				clock-frequency = <250000000>;
>  				status = "okay";
>  			};
>  			serial at 12100 {
> -				clock-frequency = <250000000>;
>  				status = "okay";
>  			};
>  			pinctrl {
> 


-- 
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[PATCH 5/5] ARM: mvebu: don't use clocks property in UART node for Netgear RN2120

[Gregory CLEMENT]

On 18/04/2014 09:41, Thomas Petazzoni wrote:
> The Netgear RN2120 was not using the same strategy as the other Armada
> 370/375/38x/XP boards: it was using a 'clocks' property and not the
> 'clock-frequency' property in its UART controller Device Tree node.
> 
> However, now that this clock reference is present at the SoC-level,
> there is no point in duplicating it at the board-level.
> 
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>


Thanks,

Gregory

> ---
>  arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts b/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts
> index ff049ee..0cf999a 100644
> --- a/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts
> +++ b/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts
> @@ -138,7 +138,6 @@
>  			};
>  
>  			serial at 12000 {
> -				clocks = <&coreclk 0>;
>  				status = "okay";
>  			};
>  
> 


-- 
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[PATCH 0/5] ARM: mvebu: misc Device Tree fixes and updates

[Jason Cooper]

On Fri, Apr 18, 2014 at 09:41:43AM +0200, Thomas Petazzoni wrote:
> Jason, Gregory, Andrew, Sebastian,
> 
> Here are five patches making misc Device Tree fixes and updates for
> mvebu platforms:
> 
>  * The first patch is really a fix, that makes audio actually work on
>    Armada 370 DB. It should be merged as part of 3.15-rc.
> 
>  * The second patch enables the SATA interface on Armada 375 DB,
>    apparently something we forgot to do when submitting the initial
>    Armada 375 DB Device Tree. Not sure whether it's 3.15 or 3.16
>    material.
> 
>  * The last three patches are improvements to the Device Tree to use
>    the 'clocks' property for UART controllers instead of an hard-coded
>    'clock-frequency' property. This is clearly cleanup stuff, so 3.16
>    is in order.
> 
> Thanks!
> 
> Thomas
> 
> Thomas Petazzoni (5):
>   ARM: mvebu: specify I2C bus frequency on Armada 370 DB
>   ARM: mvebu: enable the SATA interface on Armada 375 DB

Patches 1 and 2 applied to mvebu/dt-fixes with Gregory's Ack.

thx,

Jason.

[PATCH 0/5] ARM: mvebu: misc Device Tree fixes and updates

[Jason Cooper]

On Fri, Apr 18, 2014 at 09:41:43AM +0200, Thomas Petazzoni wrote:
> Jason, Gregory, Andrew, Sebastian,
> 
> Here are five patches making misc Device Tree fixes and updates for
> mvebu platforms:
> 
>  * The first patch is really a fix, that makes audio actually work on
>    Armada 370 DB. It should be merged as part of 3.15-rc.
> 
>  * The second patch enables the SATA interface on Armada 375 DB,
>    apparently something we forgot to do when submitting the initial
>    Armada 375 DB Device Tree. Not sure whether it's 3.15 or 3.16
>    material.
> 
>  * The last three patches are improvements to the Device Tree to use
>    the 'clocks' property for UART controllers instead of an hard-coded
>    'clock-frequency' property. This is clearly cleanup stuff, so 3.16
>    is in order.
> 
> Thanks!
> 
> Thomas
> 
> Thomas Petazzoni (5):
>   ARM: mvebu: specify I2C bus frequency on Armada 370 DB
>   ARM: mvebu: enable the SATA interface on Armada 375 DB
>   ARM: mvebu: use clocks property for serial ports
>   ARM: mvebu: remove clock-frequency of serial port Device Tree nodes
>   ARM: mvebu: don't use clocks property in UART node for Netgear RN2120

Patches 3, 4, and 5 applied to mvebu/dt (1 and 2 already in
mvebu/dt-fixes)

thx,

Jason.