diff for duplicates of <20181115220755.GI53235@atomide.com> diff --git a/a/1.txt b/N1/1.txt index 9c1a1b5..74c2d33 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -32,7 +32,7 @@ diff --git a/arch/arm/boot/dts/dra7-l4.dtsi b/arch/arm/boot/dts/dra7-l4.dtsi @@ -2718,7 +2718,7 @@ }; - target-module@60000 { /* 0x48460000, ap 9 0e.0 */ + target-module at 60000 { /* 0x48460000, ap 9 0e.0 */ - compatible = "ti,sysc-omap4-simple", "ti,sysc"; + compatible = "ti,sysc-dra7-mcasp", "ti,sysc"; ti,hwmods = "mcasp1"; @@ -41,7 +41,7 @@ diff --git a/arch/arm/boot/dts/dra7-l4.dtsi b/arch/arm/boot/dts/dra7-l4.dtsi @@ -2752,7 +2752,7 @@ }; - target-module@64000 { /* 0x48464000, ap 11 1e.0 */ + target-module at 64000 { /* 0x48464000, ap 11 1e.0 */ - compatible = "ti,sysc-omap4-simple", "ti,sysc"; + compatible = "ti,sysc-dra7-mcasp", "ti,sysc"; ti,hwmods = "mcasp2"; @@ -50,7 +50,7 @@ diff --git a/arch/arm/boot/dts/dra7-l4.dtsi b/arch/arm/boot/dts/dra7-l4.dtsi @@ -2786,7 +2786,7 @@ }; - target-module@68000 { /* 0x48468000, ap 13 26.0 */ + target-module at 68000 { /* 0x48468000, ap 13 26.0 */ - compatible = "ti,sysc-omap4-simple", "ti,sysc"; + compatible = "ti,sysc-dra7-mcasp", "ti,sysc"; ti,hwmods = "mcasp3"; @@ -59,7 +59,7 @@ diff --git a/arch/arm/boot/dts/dra7-l4.dtsi b/arch/arm/boot/dts/dra7-l4.dtsi @@ -2819,7 +2819,7 @@ }; - target-module@6c000 { /* 0x4846c000, ap 15 2e.0 */ + target-module at 6c000 { /* 0x4846c000, ap 15 2e.0 */ - compatible = "ti,sysc-omap4-simple", "ti,sysc"; + compatible = "ti,sysc-dra7-mcasp", "ti,sysc"; ti,hwmods = "mcasp4"; @@ -68,7 +68,7 @@ diff --git a/arch/arm/boot/dts/dra7-l4.dtsi b/arch/arm/boot/dts/dra7-l4.dtsi @@ -2852,7 +2852,7 @@ }; - target-module@70000 { /* 0x48470000, ap 19 36.0 */ + target-module at 70000 { /* 0x48470000, ap 19 36.0 */ - compatible = "ti,sysc-omap4-simple", "ti,sysc"; + compatible = "ti,sysc-dra7-mcasp", "ti,sysc"; ti,hwmods = "mcasp5"; @@ -77,7 +77,7 @@ diff --git a/arch/arm/boot/dts/dra7-l4.dtsi b/arch/arm/boot/dts/dra7-l4.dtsi @@ -2885,7 +2885,7 @@ }; - target-module@74000 { /* 0x48474000, ap 35 14.0 */ + target-module at 74000 { /* 0x48474000, ap 35 14.0 */ - compatible = "ti,sysc-omap4-simple", "ti,sysc"; + compatible = "ti,sysc-dra7-mcasp", "ti,sysc"; ti,hwmods = "mcasp6"; @@ -86,7 +86,7 @@ diff --git a/arch/arm/boot/dts/dra7-l4.dtsi b/arch/arm/boot/dts/dra7-l4.dtsi @@ -2918,7 +2918,7 @@ }; - target-module@78000 { /* 0x48478000, ap 39 0c.0 */ + target-module at 78000 { /* 0x48478000, ap 39 0c.0 */ - compatible = "ti,sysc-omap4-simple", "ti,sysc"; + compatible = "ti,sysc-dra7-mcasp", "ti,sysc"; ti,hwmods = "mcasp7"; @@ -95,7 +95,7 @@ diff --git a/arch/arm/boot/dts/dra7-l4.dtsi b/arch/arm/boot/dts/dra7-l4.dtsi @@ -2951,7 +2951,7 @@ }; - target-module@7c000 { /* 0x4847c000, ap 43 04.0 */ + target-module at 7c000 { /* 0x4847c000, ap 43 04.0 */ - compatible = "ti,sysc-omap4-simple", "ti,sysc"; + compatible = "ti,sysc-dra7-mcasp", "ti,sysc"; ti,hwmods = "mcasp8"; diff --git a/a/content_digest b/N1/content_digest index a0447d8..811a969 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,20 +1,9 @@ "ref\020181115220237.32129-1-tony@atomide.com\0" "ref\020181115220237.32129-3-tony@atomide.com\0" - "From\0Tony Lindgren <tony@atomide.com>\0" - "Subject\0Re: [PATCH 2/2] bus: ti-sysc: Add mcasp optional clocks flag\0" + "From\0tony@atomide.com (Tony Lindgren)\0" + "Subject\0[PATCH 2/2] bus: ti-sysc: Add mcasp optional clocks flag\0" "Date\0Thu, 15 Nov 2018 14:07:55 -0800\0" - "To\0linux-omap@vger.kernel.org\0" - "Cc\0Dave Gerlach <d-gerlach@ti.com>" - Faiz Abbas <faiz_abbas@ti.com> - Greg Kroah-Hartman <gregkh@linuxfoundation.org> - Keerthy <j-keerthy@ti.com> - Nishanth Menon <nm@ti.com> - Suman Anna <s-anna@ti.com> - Tero Kristo <t-kristo@ti.com> - linux-kernel@vger.kernel.org - linux-arm-kernel@lists.infradead.org - Mark Rutland <mark.rutland@arm.com> - " Rob Herring <robh+dt@kernel.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "* Tony Lindgren <tony@atomide.com> [181115 22:03]:\n" @@ -51,7 +40,7 @@ "@@ -2718,7 +2718,7 @@\n" " \t\t};\n" " \n" - " \t\ttarget-module@60000 {\t\t\t/* 0x48460000, ap 9 0e.0 */\n" + " \t\ttarget-module at 60000 {\t\t\t/* 0x48460000, ap 9 0e.0 */\n" "-\t\t\tcompatible = \"ti,sysc-omap4-simple\", \"ti,sysc\";\n" "+\t\t\tcompatible = \"ti,sysc-dra7-mcasp\", \"ti,sysc\";\n" " \t\t\tti,hwmods = \"mcasp1\";\n" @@ -60,7 +49,7 @@ "@@ -2752,7 +2752,7 @@\n" " \t\t};\n" " \n" - " \t\ttarget-module@64000 {\t\t\t/* 0x48464000, ap 11 1e.0 */\n" + " \t\ttarget-module at 64000 {\t\t\t/* 0x48464000, ap 11 1e.0 */\n" "-\t\t\tcompatible = \"ti,sysc-omap4-simple\", \"ti,sysc\";\n" "+\t\t\tcompatible = \"ti,sysc-dra7-mcasp\", \"ti,sysc\";\n" " \t\t\tti,hwmods = \"mcasp2\";\n" @@ -69,7 +58,7 @@ "@@ -2786,7 +2786,7 @@\n" " \t\t};\n" " \n" - " \t\ttarget-module@68000 {\t\t\t/* 0x48468000, ap 13 26.0 */\n" + " \t\ttarget-module at 68000 {\t\t\t/* 0x48468000, ap 13 26.0 */\n" "-\t\t\tcompatible = \"ti,sysc-omap4-simple\", \"ti,sysc\";\n" "+\t\t\tcompatible = \"ti,sysc-dra7-mcasp\", \"ti,sysc\";\n" " \t\t\tti,hwmods = \"mcasp3\";\n" @@ -78,7 +67,7 @@ "@@ -2819,7 +2819,7 @@\n" " \t\t};\n" " \n" - " \t\ttarget-module@6c000 {\t\t\t/* 0x4846c000, ap 15 2e.0 */\n" + " \t\ttarget-module at 6c000 {\t\t\t/* 0x4846c000, ap 15 2e.0 */\n" "-\t\t\tcompatible = \"ti,sysc-omap4-simple\", \"ti,sysc\";\n" "+\t\t\tcompatible = \"ti,sysc-dra7-mcasp\", \"ti,sysc\";\n" " \t\t\tti,hwmods = \"mcasp4\";\n" @@ -87,7 +76,7 @@ "@@ -2852,7 +2852,7 @@\n" " \t\t};\n" " \n" - " \t\ttarget-module@70000 {\t\t\t/* 0x48470000, ap 19 36.0 */\n" + " \t\ttarget-module at 70000 {\t\t\t/* 0x48470000, ap 19 36.0 */\n" "-\t\t\tcompatible = \"ti,sysc-omap4-simple\", \"ti,sysc\";\n" "+\t\t\tcompatible = \"ti,sysc-dra7-mcasp\", \"ti,sysc\";\n" " \t\t\tti,hwmods = \"mcasp5\";\n" @@ -96,7 +85,7 @@ "@@ -2885,7 +2885,7 @@\n" " \t\t};\n" " \n" - " \t\ttarget-module@74000 {\t\t\t/* 0x48474000, ap 35 14.0 */\n" + " \t\ttarget-module at 74000 {\t\t\t/* 0x48474000, ap 35 14.0 */\n" "-\t\t\tcompatible = \"ti,sysc-omap4-simple\", \"ti,sysc\";\n" "+\t\t\tcompatible = \"ti,sysc-dra7-mcasp\", \"ti,sysc\";\n" " \t\t\tti,hwmods = \"mcasp6\";\n" @@ -105,7 +94,7 @@ "@@ -2918,7 +2918,7 @@\n" " \t\t};\n" " \n" - " \t\ttarget-module@78000 {\t\t\t/* 0x48478000, ap 39 0c.0 */\n" + " \t\ttarget-module at 78000 {\t\t\t/* 0x48478000, ap 39 0c.0 */\n" "-\t\t\tcompatible = \"ti,sysc-omap4-simple\", \"ti,sysc\";\n" "+\t\t\tcompatible = \"ti,sysc-dra7-mcasp\", \"ti,sysc\";\n" " \t\t\tti,hwmods = \"mcasp7\";\n" @@ -114,7 +103,7 @@ "@@ -2951,7 +2951,7 @@\n" " \t\t};\n" " \n" - " \t\ttarget-module@7c000 {\t\t\t/* 0x4847c000, ap 43 04.0 */\n" + " \t\ttarget-module at 7c000 {\t\t\t/* 0x4847c000, ap 43 04.0 */\n" "-\t\t\tcompatible = \"ti,sysc-omap4-simple\", \"ti,sysc\";\n" "+\t\t\tcompatible = \"ti,sysc-dra7-mcasp\", \"ti,sysc\";\n" " \t\t\tti,hwmods = \"mcasp8\";\n" @@ -123,4 +112,4 @@ "-- \n" 2.19.1 -4e9c9255f748fb4a995cf9b070d5d667843199f93632b6b5e14a542daa4d7119 +7119dd73e61d4b33306b87d0e868bafadd58ecc266308685aac96b2fb935757e
diff --git a/a/1.txt b/N2/1.txt index 9c1a1b5..816fb05 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -13,7 +13,7 @@ Regards, Tony 8< ----------------- ->From tony Mon Sep 17 00:00:00 2001 +From tony Mon Sep 17 00:00:00 2001 From: Tony Lindgren <tony@atomide.com> Date: Wed, 31 Oct 2018 09:02:18 -0700 Subject: [PATCH] ARM: dts: Use dra7 mcasp compatible for mcasp instances diff --git a/a/content_digest b/N2/content_digest index a0447d8..3c8de55 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -32,7 +32,7 @@ "Tony\n" "\n" "8< -----------------\n" - ">From tony Mon Sep 17 00:00:00 2001\n" + "From tony Mon Sep 17 00:00:00 2001\n" "From: Tony Lindgren <tony@atomide.com>\n" "Date: Wed, 31 Oct 2018 09:02:18 -0700\n" "Subject: [PATCH] ARM: dts: Use dra7 mcasp compatible for mcasp instances\n" @@ -123,4 +123,4 @@ "-- \n" 2.19.1 -4e9c9255f748fb4a995cf9b070d5d667843199f93632b6b5e14a542daa4d7119 +745c4f0e6b0049f270e3e171230b71073dd2df122205855e388a2378be0eaf19
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.