diff for duplicates of <1445255774-32887-6-git-send-email-B48286@freescale.com> diff --git a/a/content_digest b/N1/content_digest index 1cbaccd..677133e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,26 +2,26 @@ "From\0Zhiqiang Hou <B48286@freescale.com>\0" "Subject\0[PATCH V5 6/6] dts/ls1043a: add LS1043ARDB board support\0" "Date\0Mon, 19 Oct 2015 19:56:14 +0800\0" - "To\0<linux-arm-kernel@lists.infradead.org>" - <catalin.marinas@arm.com> - <will.deacon@arm.com> - <linux-i2c@vger.kernel.org> - <linux-watchdog@vger.kernel.org> - <linux-doc@vger.kernel.org> - " <linux-clk@vger.kernel.org>\0" - "Cc\0<mark.rutland@arm.com>" - <linux@roeck-us.net> - <wsa@the-dreams.de> - <wim@iguana.be> - <corbet@lwn.net> - <mturquette@baylibre.com> - <sboyd@codeaurora.org> - <Mingkai.Hu@freescale.com> - <Shaohui.Xie@freescale.com> - <scottwood@freescale.com> - <bhupesh.sharma@freescale.com> - <Wenbin.Song@freescale.com> - " <B48286@freescale.com>\0" + "To\0linux-arm-kernel@lists.infradead.org" + catalin.marinas@arm.com + will.deacon@arm.com + linux-i2c@vger.kernel.org + linux-watchdog@vger.kernel.org + linux-doc@vger.kernel.org + " linux-clk@vger.kernel.org\0" + "Cc\0mark.rutland@arm.com" + linux@roeck-us.net + wsa@the-dreams.de + wim@iguana.be + corbet@lwn.net + mturquette@baylibre.com + sboyd@codeaurora.org + Mingkai.Hu@freescale.com + Shaohui.Xie@freescale.com + scottwood@freescale.com + bhupesh.sharma@freescale.com + Wenbin.Song@freescale.com + " B48286@freescale.com\0" "\00:1\0" "b\0" "From: Shaohui Xie <Shaohui.Xie@freescale.com>\n" @@ -177,4 +177,4 @@ "-- \n" 2.1.0.27.g96db324 -df953806d1855a34d77c7a4ff42f0a147d3bd48ce966924c2c316632931ef399 +003ffc0eef2aa8f6e9d120ad43473e50c367153b64dc3192c52e2574c631e06a
diff --git a/a/1.txt b/N2/1.txt index edbea4b..a1600ed 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -87,24 +87,24 @@ index 0000000..7a351e2 + +&i2c0 { + status = "okay"; -+ ina220@40 { ++ ina220 at 40 { + compatible = "ti,ina220"; + reg = <0x40>; + shunt-resistor = <1000>; + }; -+ adt7461a@4c { ++ adt7461a at 4c { + compatible = "adi,adt7461"; + reg = <0x4c>; + }; -+ eeprom@56 { ++ eeprom at 56 { + compatible = "at24,24c512"; + reg = <0x52>; + }; -+ eeprom@57 { ++ eeprom at 57 { + compatible = "at24,24c512"; + reg = <0x53>; + }; -+ rtc@68 { ++ rtc at 68 { + compatible = "pericom,pt7c4338"; + reg = <0x68>; + }; @@ -119,7 +119,7 @@ index 0000000..7a351e2 + 0x1 0x0 0x0 0x7e800000 0x00010000 + 0x2 0x0 0x0 0x7fb00000 0x00000100>; + -+ nor@0,0 { ++ nor at 0,0 { + compatible = "cfi-flash"; + #address-cells = <1>; + #size-cells = <1>; @@ -128,14 +128,14 @@ index 0000000..7a351e2 + device-width = <1>; + }; + -+ nand@1,0 { ++ nand at 1,0 { + compatible = "fsl,ifc-nand"; + #address-cells = <1>; + #size-cells = <1>; + reg = <0x1 0x0 0x10000>; + }; + -+ cpld: board-control@2,0 { ++ cpld: board-control at 2,0 { + compatible = "fsl,ls1043ardb-cpld"; + reg = <0x2 0x0 0x0000100>; + }; diff --git a/a/content_digest b/N2/content_digest index 1cbaccd..d23dc83 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,27 +1,8 @@ "ref\01445255774-32887-1-git-send-email-B48286@freescale.com\0" - "From\0Zhiqiang Hou <B48286@freescale.com>\0" + "From\0B48286@freescale.com (Zhiqiang Hou)\0" "Subject\0[PATCH V5 6/6] dts/ls1043a: add LS1043ARDB board support\0" "Date\0Mon, 19 Oct 2015 19:56:14 +0800\0" - "To\0<linux-arm-kernel@lists.infradead.org>" - <catalin.marinas@arm.com> - <will.deacon@arm.com> - <linux-i2c@vger.kernel.org> - <linux-watchdog@vger.kernel.org> - <linux-doc@vger.kernel.org> - " <linux-clk@vger.kernel.org>\0" - "Cc\0<mark.rutland@arm.com>" - <linux@roeck-us.net> - <wsa@the-dreams.de> - <wim@iguana.be> - <corbet@lwn.net> - <mturquette@baylibre.com> - <sboyd@codeaurora.org> - <Mingkai.Hu@freescale.com> - <Shaohui.Xie@freescale.com> - <scottwood@freescale.com> - <bhupesh.sharma@freescale.com> - <Wenbin.Song@freescale.com> - " <B48286@freescale.com>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "From: Shaohui Xie <Shaohui.Xie@freescale.com>\n" @@ -113,24 +94,24 @@ "+\n" "+&i2c0 {\n" "+\tstatus = \"okay\";\n" - "+\tina220@40 {\n" + "+\tina220 at 40 {\n" "+\t\tcompatible = \"ti,ina220\";\n" "+\t\treg = <0x40>;\n" "+\t\tshunt-resistor = <1000>;\n" "+\t};\n" - "+\tadt7461a@4c {\n" + "+\tadt7461a at 4c {\n" "+\t\tcompatible = \"adi,adt7461\";\n" "+\t\treg = <0x4c>;\n" "+\t};\n" - "+\teeprom@56 {\n" + "+\teeprom at 56 {\n" "+\t\tcompatible = \"at24,24c512\";\n" "+\t\treg = <0x52>;\n" "+\t};\n" - "+\teeprom@57 {\n" + "+\teeprom at 57 {\n" "+\t\tcompatible = \"at24,24c512\";\n" "+\t\treg = <0x53>;\n" "+\t};\n" - "+\trtc@68 {\n" + "+\trtc at 68 {\n" "+\t\tcompatible = \"pericom,pt7c4338\";\n" "+\t\treg = <0x68>;\n" "+\t};\n" @@ -145,7 +126,7 @@ "+\t\t 0x1 0x0 0x0 0x7e800000 0x00010000\n" "+\t\t 0x2 0x0 0x0 0x7fb00000 0x00000100>;\n" "+\n" - "+\t\tnor@0,0 {\n" + "+\t\tnor at 0,0 {\n" "+\t\t\tcompatible = \"cfi-flash\";\n" "+\t\t\t#address-cells = <1>;\n" "+\t\t\t#size-cells = <1>;\n" @@ -154,14 +135,14 @@ "+\t\t\tdevice-width = <1>;\n" "+\t\t};\n" "+\n" - "+\t\tnand@1,0 {\n" + "+\t\tnand at 1,0 {\n" "+\t\t\tcompatible = \"fsl,ifc-nand\";\n" "+\t\t\t#address-cells = <1>;\n" "+\t\t\t#size-cells = <1>;\n" "+\t\t\treg = <0x1 0x0 0x10000>;\n" "+\t\t};\n" "+\n" - "+\t\tcpld: board-control@2,0 {\n" + "+\t\tcpld: board-control at 2,0 {\n" "+\t\t\tcompatible = \"fsl,ls1043ardb-cpld\";\n" "+\t\t\treg = <0x2 0x0 0x0000100>;\n" "+\t\t};\n" @@ -177,4 +158,4 @@ "-- \n" 2.1.0.27.g96db324 -df953806d1855a34d77c7a4ff42f0a147d3bd48ce966924c2c316632931ef399 +08b2441fc3eb131d46ad947e2c1986aabc94da34878fcd74cdeff5132386b2d3
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.