diff for duplicates of <1383343739-23080-8-git-send-email-sboyd@codeaurora.org> diff --git a/a/1.txt b/N1/1.txt index c852fdb..71bfde3 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -33,32 +33,32 @@ index 386d428..ac5ea76 100644 + compatible = "qcom,scorpion"; + enable-method = "qcom,mmio"; + -+ cpu@0 { ++ cpu at 0 { + device_type = "cpu"; + reg = <0>; + }; + -+ cpu@1 { ++ cpu at 1 { + device_type = "cpu"; + reg = <1>; + }; + }; + - intc: interrupt-controller@2080000 { + intc: interrupt-controller at 2080000 { compatible = "qcom,msm-8660-qgic"; interrupt-controller; @@ -37,6 +54,13 @@ #interrupt-cells = <2>; }; -+ clock-controller@900000 { ++ clock-controller at 900000 { + compatible = "qcom,gcc-8660"; + reg = <0x00900000 0x4000>; + #clock-cells = <1>; + #reset-cells = <1>; + }; + - serial@19c40000 { + serial at 19c40000 { compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm"; reg = <0x19c40000 0x1000>, diff --git a/arch/arm/mach-msm/board-dt.c b/arch/arm/mach-msm/board-dt.c diff --git a/a/content_digest b/N1/content_digest index cecc18d..ce3dc8c 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,12 +1,8 @@ "ref\01383343739-23080-1-git-send-email-sboyd@codeaurora.org\0" - "From\0Stephen Boyd <sboyd@codeaurora.org>\0" + "From\0sboyd@codeaurora.org (Stephen Boyd)\0" "Subject\0[PATCH 07/11] ARM: msm: Re-organize platsmp to make it extensible\0" "Date\0Fri, 1 Nov 2013 15:08:55 -0700\0" "To\0linux-arm-kernel@lists.infradead.org\0" - "Cc\0Rohit Vaswani <rvaswani@codeaurora.org>" - David Brown <davidb@codeaurora.org> - linux-kernel@vger.kernel.org - " linux-arm-msm@vger.kernel.org\0" "\00:1\0" "b\0" "From: Rohit Vaswani <rvaswani@codeaurora.org>\n" @@ -44,32 +40,32 @@ "+\t\tcompatible = \"qcom,scorpion\";\n" "+\t\tenable-method = \"qcom,mmio\";\n" "+\n" - "+\t\tcpu@0 {\n" + "+\t\tcpu at 0 {\n" "+\t\t\tdevice_type = \"cpu\";\n" "+\t\t\treg = <0>;\n" "+\t\t};\n" "+\n" - "+\t\tcpu@1 {\n" + "+\t\tcpu at 1 {\n" "+\t\t\tdevice_type = \"cpu\";\n" "+\t\t\treg = <1>;\n" "+\t\t};\n" "+\t};\n" "+\n" - " \tintc: interrupt-controller@2080000 {\n" + " \tintc: interrupt-controller at 2080000 {\n" " \t\tcompatible = \"qcom,msm-8660-qgic\";\n" " \t\tinterrupt-controller;\n" "@@ -37,6 +54,13 @@\n" " \t\t#interrupt-cells = <2>;\n" " \t};\n" " \n" - "+\tclock-controller@900000 {\n" + "+\tclock-controller at 900000 {\n" "+\t\tcompatible = \"qcom,gcc-8660\";\n" "+\t\treg = <0x00900000 0x4000>;\n" "+\t\t#clock-cells = <1>;\n" "+\t\t#reset-cells = <1>;\n" "+\t};\n" "+\n" - " \tserial@19c40000 {\n" + " \tserial at 19c40000 {\n" " \t\tcompatible = \"qcom,msm-uartdm-v1.3\", \"qcom,msm-uartdm\";\n" " \t\treg = <0x19c40000 0x1000>,\n" "diff --git a/arch/arm/mach-msm/board-dt.c b/arch/arm/mach-msm/board-dt.c\n" @@ -270,4 +266,4 @@ "The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,\n" hosted by The Linux Foundation -a0e784bd3a9fd910fd6a8f55f0f2f2d4d431139daa3d1dd4cf612dd9d6131eec +82fdbda601f549b02e4aa8d053019ca8f1ea7e59ec44501e946a83ccd4d6812c
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.