* [PATCH 0/9] Move closer to single 8660/8960 zImage
@ 2012-09-05 19:28 Stephen Boyd
2012-09-05 19:28 ` [PATCH 3/9] ARM: msm: Add DT support to msm_timer Stephen Boyd
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Stephen Boyd @ 2012-09-05 19:28 UTC (permalink / raw)
To: David Brown, Bryan Huntsman, Daniel Walker
Cc: linux-kernel, linux-arm-msm, linux-arm-kernel, devicetree-discuss
The first half of this series adds devicetree support to the msm timer.
The second half moves 8660 and 8960 to be devicetree only. After this
patch series it should be possible to compile 8660 and 8960 together
in one zImage (although Kconfig doesn't allow it right now).
This relies on the previous 8660 dt fixlets patches I sent and it also
assumes that 'ARM: msm: Remove call to missing FPGA init on 8660' has been
applied.
Stephen Boyd (9):
ARM: msm: Don't touch GIC registers outside of GIC code
ARM: msm: Allow timer.c to compile on multiple targets
ARM: msm: Add DT support to msm_timer
ARM: msm: Move 8660 to DT timer
ARM: msm: Make 8660 a DT only target
ARM: msm: Rename board-msm8x60 to signify its DT only status
ARM: msm: Move io mapping prototypes to common.h
ARM: msm: Add DT support for 8960
ARM: msm: Remove non-DT targets from 8960
.../devicetree/bindings/arm/msm/timer.txt | 38 +++++
arch/arm/boot/dts/msm8660-surf.dts | 17 ++
arch/arm/boot/dts/msm8960-cdp.dts | 41 +++++
arch/arm/mach-msm/Kconfig | 41 +----
arch/arm/mach-msm/Makefile | 4 +-
arch/arm/mach-msm/Makefile.boot | 1 +
arch/arm/mach-msm/board-dt-8660.c | 63 +++++++
arch/arm/mach-msm/board-dt-8960.c | 49 ++++++
arch/arm/mach-msm/board-halibut.c | 5 +-
arch/arm/mach-msm/board-msm7x30.c | 9 +-
arch/arm/mach-msm/board-msm8960.c | 122 --------------
arch/arm/mach-msm/board-msm8x60.c | 162 ------------------
arch/arm/mach-msm/board-qsd8x50.c | 7 +-
arch/arm/mach-msm/board-trout.c | 5 +-
arch/arm/mach-msm/common.h | 30 ++++
arch/arm/mach-msm/devices-msm8960.c | 85 ----------
arch/arm/mach-msm/include/mach/board.h | 3 -
arch/arm/mach-msm/include/mach/msm_iomap-7x00.h | 7 -
arch/arm/mach-msm/include/mach/msm_iomap-7x30.h | 4 -
arch/arm/mach-msm/include/mach/msm_iomap-8960.h | 4 -
arch/arm/mach-msm/include/mach/msm_iomap-8x50.h | 4 -
arch/arm/mach-msm/include/mach/msm_iomap-8x60.h | 4 -
arch/arm/mach-msm/io.c | 2 +
arch/arm/mach-msm/platsmp.c | 8 -
arch/arm/mach-msm/timer.c | 186 ++++++++++++++++-----
25 files changed, 404 insertions(+), 497 deletions(-)
create mode 100644 Documentation/devicetree/bindings/arm/msm/timer.txt
create mode 100644 arch/arm/boot/dts/msm8960-cdp.dts
create mode 100644 arch/arm/mach-msm/board-dt-8660.c
create mode 100644 arch/arm/mach-msm/board-dt-8960.c
delete mode 100644 arch/arm/mach-msm/board-msm8960.c
delete mode 100644 arch/arm/mach-msm/board-msm8x60.c
create mode 100644 arch/arm/mach-msm/common.h
delete mode 100644 arch/arm/mach-msm/devices-msm8960.c
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 3/9] ARM: msm: Add DT support to msm_timer
2012-09-05 19:28 [PATCH 0/9] Move closer to single 8660/8960 zImage Stephen Boyd
@ 2012-09-05 19:28 ` Stephen Boyd
2012-09-12 16:07 ` David Brown
2012-09-05 19:28 ` [PATCH 4/9] ARM: msm: Move 8660 to DT timer Stephen Boyd
2012-09-05 19:28 ` [PATCH 8/9] ARM: msm: Add DT support for 8960 Stephen Boyd
2 siblings, 1 reply; 9+ messages in thread
From: Stephen Boyd @ 2012-09-05 19:28 UTC (permalink / raw)
To: David Brown, Bryan Huntsman, Daniel Walker
Cc: linux-kernel, linux-arm-msm, linux-arm-kernel, devicetree-discuss
Add support to setup the MSM timer via information obtained from
the devicetree.
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---
.../devicetree/bindings/arm/msm/timer.txt | 38 ++++++++++
arch/arm/mach-msm/common.h | 1 +
arch/arm/mach-msm/timer.c | 87 ++++++++++++++++++++++
3 files changed, 126 insertions(+)
create mode 100644 Documentation/devicetree/bindings/arm/msm/timer.txt
diff --git a/Documentation/devicetree/bindings/arm/msm/timer.txt b/Documentation/devicetree/bindings/arm/msm/timer.txt
new file mode 100644
index 0000000..a9c0748
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/msm/timer.txt
@@ -0,0 +1,38 @@
+* MSM Timer
+
+Properties:
+
+- compatible : Should at least contain "qcom,msm-timer". More specific
+ properties such as "qcom,msm-gpt" and "qcom,msm-dgt" specify a general
+ purpose timer and a debug timer respectively.
+
+- interrupts : Interrupt indicating a match event.
+
+- reg : Specifies the base address of the timer registers. The second region
+ specifies an optional register used to configure the clock divider.
+
+- clock-frequency : The frequency of the timer in Hz.
+
+Optional:
+
+- cpu-offset : per-cpu offset used when the timer is accessed without the
+ CPU remapping facilities. The offset is cpu-offset * cpu-nr.
+
+Example:
+
+ timer@0200a004 {
+ compatible = "qcom,msm-gpt", "qcom,msm-timer";
+ interrupts = <1 2 0x301>;
+ reg = <0x0200a004 0x10>;
+ clock-frequency = <32768>;
+ cpu-offset = <0x40000>;
+ };
+
+ timer@0200a024 {
+ compatible = "qcom,msm-dgt", "qcom,msm-timer";
+ interrupts = <1 3 0x301>;
+ reg = <0x0200a024 0x10>,
+ <0x0200a034 0x4>;
+ clock-frequency = <6750000>;
+ cpu-offset = <0x40000>;
+ };
diff --git a/arch/arm/mach-msm/common.h b/arch/arm/mach-msm/common.h
index 4c2dd16..7d57fb0 100644
--- a/arch/arm/mach-msm/common.h
+++ b/arch/arm/mach-msm/common.h
@@ -16,6 +16,7 @@ extern struct sys_timer msm7x01_timer;
extern struct sys_timer msm7x30_timer;
extern struct sys_timer msm8x60_timer;
extern struct sys_timer msm8960_timer;
+extern struct sys_timer msm_dt_timer;
extern struct sys_timer qsd8x50_timer;
#endif
diff --git a/arch/arm/mach-msm/timer.c b/arch/arm/mach-msm/timer.c
index ddb8701..b17a39d 100644
--- a/arch/arm/mach-msm/timer.c
+++ b/arch/arm/mach-msm/timer.c
@@ -20,6 +20,9 @@
#include <linux/interrupt.h>
#include <linux/irq.h>
#include <linux/io.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
#include <asm/mach/time.h>
#include <asm/hardware/gic.h>
@@ -216,6 +219,90 @@ err:
setup_sched_clock(msm_sched_clock_read, sched_bits, dgt_hz);
}
+#ifdef CONFIG_OF
+static const struct of_device_id msm_dgt_match[] __initconst = {
+ { .compatible = "qcom,msm-dgt" },
+ { },
+};
+
+static const struct of_device_id msm_gpt_match[] __initconst = {
+ { .compatible = "qcom,msm-gpt" },
+ { },
+};
+
+static void __init msm_dt_timer_init(void)
+{
+ struct device_node *np;
+ u32 freq;
+ int irq;
+ struct resource res;
+ u32 percpu_offset;
+ void __iomem *dgt_clk_ctl;
+
+ np = of_find_matching_node(NULL, msm_gpt_match);
+ if (!np) {
+ pr_err("Can't find GPT DT node\n");
+ return;
+ }
+
+ event_base = of_iomap(np, 0);
+ if (!event_base) {
+ pr_err("Failed to map event base\n");
+ return;
+ }
+
+ irq = irq_of_parse_and_map(np, 0);
+ if (irq <= 0) {
+ pr_err("Can't get irq\n");
+ return;
+ }
+ of_node_put(np);
+
+ np = of_find_matching_node(NULL, msm_dgt_match);
+ if (!np) {
+ pr_err("Can't find DGT DT node\n");
+ return;
+ }
+
+ if (of_property_read_u32(np, "cpu-offset", &percpu_offset))
+ percpu_offset = 0;
+
+ if (of_address_to_resource(np, 0, &res)) {
+ pr_err("Failed to parse DGT resource\n");
+ return;
+ }
+
+ source_base = ioremap(res.start + percpu_offset, resource_size(&res));
+ if (!source_base) {
+ pr_err("Failed to map source base\n");
+ return;
+ }
+
+ if (!of_address_to_resource(np, 1, &res)) {
+ dgt_clk_ctl = ioremap(res.start + percpu_offset,
+ resource_size(&res));
+ if (!dgt_clk_ctl) {
+ pr_err("Failed to map DGT control base\n");
+ return;
+ }
+ writel_relaxed(DGT_CLK_CTL_DIV_4, dgt_clk_ctl);
+ iounmap(dgt_clk_ctl);
+ }
+
+ if (of_property_read_u32(np, "clock-frequency", &freq)) {
+ pr_err("Unknown frequency\n");
+ return;
+ }
+ of_node_put(np);
+
+ msm_timer_init(freq, 32, irq, !!percpu_offset);
+}
+
+struct sys_timer msm_dt_timer = {
+ .init = msm_dt_timer_init
+};
+#endif
+
static int __init msm_timer_map(phys_addr_t event, phys_addr_t source)
{
event_base = ioremap(event, SZ_64);
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 4/9] ARM: msm: Move 8660 to DT timer
2012-09-05 19:28 [PATCH 0/9] Move closer to single 8660/8960 zImage Stephen Boyd
2012-09-05 19:28 ` [PATCH 3/9] ARM: msm: Add DT support to msm_timer Stephen Boyd
@ 2012-09-05 19:28 ` Stephen Boyd
2012-09-05 19:28 ` [PATCH 8/9] ARM: msm: Add DT support for 8960 Stephen Boyd
2 siblings, 0 replies; 9+ messages in thread
From: Stephen Boyd @ 2012-09-05 19:28 UTC (permalink / raw)
To: David Brown, Bryan Huntsman, Daniel Walker
Cc: linux-arm-msm, devicetree-discuss, linux-kernel, linux-arm-kernel
Add the timer entry and point the machine descriptor to the
device tree based msm timer.
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---
arch/arm/boot/dts/msm8660-surf.dts | 17 +++++++++++++++++
arch/arm/mach-msm/board-msm8x60.c | 2 +-
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/msm8660-surf.dts b/arch/arm/boot/dts/msm8660-surf.dts
index 45bc4bb..93a15ab 100644
--- a/arch/arm/boot/dts/msm8660-surf.dts
+++ b/arch/arm/boot/dts/msm8660-surf.dts
@@ -15,6 +15,23 @@
< 0x02081000 0x1000 >;
};
+ timer@02000004 {
+ compatible = "qcom,msm-gpt", "qcom,msm-timer";
+ interrupts = <1 1 0x301>;
+ reg = <0x02000004 0x10>;
+ clock-frequency = <32768>;
+ cpu-offset = <0x40000>;
+ };
+
+ timer@02000024 {
+ compatible = "qcom,msm-dgt", "qcom,msm-timer";
+ interrupts = <1 0 0x301>;
+ reg = <0x02000024 0x10>,
+ <0x02000034 0x4>;
+ clock-frequency = <6750000>;
+ cpu-offset = <0x40000>;
+ };
+
serial@19c400000 {
compatible = "qcom,msm-hsuart", "qcom,msm-uart";
reg = <0x19c40000 0x1000>,
diff --git a/arch/arm/mach-msm/board-msm8x60.c b/arch/arm/mach-msm/board-msm8x60.c
index 97db3cd..64c981d 100644
--- a/arch/arm/mach-msm/board-msm8x60.c
+++ b/arch/arm/mach-msm/board-msm8x60.c
@@ -154,7 +154,7 @@ DT_MACHINE_START(MSM_DT, "Qualcomm MSM (Flattened Device Tree)")
.handle_irq = gic_handle_irq,
.init_machine = msm8x60_dt_init,
.init_late = msm8x60_init_late,
- .timer = &msm8x60_timer,
+ .timer = &msm_dt_timer,
.dt_compat = msm8x60_fluid_match,
MACHINE_END
#endif /* CONFIG_OF */
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 8/9] ARM: msm: Add DT support for 8960
2012-09-05 19:28 [PATCH 0/9] Move closer to single 8660/8960 zImage Stephen Boyd
2012-09-05 19:28 ` [PATCH 3/9] ARM: msm: Add DT support to msm_timer Stephen Boyd
2012-09-05 19:28 ` [PATCH 4/9] ARM: msm: Move 8660 to DT timer Stephen Boyd
@ 2012-09-05 19:28 ` Stephen Boyd
2012-09-07 22:58 ` David Brown
` (2 more replies)
2 siblings, 3 replies; 9+ messages in thread
From: Stephen Boyd @ 2012-09-05 19:28 UTC (permalink / raw)
To: David Brown, Bryan Huntsman, Daniel Walker
Cc: linux-kernel, linux-arm-msm, linux-arm-kernel, devicetree-discuss
Add basic support to boot 8960 with device tree. For now just
support a basic machine with a uart device.
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---
arch/arm/boot/dts/msm8960-cdp.dts | 41 ++++++++++++++++++++++++++++++++
arch/arm/mach-msm/Kconfig | 1 +
arch/arm/mach-msm/Makefile | 1 +
arch/arm/mach-msm/Makefile.boot | 1 +
arch/arm/mach-msm/board-dt-8960.c | 49 +++++++++++++++++++++++++++++++++++++++
5 files changed, 93 insertions(+)
create mode 100644 arch/arm/boot/dts/msm8960-cdp.dts
create mode 100644 arch/arm/mach-msm/board-dt-8960.c
diff --git a/arch/arm/boot/dts/msm8960-cdp.dts b/arch/arm/boot/dts/msm8960-cdp.dts
new file mode 100644
index 0000000..76635d5
--- /dev/null
+++ b/arch/arm/boot/dts/msm8960-cdp.dts
@@ -0,0 +1,41 @@
+/dts-v1/;
+
+/include/ "skeleton.dtsi"
+
+/ {
+ model = "Qualcomm MSM8960 CDP";
+ compatible = "qcom,msm8960-cdp", "qcom,msm8960";
+ interrupt-parent = <&intc>;
+
+ intc: interrupt-controller@02000000 {
+ compatible = "qcom,msm-qgic2";
+ interrupt-controller;
+ #interrupt-cells = <3>;
+ reg = < 0x02000000 0x1000 >,
+ < 0x02002000 0x1000 >;
+ };
+
+ timer@0200a004 {
+ compatible = "qcom,msm-gpt", "qcom,msm-timer";
+ interrupts = <1 2 0x301>;
+ reg = <0x0200a004 0x10>;
+ clock-frequency = <32768>;
+ cpu-offset = <0x80000>;
+ };
+
+ timer@0200a024 {
+ compatible = "qcom,msm-dgt", "qcom,msm-timer";
+ interrupts = <1 1 0x301>;
+ reg = <0x0200a024 0x10>,
+ <0x0200a034 0x4>;
+ clock-frequency = <6750000>;
+ cpu-offset = <0x80000>;
+ };
+
+ serial@19c400000 {
+ compatible = "qcom,msm-hsuart", "qcom,msm-uart";
+ reg = <0x16440000 0x1000>,
+ <0x16400000 0x1000>;
+ interrupts = <0 154 0x0>;
+ };
+};
diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index cd78427..2e5a27e 100644
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -56,6 +56,7 @@ config ARCH_MSM8960
select MSM_V2_TLMM
select MSM_GPIOMUX
select MSM_SCM if SMP
+ select USE_OF
endchoice
diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile
index c4f5169..bc2a3cc 100644
--- a/arch/arm/mach-msm/Makefile
+++ b/arch/arm/mach-msm/Makefile
@@ -27,6 +27,7 @@ obj-$(CONFIG_ARCH_MSM7X30) += board-msm7x30.o devices-msm7x30.o
obj-$(CONFIG_ARCH_QSD8X50) += board-qsd8x50.o devices-qsd8x50.o
obj-$(CONFIG_ARCH_MSM8X60) += board-dt-8660.o
obj-$(CONFIG_ARCH_MSM8960) += board-msm8960.o devices-msm8960.o
+obj-$(CONFIG_ARCH_MSM8960) += board-dt-8960.o
obj-$(CONFIG_ARCH_MSM7X30) += gpiomux-v1.o gpiomux.o
obj-$(CONFIG_ARCH_QSD8X50) += gpiomux-8x50.o gpiomux-v1.o gpiomux.o
diff --git a/arch/arm/mach-msm/Makefile.boot b/arch/arm/mach-msm/Makefile.boot
index 8de0678..f7d6ae9 100644
--- a/arch/arm/mach-msm/Makefile.boot
+++ b/arch/arm/mach-msm/Makefile.boot
@@ -3,3 +3,4 @@ params_phys-y := 0x10000100
initrd_phys-y := 0x10800000
dtb-$(CONFIG_ARCH_MSM8X60) += msm8660-surf.dtb
+dtb-$(CONFIG_ARCH_MSM8960) += msm8960-cdp.dtb
diff --git a/arch/arm/mach-msm/board-dt-8960.c b/arch/arm/mach-msm/board-dt-8960.c
new file mode 100644
index 0000000..8df99b8f
--- /dev/null
+++ b/arch/arm/mach-msm/board-dt-8960.c
@@ -0,0 +1,49 @@
+/* Copyright (c) 2012, The Linux Foundation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/init.h>
+#include <linux/of_irq.h>
+#include <linux/of_platform.h>
+
+#include <asm/hardware/gic.h>
+#include <asm/mach/arch.h>
+
+#include "common.h"
+
+static const struct of_device_id msm_dt_gic_match[] __initconst = {
+ { .compatible = "qcom,msm-qgic2", .data = gic_of_init },
+ { }
+};
+
+static void __init msm_dt_init_irq(void)
+{
+ of_irq_init(msm_dt_gic_match);
+}
+
+static void __init msm_dt_init(void)
+{
+ of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
+}
+
+static const char * const msm8960_dt_match[] __initconst = {
+ "qcom,msm8960-cdp",
+ NULL
+};
+
+DT_MACHINE_START(MSM8960_DT, "Qualcomm MSM (Flattened Device Tree)")
+ .map_io = msm_map_msm8960_io,
+ .init_irq = msm_dt_init_irq,
+ .timer = &msm_dt_timer,
+ .init_machine = msm_dt_init,
+ .dt_compat = msm8960_dt_match,
+ .handle_irq = gic_handle_irq,
+MACHINE_END
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 8/9] ARM: msm: Add DT support for 8960
2012-09-05 19:28 ` [PATCH 8/9] ARM: msm: Add DT support for 8960 Stephen Boyd
@ 2012-09-07 22:58 ` David Brown
2012-09-08 0:49 ` Stephen Boyd
2012-09-12 16:09 ` David Brown
2012-09-12 16:23 ` David Brown
2 siblings, 1 reply; 9+ messages in thread
From: David Brown @ 2012-09-07 22:58 UTC (permalink / raw)
To: Stephen Boyd
Cc: Bryan Huntsman, Daniel Walker, linux-kernel, linux-arm-msm,
linux-arm-kernel, devicetree-discuss
On Wed, Sep 05, 2012 at 12:28:58PM -0700, Stephen Boyd wrote:
> +DT_MACHINE_START(MSM8960_DT, "Qualcomm MSM (Flattened Device Tree)")
The description string should specify the general name of what this is
suspporting. Right now, with these patches, it would list
Qualcomm MSM (Flattened Device Tree)
twice as the two targets we support (and isn't helpful when you see
which one it picks). I'd put the "MSM" name by itself without
thinking about it too much. It wasn't that confusing, since there was
only one at the time.
Perhaps make the 8660 one "Qualcomm MSM8660 (Flattened Device Tree)"
and the 8960 one "Qualcomm MSM8960 (Flattened Device Tree)"
I realize that the chip numbers are a bit confusing, so probably best
to pick a canonical name for the description.
David
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 8/9] ARM: msm: Add DT support for 8960
2012-09-07 22:58 ` David Brown
@ 2012-09-08 0:49 ` Stephen Boyd
0 siblings, 0 replies; 9+ messages in thread
From: Stephen Boyd @ 2012-09-08 0:49 UTC (permalink / raw)
To: David Brown
Cc: Bryan Huntsman, Daniel Walker, linux-kernel, linux-arm-msm,
linux-arm-kernel, devicetree-discuss
On 09/07/12 15:58, David Brown wrote:
> On Wed, Sep 05, 2012 at 12:28:58PM -0700, Stephen Boyd wrote:
>
>> +DT_MACHINE_START(MSM8960_DT, "Qualcomm MSM (Flattened Device Tree)")
> The description string should specify the general name of what this is
> suspporting. Right now, with these patches, it would list
>
> Qualcomm MSM (Flattened Device Tree)
>
> twice as the two targets we support (and isn't helpful when you see
> which one it picks). I'd put the "MSM" name by itself without
> thinking about it too much. It wasn't that confusing, since there was
> only one at the time.
>
> Perhaps make the 8660 one "Qualcomm MSM8660 (Flattened Device Tree)"
> and the 8960 one "Qualcomm MSM8960 (Flattened Device Tree)"
>
> I realize that the chip numbers are a bit confusing, so probably best
> to pick a canonical name for the description.
>
I think we don't need to do anything. Basically machine name is always
"Qualcomm MSM (Flattened Device Tree)" but then the model name in the
devicetree blob says a more descriptive value "Qualcomm MSM8960 CDP" or
"Qualcomm MSM8660 SURF", etc. All this info is printed in the kernel log
upon boot:
[ 0.000000] Machine: Qualcomm MSM (Flattened Device Tree), model: Qualcomm MSM8960 CDP
In fact, it should be possible to put the two dt board files together at
some point if we can somehow drive the map_io routine from devicetree.
In this case we could even have the same machine descriptor used for
both machines.
--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
hosted by The Linux Foundation
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 3/9] ARM: msm: Add DT support to msm_timer
2012-09-05 19:28 ` [PATCH 3/9] ARM: msm: Add DT support to msm_timer Stephen Boyd
@ 2012-09-12 16:07 ` David Brown
0 siblings, 0 replies; 9+ messages in thread
From: David Brown @ 2012-09-12 16:07 UTC (permalink / raw)
To: Stephen Boyd
Cc: Bryan Huntsman, Daniel Walker, linux-kernel, linux-arm-msm,
linux-arm-kernel, devicetree-discuss
On Wed, Sep 05, 2012 at 12:28:53PM -0700, Stephen Boyd wrote:
> diff --git a/Documentation/devicetree/bindings/arm/msm/timer.txt b/Documentation/devicetree/bindings/arm/msm/timer.txt
> + timer@0200a004 {
> + compatible = "qcom,msm-gpt", "qcom,msm-timer";
> + interrupts = <1 2 0x301>;
> + reg = <0x0200a004 0x10>;
> + clock-frequency = <32768>;
> + cpu-offset = <0x40000>;
> + };
> +
> + timer@0200a024 {
> + compatible = "qcom,msm-dgt", "qcom,msm-timer";
> + interrupts = <1 3 0x301>;
> + reg = <0x0200a024 0x10>,
> + <0x0200a034 0x4>;
> + clock-frequency = <6750000>;
> + cpu-offset = <0x40000>;
> + };
The names should be timer@200a004 and timer@200a024, without the
leading zero. If there are no other concerns, I can just fix these up
when I pull the patch in. No need to resend.
Thanks,
David
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 8/9] ARM: msm: Add DT support for 8960
2012-09-05 19:28 ` [PATCH 8/9] ARM: msm: Add DT support for 8960 Stephen Boyd
2012-09-07 22:58 ` David Brown
@ 2012-09-12 16:09 ` David Brown
2012-09-12 16:23 ` David Brown
2 siblings, 0 replies; 9+ messages in thread
From: David Brown @ 2012-09-12 16:09 UTC (permalink / raw)
To: Stephen Boyd
Cc: Bryan Huntsman, Daniel Walker, linux-kernel, linux-arm-msm,
linux-arm-kernel, devicetree-discuss
On Wed, Sep 05, 2012 at 12:28:58PM -0700, Stephen Boyd wrote:
> diff --git a/arch/arm/boot/dts/msm8960-cdp.dts b/arch/arm/boot/dts/msm8960-cdp.dts
> +
> + intc: interrupt-controller@02000000 {
> + compatible = "qcom,msm-qgic2";
> + interrupt-controller;
> + #interrupt-cells = <3>;
> + reg = < 0x02000000 0x1000 >,
> + < 0x02002000 0x1000 >;
> + };
> + timer@0200a004 {
...
> + timer@0200a024 {
Likewise here, the leading zeros need to be removed on the names. I
can also take care of this one when I pull it in.
David
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 8/9] ARM: msm: Add DT support for 8960
2012-09-05 19:28 ` [PATCH 8/9] ARM: msm: Add DT support for 8960 Stephen Boyd
2012-09-07 22:58 ` David Brown
2012-09-12 16:09 ` David Brown
@ 2012-09-12 16:23 ` David Brown
2 siblings, 0 replies; 9+ messages in thread
From: David Brown @ 2012-09-12 16:23 UTC (permalink / raw)
To: Stephen Boyd
Cc: Bryan Huntsman, Daniel Walker, linux-kernel, linux-arm-msm,
linux-arm-kernel, devicetree-discuss
On Wed, Sep 05, 2012 at 12:28:58PM -0700, Stephen Boyd wrote:
> diff --git a/arch/arm/boot/dts/msm8960-cdp.dts b/arch/arm/boot/dts/msm8960-cdp.dts
> + intc: interrupt-controller@02000000 {
> + timer@0200a004 {
> + timer@0200a024 {
Same here. Again, I'll fix these when I pull the patch in.
I guess a question: According to
https://lists.ozlabs.org/pipermail/devicetree-discuss/2012-February/012412.html
these leading zeros shouldn't be there, but I do find a few hundred of
them in our existing devicetree files. There are also a handful that
have a @0xnnn form of address.
David
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2012-09-12 16:23 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-05 19:28 [PATCH 0/9] Move closer to single 8660/8960 zImage Stephen Boyd
2012-09-05 19:28 ` [PATCH 3/9] ARM: msm: Add DT support to msm_timer Stephen Boyd
2012-09-12 16:07 ` David Brown
2012-09-05 19:28 ` [PATCH 4/9] ARM: msm: Move 8660 to DT timer Stephen Boyd
2012-09-05 19:28 ` [PATCH 8/9] ARM: msm: Add DT support for 8960 Stephen Boyd
2012-09-07 22:58 ` David Brown
2012-09-08 0:49 ` Stephen Boyd
2012-09-12 16:09 ` David Brown
2012-09-12 16:23 ` David Brown
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).