On 09/24/14 06:49, Lina Iyer wrote: > On Wed, Sep 24 2014 at 00:14 -0600, Pramod Gurav wrote: >> Hi Lina, >> >> On Wednesday 24 September 2014 05:21 AM, Lina Iyer wrote: >>> Add SPM device bindings for QCOM 8974 based cpus. SPM is the sub-system >>> power manager and controls the logic around the cores (cpu and L2). >>> >>> Each core has an instance of SPM and controls only that core. Each cpu >>> SPM is configured to support WFI and SPC (standalone-power collapse). >>> >>> Signed-off-by: Lina Iyer <lina.iyer@xxxxxxxxxx> >>> --- >>> arch/arm/boot/dts/qcom-msm8974-pm.dtsi | 69 >>> ++++++++++++++++++++++++++++++++++ >>> arch/arm/boot/dts/qcom-msm8974.dtsi | 10 +++-- >>> 2 files changed, 75 insertions(+), 4 deletions(-) >>> create mode 100644 arch/arm/boot/dts/qcom-msm8974-pm.dtsi >> >> <snip> >> >>> +}; >>> diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi >>> b/arch/arm/boot/dts/qcom-msm8974.dtsi >>> index 69dca2a..0580bc2 100644 >>> --- a/arch/arm/boot/dts/qcom-msm8974.dtsi >>> +++ b/arch/arm/boot/dts/qcom-msm8974.dtsi >>> @@ -14,7 +14,7 @@ >>> #size-cells = <0>; >>> interrupts = <1 9 0xf04>; >>> >>> - cpu@0 { >>> + CPU0: cpu@0 { >> Lina, Stephen boyd has sent some DT change for krait-cpufreq which also >> renames this node to "cpu0: cpu@0". If you both could sync up and agree >> on a common naming('cpu0' with caps or not caps) for this node. >> > Sure. Will work with Stephen on that. > This doesn't seem like a big deal. I imagine Kumar can resolve the conflict if the two patches merge at the same time. -- Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html