diff for duplicates of <1389921904-3777-2-git-send-email-sboyd@codeaurora.org> diff --git a/a/1.txt b/N1/1.txt index 8321a29..b16d97d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -28,14 +28,14 @@ index 1187185cf25b..68a72f5507b9 100644 #interrupt-cells = <2>; }; -+ gcc: clock-controller@900000 { ++ gcc: clock-controller at 900000 { + compatible = "qcom,gcc-msm8660"; + #clock-cells = <1>; + #reset-cells = <1>; + reg = <0x900000 0x4000>; + }; + - serial@19c40000 { + serial at 19c40000 { compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm"; reg = <0x19c40000 0x1000>, <0x19c00000 0x1000>; @@ -44,7 +44,7 @@ index 1187185cf25b..68a72f5507b9 100644 + clock-names = "core", "iface"; }; - qcom,ssbi@500000 { + qcom,ssbi at 500000 { diff --git a/arch/arm/boot/dts/qcom-msm8960-cdp.dts b/arch/arm/boot/dts/qcom-msm8960-cdp.dts index 6ccbac77931e..7c30de4fa302 100644 --- a/arch/arm/boot/dts/qcom-msm8960-cdp.dts @@ -62,21 +62,21 @@ index 6ccbac77931e..7c30de4fa302 100644 reg = <0x800000 0x4000>; }; -+ gcc: clock-controller@900000 { ++ gcc: clock-controller at 900000 { + compatible = "qcom,gcc-msm8960"; + #clock-cells = <1>; + #reset-cells = <1>; + reg = <0x900000 0x4000>; + }; + -+ clock-controller@4000000 { ++ clock-controller at 4000000 { + compatible = "qcom,mmcc-msm8960"; + reg = <0x4000000 0x1000>; + #clock-cells = <1>; + #reset-cells = <1>; + }; + - serial@16440000 { + serial at 16440000 { compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm"; reg = <0x16440000 0x1000>, <0x16400000 0x1000>; @@ -85,7 +85,7 @@ index 6ccbac77931e..7c30de4fa302 100644 + clock-names = "core", "iface"; }; - qcom,ssbi@500000 { + qcom,ssbi at 500000 { diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi index 6ac94967d2d3..9e5dadb101eb 100644 --- a/arch/arm/boot/dts/qcom-msm8974.dtsi @@ -104,21 +104,21 @@ index 6ac94967d2d3..9e5dadb101eb 100644 reg = <0xfc4ab000 0x4>; }; + -+ gcc: clock-controller@fc400000 { ++ gcc: clock-controller at fc400000 { + compatible = "qcom,gcc-msm8974"; + #clock-cells = <1>; + #reset-cells = <1>; + reg = <0xfc400000 0x4000>; + }; + -+ mmcc: clock-controller@fd8c0000 { ++ mmcc: clock-controller at fd8c0000 { + compatible = "qcom,mmcc-msm8974"; + #clock-cells = <1>; + #reset-cells = <1>; + reg = <0xfd8c0000 0x6000>; + }; + -+ serial@f991e000 { ++ serial at f991e000 { + compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm"; + reg = <0xf991e000 0x1000>; + interrupts = <0 108 0x0>; diff --git a/a/content_digest b/N1/content_digest index e4e3eb5..fe9a237 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,13 +1,8 @@ "ref\01389921904-3777-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 1/2] ARM: dts: msm: Add clock controller nodes and hook into uart\0" "Date\0Thu, 16 Jan 2014 17:25:03 -0800\0" - "To\0arm@kernel.org\0" - "Cc\0linux-kernel@vger.kernel.org" - linux-arm-msm@vger.kernel.org - linux-arm-kernel@lists.infradead.org - Mike Turquette <mturquette@linaro.org> - " David Brown <davidb@codeaurora.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Add the necessary DT nodes to probe the clock controllers on MSM\n" @@ -40,14 +35,14 @@ " \t\t#interrupt-cells = <2>;\n" " \t};\n" " \n" - "+\tgcc: clock-controller@900000 {\n" + "+\tgcc: clock-controller at 900000 {\n" "+\t\tcompatible = \"qcom,gcc-msm8660\";\n" "+\t\t#clock-cells = <1>;\n" "+\t\t#reset-cells = <1>;\n" "+\t\treg = <0x900000 0x4000>;\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" " \t\t <0x19c00000 0x1000>;\n" @@ -56,7 +51,7 @@ "+\t\tclock-names = \"core\", \"iface\";\n" " \t};\n" " \n" - " \tqcom,ssbi@500000 {\n" + " \tqcom,ssbi at 500000 {\n" "diff --git a/arch/arm/boot/dts/qcom-msm8960-cdp.dts b/arch/arm/boot/dts/qcom-msm8960-cdp.dts\n" "index 6ccbac77931e..7c30de4fa302 100644\n" "--- a/arch/arm/boot/dts/qcom-msm8960-cdp.dts\n" @@ -74,21 +69,21 @@ " \t\treg = <0x800000 0x4000>;\n" " \t};\n" " \n" - "+\tgcc: clock-controller@900000 {\n" + "+\tgcc: clock-controller at 900000 {\n" "+\t\tcompatible = \"qcom,gcc-msm8960\";\n" "+\t\t#clock-cells = <1>;\n" "+\t\t#reset-cells = <1>;\n" "+\t\treg = <0x900000 0x4000>;\n" "+\t};\n" "+\n" - "+\tclock-controller@4000000 {\n" + "+\tclock-controller at 4000000 {\n" "+\t\tcompatible = \"qcom,mmcc-msm8960\";\n" "+\t\treg = <0x4000000 0x1000>;\n" "+\t\t#clock-cells = <1>;\n" "+\t\t#reset-cells = <1>;\n" "+\t};\n" "+\n" - " \tserial@16440000 {\n" + " \tserial at 16440000 {\n" " \t\tcompatible = \"qcom,msm-uartdm-v1.3\", \"qcom,msm-uartdm\";\n" " \t\treg = <0x16440000 0x1000>,\n" " \t\t <0x16400000 0x1000>;\n" @@ -97,7 +92,7 @@ "+\t\tclock-names = \"core\", \"iface\";\n" " \t};\n" " \n" - " \tqcom,ssbi@500000 {\n" + " \tqcom,ssbi at 500000 {\n" "diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi\n" "index 6ac94967d2d3..9e5dadb101eb 100644\n" "--- a/arch/arm/boot/dts/qcom-msm8974.dtsi\n" @@ -116,21 +111,21 @@ " \t\t\treg = <0xfc4ab000 0x4>;\n" " \t\t};\n" "+\n" - "+\t\tgcc: clock-controller@fc400000 {\n" + "+\t\tgcc: clock-controller at fc400000 {\n" "+\t\t\tcompatible = \"qcom,gcc-msm8974\";\n" "+\t\t\t#clock-cells = <1>;\n" "+\t\t\t#reset-cells = <1>;\n" "+\t\t\treg = <0xfc400000 0x4000>;\n" "+\t\t};\n" "+\n" - "+\t\tmmcc: clock-controller@fd8c0000 {\n" + "+\t\tmmcc: clock-controller at fd8c0000 {\n" "+\t\t\tcompatible = \"qcom,mmcc-msm8974\";\n" "+\t\t\t#clock-cells = <1>;\n" "+\t\t\t#reset-cells = <1>;\n" "+\t\t\treg = <0xfd8c0000 0x6000>;\n" "+\t\t};\n" "+\n" - "+\t\tserial@f991e000 {\n" + "+\t\tserial at f991e000 {\n" "+\t\t\tcompatible = \"qcom,msm-uartdm-v1.4\", \"qcom,msm-uartdm\";\n" "+\t\t\treg = <0xf991e000 0x1000>;\n" "+\t\t\tinterrupts = <0 108 0x0>;\n" @@ -143,4 +138,4 @@ "The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,\n" hosted by The Linux Foundation -5da942f6c31c2899169142f628b2bcde582913a28ae25dbbdfcc149026e5944b +6bd6246c267ca774085c8b215061195688de1425ac0ff0e38d73ea3398caf282
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.