* [PATCH v4 1/5] ARM: dts: pxa: add pwri2c to pxa device-tree
@ 2015-02-12 17:22 Robert Jarzmik
2015-02-12 17:22 ` [PATCH v4 2/5] ARM: dts: pxa: add clocks Robert Jarzmik
` (4 more replies)
0 siblings, 5 replies; 7+ messages in thread
From: Robert Jarzmik @ 2015-02-12 17:22 UTC (permalink / raw)
To: linux-arm-kernel
pxa27x 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 pxa27x description.
Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
---
Since v2: as Dmitry pointed out, no pwri2c on pxa25x, only pxa27x
---
arch/arm/boot/dts/pxa27x.dtsi | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/arch/arm/boot/dts/pxa27x.dtsi b/arch/arm/boot/dts/pxa27x.dtsi
index 80fc5d7..98b560e 100644
--- a/arch/arm/boot/dts/pxa27x.dtsi
+++ b/arch/arm/boot/dts/pxa27x.dtsi
@@ -35,6 +35,13 @@
reg = <0x40c00010 0x10>;
#pwm-cells = <1>;
};
+
+ pwri2c: i2c at 40f000180 {
+ compatible = "mrvl,pxa-i2c";
+ reg = <0x40f00180 0x24>;
+ interrupts = <6>;
+ status = "disabled";
+ };
};
clocks {
--
2.1.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v4 2/5] ARM: dts: pxa: add clocks
2015-02-12 17:22 [PATCH v4 1/5] ARM: dts: pxa: add pwri2c to pxa device-tree Robert Jarzmik
@ 2015-02-12 17:22 ` Robert Jarzmik
2015-02-12 17:22 ` [PATCH v4 3/5] ARM: dts: pxa: add pxa27x-udc to pxa27x Robert Jarzmik
` (3 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Robert Jarzmik @ 2015-02-12 17:22 UTC (permalink / raw)
To: linux-arm-kernel
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>
---
Since v3: change pxa2xx-clks into clks to accomodate pxa3xx as well
---
arch/arm/boot/dts/pxa27x.dtsi | 18 ++++++++++++++----
arch/arm/boot/dts/pxa2xx.dtsi | 7 ++++++-
arch/arm/boot/dts/pxa3xx.dtsi | 21 ++++++++++++++++++++-
3 files changed, 40 insertions(+), 6 deletions(-)
diff --git a/arch/arm/boot/dts/pxa27x.dtsi b/arch/arm/boot/dts/pxa27x.dtsi
index 98b560e..9696718 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,36 +12,47 @@
marvell,intc-nr-irqs = <34>;
};
+ gpio: gpio at 40e00000 {
+ compatible = "intel,pxa27x-gpio";
+ clocks = <&clks CLK_NONE>;
+ };
+
pwm0: pwm at 40b00000 {
compatible = "marvell,pxa270-pwm", "marvell,pxa250-pwm";
reg = <0x40b00000 0x10>;
#pwm-cells = <1>;
+ clocks = <&clks CLK_PWM0>;
};
pwm1: pwm at 40b00010 {
compatible = "marvell,pxa270-pwm", "marvell,pxa250-pwm";
reg = <0x40b00010 0x10>;
#pwm-cells = <1>;
+ clocks = <&clks CLK_PWM1>;
};
pwm2: pwm at 40c00000 {
compatible = "marvell,pxa270-pwm", "marvell,pxa250-pwm";
reg = <0x40c00000 0x10>;
#pwm-cells = <1>;
+ clocks = <&clks CLK_PWM0>;
};
pwm3: pwm at 40c00010 {
compatible = "marvell,pxa270-pwm", "marvell,pxa250-pwm";
reg = <0x40c00010 0x10>;
#pwm-cells = <1>;
+ clocks = <&clks CLK_PWM1>;
};
pwri2c: i2c at 40f000180 {
compatible = "mrvl,pxa-i2c";
reg = <0x40f00180 0x24>;
interrupts = <6>;
+ clocks = <&clks CLK_PWRI2C>;
status = "disabled";
};
+
};
clocks {
@@ -53,11 +64,10 @@
#size-cells = <1>;
ranges;
- pxa2xx_clks: pxa2xx_clks at 41300004 {
- compatible = "marvell,pxa-clocks";
+ clks: pxa2xx_clks at 41300004 {
+ compatible = "marvell,pxa270-clocks";
#clock-cells = <1>;
status = "okay";
};
};
-
};
diff --git a/arch/arm/boot/dts/pxa2xx.dtsi b/arch/arm/boot/dts/pxa2xx.dtsi
index c08f8462..71a0cd7 100644
--- a/arch/arm/boot/dts/pxa2xx.dtsi
+++ b/arch/arm/boot/dts/pxa2xx.dtsi
@@ -6,7 +6,8 @@
* Licensed under GPLv2 or later.
*/
-/include/ "skeleton.dtsi"
+#include "skeleton.dtsi"
+#include "dt-bindings/clock/pxa-clock.h"
/ {
model = "Marvell PXA2xx family SoC";
@@ -79,6 +80,7 @@
compatible = "mrvl,pxa-uart";
reg = <0x40100000 0x30>;
interrupts = <22>;
+ clocks = <&clks CLK_FFUART>;
status = "disabled";
};
@@ -86,6 +88,7 @@
compatible = "mrvl,pxa-uart";
reg = <0x40200000 0x30>;
interrupts = <21>;
+ clocks = <&clks CLK_BTUART>;
status = "disabled";
};
@@ -93,6 +96,7 @@
compatible = "mrvl,pxa-uart";
reg = <0x40700000 0x30>;
interrupts = <20>;
+ clocks = <&clks CLK_STUART>;
status = "disabled";
};
@@ -107,6 +111,7 @@
compatible = "mrvl,pxa-i2c";
reg = <0x40301680 0x30>;
interrupts = <18>;
+ clocks = <&clks CLK_I2C>;
#address-cells = <0x1>;
#size-cells = <0>;
status = "disabled";
diff --git a/arch/arm/boot/dts/pxa3xx.dtsi b/arch/arm/boot/dts/pxa3xx.dtsi
index 83bb0ef..c7066eb 100644
--- a/arch/arm/boot/dts/pxa3xx.dtsi
+++ b/arch/arm/boot/dts/pxa3xx.dtsi
@@ -1,5 +1,5 @@
/* The pxa3xx skeleton simply augments the 2xx version */
-/include/ "pxa2xx.dtsi"
+#include "pxa2xx.dtsi"
/ {
model = "Marvell PXA3xx familiy SoC";
@@ -10,6 +10,7 @@
compatible = "mrvl,pwri2c";
reg = <0x40f500c0 0x30>;
interrupts = <6>;
+ clocks = <&clks CLK_PWRI2C>;
#address-cells = <0x1>;
#size-cells = <0>;
status = "disabled";
@@ -19,6 +20,7 @@
compatible = "marvell,pxa3xx-nand";
reg = <0x43100000 90>;
interrupts = <45>;
+ clocks = <&clks CLK_NAND>;
#address-cells = <1>;
#size-cells = <1>;
status = "disabled";
@@ -32,6 +34,7 @@
gpio: gpio at 40e00000 {
compatible = "intel,pxa3xx-gpio";
reg = <0x40e00000 0x10000>;
+ clocks = <&clks CLK_GPIO>;
interrupt-names = "gpio0", "gpio1", "gpio_mux";
interrupts = <8 9 10>;
gpio-controller;
@@ -40,4 +43,20 @@
#interrupt-cells = <0x2>;
};
};
+
+ clocks {
+ /*
+ * The muxing of external clocks/internal dividers for osc* clock
+ * sources has been hidden under the carpet by now.
+ */
+ #address-cells = <1>;
+ #size-cells = <1>;
+ ranges;
+
+ clks: pxa3xx_clks at 41300004 {
+ compatible = "marvell,pxa300-clocks";
+ #clock-cells = <1>;
+ status = "okay";
+ };
+ };
};
--
2.1.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v4 3/5] ARM: dts: pxa: add pxa27x-udc to pxa27x
2015-02-12 17:22 [PATCH v4 1/5] ARM: dts: pxa: add pwri2c to pxa device-tree Robert Jarzmik
2015-02-12 17:22 ` [PATCH v4 2/5] ARM: dts: pxa: add clocks Robert Jarzmik
@ 2015-02-12 17:22 ` Robert Jarzmik
2015-02-12 17:22 ` [PATCH v4 4/5] ARM: dts: pxa: add pxa27x-keypad " Robert Jarzmik
` (2 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Robert Jarzmik @ 2015-02-12 17:22 UTC (permalink / raw)
To: linux-arm-kernel
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>
---
Since v3: changed pxa2xx-clks into clks
---
arch/arm/boot/dts/pxa27x.dtsi | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/arch/arm/boot/dts/pxa27x.dtsi b/arch/arm/boot/dts/pxa27x.dtsi
index 9696718..7cc36ef 100644
--- a/arch/arm/boot/dts/pxa27x.dtsi
+++ b/arch/arm/boot/dts/pxa27x.dtsi
@@ -53,6 +53,13 @@
status = "disabled";
};
+ pxa27x_udc: udc at 40600000 {
+ compatible = "marvell,pxa270-udc";
+ reg = <0x40600000 0x10000>;
+ interrupts = <11>;
+ clocks = <&clks CLK_USB>;
+ status = "disabled";
+ };
};
clocks {
--
2.1.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v4 4/5] ARM: dts: pxa: add pxa27x-keypad to pxa27x
2015-02-12 17:22 [PATCH v4 1/5] ARM: dts: pxa: add pwri2c to pxa device-tree Robert Jarzmik
2015-02-12 17:22 ` [PATCH v4 2/5] ARM: dts: pxa: add clocks Robert Jarzmik
2015-02-12 17:22 ` [PATCH v4 3/5] ARM: dts: pxa: add pxa27x-udc to pxa27x Robert Jarzmik
@ 2015-02-12 17:22 ` Robert Jarzmik
2015-02-12 17:22 ` [PATCH v4 5/5] ARM: dts: pxa: add pxa-timer to pxa27x and pxa3xx Robert Jarzmik
2015-02-14 14:57 ` [PATCH v4 1/5] ARM: dts: pxa: add pwri2c to pxa device-tree Robert Jarzmik
4 siblings, 0 replies; 7+ messages in thread
From: Robert Jarzmik @ 2015-02-12 17:22 UTC (permalink / raw)
To: linux-arm-kernel
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 | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/arch/arm/boot/dts/pxa27x.dtsi b/arch/arm/boot/dts/pxa27x.dtsi
index 7cc36ef..74f7df7 100644
--- a/arch/arm/boot/dts/pxa27x.dtsi
+++ b/arch/arm/boot/dts/pxa27x.dtsi
@@ -60,6 +60,14 @@
clocks = <&clks CLK_USB>;
status = "disabled";
};
+
+ keypad: keypad at 41500000 {
+ compatible = "marvell,pxa27x-keypad";
+ reg = <0x41500000 0x4c>;
+ interrupts = <4>;
+ clocks = <&clks CLK_KEYPAD>;
+ status = "disabled";
+ };
};
clocks {
--
2.1.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v4 5/5] ARM: dts: pxa: add pxa-timer to pxa27x and pxa3xx
2015-02-12 17:22 [PATCH v4 1/5] ARM: dts: pxa: add pwri2c to pxa device-tree Robert Jarzmik
` (2 preceding siblings ...)
2015-02-12 17:22 ` [PATCH v4 4/5] ARM: dts: pxa: add pxa27x-keypad " Robert Jarzmik
@ 2015-02-12 17:22 ` Robert Jarzmik
2015-02-14 14:57 ` [PATCH v4 1/5] ARM: dts: pxa: add pwri2c to pxa device-tree Robert Jarzmik
4 siblings, 0 replies; 7+ messages in thread
From: Robert Jarzmik @ 2015-02-12 17:22 UTC (permalink / raw)
To: linux-arm-kernel
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>
---
Since v1: removed clocksource node, pxa-timer being directly under
pxabus (Rob's comment).
Since v2: renamed pxa-timer to timer (Sergei's comment)
Since v3: added pxa-timer to pxa3xx as well
---
arch/arm/boot/dts/pxa27x.dtsi | 8 ++++++++
arch/arm/boot/dts/pxa3xx.dtsi | 8 ++++++++
2 files changed, 16 insertions(+)
diff --git a/arch/arm/boot/dts/pxa27x.dtsi b/arch/arm/boot/dts/pxa27x.dtsi
index 74f7df7..90b9971 100644
--- a/arch/arm/boot/dts/pxa27x.dtsi
+++ b/arch/arm/boot/dts/pxa27x.dtsi
@@ -85,4 +85,12 @@
status = "okay";
};
};
+
+ timer at 40a00000 {
+ compatible = "marvell,pxa-timer";
+ reg = <0x40a00000 0x20>;
+ interrupts = <26>;
+ clocks = <&clks CLK_OSTIMER>;
+ status = "okay";
+ };
};
diff --git a/arch/arm/boot/dts/pxa3xx.dtsi b/arch/arm/boot/dts/pxa3xx.dtsi
index c7066eb..7ad0b17 100644
--- a/arch/arm/boot/dts/pxa3xx.dtsi
+++ b/arch/arm/boot/dts/pxa3xx.dtsi
@@ -59,4 +59,12 @@
status = "okay";
};
};
+
+ timer at 40a00000 {
+ compatible = "marvell,pxa-timer";
+ reg = <0x40a00000 0x20>;
+ interrupts = <26>;
+ clocks = <&clks CLK_OSTIMER>;
+ status = "okay";
+ };
};
--
2.1.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v4 1/5] ARM: dts: pxa: add pwri2c to pxa device-tree
2015-02-12 17:22 [PATCH v4 1/5] ARM: dts: pxa: add pwri2c to pxa device-tree Robert Jarzmik
` (3 preceding siblings ...)
2015-02-12 17:22 ` [PATCH v4 5/5] ARM: dts: pxa: add pxa-timer to pxa27x and pxa3xx Robert Jarzmik
@ 2015-02-14 14:57 ` Robert Jarzmik
2015-02-23 19:39 ` Robert Jarzmik
4 siblings, 1 reply; 7+ messages in thread
From: Robert Jarzmik @ 2015-02-14 14:57 UTC (permalink / raw)
To: linux-arm-kernel
Robert Jarzmik <robert.jarzmik@free.fr> writes:
> pxa27x 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 pxa27x description.
>
> Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
Hi Rob, Mark, Sergei,
I'd like to queue that into the pxa/dt tree next week.
Could I have a "Reviewed-by" ?
Cheers.
--
Robert
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v4 1/5] ARM: dts: pxa: add pwri2c to pxa device-tree
2015-02-14 14:57 ` [PATCH v4 1/5] ARM: dts: pxa: add pwri2c to pxa device-tree Robert Jarzmik
@ 2015-02-23 19:39 ` Robert Jarzmik
0 siblings, 0 replies; 7+ messages in thread
From: Robert Jarzmik @ 2015-02-23 19:39 UTC (permalink / raw)
To: linux-arm-kernel
Robert Jarzmik <robert.jarzmik@free.fr> writes:
> Robert Jarzmik <robert.jarzmik@free.fr> writes:
>
>> pxa27x 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 pxa27x description.
>>
>> Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
>
> Hi Rob, Mark, Sergei,
>
> I'd like to queue that into the pxa/dt tree next week.
> Could I have a "Reviewed-by" ?
Queued in pxa/dt.
Cheers.
--
Robert
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2015-02-23 19:39 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-02-12 17:22 [PATCH v4 1/5] ARM: dts: pxa: add pwri2c to pxa device-tree Robert Jarzmik
2015-02-12 17:22 ` [PATCH v4 2/5] ARM: dts: pxa: add clocks Robert Jarzmik
2015-02-12 17:22 ` [PATCH v4 3/5] ARM: dts: pxa: add pxa27x-udc to pxa27x Robert Jarzmik
2015-02-12 17:22 ` [PATCH v4 4/5] ARM: dts: pxa: add pxa27x-keypad " Robert Jarzmik
2015-02-12 17:22 ` [PATCH v4 5/5] ARM: dts: pxa: add pxa-timer to pxa27x and pxa3xx Robert Jarzmik
2015-02-14 14:57 ` [PATCH v4 1/5] ARM: dts: pxa: add pwri2c to pxa device-tree Robert Jarzmik
2015-02-23 19:39 ` Robert Jarzmik
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).