diff for duplicates of <20180913181245.25484-19-robh@kernel.org> diff --git a/a/1.txt b/N1/1.txt index 4764515..d87b8f7 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,8 +1,8 @@ dtc has new checks for I2C and SPI buses. Fix the SPI bus node names and warnings in unit-addresses. -arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dtb: Warning (i2c_bus_reg): /soc/i2c at 2180000/eeprom at 57: I2C bus unit address format error, expected "53" -arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dtb: Warning (i2c_bus_reg): /soc/i2c at 2180000/eeprom at 56: I2C bus unit address format error, expected "52" +arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dtb: Warning (i2c_bus_reg): /soc/i2c@2180000/eeprom@57: I2C bus unit address format error, expected "53" +arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dtb: Warning (i2c_bus_reg): /soc/i2c@2180000/eeprom@56: I2C bus unit address format error, expected "52" Cc: Shawn Guo <shawnguo@kernel.org> Cc: Li Yang <leoyang.li@nxp.com> @@ -26,8 +26,8 @@ index 68ac78c4564d..5da732f82fa0 100644 status = "disabled"; }; -- dspi: dspi at 2100000 { -+ dspi: spi at 2100000 { +- dspi: dspi@2100000 { ++ dspi: spi@2100000 { compatible = "fsl,ls1012a-dspi", "fsl,ls1021a-v1.0-dspi"; #address-cells = <1>; #size-cells = <0>; @@ -39,8 +39,8 @@ index 7881e3d81a9a..b9c0f2de8f12 100644 interrupts = <0 43 0x4>; }; -- qspi: quadspi at 1550000 { -+ qspi: spi at 1550000 { +- qspi: quadspi@1550000 { ++ qspi: spi@1550000 { compatible = "fsl,ls1043a-qspi", "fsl,ls1021a-qspi"; #address-cells = <1>; #size-cells = <0>; @@ -48,8 +48,8 @@ index 7881e3d81a9a..b9c0f2de8f12 100644 ranges = <0x0 0x5 0x00000000 0x8000000>; }; -- dspi0: dspi at 2100000 { -+ dspi0: spi at 2100000 { +- dspi0: dspi@2100000 { ++ dspi0: spi@2100000 { compatible = "fsl,ls1043a-dspi", "fsl,ls1021a-v1.0-dspi"; #address-cells = <1>; #size-cells = <0>; @@ -57,8 +57,8 @@ index 7881e3d81a9a..b9c0f2de8f12 100644 status = "disabled"; }; -- dspi1: dspi at 2110000 { -+ dspi1: spi at 2110000 { +- dspi1: dspi@2110000 { ++ dspi1: spi@2110000 { compatible = "fsl,ls1043a-dspi", "fsl,ls1021a-v1.0-dspi"; #address-cells = <1>; #size-cells = <0>; @@ -70,14 +70,14 @@ index 440e111651d5..a59b48203688 100644 reg = <0x4c>; }; -- eeprom at 56 { -+ eeprom at 52 { +- eeprom@56 { ++ eeprom@52 { compatible = "atmel,24c512"; reg = <0x52>; }; -- eeprom at 57 { -+ eeprom at 53 { +- eeprom@57 { ++ eeprom@53 { compatible = "atmel,24c512"; reg = <0x53>; }; @@ -89,8 +89,8 @@ index ef83786b8b90..de6af453a6e1 100644 interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>; }; -- qspi: quadspi at 1550000 { -+ qspi: spi at 1550000 { +- qspi: quadspi@1550000 { ++ qspi: spi@1550000 { compatible = "fsl,ls1021a-qspi"; #address-cells = <1>; #size-cells = <0>; @@ -98,8 +98,8 @@ index ef83786b8b90..de6af453a6e1 100644 #thermal-sensor-cells = <1>; }; -- dspi: dspi at 2100000 { -+ dspi: spi at 2100000 { +- dspi: dspi@2100000 { ++ dspi: spi@2100000 { compatible = "fsl,ls1021a-v1.0-dspi"; #address-cells = <1>; #size-cells = <0>; @@ -111,8 +111,8 @@ index 8cb78dd99672..ebe0cd4bf2b7 100644 mmu-masters = <&fsl_mc 0x300 0>; }; -- dspi: dspi at 2100000 { -+ dspi: spi at 2100000 { +- dspi: dspi@2100000 { ++ dspi: spi@2100000 { status = "disabled"; compatible = "fsl,ls2080a-dspi", "fsl,ls2085a-dspi"; #address-cells = <1>; @@ -120,8 +120,8 @@ index 8cb78dd99672..ebe0cd4bf2b7 100644 3 0 0x5 0x20000000 0x00010000>; }; -- qspi: quadspi at 20c0000 { -+ qspi: spi at 20c0000 { +- qspi: quadspi@20c0000 { ++ qspi: spi@20c0000 { status = "disabled"; compatible = "fsl,ls2080a-qspi", "fsl,ls1021a-qspi"; #address-cells = <1>; diff --git a/a/content_digest b/N1/content_digest index 196740c..43f22e2 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,14 +1,17 @@ - "From\0robh@kernel.org (Rob Herring)\0" + "From\0Rob Herring <robh@kernel.org>\0" "Subject\0[PATCH] arm64: dts: fsl: Fix I2C and SPI bus warnings\0" "Date\0Thu, 13 Sep 2018 13:12:43 -0500\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0devicetree@vger.kernel.org" + " linux-arm-kernel@lists.infradead.org\0" + "Cc\0Shawn Guo <shawnguo@kernel.org>" + " Li Yang <leoyang.li@nxp.com>\0" "\00:1\0" "b\0" "dtc has new checks for I2C and SPI buses. Fix the SPI bus node names\n" "and warnings in unit-addresses.\n" "\n" - "arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dtb: Warning (i2c_bus_reg): /soc/i2c at 2180000/eeprom at 57: I2C bus unit address format error, expected \"53\"\n" - "arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dtb: Warning (i2c_bus_reg): /soc/i2c at 2180000/eeprom at 56: I2C bus unit address format error, expected \"52\"\n" + "arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dtb: Warning (i2c_bus_reg): /soc/i2c@2180000/eeprom@57: I2C bus unit address format error, expected \"53\"\n" + "arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dtb: Warning (i2c_bus_reg): /soc/i2c@2180000/eeprom@56: I2C bus unit address format error, expected \"52\"\n" "\n" "Cc: Shawn Guo <shawnguo@kernel.org>\n" "Cc: Li Yang <leoyang.li@nxp.com>\n" @@ -32,8 +35,8 @@ " \t\t\tstatus = \"disabled\";\n" " \t\t};\n" " \n" - "-\t\tdspi: dspi at 2100000 {\n" - "+\t\tdspi: spi at 2100000 {\n" + "-\t\tdspi: dspi@2100000 {\n" + "+\t\tdspi: spi@2100000 {\n" " \t\t\tcompatible = \"fsl,ls1012a-dspi\", \"fsl,ls1021a-v1.0-dspi\";\n" " \t\t\t#address-cells = <1>;\n" " \t\t\t#size-cells = <0>;\n" @@ -45,8 +48,8 @@ " \t\t\tinterrupts = <0 43 0x4>;\n" " \t\t};\n" " \n" - "-\t\tqspi: quadspi at 1550000 {\n" - "+\t\tqspi: spi at 1550000 {\n" + "-\t\tqspi: quadspi@1550000 {\n" + "+\t\tqspi: spi@1550000 {\n" " \t\t\tcompatible = \"fsl,ls1043a-qspi\", \"fsl,ls1021a-qspi\";\n" " \t\t\t#address-cells = <1>;\n" " \t\t\t#size-cells = <0>;\n" @@ -54,8 +57,8 @@ " \t\t\tranges = <0x0 0x5 0x00000000 0x8000000>;\n" " \t\t};\n" " \n" - "-\t\tdspi0: dspi at 2100000 {\n" - "+\t\tdspi0: spi at 2100000 {\n" + "-\t\tdspi0: dspi@2100000 {\n" + "+\t\tdspi0: spi@2100000 {\n" " \t\t\tcompatible = \"fsl,ls1043a-dspi\", \"fsl,ls1021a-v1.0-dspi\";\n" " \t\t\t#address-cells = <1>;\n" " \t\t\t#size-cells = <0>;\n" @@ -63,8 +66,8 @@ " \t\t\tstatus = \"disabled\";\n" " \t\t};\n" " \n" - "-\t\tdspi1: dspi at 2110000 {\n" - "+\t\tdspi1: spi at 2110000 {\n" + "-\t\tdspi1: dspi@2110000 {\n" + "+\t\tdspi1: spi@2110000 {\n" " \t\t\tcompatible = \"fsl,ls1043a-dspi\", \"fsl,ls1021a-v1.0-dspi\";\n" " \t\t\t#address-cells = <1>;\n" " \t\t\t#size-cells = <0>;\n" @@ -76,14 +79,14 @@ " \t\treg = <0x4c>;\n" " \t};\n" " \n" - "-\teeprom at 56 {\n" - "+\teeprom at 52 {\n" + "-\teeprom@56 {\n" + "+\teeprom@52 {\n" " \t\tcompatible = \"atmel,24c512\";\n" " \t\treg = <0x52>;\n" " \t};\n" " \n" - "-\teeprom at 57 {\n" - "+\teeprom at 53 {\n" + "-\teeprom@57 {\n" + "+\teeprom@53 {\n" " \t\tcompatible = \"atmel,24c512\";\n" " \t\treg = <0x53>;\n" " \t};\n" @@ -95,8 +98,8 @@ " \t\t\tinterrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;\n" " \t\t};\n" " \n" - "-\t\tqspi: quadspi at 1550000 {\n" - "+\t\tqspi: spi at 1550000 {\n" + "-\t\tqspi: quadspi@1550000 {\n" + "+\t\tqspi: spi@1550000 {\n" " \t\t\tcompatible = \"fsl,ls1021a-qspi\";\n" " \t\t\t#address-cells = <1>;\n" " \t\t\t#size-cells = <0>;\n" @@ -104,8 +107,8 @@ " \t\t\t#thermal-sensor-cells = <1>;\n" " \t\t};\n" " \n" - "-\t\tdspi: dspi at 2100000 {\n" - "+\t\tdspi: spi at 2100000 {\n" + "-\t\tdspi: dspi@2100000 {\n" + "+\t\tdspi: spi@2100000 {\n" " \t\t\tcompatible = \"fsl,ls1021a-v1.0-dspi\";\n" " \t\t\t#address-cells = <1>;\n" " \t\t\t#size-cells = <0>;\n" @@ -117,8 +120,8 @@ " \t\t\tmmu-masters = <&fsl_mc 0x300 0>;\n" " \t\t};\n" " \n" - "-\t\tdspi: dspi at 2100000 {\n" - "+\t\tdspi: spi at 2100000 {\n" + "-\t\tdspi: dspi@2100000 {\n" + "+\t\tdspi: spi@2100000 {\n" " \t\t\tstatus = \"disabled\";\n" " \t\t\tcompatible = \"fsl,ls2080a-dspi\", \"fsl,ls2085a-dspi\";\n" " \t\t\t#address-cells = <1>;\n" @@ -126,12 +129,12 @@ " \t\t\t\t 3 0 0x5 0x20000000 0x00010000>;\n" " \t\t};\n" " \n" - "-\t\tqspi: quadspi at 20c0000 {\n" - "+\t\tqspi: spi at 20c0000 {\n" + "-\t\tqspi: quadspi@20c0000 {\n" + "+\t\tqspi: spi@20c0000 {\n" " \t\t\tstatus = \"disabled\";\n" " \t\t\tcompatible = \"fsl,ls2080a-qspi\", \"fsl,ls1021a-qspi\";\n" " \t\t\t#address-cells = <1>;\n" "-- \n" 2.17.1 -ed114861cd08f779721f9e7e129c71b7f6494f3b15132a4fd55f6ab2f4b1d1cf +3af0aa224e347795f730f5825ded1eb278ce2634e590bfafdd94a558540c9dbe
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.