-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'msm-dt-for-3.7' of git://git.kernel.org/pub/scm/linux/kern…
…el/git/davidb/linux-msm into next/dt From David Brown: These patches migrate both the 8660 and 8960 targets on msm to be devicetree only. This also sets most of the frame in place necessary to build both targets into the same image. There's a couple of cleanups in here that are kept in this series because they are intimately tied to the changes necessary to support the devicetree conversions. By Stephen Boyd via David Brown * tag 'msm-dt-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm: ARM: msm: Remove non-DT targets from 8960 ARM: msm: Add DT support for 8960 ARM: msm: Move io mapping prototypes to common.h ARM: msm: Rename board-msm8x60 to signify its DT only status ARM: msm: Make 8660 a DT only target ARM: msm: Move 8660 to DT timer ARM: msm: Add DT support to msm_timer ARM: msm: Allow timer.c to compile on multiple targets ARM: msm: Don't touch GIC registers outside of GIC code ARM: msm: Add msm8660-surf.dts to Makefile.boot ARM: msm: Add handle_irq handler for 8660 DT machine Resolved trivial context conflict in arch/arm/mach-msm/io.c and a remove/change conflict in arch/arm/mach-msm/board-msm8x60.c. Signed-off-by: Olof Johansson <olof@lixom.net>
- Loading branch information
Showing
25 changed files
with
407 additions
and
497 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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@200a004 { | ||
| compatible = "qcom,msm-gpt", "qcom,msm-timer"; | ||
| interrupts = <1 2 0x301>; | ||
| reg = <0x0200a004 0x10>; | ||
| clock-frequency = <32768>; | ||
| cpu-offset = <0x40000>; | ||
| }; | ||
|
|
||
| timer@200a024 { | ||
| compatible = "qcom,msm-dgt", "qcom,msm-timer"; | ||
| interrupts = <1 3 0x301>; | ||
| reg = <0x0200a024 0x10>, | ||
| <0x0200a034 0x4>; | ||
| clock-frequency = <6750000>; | ||
| cpu-offset = <0x40000>; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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@2000000 { | ||
| compatible = "qcom,msm-qgic2"; | ||
| interrupt-controller; | ||
| #interrupt-cells = <3>; | ||
| reg = < 0x02000000 0x1000 >, | ||
| < 0x02002000 0x1000 >; | ||
| }; | ||
|
|
||
| timer@200a004 { | ||
| compatible = "qcom,msm-gpt", "qcom,msm-timer"; | ||
| interrupts = <1 2 0x301>; | ||
| reg = <0x0200a004 0x10>; | ||
| clock-frequency = <32768>; | ||
| cpu-offset = <0x80000>; | ||
| }; | ||
|
|
||
| timer@200a024 { | ||
| 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>; | ||
| }; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,6 @@ | ||
| zreladdr-y += 0x10008000 | ||
| params_phys-y := 0x10000100 | ||
| initrd_phys-y := 0x10800000 | ||
|
|
||
| dtb-$(CONFIG_ARCH_MSM8X60) += msm8660-surf.dtb | ||
| dtb-$(CONFIG_ARCH_MSM8960) += msm8960-cdp.dtb |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| /* Copyright (c) 2010-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.h> | ||
| #include <linux/of_irq.h> | ||
| #include <linux/of_platform.h> | ||
|
|
||
| #include <asm/mach/arch.h> | ||
| #include <asm/hardware/gic.h> | ||
|
|
||
| #include <mach/board.h> | ||
| #include "common.h" | ||
|
|
||
| static const struct of_device_id msm_dt_gic_match[] __initconst = { | ||
| { .compatible = "qcom,msm-8660-qgic", .data = gic_of_init }, | ||
| {} | ||
| }; | ||
|
|
||
| static void __init msm8x60_init_irq(void) | ||
| { | ||
| of_irq_init(msm_dt_gic_match); | ||
| } | ||
|
|
||
| static void __init msm8x60_init_late(void) | ||
| { | ||
| smd_debugfs_init(); | ||
| } | ||
|
|
||
| static struct of_dev_auxdata msm_auxdata_lookup[] __initdata = { | ||
| {} | ||
| }; | ||
|
|
||
| static void __init msm8x60_dt_init(void) | ||
| { | ||
| of_platform_populate(NULL, of_default_bus_match_table, | ||
| msm_auxdata_lookup, NULL); | ||
| } | ||
|
|
||
| static const char *msm8x60_fluid_match[] __initdata = { | ||
| "qcom,msm8660-fluid", | ||
| "qcom,msm8660-surf", | ||
| NULL | ||
| }; | ||
|
|
||
| DT_MACHINE_START(MSM_DT, "Qualcomm MSM (Flattened Device Tree)") | ||
| .map_io = msm_map_msm8x60_io, | ||
| .init_irq = msm8x60_init_irq, | ||
| .handle_irq = gic_handle_irq, | ||
| .init_machine = msm8x60_dt_init, | ||
| .init_late = msm8x60_init_late, | ||
| .timer = &msm_dt_timer, | ||
| .dt_compat = msm8x60_fluid_match, | ||
| MACHINE_END |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.