diff for duplicates of <1434486676-21812-5-git-send-email-sboyd@codeaurora.org> diff --git a/a/1.txt b/N1/1.txt index a0cf485..36242b3 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -19,14 +19,14 @@ index be241f14246d..fad71d5527b0 100644 }; }; + -+ gsbi@16000000 { ++ gsbi at 16000000 { + status = "ok"; + qcom,mode = <GSBI_PROT_SPI>; + pinctrl-names = "default"; + pinctrl-0 = <&spi1_default>; -+ spi@16080000 { ++ spi at 16080000 { + status = "ok"; -+ eth@0 { ++ eth at 0 { + compatible = "micrel,ks8851"; + reg = <0>; + interrupt-parent = <&msmgpio>; @@ -39,7 +39,7 @@ index be241f14246d..fad71d5527b0 100644 + }; + }; + -+ pinctrl@800000 { ++ pinctrl at 800000 { + spi1_default: spi1_default { + mux { + pins = "gpio6", "gpio7", "gpio9"; @@ -77,7 +77,7 @@ index be241f14246d..fad71d5527b0 100644 + regulators { + compatible = "simple-bus"; + -+ ext_l2: gpio-regulator@91 { ++ ext_l2: gpio-regulator at 91 { + compatible = "regulator-fixed"; + regulator-name = "ext_l2"; + gpio = <&msmgpio 91 0>; @@ -96,7 +96,7 @@ index fcf4bb5f9c3f..2096a94c9b52 100644 reg = <0x1a400000 0x100>; }; + -+ gsbi@16000000 { ++ gsbi at 16000000 { + compatible = "qcom,gsbi-v1.0.0"; + cell-index = <1>; + reg = <0x16000000 0x100>; @@ -106,7 +106,7 @@ index fcf4bb5f9c3f..2096a94c9b52 100644 + #size-cells = <1>; + ranges; + -+ spi@16080000 { ++ spi at 16080000 { + compatible = "qcom,spi-qup-v1.1.1"; + #address-cells = <1>; + #size-cells = <0>; diff --git a/a/content_digest b/N1/content_digest index ef66956..2b90784 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,11 +1,8 @@ "ref\01434486676-21812-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 4/5] ARM: dts: qcom: Add ks8851 node for wired ethernet\0" "Date\0Tue, 16 Jun 2015 13:31:15 -0700\0" - "To\0Andy Gross <agross@codeaurora.org>\0" - "Cc\0linux-arm-msm@vger.kernel.org" - linux-kernel@vger.kernel.org - " linux-arm-kernel@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "The micrel ks8851 device is present on MSM8960 CDP boards. It is\n" @@ -29,14 +26,14 @@ " \t\t\t};\n" " \t\t};\n" "+\n" - "+\t\tgsbi@16000000 {\n" + "+\t\tgsbi at 16000000 {\n" "+\t\t\tstatus = \"ok\";\n" "+\t\t\tqcom,mode = <GSBI_PROT_SPI>;\n" "+\t\t\tpinctrl-names = \"default\";\n" "+\t\t\tpinctrl-0 = <&spi1_default>;\n" - "+\t\t\tspi@16080000 {\n" + "+\t\t\tspi at 16080000 {\n" "+\t\t\t\tstatus = \"ok\";\n" - "+\t\t\t\teth@0 {\n" + "+\t\t\t\teth at 0 {\n" "+\t\t\t\t\tcompatible = \"micrel,ks8851\";\n" "+\t\t\t\t\treg = <0>;\n" "+\t\t\t\t\tinterrupt-parent = <&msmgpio>;\n" @@ -49,7 +46,7 @@ "+\t\t\t};\n" "+\t\t};\n" "+\n" - "+\t\tpinctrl@800000 {\n" + "+\t\tpinctrl at 800000 {\n" "+\t\t\tspi1_default: spi1_default {\n" "+\t\t\t\tmux {\n" "+\t\t\t\t\tpins = \"gpio6\", \"gpio7\", \"gpio9\";\n" @@ -87,7 +84,7 @@ "+\tregulators {\n" "+\t\tcompatible = \"simple-bus\";\n" "+\n" - "+\t\text_l2: gpio-regulator@91 {\n" + "+\t\text_l2: gpio-regulator at 91 {\n" "+\t\t\tcompatible = \"regulator-fixed\";\n" "+\t\t\tregulator-name = \"ext_l2\";\n" "+\t\t\tgpio = <&msmgpio 91 0>;\n" @@ -106,7 +103,7 @@ " \t\t\treg = <0x1a400000 0x100>;\n" " \t\t};\n" "+\n" - "+\t\tgsbi@16000000 {\n" + "+\t\tgsbi at 16000000 {\n" "+\t\t\tcompatible = \"qcom,gsbi-v1.0.0\";\n" "+\t\t\tcell-index = <1>;\n" "+\t\t\treg = <0x16000000 0x100>;\n" @@ -116,7 +113,7 @@ "+\t\t\t#size-cells = <1>;\n" "+\t\t\tranges;\n" "+\n" - "+\t\t\tspi@16080000 {\n" + "+\t\t\tspi at 16080000 {\n" "+\t\t\t\tcompatible = \"qcom,spi-qup-v1.1.1\";\n" "+\t\t\t\t#address-cells = <1>;\n" "+\t\t\t\t#size-cells = <0>;\n" @@ -136,4 +133,4 @@ "The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,\n" a Linux Foundation Collaborative Project -a33eaf273e794afa96fc70ff0ad96f4e1be88f6986d29999849c064d888ff10c +fa2cb7804ff7bc892e7ddeb63861766183fb7081dd8fadd9a15dfeb10cb638a0
diff --git a/a/content_digest b/N2/content_digest index ef66956..ea02b0e 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -3,8 +3,8 @@ "Subject\0[PATCH 4/5] ARM: dts: qcom: Add ks8851 node for wired ethernet\0" "Date\0Tue, 16 Jun 2015 13:31:15 -0700\0" "To\0Andy Gross <agross@codeaurora.org>\0" - "Cc\0linux-arm-msm@vger.kernel.org" - linux-kernel@vger.kernel.org + "Cc\0linux-kernel@vger.kernel.org" + linux-arm-msm@vger.kernel.org " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -136,4 +136,4 @@ "The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,\n" a Linux Foundation Collaborative Project -a33eaf273e794afa96fc70ff0ad96f4e1be88f6986d29999849c064d888ff10c +3193009f8af32da8218af2ba3501f35edd3dcf921df9554ec2b989ccdf6d6bc9
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.