diff for duplicates of <20180913181245.25484-2-robh@kernel.org> diff --git a/a/1.txt b/N1/1.txt index 05adee7..5e4d667 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -22,8 +22,8 @@ index a917cf8825ca..0e4c7c4c8c09 100644 clock-names = "uartclk", "apb_pclk"; }; -- ssp: ssp at 1000d000 { -+ ssp: spi at 1000d000 { +- ssp: ssp@1000d000 { ++ ssp: spi@1000d000 { compatible = "arm,pl022", "arm,primecell"; reg = <0x1000d000 0x1000>; clocks = <&sspclk>, <&pclk>; @@ -35,8 +35,8 @@ index f935b72d3d96..f2a1d25eb6cf 100644 clock-names = "apb_pclk"; }; -- pb1176_ssp: ssp at 1010b000 { -+ pb1176_ssp: spi at 1010b000 { +- pb1176_ssp: ssp@1010b000 { ++ pb1176_ssp: spi@1010b000 { compatible = "arm,pl022", "arm,primecell"; reg = <0x1010b000 0x1000>; interrupt-parent = <&intc_dc1176>; @@ -48,8 +48,8 @@ index 36203288de42..7f9cbdf33a51 100644 clock-names = "uartclk", "apb_pclk"; }; -- ssp at 1000d000 { -+ spi at 1000d000 { +- ssp@1000d000 { ++ spi@1000d000 { compatible = "arm,pl022", "arm,primecell"; reg = <0x1000d000 0x1000>; interrupt-parent = <&intc_pb11mp>; @@ -61,8 +61,8 @@ index 10868ba3277f..a5676697ff3b 100644 clock-names = "uartclk", "apb_pclk"; }; -- ssp: ssp at 1000d000 { -+ ssp: spi at 1000d000 { +- ssp: ssp@1000d000 { ++ ssp: spi@1000d000 { compatible = "arm,pl022", "arm,primecell"; reg = <0x1000d000 0x1000>; clocks = <&sspclk>, <&pclk>; @@ -74,8 +74,8 @@ index 5f61d3609027..6f4f60ba5429 100644 clock-names = "apb_pclk"; }; -- ssp at 101f4000 { -+ spi at 101f4000 { +- ssp@101f4000 { ++ spi@101f4000 { compatible = "arm,pl022", "arm,primecell"; reg = <0x101f4000 0x1000>; interrupts = <11>; diff --git a/a/content_digest b/N1/content_digest index 5aae50a..c398a96 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,9 @@ - "From\0robh@kernel.org (Rob Herring)\0" + "From\0Rob Herring <robh@kernel.org>\0" "Subject\0[PATCH] ARM: dts: realview: Fix SPI controller node names\0" "Date\0Thu, 13 Sep 2018 13:12:26 -0500\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0devicetree@vger.kernel.org" + " linux-arm-kernel@lists.infradead.org\0" + "Cc\0Linus Walleij <linus.walleij@linaro.org>\0" "\00:1\0" "b\0" "SPI controller nodes should be named 'spi' rather than 'ssp'. Fixing the\n" @@ -28,8 +30,8 @@ " \t\t\tclock-names = \"uartclk\", \"apb_pclk\";\n" " \t\t};\n" " \n" - "-\t\tssp: ssp at 1000d000 {\n" - "+\t\tssp: spi at 1000d000 {\n" + "-\t\tssp: ssp@1000d000 {\n" + "+\t\tssp: spi@1000d000 {\n" " \t\t\tcompatible = \"arm,pl022\", \"arm,primecell\";\n" " \t\t\treg = <0x1000d000 0x1000>;\n" " \t\t\tclocks = <&sspclk>, <&pclk>;\n" @@ -41,8 +43,8 @@ " \t\t\tclock-names = \"apb_pclk\";\n" " \t\t};\n" " \n" - "-\t\tpb1176_ssp: ssp at 1010b000 {\n" - "+\t\tpb1176_ssp: spi at 1010b000 {\n" + "-\t\tpb1176_ssp: ssp@1010b000 {\n" + "+\t\tpb1176_ssp: spi@1010b000 {\n" " \t\t\tcompatible = \"arm,pl022\", \"arm,primecell\";\n" " \t\t\treg = <0x1010b000 0x1000>;\n" " \t\t\tinterrupt-parent = <&intc_dc1176>;\n" @@ -54,8 +56,8 @@ " \t\t\tclock-names = \"uartclk\", \"apb_pclk\";\n" " \t\t};\n" " \n" - "-\t\tssp at 1000d000 {\n" - "+\t\tspi at 1000d000 {\n" + "-\t\tssp@1000d000 {\n" + "+\t\tspi@1000d000 {\n" " \t\t\tcompatible = \"arm,pl022\", \"arm,primecell\";\n" " \t\t\treg = <0x1000d000 0x1000>;\n" " \t\t\tinterrupt-parent = <&intc_pb11mp>;\n" @@ -67,8 +69,8 @@ " \t\t\tclock-names = \"uartclk\", \"apb_pclk\";\n" " \t\t};\n" " \n" - "-\t\tssp: ssp at 1000d000 {\n" - "+\t\tssp: spi at 1000d000 {\n" + "-\t\tssp: ssp@1000d000 {\n" + "+\t\tssp: spi@1000d000 {\n" " \t\t\tcompatible = \"arm,pl022\", \"arm,primecell\";\n" " \t\t\treg = <0x1000d000 0x1000>;\n" " \t\t\tclocks = <&sspclk>, <&pclk>;\n" @@ -80,12 +82,12 @@ " \t\t\tclock-names = \"apb_pclk\";\n" " \t\t};\n" " \n" - "-\t\tssp at 101f4000 {\n" - "+\t\tspi at 101f4000 {\n" + "-\t\tssp@101f4000 {\n" + "+\t\tspi@101f4000 {\n" " \t\t\tcompatible = \"arm,pl022\", \"arm,primecell\";\n" " \t\t\treg = <0x101f4000 0x1000>;\n" " \t\t\tinterrupts = <11>;\n" "-- \n" 2.17.1 -60439633f1e940930caac55595560a3618475fb0e79472b0c7a28dc0f9d81235 +2c9a585783e9e91f31c1cf1da8e31c9635ac11c920751361aac2864139afda2b
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.