[PATCH 1/5] ARM: dts: pxa: add pwri2c to pxa device-tree

[PATCH 1/5] ARM: dts: pxa: add pwri2c to pxa device-tree

[Robert Jarzmik]

Each pxa variant has 2 I2C busses on the SoC :
 - the casual I2C
 - the power I2C, normally driving power regulators, and capable of
 receiving orders on core frequency modifications

Add the missing pwri2c to pxa description.

Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
---
 arch/arm/boot/dts/pxa2xx.dtsi | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/arch/arm/boot/dts/pxa2xx.dtsi b/arch/arm/boot/dts/pxa2xx.dtsi
index c08f846..2371d9b 100644
--- a/arch/arm/boot/dts/pxa2xx.dtsi
+++ b/arch/arm/boot/dts/pxa2xx.dtsi
@@ -103,6 +103,15 @@
 			status = "disabled";
 		};
 
+		pwri2c: i2c@40f000180 {
+			compatible = "mrvl,pxa-i2c";
+			reg = <0x40f00180 0x24>;
+			interrupts = <6>;
+			#address-cells = <0x1>;
+			#size-cells = <0>;
+			status = "disabled";
+		};
+
 		pxai2c1: i2c@40301680 {
 			compatible = "mrvl,pxa-i2c";
 			reg = <0x40301680 0x30>;
-- 
2.1.0

[PATCH 2/5] ARM: dts: pxa: add clocks

[Robert Jarzmik]

Add clocks to the IPs already described in the pxa device-tree
files. There are more clocks in the clock tree than IPs described in the
current pxa device-tree.

This patch ensures that :
 - the current description is correct
 - the clocks are actually claimed, so that clock framework doesn't
   disable them automatically (unused clocks shutdown)

Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
---
 arch/arm/boot/dts/pxa27x.dtsi | 36 ++++++++++++++++++++++++++++++++----
 1 file changed, 32 insertions(+), 4 deletions(-)

diff --git a/arch/arm/boot/dts/pxa27x.dtsi b/arch/arm/boot/dts/pxa27x.dtsi
index 80fc5d7..7cbf36f 100644
--- a/arch/arm/boot/dts/pxa27x.dtsi
+++ b/arch/arm/boot/dts/pxa27x.dtsi
@@ -1,6 +1,6 @@
 /* The pxa3xx skeleton simply augments the 2xx version */
 #include "pxa2xx.dtsi"
-#include "dt-bindings/clock/pxa2xx-clock.h"
+#include "dt-bindings/clock/pxa-clock.h"
 
 / {
 	model = "Marvell PXA27x familiy SoC";
@@ -12,30 +12,58 @@
 			marvell,intc-nr-irqs = <34>;
 		};
 
+		gpio: gpio@40e00000 {
+			compatible = "intel,pxa27x-gpio";
+			clocks = <&pxa2xx_clks CLK_NONE>;
+		};
+
+		ffuart: uart@40100000 {
+			clocks = <&pxa2xx_clks CLK_FFUART>;
+		};
+
+		btuart: uart@40200000 {
+			clocks = <&pxa2xx_clks CLK_BTUART>;
+		};
+
+		stuart: uart@40700000 {
+			clocks = <&pxa2xx_clks CLK_STUART>;
+		};
+
 		pwm0: pwm@40b00000 {
 			compatible = "marvell,pxa270-pwm", "marvell,pxa250-pwm";
 			reg = <0x40b00000 0x10>;
 			#pwm-cells = <1>;
+			clocks = <&pxa2xx_clks CLK_PWM0>;
 		};
 
 		pwm1: pwm@40b00010 {
 			compatible = "marvell,pxa270-pwm", "marvell,pxa250-pwm";
 			reg = <0x40b00010 0x10>;
 			#pwm-cells = <1>;
+			clocks = <&pxa2xx_clks CLK_PWM1>;
 		};
 
 		pwm2: pwm@40c00000 {
 			compatible = "marvell,pxa270-pwm", "marvell,pxa250-pwm";
 			reg = <0x40c00000 0x10>;
 			#pwm-cells = <1>;
+			clocks = <&pxa2xx_clks CLK_PWM0>;
 		};
 
 		pwm3: pwm@40c00010 {
 			compatible = "marvell,pxa270-pwm", "marvell,pxa250-pwm";
 			reg = <0x40c00010 0x10>;
 			#pwm-cells = <1>;
+			clocks = <&pxa2xx_clks CLK_PWM1>;
+		};
+
+		pwri2c: i2c@40f000180 {
+			clocks = <&pxa2xx_clks CLK_PWRI2C>;
+		};
+
+		pxai2c1: i2c@40301680 {
+			clocks = <&pxa2xx_clks CLK_I2C>;
 		};
-	};
 
 	clocks {
 	       /*
@@ -47,10 +75,10 @@
 		ranges;
 
 		pxa2xx_clks: pxa2xx_clks@41300004 {
-			compatible = "marvell,pxa-clocks";
+			compatible = "marvell,pxa270-clocks";
 			#clock-cells = <1>;
 			status = "okay";
 		};
 	};
-
+	};
 };
-- 
2.1.0

[PATCH 3/5] ARM: dts: pxa: add pxa27x-udc to pxa27x

[Robert Jarzmik]

Each pxa27x has an embedded usb udc controller. Add it in the pxa27x
device-tree description.

Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
---
 arch/arm/boot/dts/pxa27x.dtsi | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/arch/arm/boot/dts/pxa27x.dtsi b/arch/arm/boot/dts/pxa27x.dtsi
index 7cbf36f..979560c 100644
--- a/arch/arm/boot/dts/pxa27x.dtsi
+++ b/arch/arm/boot/dts/pxa27x.dtsi
@@ -65,6 +65,14 @@
 			clocks = <&pxa2xx_clks CLK_I2C>;
 		};
 
+		pxa27x_udc: udc@40600000 {
+			compatible = "marvell,pxa270-udc";
+			reg = <0x40600000 0x10000>;
+			interrupts = <11>;
+			clocks = <&pxa2xx_clks CLK_USB>;
+			status = "disabled";
+		};
+
 	clocks {
 	       /*
 		* The muxing of external clocks/internal dividers for osc* clock
-- 
2.1.0

[PATCH 4/5] ARM: dts: pxa: add pxa27x-keypad to pxa27x

[Robert Jarzmik]

Each pxa27x has an embedded keypad controller. Add it in the pxa27x
device-tree description.

Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
---
 arch/arm/boot/dts/pxa27x.dtsi | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/arch/arm/boot/dts/pxa27x.dtsi b/arch/arm/boot/dts/pxa27x.dtsi
index 979560c..7f93828 100644
--- a/arch/arm/boot/dts/pxa27x.dtsi
+++ b/arch/arm/boot/dts/pxa27x.dtsi
@@ -73,6 +73,15 @@
 			status = "disabled";
 		};
 
+		keypad: keypad@41500000 {
+			compatible = "marvell,pxa27x-keypad";
+			reg = <0x41500000 0x4c>;
+			interrupts = <4>;
+			clocks = <&pxa2xx_clks CLK_KEYPAD>;
+			status = "disabled";
+		};
+	};
+
 	clocks {
 	       /*
 		* The muxing of external clocks/internal dividers for osc* clock
-- 
2.1.0

[PATCH 5/5] ARM: dts: pxa: add pxa-timer to pxa27x

[Robert Jarzmik]

Each pxa has an embedded OS Timers IP. The kernel cannot work without a
valid clocksource, and this adds the OS Timers to the pxa device-tree
description.

Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
---
 arch/arm/boot/dts/pxa27x.dtsi | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/arch/arm/boot/dts/pxa27x.dtsi b/arch/arm/boot/dts/pxa27x.dtsi
index 7f93828..9e6bf60 100644
--- a/arch/arm/boot/dts/pxa27x.dtsi
+++ b/arch/arm/boot/dts/pxa27x.dtsi
@@ -97,5 +97,18 @@
 			status = "okay";
 		};
 	};
+
+	clocksources {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		ranges;
+
+		pxa-timer@40a00000 {
+			compatible = "marvell,pxa-timer";
+			reg = <0x40a00000 0x20>;
+			interrupts = <26>;
+			clocks = <&pxa2xx_clks CLK_OSTIMER>;
+			status = "okay";
+		};
 	};
 };
-- 
2.1.0

Re: [PATCH 5/5] ARM: dts: pxa: add pxa-timer to pxa27x

[Sergei Shtylyov]

Hello.

On 2/1/2015 1:48 AM, Robert Jarzmik wrote:

> Each pxa has an embedded OS Timers IP. The kernel cannot work without a
> valid clocksource, and this adds the OS Timers to the pxa device-tree
> description.

> Signed-off-by: Robert Jarzmik <robert.jarzmik-GANU6spQydw@public.gmane.org>
> ---
>   arch/arm/boot/dts/pxa27x.dtsi | 13 +++++++++++++
>   1 file changed, 13 insertions(+)

> diff --git a/arch/arm/boot/dts/pxa27x.dtsi b/arch/arm/boot/dts/pxa27x.dtsi
> index 7f93828..9e6bf60 100644
> --- a/arch/arm/boot/dts/pxa27x.dtsi
> +++ b/arch/arm/boot/dts/pxa27x.dtsi
> @@ -97,5 +97,18 @@
>   			status = "okay";
>   		};
>   	};
> +
> +	clocksources {
> +		#address-cells = <1>;
> +		#size-cells = <1>;
> +		ranges;
> +
> +		pxa-timer@40a00000 {

    Just "timer@40a00000", please.

WBR, Sergei

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 5/5] ARM: dts: pxa: add pxa-timer to pxa27x

[Mark Rutland]

On Sat, Jan 31, 2015 at 10:48:30PM +0000, Robert Jarzmik wrote:
> Each pxa has an embedded OS Timers IP. The kernel cannot work without a
> valid clocksource, and this adds the OS Timers to the pxa device-tree
> description.
> 
> Signed-off-by: Robert Jarzmik <robert.jarzmik-GANU6spQydw@public.gmane.org>
> ---
>  arch/arm/boot/dts/pxa27x.dtsi | 13 +++++++++++++
>  1 file changed, 13 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/pxa27x.dtsi b/arch/arm/boot/dts/pxa27x.dtsi
> index 7f93828..9e6bf60 100644
> --- a/arch/arm/boot/dts/pxa27x.dtsi
> +++ b/arch/arm/boot/dts/pxa27x.dtsi
> @@ -97,5 +97,18 @@
>  			status = "okay";
>  		};
>  	};
> +
> +	clocksources {
> +		#address-cells = <1>;
> +		#size-cells = <1>;
> +		ranges;
> +

There is absolutely no need for this container node.

Please get rid of it and place the node below directly under the parent
node.

Mark.

> +		pxa-timer@40a00000 {
> +			compatible = "marvell,pxa-timer";
> +			reg = <0x40a00000 0x20>;
> +			interrupts = <26>;
> +			clocks = <&pxa2xx_clks CLK_OSTIMER>;
> +			status = "okay";
> +		};
>  	};
>  };
> -- 
> 2.1.0
> 
> 
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 5/5] ARM: dts: pxa: add pxa-timer to pxa27x

[Robert Jarzmik]

Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org> writes:

> On Sat, Jan 31, 2015 at 10:48:30PM +0000, Robert Jarzmik wrote:
>> +	clocksources {
>> +		#address-cells = <1>;
>> +		#size-cells = <1>;
>> +		ranges;
>> +
>
> There is absolutely no need for this container node.
>
> Please get rid of it and place the node below directly under the parent
> node.
OK.

Cheers.

--
Robert
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 5/5] ARM: dts: pxa: add pxa-timer to pxa27x

[Robert Jarzmik]

Sergei Shtylyov <sergei.shtylyov-M4DtvfQ/ZS1MRgGoP+s0PdBPR1lH4CV8@public.gmane.org> writes:

>> +	clocksources {
>> +		#address-cells = <1>;
>> +		#size-cells = <1>;
>> +		ranges;
>> +
>> +		pxa-timer@40a00000 {
>
>    Just "timer@40a00000", please.
Hi Sergei,

I forgot that in the v2, sorry. I'll put it in v3.

Cheers.

-- 
Robert
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html