* [PATCH 1/4] ARM: dts: set the 24MHz xtal as parent of the UART clock
@ 2016-08-30 12:12 Linus Walleij
2016-08-30 12:12 ` [PATCH 2/4] ARM: dts: add the Integrator/AP baseboard clocks Linus Walleij
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Linus Walleij @ 2016-08-30 12:12 UTC (permalink / raw)
To: linux-arm-kernel
This has no practical effect but reflects the actual clock
hierarchy of the system.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
arch/arm/boot/dts/integratorap.dts | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/boot/dts/integratorap.dts b/arch/arm/boot/dts/integratorap.dts
index 4b34b54e09a1..c1e3abf5d072 100644
--- a/arch/arm/boot/dts/integratorap.dts
+++ b/arch/arm/boot/dts/integratorap.dts
@@ -39,6 +39,7 @@
#clock-cells = <0>;
compatible = "fixed-clock";
clock-frequency = <14745600>;
+ clocks = <&xtal24mhz>;
};
syscon {
--
2.7.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/4] ARM: dts: add the Integrator/AP baseboard clocks
2016-08-30 12:12 [PATCH 1/4] ARM: dts: set the 24MHz xtal as parent of the UART clock Linus Walleij
@ 2016-08-30 12:12 ` Linus Walleij
2016-08-30 12:12 ` [PATCH 3/4] ARM: dts: Add the core module clocks to Integrator/AP Linus Walleij
2016-08-30 12:12 ` [PATCH 4/4] ARM: dts: add the core module clocks to Integrator/CP Linus Walleij
2 siblings, 0 replies; 4+ messages in thread
From: Linus Walleij @ 2016-08-30 12:12 UTC (permalink / raw)
To: linux-arm-kernel
The two clocks present on the Integrator/AP baseboard and
accessible through its system controller is the PCIv3 bridge
clock and the PCI bus clock. Define the proper device tree
nodes for these.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
arch/arm/boot/dts/integratorap.dts | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/arch/arm/boot/dts/integratorap.dts b/arch/arm/boot/dts/integratorap.dts
index c1e3abf5d072..726a3ac486e0 100644
--- a/arch/arm/boot/dts/integratorap.dts
+++ b/arch/arm/boot/dts/integratorap.dts
@@ -48,6 +48,27 @@
interrupt-parent = <&pic>;
/* These are the logical module IRQs */
interrupts = <9>, <10>, <11>, <12>;
+
+ /*
+ * SYSCLK clocks PCIv3 bridge, system controller and the
+ * logic modules.
+ */
+ sysclk: apsys at 24M {
+ compatible = "arm,syscon-icst525-integratorap-sys";
+ #clock-cells = <0>;
+ lock-offset = <0x1c>;
+ vco-offset = <0x04>;
+ clocks = <&xtal24mhz>;
+ };
+
+ /* One-bit control for the PCI bus clock (33 or 25 MHz) */
+ pciclk: pciclk at 24M {
+ compatible = "arm,syscon-icst525-integratorap-pci";
+ #clock-cells = <0>;
+ lock-offset = <0x1c>;
+ vco-offset = <0x04>;
+ clocks = <&xtal24mhz>;
+ };
};
timer0: timer at 13000000 {
--
2.7.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 3/4] ARM: dts: Add the core module clocks to Integrator/AP
2016-08-30 12:12 [PATCH 1/4] ARM: dts: set the 24MHz xtal as parent of the UART clock Linus Walleij
2016-08-30 12:12 ` [PATCH 2/4] ARM: dts: add the Integrator/AP baseboard clocks Linus Walleij
@ 2016-08-30 12:12 ` Linus Walleij
2016-08-30 12:12 ` [PATCH 4/4] ARM: dts: add the core module clocks to Integrator/CP Linus Walleij
2 siblings, 0 replies; 4+ messages in thread
From: Linus Walleij @ 2016-08-30 12:12 UTC (permalink / raw)
To: linux-arm-kernel
This adds the clocks on the core module to the Integrator/AP
board: a 24MHz chrystal, and two special-purpose ICST525
dividers, one used to clock the CPU core and another auxilary
oscillator.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
arch/arm/boot/dts/integratorap.dts | 29 ++++++++++++++++++++++++++++-
1 file changed, 28 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/integratorap.dts b/arch/arm/boot/dts/integratorap.dts
index 726a3ac486e0..6f16d09dc5a4 100644
--- a/arch/arm/boot/dts/integratorap.dts
+++ b/arch/arm/boot/dts/integratorap.dts
@@ -19,7 +19,7 @@
bootargs = "root=/dev/ram0 console=ttyAM0,38400n8 earlyprintk";
};
- /* 24 MHz chrystal on the core module */
+ /* 24 MHz chrystal on the Integrator/AP development board */
xtal24mhz: xtal24mhz at 24M {
#clock-cells = <0>;
compatible = "fixed-clock";
@@ -42,6 +42,33 @@
clocks = <&xtal24mhz>;
};
+ core-module at 10000000 {
+ /* 24 MHz chrystal on the core module */
+ cm24mhz: cm24mhz at 24M {
+ #clock-cells = <0>;
+ compatible = "fixed-clock";
+ clock-frequency = <24000000>;
+ };
+
+ /* Oscillator on the core module, clocks the CPU core */
+ cmosc: cmosc at 24M {
+ compatible = "arm,syscon-icst525-integratorap-cm";
+ #clock-cells = <0>;
+ lock-offset = <0x14>;
+ vco-offset = <0x08>;
+ clocks = <&cm24mhz>;
+ };
+
+ /* Auxilary oscillator on the core module, 32.369MHz at boot */
+ auxosc: auxosc at 24M {
+ compatible = "arm,syscon-icst525";
+ #clock-cells = <0>;
+ lock-offset = <0x14>;
+ vco-offset = <0x1c>;
+ clocks = <&cm24mhz>;
+ };
+ };
+
syscon {
compatible = "arm,integrator-ap-syscon", "syscon";
reg = <0x11000000 0x100>;
--
2.7.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 4/4] ARM: dts: add the core module clocks to Integrator/CP
2016-08-30 12:12 [PATCH 1/4] ARM: dts: set the 24MHz xtal as parent of the UART clock Linus Walleij
2016-08-30 12:12 ` [PATCH 2/4] ARM: dts: add the Integrator/AP baseboard clocks Linus Walleij
2016-08-30 12:12 ` [PATCH 3/4] ARM: dts: Add the core module clocks to Integrator/AP Linus Walleij
@ 2016-08-30 12:12 ` Linus Walleij
2 siblings, 0 replies; 4+ messages in thread
From: Linus Walleij @ 2016-08-30 12:12 UTC (permalink / raw)
To: linux-arm-kernel
This adds the core and memory clocks to the Integrator/CP device
tree.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
arch/arm/boot/dts/integratorcp.dts | 37 +++++++++++++++++++++++++++----------
1 file changed, 27 insertions(+), 10 deletions(-)
diff --git a/arch/arm/boot/dts/integratorcp.dts b/arch/arm/boot/dts/integratorcp.dts
index 79430fbfec3b..cf27958fed4c 100644
--- a/arch/arm/boot/dts/integratorcp.dts
+++ b/arch/arm/boot/dts/integratorcp.dts
@@ -58,20 +58,37 @@
core-module at 10000000 {
/* 24 MHz chrystal on the core module */
- xtal24mhz: xtal24mhz at 24M {
+ cm24mhz: cm24mhz at 24M {
#clock-cells = <0>;
compatible = "fixed-clock";
clock-frequency = <24000000>;
};
- /*
- * External oscillator on the core module, usually used
- * to drive video circuitry. Driven from the 24MHz clock.
- */
- auxosc: cm_aux_osc at 25M {
+ /* Oscillator on the core module, clocks the CPU core */
+ cmcore: cmosc at 24M {
+ compatible = "arm,syscon-icst525-integratorcp-cm-core";
+ #clock-cells = <0>;
+ lock-offset = <0x14>;
+ vco-offset = <0x08>;
+ clocks = <&cm24mhz>;
+ };
+
+ /* Oscillator on the core module, clocks the memory bus */
+ cmmem: cmosc at 24M {
+ compatible = "arm,syscon-icst525-integratorcp-cm-mem";
+ #clock-cells = <0>;
+ lock-offset = <0x14>;
+ vco-offset = <0x08>;
+ clocks = <&cm24mhz>;
+ };
+
+ /* Auxilary oscillator on the core module, clocks the CLCD */
+ auxosc: auxosc at 24M {
+ compatible = "arm,syscon-icst525";
#clock-cells = <0>;
- compatible = "arm,integrator-cm-auxosc";
- clocks = <&xtal24mhz>;
+ lock-offset = <0x14>;
+ vco-offset = <0x1c>;
+ clocks = <&cm24mhz>;
};
/* The KMI clock is the 24 MHz oscillator divided to 8MHz */
@@ -80,7 +97,7 @@
compatible = "fixed-factor-clock";
clock-div = <3>;
clock-mult = <1>;
- clocks = <&xtal24mhz>;
+ clocks = <&cm24mhz>;
};
/* The timer clock is the 24 MHz oscillator divided to 1MHz */
@@ -89,7 +106,7 @@
compatible = "fixed-factor-clock";
clock-div = <24>;
clock-mult = <1>;
- clocks = <&xtal24mhz>;
+ clocks = <&cm24mhz>;
};
};
--
2.7.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-08-30 12:12 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-08-30 12:12 [PATCH 1/4] ARM: dts: set the 24MHz xtal as parent of the UART clock Linus Walleij
2016-08-30 12:12 ` [PATCH 2/4] ARM: dts: add the Integrator/AP baseboard clocks Linus Walleij
2016-08-30 12:12 ` [PATCH 3/4] ARM: dts: Add the core module clocks to Integrator/AP Linus Walleij
2016-08-30 12:12 ` [PATCH 4/4] ARM: dts: add the core module clocks to Integrator/CP Linus Walleij
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.