diff for duplicates of <20180913181245.25484-10-robh@kernel.org> diff --git a/a/1.txt b/N1/1.txt index 94a3057..612e286 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -21,8 +21,8 @@ index 2310a4e97768..8b5288172085 100644 power-domains = <&pm_domains DOMAIN_VAPE>; }; -- ssp at 80002000 { -+ spi at 80002000 { +- ssp@80002000 { ++ spi@80002000 { compatible = "arm,pl022", "arm,primecell"; reg = <0x80002000 0x1000>; interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>; @@ -30,8 +30,8 @@ index 2310a4e97768..8b5288172085 100644 power-domains = <&pm_domains DOMAIN_VAPE>; }; -- ssp at 80003000 { -+ spi at 80003000 { +- ssp@80003000 { ++ spi@80003000 { compatible = "arm,pl022", "arm,primecell"; reg = <0x80003000 0x1000>; interrupts = <GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH>; @@ -43,8 +43,8 @@ index 3f14b4df69b4..94eeb7f1c947 100644 }; }; -- ssp at 80002000 { -+ spi at 80002000 { +- ssp@80002000 { ++ spi@80002000 { /* * On the first generation boards, this SSP/SPI port was connected * to the AB8500. @@ -56,8 +56,8 @@ index b0b94d053098..603890461ae0 100644 pinctrl-1 = <&i2c3_sleep_mode>; }; -- ssp at 80002000 { -+ spi at 80002000 { +- ssp@80002000 { ++ spi@80002000 { pinctrl-names = "default"; pinctrl-0 = <&ssp0_snowball_mode>; }; @@ -69,8 +69,8 @@ index 62ecb6a2fa39..1bd1aba3322f 100644 dma-names = "rx"; }; -- spi: ssp at c0006000 { -+ spi: spi at c0006000 { +- spi: ssp@c0006000 { ++ spi: spi@c0006000 { compatible = "arm,pl022", "arm,primecell"; reg = <0xc0006000 0x1000>; interrupt-parent = <&vica>; diff --git a/a/content_digest b/N1/content_digest index cf39045..ce107c9 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: ste: Fix SPI controller node names\0" "Date\0Thu, 13 Sep 2018 13:12:34 -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" @@ -27,8 +29,8 @@ " \t\t\tpower-domains = <&pm_domains DOMAIN_VAPE>;\n" " \t\t};\n" " \n" - "-\t\tssp at 80002000 {\n" - "+\t\tspi at 80002000 {\n" + "-\t\tssp@80002000 {\n" + "+\t\tspi@80002000 {\n" " \t\t\tcompatible = \"arm,pl022\", \"arm,primecell\";\n" " \t\t\treg = <0x80002000 0x1000>;\n" " \t\t\tinterrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -36,8 +38,8 @@ " \t\t\tpower-domains = <&pm_domains DOMAIN_VAPE>;\n" " \t\t};\n" " \n" - "-\t\tssp at 80003000 {\n" - "+\t\tspi at 80003000 {\n" + "-\t\tssp@80003000 {\n" + "+\t\tspi@80003000 {\n" " \t\t\tcompatible = \"arm,pl022\", \"arm,primecell\";\n" " \t\t\treg = <0x80003000 0x1000>;\n" " \t\t\tinterrupts = <GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -49,8 +51,8 @@ " \t\t\t};\n" " \t\t};\n" " \n" - "-\t\tssp at 80002000 {\n" - "+\t\tspi at 80002000 {\n" + "-\t\tssp@80002000 {\n" + "+\t\tspi@80002000 {\n" " \t\t\t/*\n" " \t\t\t * On the first generation boards, this SSP/SPI port was connected\n" " \t\t\t * to the AB8500.\n" @@ -62,8 +64,8 @@ " \t\t\tpinctrl-1 = <&i2c3_sleep_mode>;\n" " \t\t};\n" " \n" - "-\t\tssp at 80002000 {\n" - "+\t\tspi at 80002000 {\n" + "-\t\tssp@80002000 {\n" + "+\t\tspi@80002000 {\n" " \t\t\tpinctrl-names = \"default\";\n" " \t\t\tpinctrl-0 = <&ssp0_snowball_mode>;\n" " \t\t};\n" @@ -75,12 +77,12 @@ " \t\t\tdma-names = \"rx\";\n" " \t\t};\n" " \n" - "-\t\tspi: ssp at c0006000 {\n" - "+\t\tspi: spi at c0006000 {\n" + "-\t\tspi: ssp@c0006000 {\n" + "+\t\tspi: spi@c0006000 {\n" " \t\t\tcompatible = \"arm,pl022\", \"arm,primecell\";\n" " \t\t\treg = <0xc0006000 0x1000>;\n" " \t\t\tinterrupt-parent = <&vica>;\n" "-- \n" 2.17.1 -04f1676c67ddb654996bad8553e8b490809ddefcd431d44b6a109616ef3183e8 +e39877deb474ecd61e28b23ccd777e76d51659c707c4d9a308abf07bd2610568
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.