diff for duplicates of <1405543783-10211-1-git-send-email-sboyd@codeaurora.org> diff --git a/a/1.txt b/N1/1.txt index 8db54a9..0f46fc4 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -22,14 +22,14 @@ index db896bddeea3..245351bde5f4 100644 #reset-cells = <1>; }; -+ mmcc: clock-controller@4000000 { ++ mmcc: clock-controller at 4000000 { + compatible = "qcom,mmcc-apq8064"; + reg = <0x4000000 0x1000>; + #clock-cells = <1>; + #reset-cells = <1>; + }; + - msmgpio: pinctrl@800000 { + msmgpio: pinctrl at 800000 { compatible = "qcom,apq8064-pinctrl"; reg = <0x800000 0x4000>; -- diff --git a/a/content_digest b/N1/content_digest index d431023..1d4dcb2 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,11 +1,7 @@ - "From\0Stephen Boyd <sboyd@codeaurora.org>\0" + "From\0sboyd@codeaurora.org (Stephen Boyd)\0" "Subject\0[PATCH] ARM: dts: qcom: Add 8064 multimedia clock controller node\0" "Date\0Wed, 16 Jul 2014 13:49:43 -0700\0" - "To\0David Brown <davidb@codeaurora.org>" - " Kumar Gala <galak@codeaurora.org>\0" - "Cc\0linux-kernel@vger.kernel.org" - linux-arm-msm@vger.kernel.org - " linux-arm-kernel@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Add the mmcc node so that we can probe and use the multimedia\n" @@ -32,18 +28,18 @@ " \t\t\t#reset-cells = <1>;\n" " \t\t};\n" " \n" - "+\t\tmmcc: clock-controller@4000000 {\n" + "+\t\tmmcc: clock-controller at 4000000 {\n" "+\t\t\tcompatible = \"qcom,mmcc-apq8064\";\n" "+\t\t\treg = <0x4000000 0x1000>;\n" "+\t\t\t#clock-cells = <1>;\n" "+\t\t\t#reset-cells = <1>;\n" "+\t\t};\n" "+\n" - " \t\tmsmgpio: pinctrl@800000 {\n" + " \t\tmsmgpio: pinctrl at 800000 {\n" " \t\t\tcompatible = \"qcom,apq8064-pinctrl\";\n" " \t\t\treg = <0x800000 0x4000>;\n" "-- \n" "The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,\n" hosted by The Linux Foundation -fde40bf8a3b9397274d803b15780bf7771395156f2f5b824319a21bf6757d613 +65acc02c20f13b83404fa12deebf7018e5c793f3358a9f7003722ce2a01a3bfd
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.