diff for duplicates of <20180221202541.3258-1-atull@kernel.org> diff --git a/a/1.txt b/N1/1.txt index ff69293..78ca8a5 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -77,7 +77,7 @@ index b7f0b6b..cf3b519 100644 + }; + soc { - clock-controller at ffd10000 { + clock-controller@ffd10000 { clocks { @@ -111,3 +118,30 @@ &usb0 { @@ -88,24 +88,24 @@ index b7f0b6b..cf3b519 100644 + status = "okay"; + clock-frequency = <100000>; + -+ adc at 14 { ++ adc@14 { + compatible = "lltc,ltc2497"; + reg = <0x14>; + vref-supply = <&ref_033v>; + }; + -+ temp at 4c { ++ temp@4c { + compatible = "maxim,max1619"; + reg = <0x4c>; + }; + -+ eeprom at 51 { ++ eeprom@51 { + compatible = "atmel,24c32"; + reg = <0x51>; + pagesize = <32>; + }; + -+ rtc at 68 { ++ rtc@68 { + compatible = "dallas,ds1339"; + reg = <0x68>; + }; diff --git a/a/content_digest b/N1/content_digest index d8903bf..a969e81 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,15 @@ - "From\0atull@kernel.org (Alan Tull)\0" + "From\0Alan Tull <atull@kernel.org>\0" "Subject\0[PATCH] arm64: dts: stratix10: enable i2c, add i2c periperals\0" "Date\0Wed, 21 Feb 2018 14:25:41 -0600\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Dinh Nguyen <dinguyen@kernel.org>\0" + "Cc\0Mark Rutland <mark.rutland@arm.com>" + devicetree@vger.kernel.org + Alan Tull <atull@kernel.org> + Catalin Marinas <catalin.marinas@arm.com> + Will Deacon <will.deacon@arm.com> + linux-kernel@vger.kernel.org + Rob Herring <robh+dt@kernel.org> + " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Add clock for i2c\n" @@ -83,7 +91,7 @@ "+\t};\n" "+\n" " \tsoc {\n" - " \t\tclock-controller at ffd10000 {\n" + " \t\tclock-controller@ffd10000 {\n" " \t\t\tclocks {\n" "@@ -111,3 +118,30 @@\n" " &usb0 {\n" @@ -94,24 +102,24 @@ "+\tstatus = \"okay\";\n" "+\tclock-frequency = <100000>;\n" "+\n" - "+\tadc at 14 {\n" + "+\tadc@14 {\n" "+\t\tcompatible = \"lltc,ltc2497\";\n" "+\t\treg = <0x14>;\n" "+\t\tvref-supply = <&ref_033v>;\n" "+\t};\n" "+\n" - "+\ttemp at 4c {\n" + "+\ttemp@4c {\n" "+\t\tcompatible = \"maxim,max1619\";\n" "+\t\treg = <0x4c>;\n" "+\t};\n" "+\n" - "+\teeprom at 51 {\n" + "+\teeprom@51 {\n" "+\t\tcompatible = \"atmel,24c32\";\n" "+\t\treg = <0x51>;\n" "+\t\tpagesize = <32>;\n" "+\t};\n" "+\n" - "+\trtc at 68 {\n" + "+\trtc@68 {\n" "+\t\tcompatible = \"dallas,ds1339\";\n" "+\t\treg = <0x68>;\n" "+\t};\n" @@ -119,4 +127,4 @@ "-- \n" 2.7.4 -ff54d74d28f3d339009d03a6b1de630ce53ab23a74fd782f908e79592cb9b8c3 +601db0fa4e27c6b63865d5f810a513fa85097187a1bcc6386317506533a12341
diff --git a/a/1.txt b/N2/1.txt index ff69293..78ca8a5 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -77,7 +77,7 @@ index b7f0b6b..cf3b519 100644 + }; + soc { - clock-controller at ffd10000 { + clock-controller@ffd10000 { clocks { @@ -111,3 +118,30 @@ &usb0 { @@ -88,24 +88,24 @@ index b7f0b6b..cf3b519 100644 + status = "okay"; + clock-frequency = <100000>; + -+ adc at 14 { ++ adc@14 { + compatible = "lltc,ltc2497"; + reg = <0x14>; + vref-supply = <&ref_033v>; + }; + -+ temp at 4c { ++ temp@4c { + compatible = "maxim,max1619"; + reg = <0x4c>; + }; + -+ eeprom at 51 { ++ eeprom@51 { + compatible = "atmel,24c32"; + reg = <0x51>; + pagesize = <32>; + }; + -+ rtc at 68 { ++ rtc@68 { + compatible = "dallas,ds1339"; + reg = <0x68>; + }; diff --git a/a/content_digest b/N2/content_digest index d8903bf..33cf4b6 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,7 +1,15 @@ - "From\0atull@kernel.org (Alan Tull)\0" + "From\0Alan Tull <atull@kernel.org>\0" "Subject\0[PATCH] arm64: dts: stratix10: enable i2c, add i2c periperals\0" "Date\0Wed, 21 Feb 2018 14:25:41 -0600\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Dinh Nguyen <dinguyen@kernel.org>\0" + "Cc\0Rob Herring <robh+dt@kernel.org>" + Mark Rutland <mark.rutland@arm.com> + Catalin Marinas <catalin.marinas@arm.com> + Will Deacon <will.deacon@arm.com> + Alan Tull <atull@kernel.org> + devicetree@vger.kernel.org + linux-arm-kernel@lists.infradead.org + " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" "Add clock for i2c\n" @@ -83,7 +91,7 @@ "+\t};\n" "+\n" " \tsoc {\n" - " \t\tclock-controller at ffd10000 {\n" + " \t\tclock-controller@ffd10000 {\n" " \t\t\tclocks {\n" "@@ -111,3 +118,30 @@\n" " &usb0 {\n" @@ -94,24 +102,24 @@ "+\tstatus = \"okay\";\n" "+\tclock-frequency = <100000>;\n" "+\n" - "+\tadc at 14 {\n" + "+\tadc@14 {\n" "+\t\tcompatible = \"lltc,ltc2497\";\n" "+\t\treg = <0x14>;\n" "+\t\tvref-supply = <&ref_033v>;\n" "+\t};\n" "+\n" - "+\ttemp at 4c {\n" + "+\ttemp@4c {\n" "+\t\tcompatible = \"maxim,max1619\";\n" "+\t\treg = <0x4c>;\n" "+\t};\n" "+\n" - "+\teeprom at 51 {\n" + "+\teeprom@51 {\n" "+\t\tcompatible = \"atmel,24c32\";\n" "+\t\treg = <0x51>;\n" "+\t\tpagesize = <32>;\n" "+\t};\n" "+\n" - "+\trtc at 68 {\n" + "+\trtc@68 {\n" "+\t\tcompatible = \"dallas,ds1339\";\n" "+\t\treg = <0x68>;\n" "+\t};\n" @@ -119,4 +127,4 @@ "-- \n" 2.7.4 -ff54d74d28f3d339009d03a6b1de630ce53ab23a74fd782f908e79592cb9b8c3 +b686613a8c228732843465b0c56223d9c62ecca6d1dfa999779c4d358096ef8f
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.