diff for duplicates of <20171004064917.2498-9-joel@jms.id.au> diff --git a/a/content_digest b/N1/content_digest index 983f931..80d855b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,8 @@ "ref\020171004064917.2498-1-joel@jms.id.au\0" - "From\0Joel Stanley <joel@jms.id.au>\0" + "From\0joel@jms.id.au (Joel Stanley)\0" "Subject\0[PATCH v2 8/9] ARM: dts: aspeed: Correctly order UART nodes\0" "Date\0Wed, 4 Oct 2017 17:19:16 +1030\0" - "To\0linux-aspeed@lists.ozlabs.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Order them all by address.\n" @@ -184,4 +184,4 @@ "-- \n" 2.14.1 -0f954fb12331f82f95e9bbbe6fb07c8efa6bf4155480318c9db90097fef82614 +a9118a032854825325a3899bd95d2efdc6a9a61c9958cb55da842353505c6e89
diff --git a/a/1.txt b/N2/1.txt index 213d8c9..e6cef44 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,6 +1,6 @@ Order them all by address. -Signed-off-by: Joel Stanley <joel@jms.id.au> +Signed-off-by: Joel Stanley <joel-U3u1mxZcP9KHXe+LvDLADg@public.gmane.org> --- arch/arm/boot/dts/aspeed-g4.dtsi | 48 +++++++++++++++---------------- arch/arm/boot/dts/aspeed-g5.dtsi | 61 ++++++++++++++++++++-------------------- @@ -14,7 +14,7 @@ index a549413bda3f..4125e07f22f9 100644 clock-names = "PCLK"; }; -+ uart1: serial at 1e783000 { ++ uart1: serial@1e783000 { + compatible = "ns16550a"; + reg = <0x1e783000 0x1000>; + reg-shift = <2>; @@ -24,7 +24,7 @@ index a549413bda3f..4125e07f22f9 100644 + status = "disabled"; + }; + -+ uart5: serial at 1e784000 { ++ uart5: serial@1e784000 { + compatible = "ns16550a"; + reg = <0x1e784000 0x1000>; + reg-shift = <2>; @@ -35,15 +35,15 @@ index a549413bda3f..4125e07f22f9 100644 + status = "disabled"; + }; + - wdt1: wdt at 1e785000 { + wdt1: wdt@1e785000 { compatible = "aspeed,ast2400-wdt"; reg = <0x1e785000 0x1c>; @@ -197,11 +218,11 @@ status = "disabled"; }; -- uart1: serial at 1e783000 { -+ uart6: serial at 1e787000 { +- uart1: serial@1e783000 { ++ uart6: serial@1e787000 { compatible = "ns16550a"; - reg = <0x1e783000 0x1000>; + reg = <0x1e787000 0x1000>; @@ -57,7 +57,7 @@ index a549413bda3f..4125e07f22f9 100644 status = "disabled"; }; -- uart5: serial at 1e784000 { +- uart5: serial@1e784000 { - compatible = "ns16550a"; - reg = <0x1e784000 0x1000>; - reg-shift = <2>; @@ -68,7 +68,7 @@ index a549413bda3f..4125e07f22f9 100644 - status = "disabled"; - }; - -- uart6: serial at 1e787000 { +- uart6: serial@1e787000 { - compatible = "ns16550a"; - reg = <0x1e787000 0x1000>; - reg-shift = <2>; @@ -78,7 +78,7 @@ index a549413bda3f..4125e07f22f9 100644 - status = "disabled"; - }; - - i2c: i2c at 1e78a000 { + i2c: i2c@1e78a000 { compatible = "simple-bus"; #address-cells = <1>; diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi @@ -89,7 +89,7 @@ index de2dafa71651..61cc2d25143a 100644 clock-names = "PCLK"; }; -+ uart1: serial at 1e783000 { ++ uart1: serial@1e783000 { + compatible = "ns16550a"; + reg = <0x1e783000 0x1000>; + reg-shift = <2>; @@ -99,7 +99,7 @@ index de2dafa71651..61cc2d25143a 100644 + status = "disabled"; + }; + -+ uart5: serial at 1e784000 { ++ uart5: serial@1e784000 { + compatible = "ns16550a"; + reg = <0x1e784000 0x1000>; + reg-shift = <2>; @@ -110,13 +110,13 @@ index de2dafa71651..61cc2d25143a 100644 + status = "disabled"; + }; - wdt1: wdt at 1e785000 { + wdt1: wdt@1e785000 { compatible = "aspeed,ast2500-wdt"; @@ -247,16 +267,6 @@ status = "disabled"; }; -- uart1: serial at 1e783000 { +- uart1: serial@1e783000 { - compatible = "ns16550a"; - reg = <0x1e783000 0x1000>; - reg-shift = <2>; @@ -126,14 +126,14 @@ index de2dafa71651..61cc2d25143a 100644 - status = "disabled"; - }; - - lpc: lpc at 1e789000 { + lpc: lpc@1e789000 { compatible = "aspeed,ast2500-lpc", "simple-mfd"; reg = <0x1e789000 0x1000>; @@ -287,6 +297,16 @@ }; }; -+ uart6: serial at 1e787000 { ++ uart6: serial@1e787000 { + compatible = "ns16550a"; + reg = <0x1e787000 0x1000>; + reg-shift = <2>; @@ -143,14 +143,14 @@ index de2dafa71651..61cc2d25143a 100644 + status = "disabled"; + }; + - uart2: serial at 1e78d000 { + uart2: serial@1e78d000 { compatible = "ns16550a"; reg = <0x1e78d000 0x1000>; @@ -317,27 +337,6 @@ status = "disabled"; }; -- uart5: serial at 1e784000 { +- uart5: serial@1e784000 { - compatible = "ns16550a"; - reg = <0x1e784000 0x1000>; - reg-shift = <2>; @@ -161,7 +161,7 @@ index de2dafa71651..61cc2d25143a 100644 - status = "disabled"; - }; - -- uart6: serial at 1e787000 { +- uart6: serial@1e787000 { - compatible = "ns16550a"; - reg = <0x1e787000 0x1000>; - reg-shift = <2>; @@ -171,8 +171,13 @@ index de2dafa71651..61cc2d25143a 100644 - status = "disabled"; - }; - - i2c: i2c at 1e78a000 { + i2c: i2c@1e78a000 { compatible = "simple-bus"; #address-cells = <1>; -- 2.14.1 + +-- +To unsubscribe from this list: send the line "unsubscribe devicetree" in +the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N2/content_digest index 983f931..353b8a7 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,13 +1,25 @@ "ref\020171004064917.2498-1-joel@jms.id.au\0" - "From\0Joel Stanley <joel@jms.id.au>\0" + "ref\020171004064917.2498-1-joel-U3u1mxZcP9KHXe+LvDLADg@public.gmane.org\0" + "From\0Joel Stanley <joel-U3u1mxZcP9KHXe+LvDLADg@public.gmane.org>\0" "Subject\0[PATCH v2 8/9] ARM: dts: aspeed: Correctly order UART nodes\0" "Date\0Wed, 4 Oct 2017 17:19:16 +1030\0" - "To\0linux-aspeed@lists.ozlabs.org\0" + "To\0Joel Stanley <joel-U3u1mxZcP9KHXe+LvDLADg@public.gmane.org>" + Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> + " Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org>\0" + "Cc\0Russell King <linux-I+IVW8TIWO2tmTQ+vhA3Yw@public.gmane.org>" + devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + Andrew Jeffery <andrew-zrmu5oMJ5Fs@public.gmane.org> + Rick Altherr <raltherr-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org> + Brendan Higgins <brendanhiggins-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org> + " C\303\251dric Le Goater <clg-Bxea+6Xhats@public.gmane.org>" + " linux-aspeed-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org\0" "\00:1\0" "b\0" "Order them all by address.\n" "\n" - "Signed-off-by: Joel Stanley <joel@jms.id.au>\n" + "Signed-off-by: Joel Stanley <joel-U3u1mxZcP9KHXe+LvDLADg@public.gmane.org>\n" "---\n" " arch/arm/boot/dts/aspeed-g4.dtsi | 48 +++++++++++++++----------------\n" " arch/arm/boot/dts/aspeed-g5.dtsi | 61 ++++++++++++++++++++--------------------\n" @@ -21,7 +33,7 @@ " \t\t\t\tclock-names = \"PCLK\";\n" " \t\t\t};\n" " \n" - "+\t\t\tuart1: serial at 1e783000 {\n" + "+\t\t\tuart1: serial@1e783000 {\n" "+\t\t\t\tcompatible = \"ns16550a\";\n" "+\t\t\t\treg = <0x1e783000 0x1000>;\n" "+\t\t\t\treg-shift = <2>;\n" @@ -31,7 +43,7 @@ "+\t\t\t\tstatus = \"disabled\";\n" "+\t\t\t};\n" "+\n" - "+\t\t\tuart5: serial at 1e784000 {\n" + "+\t\t\tuart5: serial@1e784000 {\n" "+\t\t\t\tcompatible = \"ns16550a\";\n" "+\t\t\t\treg = <0x1e784000 0x1000>;\n" "+\t\t\t\treg-shift = <2>;\n" @@ -42,15 +54,15 @@ "+\t\t\t\tstatus = \"disabled\";\n" "+\t\t\t};\n" "+\n" - " \t\t\twdt1: wdt at 1e785000 {\n" + " \t\t\twdt1: wdt@1e785000 {\n" " \t\t\t\tcompatible = \"aspeed,ast2400-wdt\";\n" " \t\t\t\treg = <0x1e785000 0x1c>;\n" "@@ -197,11 +218,11 @@\n" " \t\t\t\tstatus = \"disabled\";\n" " \t\t\t};\n" " \n" - "-\t\t\tuart1: serial at 1e783000 {\n" - "+\t\t\tuart6: serial at 1e787000 {\n" + "-\t\t\tuart1: serial@1e783000 {\n" + "+\t\t\tuart6: serial@1e787000 {\n" " \t\t\t\tcompatible = \"ns16550a\";\n" "-\t\t\t\treg = <0x1e783000 0x1000>;\n" "+\t\t\t\treg = <0x1e787000 0x1000>;\n" @@ -64,7 +76,7 @@ " \t\t\t\tstatus = \"disabled\";\n" " \t\t\t};\n" " \n" - "-\t\t\tuart5: serial at 1e784000 {\n" + "-\t\t\tuart5: serial@1e784000 {\n" "-\t\t\t\tcompatible = \"ns16550a\";\n" "-\t\t\t\treg = <0x1e784000 0x1000>;\n" "-\t\t\t\treg-shift = <2>;\n" @@ -75,7 +87,7 @@ "-\t\t\t\tstatus = \"disabled\";\n" "-\t\t\t};\n" "-\n" - "-\t\t\tuart6: serial at 1e787000 {\n" + "-\t\t\tuart6: serial@1e787000 {\n" "-\t\t\t\tcompatible = \"ns16550a\";\n" "-\t\t\t\treg = <0x1e787000 0x1000>;\n" "-\t\t\t\treg-shift = <2>;\n" @@ -85,7 +97,7 @@ "-\t\t\t\tstatus = \"disabled\";\n" "-\t\t\t};\n" "-\n" - " \t\t\ti2c: i2c at 1e78a000 {\n" + " \t\t\ti2c: i2c@1e78a000 {\n" " \t\t\t\tcompatible = \"simple-bus\";\n" " \t\t\t\t#address-cells = <1>;\n" "diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi\n" @@ -96,7 +108,7 @@ " \t\t\t\tclock-names = \"PCLK\";\n" " \t\t\t};\n" " \n" - "+\t\t\tuart1: serial at 1e783000 {\n" + "+\t\t\tuart1: serial@1e783000 {\n" "+\t\t\t\tcompatible = \"ns16550a\";\n" "+\t\t\t\treg = <0x1e783000 0x1000>;\n" "+\t\t\t\treg-shift = <2>;\n" @@ -106,7 +118,7 @@ "+\t\t\t\tstatus = \"disabled\";\n" "+\t\t\t};\n" "+\n" - "+\t\t\tuart5: serial at 1e784000 {\n" + "+\t\t\tuart5: serial@1e784000 {\n" "+\t\t\t\tcompatible = \"ns16550a\";\n" "+\t\t\t\treg = <0x1e784000 0x1000>;\n" "+\t\t\t\treg-shift = <2>;\n" @@ -117,13 +129,13 @@ "+\t\t\t\tstatus = \"disabled\";\n" "+\t\t\t};\n" " \n" - " \t\t\twdt1: wdt at 1e785000 {\n" + " \t\t\twdt1: wdt@1e785000 {\n" " \t\t\t\tcompatible = \"aspeed,ast2500-wdt\";\n" "@@ -247,16 +267,6 @@\n" " \t\t\t\tstatus = \"disabled\";\n" " \t\t\t};\n" " \n" - "-\t\t\tuart1: serial at 1e783000 {\n" + "-\t\t\tuart1: serial@1e783000 {\n" "-\t\t\t\tcompatible = \"ns16550a\";\n" "-\t\t\t\treg = <0x1e783000 0x1000>;\n" "-\t\t\t\treg-shift = <2>;\n" @@ -133,14 +145,14 @@ "-\t\t\t\tstatus = \"disabled\";\n" "-\t\t\t};\n" "-\n" - " \t\t\tlpc: lpc at 1e789000 {\n" + " \t\t\tlpc: lpc@1e789000 {\n" " \t\t\t\tcompatible = \"aspeed,ast2500-lpc\", \"simple-mfd\";\n" " \t\t\t\treg = <0x1e789000 0x1000>;\n" "@@ -287,6 +297,16 @@\n" " \t\t\t\t};\n" " \t\t\t};\n" " \n" - "+\t\t\tuart6: serial at 1e787000 {\n" + "+\t\t\tuart6: serial@1e787000 {\n" "+\t\t\t\tcompatible = \"ns16550a\";\n" "+\t\t\t\treg = <0x1e787000 0x1000>;\n" "+\t\t\t\treg-shift = <2>;\n" @@ -150,14 +162,14 @@ "+\t\t\t\tstatus = \"disabled\";\n" "+\t\t\t};\n" "+\n" - " \t\t\tuart2: serial at 1e78d000 {\n" + " \t\t\tuart2: serial@1e78d000 {\n" " \t\t\t\tcompatible = \"ns16550a\";\n" " \t\t\t\treg = <0x1e78d000 0x1000>;\n" "@@ -317,27 +337,6 @@\n" " \t\t\t\tstatus = \"disabled\";\n" " \t\t\t};\n" " \n" - "-\t\t\tuart5: serial at 1e784000 {\n" + "-\t\t\tuart5: serial@1e784000 {\n" "-\t\t\t\tcompatible = \"ns16550a\";\n" "-\t\t\t\treg = <0x1e784000 0x1000>;\n" "-\t\t\t\treg-shift = <2>;\n" @@ -168,7 +180,7 @@ "-\t\t\t\tstatus = \"disabled\";\n" "-\t\t\t};\n" "-\n" - "-\t\t\tuart6: serial at 1e787000 {\n" + "-\t\t\tuart6: serial@1e787000 {\n" "-\t\t\t\tcompatible = \"ns16550a\";\n" "-\t\t\t\treg = <0x1e787000 0x1000>;\n" "-\t\t\t\treg-shift = <2>;\n" @@ -178,10 +190,15 @@ "-\t\t\t\tstatus = \"disabled\";\n" "-\t\t\t};\n" "-\n" - " \t\t\ti2c: i2c at 1e78a000 {\n" + " \t\t\ti2c: i2c@1e78a000 {\n" " \t\t\t\tcompatible = \"simple-bus\";\n" " \t\t\t\t#address-cells = <1>;\n" "-- \n" - 2.14.1 + "2.14.1\n" + "\n" + "--\n" + "To unsubscribe from this list: send the line \"unsubscribe devicetree\" in\n" + "the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n" + More majordomo info at http://vger.kernel.org/majordomo-info.html -0f954fb12331f82f95e9bbbe6fb07c8efa6bf4155480318c9db90097fef82614 +db53877cddbd2e2a826ec6afb20b0b90bc61f3128aa2aec0487061a36e298a61
diff --git a/a/1.txt b/N3/1.txt index 213d8c9..0e426ef 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -14,7 +14,7 @@ index a549413bda3f..4125e07f22f9 100644 clock-names = "PCLK"; }; -+ uart1: serial at 1e783000 { ++ uart1: serial@1e783000 { + compatible = "ns16550a"; + reg = <0x1e783000 0x1000>; + reg-shift = <2>; @@ -24,7 +24,7 @@ index a549413bda3f..4125e07f22f9 100644 + status = "disabled"; + }; + -+ uart5: serial at 1e784000 { ++ uart5: serial@1e784000 { + compatible = "ns16550a"; + reg = <0x1e784000 0x1000>; + reg-shift = <2>; @@ -35,15 +35,15 @@ index a549413bda3f..4125e07f22f9 100644 + status = "disabled"; + }; + - wdt1: wdt at 1e785000 { + wdt1: wdt@1e785000 { compatible = "aspeed,ast2400-wdt"; reg = <0x1e785000 0x1c>; @@ -197,11 +218,11 @@ status = "disabled"; }; -- uart1: serial at 1e783000 { -+ uart6: serial at 1e787000 { +- uart1: serial@1e783000 { ++ uart6: serial@1e787000 { compatible = "ns16550a"; - reg = <0x1e783000 0x1000>; + reg = <0x1e787000 0x1000>; @@ -57,7 +57,7 @@ index a549413bda3f..4125e07f22f9 100644 status = "disabled"; }; -- uart5: serial at 1e784000 { +- uart5: serial@1e784000 { - compatible = "ns16550a"; - reg = <0x1e784000 0x1000>; - reg-shift = <2>; @@ -68,7 +68,7 @@ index a549413bda3f..4125e07f22f9 100644 - status = "disabled"; - }; - -- uart6: serial at 1e787000 { +- uart6: serial@1e787000 { - compatible = "ns16550a"; - reg = <0x1e787000 0x1000>; - reg-shift = <2>; @@ -78,7 +78,7 @@ index a549413bda3f..4125e07f22f9 100644 - status = "disabled"; - }; - - i2c: i2c at 1e78a000 { + i2c: i2c@1e78a000 { compatible = "simple-bus"; #address-cells = <1>; diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi @@ -89,7 +89,7 @@ index de2dafa71651..61cc2d25143a 100644 clock-names = "PCLK"; }; -+ uart1: serial at 1e783000 { ++ uart1: serial@1e783000 { + compatible = "ns16550a"; + reg = <0x1e783000 0x1000>; + reg-shift = <2>; @@ -99,7 +99,7 @@ index de2dafa71651..61cc2d25143a 100644 + status = "disabled"; + }; + -+ uart5: serial at 1e784000 { ++ uart5: serial@1e784000 { + compatible = "ns16550a"; + reg = <0x1e784000 0x1000>; + reg-shift = <2>; @@ -110,13 +110,13 @@ index de2dafa71651..61cc2d25143a 100644 + status = "disabled"; + }; - wdt1: wdt at 1e785000 { + wdt1: wdt@1e785000 { compatible = "aspeed,ast2500-wdt"; @@ -247,16 +267,6 @@ status = "disabled"; }; -- uart1: serial at 1e783000 { +- uart1: serial@1e783000 { - compatible = "ns16550a"; - reg = <0x1e783000 0x1000>; - reg-shift = <2>; @@ -126,14 +126,14 @@ index de2dafa71651..61cc2d25143a 100644 - status = "disabled"; - }; - - lpc: lpc at 1e789000 { + lpc: lpc@1e789000 { compatible = "aspeed,ast2500-lpc", "simple-mfd"; reg = <0x1e789000 0x1000>; @@ -287,6 +297,16 @@ }; }; -+ uart6: serial at 1e787000 { ++ uart6: serial@1e787000 { + compatible = "ns16550a"; + reg = <0x1e787000 0x1000>; + reg-shift = <2>; @@ -143,14 +143,14 @@ index de2dafa71651..61cc2d25143a 100644 + status = "disabled"; + }; + - uart2: serial at 1e78d000 { + uart2: serial@1e78d000 { compatible = "ns16550a"; reg = <0x1e78d000 0x1000>; @@ -317,27 +337,6 @@ status = "disabled"; }; -- uart5: serial at 1e784000 { +- uart5: serial@1e784000 { - compatible = "ns16550a"; - reg = <0x1e784000 0x1000>; - reg-shift = <2>; @@ -161,7 +161,7 @@ index de2dafa71651..61cc2d25143a 100644 - status = "disabled"; - }; - -- uart6: serial at 1e787000 { +- uart6: serial@1e787000 { - compatible = "ns16550a"; - reg = <0x1e787000 0x1000>; - reg-shift = <2>; @@ -171,7 +171,7 @@ index de2dafa71651..61cc2d25143a 100644 - status = "disabled"; - }; - - i2c: i2c at 1e78a000 { + i2c: i2c@1e78a000 { compatible = "simple-bus"; #address-cells = <1>; -- diff --git a/a/content_digest b/N3/content_digest index 983f931..0a552b6 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -2,7 +2,18 @@ "From\0Joel Stanley <joel@jms.id.au>\0" "Subject\0[PATCH v2 8/9] ARM: dts: aspeed: Correctly order UART nodes\0" "Date\0Wed, 4 Oct 2017 17:19:16 +1030\0" - "To\0linux-aspeed@lists.ozlabs.org\0" + "To\0Joel Stanley <joel@jms.id.au>" + Rob Herring <robh+dt@kernel.org> + " Mark Rutland <mark.rutland@arm.com>\0" + "Cc\0Russell King <linux@armlinux.org.uk>" + devicetree@vger.kernel.org + linux-arm-kernel@lists.infradead.org + linux-kernel@vger.kernel.org + Andrew Jeffery <andrew@aj.id.au> + Rick Altherr <raltherr@google.com> + Brendan Higgins <brendanhiggins@google.com> + " C\303\251dric Le Goater <clg@kaod.org>" + " linux-aspeed@lists.ozlabs.org\0" "\00:1\0" "b\0" "Order them all by address.\n" @@ -21,7 +32,7 @@ " \t\t\t\tclock-names = \"PCLK\";\n" " \t\t\t};\n" " \n" - "+\t\t\tuart1: serial at 1e783000 {\n" + "+\t\t\tuart1: serial@1e783000 {\n" "+\t\t\t\tcompatible = \"ns16550a\";\n" "+\t\t\t\treg = <0x1e783000 0x1000>;\n" "+\t\t\t\treg-shift = <2>;\n" @@ -31,7 +42,7 @@ "+\t\t\t\tstatus = \"disabled\";\n" "+\t\t\t};\n" "+\n" - "+\t\t\tuart5: serial at 1e784000 {\n" + "+\t\t\tuart5: serial@1e784000 {\n" "+\t\t\t\tcompatible = \"ns16550a\";\n" "+\t\t\t\treg = <0x1e784000 0x1000>;\n" "+\t\t\t\treg-shift = <2>;\n" @@ -42,15 +53,15 @@ "+\t\t\t\tstatus = \"disabled\";\n" "+\t\t\t};\n" "+\n" - " \t\t\twdt1: wdt at 1e785000 {\n" + " \t\t\twdt1: wdt@1e785000 {\n" " \t\t\t\tcompatible = \"aspeed,ast2400-wdt\";\n" " \t\t\t\treg = <0x1e785000 0x1c>;\n" "@@ -197,11 +218,11 @@\n" " \t\t\t\tstatus = \"disabled\";\n" " \t\t\t};\n" " \n" - "-\t\t\tuart1: serial at 1e783000 {\n" - "+\t\t\tuart6: serial at 1e787000 {\n" + "-\t\t\tuart1: serial@1e783000 {\n" + "+\t\t\tuart6: serial@1e787000 {\n" " \t\t\t\tcompatible = \"ns16550a\";\n" "-\t\t\t\treg = <0x1e783000 0x1000>;\n" "+\t\t\t\treg = <0x1e787000 0x1000>;\n" @@ -64,7 +75,7 @@ " \t\t\t\tstatus = \"disabled\";\n" " \t\t\t};\n" " \n" - "-\t\t\tuart5: serial at 1e784000 {\n" + "-\t\t\tuart5: serial@1e784000 {\n" "-\t\t\t\tcompatible = \"ns16550a\";\n" "-\t\t\t\treg = <0x1e784000 0x1000>;\n" "-\t\t\t\treg-shift = <2>;\n" @@ -75,7 +86,7 @@ "-\t\t\t\tstatus = \"disabled\";\n" "-\t\t\t};\n" "-\n" - "-\t\t\tuart6: serial at 1e787000 {\n" + "-\t\t\tuart6: serial@1e787000 {\n" "-\t\t\t\tcompatible = \"ns16550a\";\n" "-\t\t\t\treg = <0x1e787000 0x1000>;\n" "-\t\t\t\treg-shift = <2>;\n" @@ -85,7 +96,7 @@ "-\t\t\t\tstatus = \"disabled\";\n" "-\t\t\t};\n" "-\n" - " \t\t\ti2c: i2c at 1e78a000 {\n" + " \t\t\ti2c: i2c@1e78a000 {\n" " \t\t\t\tcompatible = \"simple-bus\";\n" " \t\t\t\t#address-cells = <1>;\n" "diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi\n" @@ -96,7 +107,7 @@ " \t\t\t\tclock-names = \"PCLK\";\n" " \t\t\t};\n" " \n" - "+\t\t\tuart1: serial at 1e783000 {\n" + "+\t\t\tuart1: serial@1e783000 {\n" "+\t\t\t\tcompatible = \"ns16550a\";\n" "+\t\t\t\treg = <0x1e783000 0x1000>;\n" "+\t\t\t\treg-shift = <2>;\n" @@ -106,7 +117,7 @@ "+\t\t\t\tstatus = \"disabled\";\n" "+\t\t\t};\n" "+\n" - "+\t\t\tuart5: serial at 1e784000 {\n" + "+\t\t\tuart5: serial@1e784000 {\n" "+\t\t\t\tcompatible = \"ns16550a\";\n" "+\t\t\t\treg = <0x1e784000 0x1000>;\n" "+\t\t\t\treg-shift = <2>;\n" @@ -117,13 +128,13 @@ "+\t\t\t\tstatus = \"disabled\";\n" "+\t\t\t};\n" " \n" - " \t\t\twdt1: wdt at 1e785000 {\n" + " \t\t\twdt1: wdt@1e785000 {\n" " \t\t\t\tcompatible = \"aspeed,ast2500-wdt\";\n" "@@ -247,16 +267,6 @@\n" " \t\t\t\tstatus = \"disabled\";\n" " \t\t\t};\n" " \n" - "-\t\t\tuart1: serial at 1e783000 {\n" + "-\t\t\tuart1: serial@1e783000 {\n" "-\t\t\t\tcompatible = \"ns16550a\";\n" "-\t\t\t\treg = <0x1e783000 0x1000>;\n" "-\t\t\t\treg-shift = <2>;\n" @@ -133,14 +144,14 @@ "-\t\t\t\tstatus = \"disabled\";\n" "-\t\t\t};\n" "-\n" - " \t\t\tlpc: lpc at 1e789000 {\n" + " \t\t\tlpc: lpc@1e789000 {\n" " \t\t\t\tcompatible = \"aspeed,ast2500-lpc\", \"simple-mfd\";\n" " \t\t\t\treg = <0x1e789000 0x1000>;\n" "@@ -287,6 +297,16 @@\n" " \t\t\t\t};\n" " \t\t\t};\n" " \n" - "+\t\t\tuart6: serial at 1e787000 {\n" + "+\t\t\tuart6: serial@1e787000 {\n" "+\t\t\t\tcompatible = \"ns16550a\";\n" "+\t\t\t\treg = <0x1e787000 0x1000>;\n" "+\t\t\t\treg-shift = <2>;\n" @@ -150,14 +161,14 @@ "+\t\t\t\tstatus = \"disabled\";\n" "+\t\t\t};\n" "+\n" - " \t\t\tuart2: serial at 1e78d000 {\n" + " \t\t\tuart2: serial@1e78d000 {\n" " \t\t\t\tcompatible = \"ns16550a\";\n" " \t\t\t\treg = <0x1e78d000 0x1000>;\n" "@@ -317,27 +337,6 @@\n" " \t\t\t\tstatus = \"disabled\";\n" " \t\t\t};\n" " \n" - "-\t\t\tuart5: serial at 1e784000 {\n" + "-\t\t\tuart5: serial@1e784000 {\n" "-\t\t\t\tcompatible = \"ns16550a\";\n" "-\t\t\t\treg = <0x1e784000 0x1000>;\n" "-\t\t\t\treg-shift = <2>;\n" @@ -168,7 +179,7 @@ "-\t\t\t\tstatus = \"disabled\";\n" "-\t\t\t};\n" "-\n" - "-\t\t\tuart6: serial at 1e787000 {\n" + "-\t\t\tuart6: serial@1e787000 {\n" "-\t\t\t\tcompatible = \"ns16550a\";\n" "-\t\t\t\treg = <0x1e787000 0x1000>;\n" "-\t\t\t\treg-shift = <2>;\n" @@ -178,10 +189,10 @@ "-\t\t\t\tstatus = \"disabled\";\n" "-\t\t\t};\n" "-\n" - " \t\t\ti2c: i2c at 1e78a000 {\n" + " \t\t\ti2c: i2c@1e78a000 {\n" " \t\t\t\tcompatible = \"simple-bus\";\n" " \t\t\t\t#address-cells = <1>;\n" "-- \n" 2.14.1 -0f954fb12331f82f95e9bbbe6fb07c8efa6bf4155480318c9db90097fef82614 +7207dc8e50df245055d30178d99154aab2a054e7220bba53cb3d85344bd7ebe8
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.