diff for duplicates of <1496447559-19782-2-git-send-email-thor.thayer@linux.intel.com> diff --git a/a/1.txt b/N1/1.txt index 0413840..49bc67e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -34,8 +34,8 @@ index b2674bd..d69c13d 100644 }; }; -- fpga_bridge0: fpga_bridge@ff400000 { -+ fpga_bridge0: fpga_bridge@ff200000 { +- fpga_bridge0: fpga_bridge at ff400000 { ++ fpga_bridge0: fpga_bridge at ff200000 { compatible = "altr,socfpga-lwhps2fpga-bridge"; - reg = <0xff400000 0x100000>; + reg = <0xff200000 0x00200000>; @@ -44,7 +44,7 @@ index b2674bd..d69c13d 100644 + clocks = <&clk_0>; }; - fpga_bridge1: fpga_bridge@ff500000 { + fpga_bridge1: fpga_bridge at ff500000 { diff --git a/arch/arm/boot/dts/socfpga_cyclone5_socdk.dts b/arch/arm/boot/dts/socfpga_cyclone5_socdk.dts index 155829f..f99576b 100644 --- a/arch/arm/boot/dts/socfpga_cyclone5_socdk.dts @@ -77,7 +77,7 @@ index 155829f..f99576b 100644 + #size-cells = <1>; + ranges = <0x00000001 0x00080000 0xff280000 0x00000040>; + -+ i2c_0: i2c@0x100080000 { ++ i2c_0: i2c at 0x100080000 { + compatible = "altr,softip-i2c-v1.0"; + reg = <0x00000001 0x00080000 0x00000040>; + interrupt-parent = <&intc>; @@ -88,7 +88,7 @@ index 155829f..f99576b 100644 + #address-cells = <1>; + #size-cells = <0>; + -+ eeprom@51 { ++ eeprom at 51 { + compatible = "atmel,24c32"; + reg = <0x51>; + pagesize = <32>; diff --git a/a/content_digest b/N1/content_digest index fe9f894..da5a625 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,19 +1,8 @@ "ref\01496447559-19782-1-git-send-email-thor.thayer@linux.intel.com\0" - "From\0thor.thayer@linux.intel.com\0" + "From\0thor.thayer@linux.intel.com (thor.thayer at linux.intel.com)\0" "Subject\0[PATCHv3 1/4] ARM: dts: socfpga: Add Altera I2C Controller to CycloneV\0" "Date\0Fri, 2 Jun 2017 18:52:36 -0500\0" - "To\0wsa@the-dreams.de" - robh+dt@kernel.org - mark.rutland@arm.com - dinguyen@kernel.org - " thor.thayer@linux.intel.com\0" - "Cc\0devicetree@vger.kernel.org" - gregkh@linuxfoundation.org - linux-kernel@vger.kernel.org - linux-i2c@vger.kernel.org - mchehab@kernel.org - davem@davemloft.net - " linux-arm-kernel@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "From: Thor Thayer <thor.thayer@linux.intel.com>\n" @@ -52,8 +41,8 @@ " \t\t\t\t};\n" " \t\t};\n" " \n" - "-\t\tfpga_bridge0: fpga_bridge@ff400000 {\n" - "+\t\tfpga_bridge0: fpga_bridge@ff200000 {\n" + "-\t\tfpga_bridge0: fpga_bridge at ff400000 {\n" + "+\t\tfpga_bridge0: fpga_bridge at ff200000 {\n" " \t\t\tcompatible = \"altr,socfpga-lwhps2fpga-bridge\";\n" "-\t\t\treg = <0xff400000 0x100000>;\n" "+\t\t\treg = <0xff200000 0x00200000>;\n" @@ -62,7 +51,7 @@ "+\t\t\tclocks = <&clk_0>;\n" " \t\t};\n" " \n" - " \t\tfpga_bridge1: fpga_bridge@ff500000 {\n" + " \t\tfpga_bridge1: fpga_bridge at ff500000 {\n" "diff --git a/arch/arm/boot/dts/socfpga_cyclone5_socdk.dts b/arch/arm/boot/dts/socfpga_cyclone5_socdk.dts\n" "index 155829f..f99576b 100644\n" "--- a/arch/arm/boot/dts/socfpga_cyclone5_socdk.dts\n" @@ -95,7 +84,7 @@ "+\t#size-cells = <1>;\n" "+\tranges = <0x00000001 0x00080000 0xff280000 0x00000040>;\n" "+\n" - "+\ti2c_0: i2c@0x100080000 {\n" + "+\ti2c_0: i2c at 0x100080000 {\n" "+\t\tcompatible = \"altr,softip-i2c-v1.0\";\n" "+\t\treg = <0x00000001 0x00080000 0x00000040>;\n" "+\t\tinterrupt-parent = <&intc>;\n" @@ -106,7 +95,7 @@ "+\t\t#address-cells = <1>;\n" "+\t\t#size-cells = <0>;\n" "+\n" - "+\t\teeprom@51 {\n" + "+\t\teeprom at 51 {\n" "+\t\t\tcompatible = \"atmel,24c32\";\n" "+\t\t\treg = <0x51>;\n" "+\t\t\tpagesize = <32>;\n" @@ -116,4 +105,4 @@ "-- \n" 2.7.4 -35a036b28f0e92dfe5798c4d3e62db5afa70ee0a0c329d42f38096c9e8d8ebd1 +4b403ad60609aabb0f52e4e0b93393edd125cfc83cf395fac513bc55943968bb
diff --git a/a/content_digest b/N2/content_digest index fe9f894..67d8110 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -7,12 +7,12 @@ mark.rutland@arm.com dinguyen@kernel.org " thor.thayer@linux.intel.com\0" - "Cc\0devicetree@vger.kernel.org" + "Cc\0davem@davemloft.net" gregkh@linuxfoundation.org - linux-kernel@vger.kernel.org - linux-i2c@vger.kernel.org mchehab@kernel.org - davem@davemloft.net + linux-i2c@vger.kernel.org + devicetree@vger.kernel.org + linux-kernel@vger.kernel.org " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -116,4 +116,4 @@ "-- \n" 2.7.4 -35a036b28f0e92dfe5798c4d3e62db5afa70ee0a0c329d42f38096c9e8d8ebd1 +c7a57a5726914c518316968f9376f1aefdc67f9c39c32cc4dd587ea7e23cfe99
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.