diff for duplicates of <20180913181245.25484-4-robh@kernel.org> diff --git a/a/1.txt b/N1/1.txt index b3e8166..581b0d8 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,13 +1,13 @@ dtc has new checks for I2C and SPI buses. Fix the warnings in node names and unit-addresses. -arch/arm/boot/dts/at91-dvk_som60.dtb: Warning (i2c_bus_reg): /ahb/apb/i2c at f0018000/eeprom at 87: I2C bus unit address format error, expected "57" -arch/arm/boot/dts/at91-dvk_som60.dtb: Warning (i2c_bus_reg): /ahb/apb/i2c at f0018000/ft5426 at 56: I2C bus unit address format error, expected "38" -arch/arm/boot/dts/at91-vinco.dtb: Warning (i2c_bus_reg): /ahb/apb/i2c at f8024000/rtc at 64: I2C bus unit address format error, expected "32" -arch/arm/boot/dts/at91sam9260ek.dtb: Warning (spi_bus_reg): /ahb/apb/spi at fffc8000/mtd_dataflash at 0: SPI bus unit address format error, expected "1" -arch/arm/boot/dts/at91sam9g20ek_2mmc.dtb: Warning (spi_bus_reg): /ahb/apb/spi at fffc8000/mtd_dataflash at 0: SPI bus unit address format error, expected "1" -arch/arm/boot/dts/at91sam9g20ek.dtb: Warning (spi_bus_reg): /ahb/apb/spi at fffc8000/mtd_dataflash at 0: SPI bus unit address format error, expected "1" -arch/arm/boot/dts/at91sam9261ek.dtb: Warning (spi_bus_reg): /ahb/apb/spi at fffc8000/tsc2046 at 0: SPI bus unit address format error, expected "2" +arch/arm/boot/dts/at91-dvk_som60.dtb: Warning (i2c_bus_reg): /ahb/apb/i2c@f0018000/eeprom@87: I2C bus unit address format error, expected "57" +arch/arm/boot/dts/at91-dvk_som60.dtb: Warning (i2c_bus_reg): /ahb/apb/i2c@f0018000/ft5426@56: I2C bus unit address format error, expected "38" +arch/arm/boot/dts/at91-vinco.dtb: Warning (i2c_bus_reg): /ahb/apb/i2c@f8024000/rtc@64: I2C bus unit address format error, expected "32" +arch/arm/boot/dts/at91sam9260ek.dtb: Warning (spi_bus_reg): /ahb/apb/spi@fffc8000/mtd_dataflash@0: SPI bus unit address format error, expected "1" +arch/arm/boot/dts/at91sam9g20ek_2mmc.dtb: Warning (spi_bus_reg): /ahb/apb/spi@fffc8000/mtd_dataflash@0: SPI bus unit address format error, expected "1" +arch/arm/boot/dts/at91sam9g20ek.dtb: Warning (spi_bus_reg): /ahb/apb/spi@fffc8000/mtd_dataflash@0: SPI bus unit address format error, expected "1" +arch/arm/boot/dts/at91sam9261ek.dtb: Warning (spi_bus_reg): /ahb/apb/spi@fffc8000/tsc2046@0: SPI bus unit address format error, expected "2" Cc: Nicolas Ferre <nicolas.ferre@microchip.com> Cc: Alexandre Belloni <alexandre.belloni@bootlin.com> @@ -32,8 +32,8 @@ index bb86f17ed5ed..21876da7c442 100644 &i2c1 { status = "okay"; -- eeprom at 87 { -+ eeprom at 57 { +- eeprom@87 { ++ eeprom@57 { compatible = "giantec,gt24c32a", "atmel,24c32"; - reg = <87>; + reg = <0x57>; @@ -48,8 +48,8 @@ index 4b9176dc5d02..df0f0cc575c1 100644 &i2c1 { status = "okay"; -- ft5426 at 56 { -+ ft5426 at 38 { +- ft5426@56 { ++ ft5426@38 { compatible = "focaltech,ft5426", "edt,edt-ft5406"; - reg = <56>; + reg = <0x38>; @@ -61,11 +61,11 @@ index 1be9889a2b3a..430277291e02 100644 --- a/arch/arm/boot/dts/at91-vinco.dts +++ b/arch/arm/boot/dts/at91-vinco.dts @@ -128,7 +128,7 @@ - i2c2: i2c at f8024000 { + i2c2: i2c@f8024000 { status = "okay"; -- rtc1: rtc at 64 { -+ rtc1: rtc at 32 { +- rtc1: rtc@64 { ++ rtc1: rtc@32 { compatible = "epson,rx8900"; reg = <0x32>; }; @@ -75,10 +75,10 @@ index d2b865f60293..07d1b571e601 100644 +++ b/arch/arm/boot/dts/at91sam9260ek.dts @@ -127,7 +127,7 @@ - spi0: spi at fffc8000 { + spi0: spi@fffc8000 { cs-gpios = <0>, <&pioC 11 0>, <0>, <0>; -- mtd_dataflash at 0 { -+ mtd_dataflash at 1 { +- mtd_dataflash@0 { ++ mtd_dataflash@1 { compatible = "atmel,at45", "atmel,dataflash"; spi-max-frequency = <50000000>; reg = <1>; @@ -90,8 +90,8 @@ index a29fc0494076..a57f2d435dca 100644 spi-max-frequency = <15000000>; }; -- tsc2046 at 0 { -+ tsc2046 at 2 { +- tsc2046@0 { ++ tsc2046@2 { reg = <2>; compatible = "ti,ads7843"; interrupts-extended = <&pioC 2 IRQ_TYPE_EDGE_BOTH>; @@ -101,10 +101,10 @@ index 71df3adfc7ca..ec1f17ab6753 100644 +++ b/arch/arm/boot/dts/at91sam9g20ek_common.dtsi @@ -109,7 +109,7 @@ - spi0: spi at fffc8000 { + spi0: spi@fffc8000 { cs-gpios = <0>, <&pioC 11 0>, <0>, <0>; -- mtd_dataflash at 0 { -+ mtd_dataflash at 1 { +- mtd_dataflash@0 { ++ mtd_dataflash@1 { compatible = "atmel,at45", "atmel,dataflash"; spi-max-frequency = <50000000>; reg = <1>; diff --git a/a/content_digest b/N1/content_digest index 4b30621..0de629a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,19 +1,21 @@ - "From\0robh@kernel.org (Rob Herring)\0" + "From\0Rob Herring <robh@kernel.org>\0" "Subject\0[PATCH] ARM: dts: atmel: Fix I2C and SPI bus warnings\0" "Date\0Thu, 13 Sep 2018 13:12:28 -0500\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0devicetree@vger.kernel.org" + " linux-arm-kernel@lists.infradead.org\0" + "Cc\0Alexandre Belloni <alexandre.belloni@bootlin.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/at91-dvk_som60.dtb: Warning (i2c_bus_reg): /ahb/apb/i2c at f0018000/eeprom at 87: I2C bus unit address format error, expected \"57\"\n" - "arch/arm/boot/dts/at91-dvk_som60.dtb: Warning (i2c_bus_reg): /ahb/apb/i2c at f0018000/ft5426 at 56: I2C bus unit address format error, expected \"38\"\n" - "arch/arm/boot/dts/at91-vinco.dtb: Warning (i2c_bus_reg): /ahb/apb/i2c at f8024000/rtc at 64: I2C bus unit address format error, expected \"32\"\n" - "arch/arm/boot/dts/at91sam9260ek.dtb: Warning (spi_bus_reg): /ahb/apb/spi at fffc8000/mtd_dataflash at 0: SPI bus unit address format error, expected \"1\"\n" - "arch/arm/boot/dts/at91sam9g20ek_2mmc.dtb: Warning (spi_bus_reg): /ahb/apb/spi at fffc8000/mtd_dataflash at 0: SPI bus unit address format error, expected \"1\"\n" - "arch/arm/boot/dts/at91sam9g20ek.dtb: Warning (spi_bus_reg): /ahb/apb/spi at fffc8000/mtd_dataflash at 0: SPI bus unit address format error, expected \"1\"\n" - "arch/arm/boot/dts/at91sam9261ek.dtb: Warning (spi_bus_reg): /ahb/apb/spi at fffc8000/tsc2046 at 0: SPI bus unit address format error, expected \"2\"\n" + "arch/arm/boot/dts/at91-dvk_som60.dtb: Warning (i2c_bus_reg): /ahb/apb/i2c@f0018000/eeprom@87: I2C bus unit address format error, expected \"57\"\n" + "arch/arm/boot/dts/at91-dvk_som60.dtb: Warning (i2c_bus_reg): /ahb/apb/i2c@f0018000/ft5426@56: I2C bus unit address format error, expected \"38\"\n" + "arch/arm/boot/dts/at91-vinco.dtb: Warning (i2c_bus_reg): /ahb/apb/i2c@f8024000/rtc@64: I2C bus unit address format error, expected \"32\"\n" + "arch/arm/boot/dts/at91sam9260ek.dtb: Warning (spi_bus_reg): /ahb/apb/spi@fffc8000/mtd_dataflash@0: SPI bus unit address format error, expected \"1\"\n" + "arch/arm/boot/dts/at91sam9g20ek_2mmc.dtb: Warning (spi_bus_reg): /ahb/apb/spi@fffc8000/mtd_dataflash@0: SPI bus unit address format error, expected \"1\"\n" + "arch/arm/boot/dts/at91sam9g20ek.dtb: Warning (spi_bus_reg): /ahb/apb/spi@fffc8000/mtd_dataflash@0: SPI bus unit address format error, expected \"1\"\n" + "arch/arm/boot/dts/at91sam9261ek.dtb: Warning (spi_bus_reg): /ahb/apb/spi@fffc8000/tsc2046@0: SPI bus unit address format error, expected \"2\"\n" "\n" "Cc: Nicolas Ferre <nicolas.ferre@microchip.com>\n" "Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>\n" @@ -38,8 +40,8 @@ " &i2c1 {\n" " \tstatus = \"okay\";\n" " \n" - "-\teeprom at 87 {\n" - "+\teeprom at 57 {\n" + "-\teeprom@87 {\n" + "+\teeprom@57 {\n" " \t\tcompatible = \"giantec,gt24c32a\", \"atmel,24c32\";\n" "-\t\treg = <87>;\n" "+\t\treg = <0x57>;\n" @@ -54,8 +56,8 @@ " &i2c1 {\n" " \tstatus = \"okay\";\n" " \n" - "-\tft5426 at 56 {\n" - "+\tft5426 at 38 {\n" + "-\tft5426@56 {\n" + "+\tft5426@38 {\n" " \t\tcompatible = \"focaltech,ft5426\", \"edt,edt-ft5406\";\n" "-\t\treg = <56>;\n" "+\t\treg = <0x38>;\n" @@ -67,11 +69,11 @@ "--- a/arch/arm/boot/dts/at91-vinco.dts\n" "+++ b/arch/arm/boot/dts/at91-vinco.dts\n" "@@ -128,7 +128,7 @@\n" - " \t\t\ti2c2: i2c at f8024000 {\n" + " \t\t\ti2c2: i2c@f8024000 {\n" " \t\t\t\tstatus = \"okay\";\n" " \n" - "-\t\t\t\trtc1: rtc at 64 {\n" - "+\t\t\t\trtc1: rtc at 32 {\n" + "-\t\t\t\trtc1: rtc@64 {\n" + "+\t\t\t\trtc1: rtc@32 {\n" " \t\t\t\t\tcompatible = \"epson,rx8900\";\n" " \t\t\t\t\treg = <0x32>;\n" " \t\t\t\t};\n" @@ -81,10 +83,10 @@ "+++ b/arch/arm/boot/dts/at91sam9260ek.dts\n" "@@ -127,7 +127,7 @@\n" " \n" - " \t\t\tspi0: spi at fffc8000 {\n" + " \t\t\tspi0: spi@fffc8000 {\n" " \t\t\t\tcs-gpios = <0>, <&pioC 11 0>, <0>, <0>;\n" - "-\t\t\t\tmtd_dataflash at 0 {\n" - "+\t\t\t\tmtd_dataflash at 1 {\n" + "-\t\t\t\tmtd_dataflash@0 {\n" + "+\t\t\t\tmtd_dataflash@1 {\n" " \t\t\t\t\tcompatible = \"atmel,at45\", \"atmel,dataflash\";\n" " \t\t\t\t\tspi-max-frequency = <50000000>;\n" " \t\t\t\t\treg = <1>;\n" @@ -96,8 +98,8 @@ " \t\t\t\t\tspi-max-frequency = <15000000>;\n" " \t\t\t\t};\n" " \n" - "-\t\t\t\ttsc2046 at 0 {\n" - "+\t\t\t\ttsc2046 at 2 {\n" + "-\t\t\t\ttsc2046@0 {\n" + "+\t\t\t\ttsc2046@2 {\n" " \t\t\t\t\treg = <2>;\n" " \t\t\t\t\tcompatible = \"ti,ads7843\";\n" " \t\t\t\t\tinterrupts-extended = <&pioC 2 IRQ_TYPE_EDGE_BOTH>;\n" @@ -107,14 +109,14 @@ "+++ b/arch/arm/boot/dts/at91sam9g20ek_common.dtsi\n" "@@ -109,7 +109,7 @@\n" " \n" - " \t\t\tspi0: spi at fffc8000 {\n" + " \t\t\tspi0: spi@fffc8000 {\n" " \t\t\t\tcs-gpios = <0>, <&pioC 11 0>, <0>, <0>;\n" - "-\t\t\t\tmtd_dataflash at 0 {\n" - "+\t\t\t\tmtd_dataflash at 1 {\n" + "-\t\t\t\tmtd_dataflash@0 {\n" + "+\t\t\t\tmtd_dataflash@1 {\n" " \t\t\t\t\tcompatible = \"atmel,at45\", \"atmel,dataflash\";\n" " \t\t\t\t\tspi-max-frequency = <50000000>;\n" " \t\t\t\t\treg = <1>;\n" "-- \n" 2.17.1 -0357130947bff0dd8ab71e9d30cd98fac4c39845f2ece5b3484a71ba08f2f850 +2dd28cc1a191c89c57290eb61a1739c8ba5fd8216d82dd168ff3240fcfa1ce47
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.