diff for duplicates of <20180913181245.25484-15-robh@kernel.org> diff --git a/a/1.txt b/N1/1.txt index d488876..7fe7b5d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,11 +1,11 @@ dtc has new checks for I2C and SPI buses. Fix the warnings in node names and unit-addresses. -arch/arm/boot/dts/zynq-zc702.dtb: Warning (i2c_bus_reg): /amba/i2c at e0004000/i2c-mux at 74/i2c at 7/hwmon at 52: I2C bus unit address format error, expected "34" -arch/arm/boot/dts/zynq-zc702.dtb: Warning (i2c_bus_reg): /amba/i2c at e0004000/i2c-mux at 74/i2c at 7/hwmon at 53: I2C bus unit address format error, expected "35" -arch/arm/boot/dts/zynq-zc702.dtb: Warning (i2c_bus_reg): /amba/i2c at e0004000/i2c-mux at 74/i2c at 7/hwmon at 54: I2C bus unit address format error, expected "36" -arch/arm/boot/dts/zynq-zc770-xm013.dtb: Warning (spi_bus_reg): /amba/spi at e0006000/eeprom at 0: SPI bus unit address format error, expected "2" -arch/arm/boot/dts/zynq-zc770-xm010.dtb: Warning (spi_bus_reg): /amba/spi at e0007000/flash at 0: SPI bus unit address format error, expected "1" +arch/arm/boot/dts/zynq-zc702.dtb: Warning (i2c_bus_reg): /amba/i2c@e0004000/i2c-mux@74/i2c@7/hwmon@52: I2C bus unit address format error, expected "34" +arch/arm/boot/dts/zynq-zc702.dtb: Warning (i2c_bus_reg): /amba/i2c@e0004000/i2c-mux@74/i2c@7/hwmon@53: I2C bus unit address format error, expected "35" +arch/arm/boot/dts/zynq-zc702.dtb: Warning (i2c_bus_reg): /amba/i2c@e0004000/i2c-mux@74/i2c@7/hwmon@54: I2C bus unit address format error, expected "36" +arch/arm/boot/dts/zynq-zc770-xm013.dtb: Warning (spi_bus_reg): /amba/spi@e0006000/eeprom@0: SPI bus unit address format error, expected "2" +arch/arm/boot/dts/zynq-zc770-xm010.dtb: Warning (spi_bus_reg): /amba/spi@e0007000/flash@0: SPI bus unit address format error, expected "1" Cc: Michal Simek <michal.simek@xilinx.com> Signed-off-by: Rob Herring <robh@kernel.org> @@ -26,20 +26,20 @@ index cc5a3dc2b4a0..27cd6cb52f1b 100644 #address-cells = <1>; #size-cells = <0>; reg = <7>; -- hwmon at 52 { -+ hwmon at 34 { +- hwmon@52 { ++ hwmon@34 { compatible = "ti,ucd9248"; - reg = <52>; + reg = <0x34>; }; -- hwmon at 53 { -+ hwmon at 35 { +- hwmon@53 { ++ hwmon@35 { compatible = "ti,ucd9248"; - reg = <53>; + reg = <0x35>; }; -- hwmon at 54 { -+ hwmon at 36 { +- hwmon@54 { ++ hwmon@36 { compatible = "ti,ucd9248"; - reg = <54>; + reg = <0x36>; @@ -54,8 +54,8 @@ index 0e1bfdd3421f..0dd352289a45 100644 status = "okay"; num-cs = <4>; is-decoded-cs = <0>; -- flash at 0 { -+ flash at 1 { +- flash@0 { ++ flash@1 { compatible = "sst25wf080", "jedec,spi-nor"; reg = <1>; spi-max-frequency = <1000000>; @@ -67,8 +67,8 @@ index 651913f1afa2..4ae2c85df3a0 100644 status = "okay"; num-cs = <4>; is-decoded-cs = <0>; -- eeprom: eeprom at 0 { -+ eeprom: eeprom at 2 { +- eeprom: eeprom@0 { ++ eeprom: eeprom@2 { at25,byte-len = <8192>; at25,addr-mode = <2>; at25,page-size = <32>; diff --git a/a/content_digest b/N1/content_digest index 482dacd..ae4ad8e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,17 +1,19 @@ - "From\0robh@kernel.org (Rob Herring)\0" + "From\0Rob Herring <robh@kernel.org>\0" "Subject\0[PATCH] ARM: dts: xilinx: Fix I2C and SPI bus warnings\0" "Date\0Thu, 13 Sep 2018 13:12:39 -0500\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0devicetree@vger.kernel.org" + " linux-arm-kernel@lists.infradead.org\0" + "Cc\0Michal Simek <michal.simek@xilinx.com>\0" "\00:1\0" "b\0" "dtc has new checks for I2C and SPI buses. Fix the warnings in node names\n" "and unit-addresses.\n" "\n" - "arch/arm/boot/dts/zynq-zc702.dtb: Warning (i2c_bus_reg): /amba/i2c at e0004000/i2c-mux at 74/i2c at 7/hwmon at 52: I2C bus unit address format error, expected \"34\"\n" - "arch/arm/boot/dts/zynq-zc702.dtb: Warning (i2c_bus_reg): /amba/i2c at e0004000/i2c-mux at 74/i2c at 7/hwmon at 53: I2C bus unit address format error, expected \"35\"\n" - "arch/arm/boot/dts/zynq-zc702.dtb: Warning (i2c_bus_reg): /amba/i2c at e0004000/i2c-mux at 74/i2c at 7/hwmon at 54: I2C bus unit address format error, expected \"36\"\n" - "arch/arm/boot/dts/zynq-zc770-xm013.dtb: Warning (spi_bus_reg): /amba/spi at e0006000/eeprom at 0: SPI bus unit address format error, expected \"2\"\n" - "arch/arm/boot/dts/zynq-zc770-xm010.dtb: Warning (spi_bus_reg): /amba/spi at e0007000/flash at 0: SPI bus unit address format error, expected \"1\"\n" + "arch/arm/boot/dts/zynq-zc702.dtb: Warning (i2c_bus_reg): /amba/i2c@e0004000/i2c-mux@74/i2c@7/hwmon@52: I2C bus unit address format error, expected \"34\"\n" + "arch/arm/boot/dts/zynq-zc702.dtb: Warning (i2c_bus_reg): /amba/i2c@e0004000/i2c-mux@74/i2c@7/hwmon@53: I2C bus unit address format error, expected \"35\"\n" + "arch/arm/boot/dts/zynq-zc702.dtb: Warning (i2c_bus_reg): /amba/i2c@e0004000/i2c-mux@74/i2c@7/hwmon@54: I2C bus unit address format error, expected \"36\"\n" + "arch/arm/boot/dts/zynq-zc770-xm013.dtb: Warning (spi_bus_reg): /amba/spi@e0006000/eeprom@0: SPI bus unit address format error, expected \"2\"\n" + "arch/arm/boot/dts/zynq-zc770-xm010.dtb: Warning (spi_bus_reg): /amba/spi@e0007000/flash@0: SPI bus unit address format error, expected \"1\"\n" "\n" "Cc: Michal Simek <michal.simek@xilinx.com>\n" "Signed-off-by: Rob Herring <robh@kernel.org>\n" @@ -32,20 +34,20 @@ " \t\t\t#address-cells = <1>;\n" " \t\t\t#size-cells = <0>;\n" " \t\t\treg = <7>;\n" - "-\t\t\thwmon at 52 {\n" - "+\t\t\thwmon at 34 {\n" + "-\t\t\thwmon@52 {\n" + "+\t\t\thwmon@34 {\n" " \t\t\t\tcompatible = \"ti,ucd9248\";\n" "-\t\t\t\treg = <52>;\n" "+\t\t\t\treg = <0x34>;\n" " \t\t\t};\n" - "-\t\t\thwmon at 53 {\n" - "+\t\t\thwmon at 35 {\n" + "-\t\t\thwmon@53 {\n" + "+\t\t\thwmon@35 {\n" " \t\t\t\tcompatible = \"ti,ucd9248\";\n" "-\t\t\t\treg = <53>;\n" "+\t\t\t\treg = <0x35>;\n" " \t\t\t};\n" - "-\t\t\thwmon at 54 {\n" - "+\t\t\thwmon at 36 {\n" + "-\t\t\thwmon@54 {\n" + "+\t\t\thwmon@36 {\n" " \t\t\t\tcompatible = \"ti,ucd9248\";\n" "-\t\t\t\treg = <54>;\n" "+\t\t\t\treg = <0x36>;\n" @@ -60,8 +62,8 @@ " \tstatus = \"okay\";\n" " \tnum-cs = <4>;\n" " \tis-decoded-cs = <0>;\n" - "-\tflash at 0 {\n" - "+\tflash at 1 {\n" + "-\tflash@0 {\n" + "+\tflash@1 {\n" " \t\tcompatible = \"sst25wf080\", \"jedec,spi-nor\";\n" " \t\treg = <1>;\n" " \t\tspi-max-frequency = <1000000>;\n" @@ -73,12 +75,12 @@ " \tstatus = \"okay\";\n" " \tnum-cs = <4>;\n" " \tis-decoded-cs = <0>;\n" - "-\teeprom: eeprom at 0 {\n" - "+\teeprom: eeprom at 2 {\n" + "-\teeprom: eeprom@0 {\n" + "+\teeprom: eeprom@2 {\n" " \t\tat25,byte-len = <8192>;\n" " \t\tat25,addr-mode = <2>;\n" " \t\tat25,page-size = <32>;\n" "-- \n" 2.17.1 -0f8f3dae7f71203d8540665d37dc7be336ed462875664eef5e42903c69bdf7be +808cb430e274564e8e4676f01c40011916036c683aa613abe50a4b0af53001c3
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.