diff for duplicates of <20181127161625.GR53235@atomide.com> diff --git a/a/1.txt b/N1/1.txt index e76b7d8..f92a651 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -44,7 +44,7 @@ diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi #size-cells = <1>; ranges = <0x0 0x38000 0x2000>; - -- mcasp0: mcasp@0 { +- mcasp0: mcasp at 0 { - compatible = "ti,am33xx-mcasp-audio"; - reg = <0x0 0x2000>, - <0x46000000 0x400000>; @@ -59,13 +59,13 @@ diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi + status = "disabled"; }; - target-module@3c000 { /* 0x4803c000, ap 20 32.0 */ + target-module at 3c000 { /* 0x4803c000, ap 20 32.0 */ @@ -1086,19 +1074,7 @@ #address-cells = <1>; #size-cells = <1>; ranges = <0x0 0x3c000 0x2000>; - -- mcasp1: mcasp@0 { +- mcasp1: mcasp at 0 { - compatible = "ti,am33xx-mcasp-audio"; - reg = <0x0 0x2000>, - <0x46400000 0x400000>; @@ -80,7 +80,7 @@ diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi + status = "disabled"; }; - target-module@40000 { /* 0x48040000, ap 22 1e.0 */ + target-module at 40000 { /* 0x48040000, ap 22 1e.0 */ diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi --- a/arch/arm/boot/dts/am33xx.dtsi +++ b/arch/arm/boot/dts/am33xx.dtsi @@ -89,7 +89,7 @@ diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi dma-names = "tx", "rx"; }; + -+ mcasp0: mcasp@48038000 { ++ mcasp0: mcasp at 48038000 { + compatible = "ti,am33xx-mcasp-audio"; + ti,hwmods = "mcasp0"; + reg = <0x48038000 0x2000>, @@ -103,7 +103,7 @@ diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi + dma-names = "tx", "rx"; + }; + -+ mcasp1: mcasp@4803c000 { ++ mcasp1: mcasp at 4803c000 { + compatible = "ti,am33xx-mcasp-audio"; + ti,hwmods = "mcasp1"; + reg = <0x4803C000 0x2000>, diff --git a/a/content_digest b/N1/content_digest index 62b79e6..16eed77 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,17 +1,10 @@ "ref\020180925000545.22931-1-tony@atomide.com\0" "ref\020180925000545.22931-5-tony@atomide.com\0" "ref\0612b09a4-5007-39bf-becb-66fdca9d6d41@ti.com\0" - "From\0Tony Lindgren <tony@atomide.com>\0" - "Subject\0Re: [PATCH 4/4] ARM: dts: am335x: Move l4 child devices to probe them with ti-sysc\0" + "From\0tony@atomide.com (Tony Lindgren)\0" + "Subject\0[PATCH 4/4] ARM: dts: am335x: Move l4 child devices to probe them with ti-sysc\0" "Date\0Tue, 27 Nov 2018 08:16:25 -0800\0" - "To\0Peter Ujfalusi <peter.ujfalusi@ti.com>\0" - "Cc\0devicetree@vger.kernel.org" - Dave Gerlach <d-gerlach@ti.com> - Keerthy <j-keerthy@ti.com> - Tero Kristo <t-kristo@ti.com> - " Beno\303\256t Cousson <bcousson@baylibre.com>" - linux-omap@vger.kernel.org - " linux-arm-kernel@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "* Peter Ujfalusi <peter.ujfalusi@ti.com> [181127 13:01]:\n" @@ -60,7 +53,7 @@ " \t\t\t#size-cells = <1>;\n" " \t\t\tranges = <0x0 0x38000 0x2000>;\n" "-\n" - "-\t\t\tmcasp0: mcasp@0 {\n" + "-\t\t\tmcasp0: mcasp at 0 {\n" "-\t\t\t\tcompatible = \"ti,am33xx-mcasp-audio\";\n" "-\t\t\t\treg = <0x0 0x2000>,\n" "-\t\t\t\t <0x46000000 0x400000>;\n" @@ -75,13 +68,13 @@ "+\t\t\tstatus = \"disabled\";\n" " \t\t};\n" " \n" - " \t\ttarget-module@3c000 {\t\t\t/* 0x4803c000, ap 20 32.0 */\n" + " \t\ttarget-module at 3c000 {\t\t\t/* 0x4803c000, ap 20 32.0 */\n" "@@ -1086,19 +1074,7 @@\n" " \t\t\t#address-cells = <1>;\n" " \t\t\t#size-cells = <1>;\n" " \t\t\tranges = <0x0 0x3c000 0x2000>;\n" "-\n" - "-\t\t\tmcasp1: mcasp@0 {\n" + "-\t\t\tmcasp1: mcasp at 0 {\n" "-\t\t\t\tcompatible = \"ti,am33xx-mcasp-audio\";\n" "-\t\t\t\treg = <0x0 0x2000>,\n" "-\t\t\t\t <0x46400000 0x400000>;\n" @@ -96,7 +89,7 @@ "+\t\t\tstatus = \"disabled\";\n" " \t\t};\n" " \n" - " \t\ttarget-module@40000 {\t\t\t/* 0x48040000, ap 22 1e.0 */\n" + " \t\ttarget-module at 40000 {\t\t\t/* 0x48040000, ap 22 1e.0 */\n" "diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi\n" "--- a/arch/arm/boot/dts/am33xx.dtsi\n" "+++ b/arch/arm/boot/dts/am33xx.dtsi\n" @@ -105,7 +98,7 @@ " \t\t\tdma-names = \"tx\", \"rx\";\n" " \t\t};\n" "+\n" - "+\t\tmcasp0: mcasp@48038000 {\n" + "+\t\tmcasp0: mcasp at 48038000 {\n" "+\t\t\tcompatible = \"ti,am33xx-mcasp-audio\";\n" "+\t\t\tti,hwmods = \"mcasp0\";\n" "+\t\t\treg = <0x48038000 0x2000>,\n" @@ -119,7 +112,7 @@ "+\t\t\tdma-names = \"tx\", \"rx\";\n" "+\t\t};\n" "+\n" - "+\t\tmcasp1: mcasp@4803c000 {\n" + "+\t\tmcasp1: mcasp at 4803c000 {\n" "+\t\t\tcompatible = \"ti,am33xx-mcasp-audio\";\n" "+\t\t\tti,hwmods = \"mcasp1\";\n" "+\t\t\treg = <0x4803C000 0x2000>,\n" @@ -140,4 +133,4 @@ "-- \n" 2.19.1 -8fa56837cce2891b7d74128f913fb5dd1f929659e9a747da85a467d1eee77c20 +e25e1b790f11911897d809f4bea2fddbab8a0da8702b9b6f30ae3e538a9e27df
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.