diff for duplicates of <20150108104141.GF1987@ulmo.nvidia.com> diff --git a/a/1.txt b/N1/1.txt index d1d8e8b..a458ff5 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -35,7 +35,7 @@ stop a loop from GIC -> LIC -> GIC, but it doesn't look quite right. > + }; > + -> + ictlr: interrupt-controller@60004000 { +> + ictlr: interrupt-controller at 60004000 { > + compatible = "nvidia,tegra114-ictlr", "nvidia,tegra-ictlr"; As previously discussed, I think the second string should be @@ -64,7 +64,7 @@ I'd prefer all of these to be hexadecimal. > + interrupt-parent = <&gic>; > }; > -> timer@60005000 { +> timer at 60005000 { > @@ -766,5 +779,6 @@ > (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, > <GIC_PPI 10 @@ -81,7 +81,7 @@ Why does this get to have a non-default parent? > status = "disabled"; > }; > -> + ictlr: interrupt-controller@60004000 { +> + ictlr: interrupt-controller at 60004000 { > + compatible = "nvidia,tegra124-ictlr", "nvidia,tegra-ictlr"; Same as for Tegra114. @@ -114,11 +114,11 @@ Could be in a follow-up patch though, and something that I can easily do after this patch set. > -> host1x@50000000 { +> host1x at 50000000 { > compatible = "nvidia,tegra20-host1x", "simple-bus"; > @@ -142,6 +142,7 @@ > -> timer@50004600 { +> timer at 50004600 { > compatible = "arm,cortex-a9-twd-timer"; > + interrupt-parent = <&intc>; > reg = <0x50040600 0x20>; @@ -131,12 +131,12 @@ after this patch set. > + interrupt-parent = <&intc>; > }; > -> cache-controller@50043000 { +> cache-controller at 50043000 { > @@ -165,6 +167,17 @@ > cache-level = <2>; > }; > -> + ictlr: interrupt-controller@60004000 { +> + ictlr: interrupt-controller at 60004000 { > + compatible = "nvidia,tegra20-ictlr", "nvidia,tegra-ictlr"; As discussed previously, I think the second compatible should be @@ -155,7 +155,7 @@ doesn't exist on Tegra20. > + interrupt-parent = <&intc>; > + }; > + -> timer@60005000 { +> timer at 60005000 { > compatible = "nvidia,tegra20-timer"; > reg = <0x60005000 0x60>; @@ -166,7 +166,7 @@ to keep the parent instead. > diff --git a/arch/arm/boot/dts/tegra30.dtsi b/arch/arm/boot/dts/tegra30.dtsi [...] > @@ -228,6 +228,7 @@ -> timer@50004600 { +> timer at 50004600 { > compatible = "arm,cortex-a9-twd-timer"; > reg = <0x50040600 0x20>; > + interrupt-parent = <&intc>; @@ -180,12 +180,12 @@ to keep the parent instead. > + interrupt-parent = <&intc>; > }; > -> cache-controller@50043000 { +> cache-controller at 50043000 { > @@ -250,6 +252,18 @@ > cache-level = <2>; > }; > -> + ictlr: interrupt-controller@60004000 { +> + ictlr: interrupt-controller at 60004000 { > + compatible = "nvidia,tegra30-ictlr", "nvidia,tegra-ictlr"; Should be "nvidia,tegra30-ictlr" only. @@ -203,10 +203,17 @@ Should be "nvidia,tegra30-ictlr" only. This should be the same as for Tegra114. > + -> timer@60005000 { +> timer at 60005000 { > compatible = "nvidia,tegra30-timer", "nvidia,tegra20-timer"; > reg = <0x60005000 0x400>; Like for Tegra20, the Tegra timer is now switched to the LIC as parent. Thierry +-------------- next part -------------- +A non-text attachment was scrubbed... +Name: not available +Type: application/pgp-signature +Size: 819 bytes +Desc: not available +URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150108/6da51cd8/attachment-0001.sig> diff --git a/a/2.bin b/a/2.bin deleted file mode 100644 index 27acbf5..0000000 --- a/a/2.bin +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQIcBAEBAgAGBQJUrl7lAAoJEN0jrNd/PrOhBPUP/A5xY3gJ9MoI79B+ShhiE1wQ -g0CMedaJ8YcPrmAD36Fd3mzR0ZU9PjWxTHhE2K4g18R0k4qCRh+rpLRYlBNh5Gru -8JMJzQTmtX9InDzv2WL5se8JDMpU8SEYz/bEhFN+asS56IMVURHVxDkg9V3UZ0YH -ylf3KxXHoEvCg/5/+PcnOUBk3dSFzBjthjj5ZkW4JbJGKVuU1xxzqCdVZvjTdFCY -Rbm4HhAg64KfB8EUv5a6tcl22SBFCaH0PxJ5GW902vU93eiJsc8WTRAguP+tXQoB -/jw4t/EowvDSJh4T3y7SI1Y+8HYiR/YawBEXM+pWOtc6cV9R1+GD1zNZkiTj3+Gy -g2owkooO8gZjXrbrrNBShMLxK1n4d7H5vDA2Wxjmk9iVQyf5MvEvBml5EBAEBVOo -xnBzUDRU4RMZBuPY6AuyCLt9RjjZqnkDRnYybyGq8BEhcQXHkYq8P8hVoelfjBES -qPOeM5qxdpG9ZYIL0P3Tb4liahmhPJOoADV/9k4gPrveKnJBjoTcnhJhzxcjsP+5 -0Ef62XkBsb0QInU3FcdUKzmzydCtThROEDRaUXvrXM+WUZHlCbmYJHGzm3OfNTdX -v07/z3tjzThsujsOmqdV+6z2Dy9A9eXi4kPYyPZWsZ+RG4VhihtCbFqlNweCidSC -jrsMIFS9JnAe+f+br/0s -=qOa7 ------END PGP SIGNATURE----- diff --git a/a/2.hdr b/a/2.hdr deleted file mode 100644 index a09cc95..0000000 --- a/a/2.hdr +++ /dev/null @@ -1 +0,0 @@ -Content-Type: application/pgp-signature diff --git a/a/content_digest b/N1/content_digest index 8635ac9..9148d46 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,30 +1,10 @@ "ref\01420652576-22309-1-git-send-email-marc.zyngier@arm.com\0" "ref\01420652576-22309-5-git-send-email-marc.zyngier@arm.com\0" - "From\0Thierry Reding <thierry.reding@gmail.com>\0" - "Subject\0Re: [PATCH v2 04/21] ARM: tegra: update DTs to expose legacy interrupt controller\0" + "From\0thierry.reding@gmail.com (Thierry Reding)\0" + "Subject\0[PATCH v2 04/21] ARM: tegra: update DTs to expose legacy interrupt controller\0" "Date\0Thu, 8 Jan 2015 11:41:42 +0100\0" - "To\0Marc Zyngier <marc.zyngier@arm.com>\0" - "Cc\0Stephen Warren <swarren@wwwdotorg.org>" - Alexandre Courbot <gnurou@gmail.com> - Benoit Cousson <bcousson@baylibre.com> - Tony Lindgren <tony@atomide.com> - Nishanth Menon <nm@ti.com> - Santosh Shilimkar <ssantosh@kernel.org> - Shawn Guo <shawn.guo@linaro.org> - Sascha Hauer <kernel@pengutronix.de> - Kukjin Kim <kgene.kim@samsung.com> - Simon Horman <horms@verge.net.au> - Magnus Damm <magnus.damm@gmail.com> - Linus Walleij <linus.walleij@linaro.org> - Michal Simek <michal.simek@xilinx.com> - Rob Herring <robh+dt@kernel.org> - Mark Rutland <mark.rutland@arm.com> - Jason Cooper <jason@lakedaemon.net> - Thomas Gleixner <tglx@linutronix.de> - linux-arm-kernel@lists.infradead.org - linux-samsung-soc@vger.kernel.org - " linux-omap@vger.kernel.org\0" - "\01:1\0" + "To\0linux-arm-kernel@lists.infradead.org\0" + "\00:1\0" "b\0" "On Wed, Jan 07, 2015 at 05:42:39PM +0000, Marc Zyngier wrote:\n" "> Describe the legacy interrupt controller in every tegra DTSI files,\n" @@ -63,7 +43,7 @@ "\n" "> +\t};\n" "> +\n" - "> +\tictlr: interrupt-controller@60004000 {\n" + "> +\tictlr: interrupt-controller at 60004000 {\n" "> +\t\tcompatible = \"nvidia,tegra114-ictlr\", \"nvidia,tegra-ictlr\";\n" "\n" "As previously discussed, I think the second string should be\n" @@ -92,7 +72,7 @@ "> +\t\tinterrupt-parent = <&gic>;\n" "> \t};\n" "> \n" - "> \ttimer@60005000 {\n" + "> \ttimer at 60005000 {\n" "> @@ -766,5 +779,6 @@\n" "> \t\t\t\t(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,\n" "> \t\t\t<GIC_PPI 10\n" @@ -109,7 +89,7 @@ "> \t\tstatus = \"disabled\";\n" "> \t};\n" "> \n" - "> +\tictlr: interrupt-controller@60004000 {\n" + "> +\tictlr: interrupt-controller at 60004000 {\n" "> +\t\tcompatible = \"nvidia,tegra124-ictlr\", \"nvidia,tegra-ictlr\";\n" "\n" "Same as for Tegra114.\n" @@ -142,11 +122,11 @@ "after this patch set.\n" "\n" "> \n" - "> \thost1x@50000000 {\n" + "> \thost1x at 50000000 {\n" "> \t\tcompatible = \"nvidia,tegra20-host1x\", \"simple-bus\";\n" "> @@ -142,6 +142,7 @@\n" "> \n" - "> \ttimer@50004600 {\n" + "> \ttimer at 50004600 {\n" "> \t\tcompatible = \"arm,cortex-a9-twd-timer\";\n" "> +\t\tinterrupt-parent = <&intc>;\n" "> \t\treg = <0x50040600 0x20>;\n" @@ -159,12 +139,12 @@ "> +\t\tinterrupt-parent = <&intc>;\n" "> \t};\n" "> \n" - "> \tcache-controller@50043000 {\n" + "> \tcache-controller at 50043000 {\n" "> @@ -165,6 +167,17 @@\n" "> \t\tcache-level = <2>;\n" "> \t};\n" "> \n" - "> +\tictlr: interrupt-controller@60004000 {\n" + "> +\tictlr: interrupt-controller at 60004000 {\n" "> +\t\tcompatible = \"nvidia,tegra20-ictlr\", \"nvidia,tegra-ictlr\";\n" "\n" "As discussed previously, I think the second compatible should be\n" @@ -183,7 +163,7 @@ "> +\t\tinterrupt-parent = <&intc>;\n" "> +\t};\n" "> +\n" - "> \ttimer@60005000 {\n" + "> \ttimer at 60005000 {\n" "> \t\tcompatible = \"nvidia,tegra20-timer\";\n" "> \t\treg = <0x60005000 0x60>;\n" "\n" @@ -194,7 +174,7 @@ "> diff --git a/arch/arm/boot/dts/tegra30.dtsi b/arch/arm/boot/dts/tegra30.dtsi\n" "[...]\n" "> @@ -228,6 +228,7 @@\n" - "> \ttimer@50004600 {\n" + "> \ttimer at 50004600 {\n" "> \t\tcompatible = \"arm,cortex-a9-twd-timer\";\n" "> \t\treg = <0x50040600 0x20>;\n" "> +\t\tinterrupt-parent = <&intc>;\n" @@ -208,12 +188,12 @@ "> +\t\tinterrupt-parent = <&intc>;\n" "> \t};\n" "> \n" - "> \tcache-controller@50043000 {\n" + "> \tcache-controller at 50043000 {\n" "> @@ -250,6 +252,18 @@\n" "> \t\tcache-level = <2>;\n" "> \t};\n" "> \n" - "> +\tictlr: interrupt-controller@60004000 {\n" + "> +\tictlr: interrupt-controller at 60004000 {\n" "> +\t\tcompatible = \"nvidia,tegra30-ictlr\", \"nvidia,tegra-ictlr\";\n" "\n" "Should be \"nvidia,tegra30-ictlr\" only.\n" @@ -231,31 +211,19 @@ "This should be the same as for Tegra114.\n" "\n" "> +\n" - "> \ttimer@60005000 {\n" + "> \ttimer at 60005000 {\n" "> \t\tcompatible = \"nvidia,tegra30-timer\", \"nvidia,tegra20-timer\";\n" "> \t\treg = <0x60005000 0x400>;\n" "\n" "Like for Tegra20, the Tegra timer is now switched to the LIC as parent.\n" "\n" - Thierry - "\01:2\0" - "b\0" - "-----BEGIN PGP SIGNATURE-----\n" - "Version: GnuPG v2\n" - "\n" - "iQIcBAEBAgAGBQJUrl7lAAoJEN0jrNd/PrOhBPUP/A5xY3gJ9MoI79B+ShhiE1wQ\n" - "g0CMedaJ8YcPrmAD36Fd3mzR0ZU9PjWxTHhE2K4g18R0k4qCRh+rpLRYlBNh5Gru\n" - "8JMJzQTmtX9InDzv2WL5se8JDMpU8SEYz/bEhFN+asS56IMVURHVxDkg9V3UZ0YH\n" - "ylf3KxXHoEvCg/5/+PcnOUBk3dSFzBjthjj5ZkW4JbJGKVuU1xxzqCdVZvjTdFCY\n" - "Rbm4HhAg64KfB8EUv5a6tcl22SBFCaH0PxJ5GW902vU93eiJsc8WTRAguP+tXQoB\n" - "/jw4t/EowvDSJh4T3y7SI1Y+8HYiR/YawBEXM+pWOtc6cV9R1+GD1zNZkiTj3+Gy\n" - "g2owkooO8gZjXrbrrNBShMLxK1n4d7H5vDA2Wxjmk9iVQyf5MvEvBml5EBAEBVOo\n" - "xnBzUDRU4RMZBuPY6AuyCLt9RjjZqnkDRnYybyGq8BEhcQXHkYq8P8hVoelfjBES\n" - "qPOeM5qxdpG9ZYIL0P3Tb4liahmhPJOoADV/9k4gPrveKnJBjoTcnhJhzxcjsP+5\n" - "0Ef62XkBsb0QInU3FcdUKzmzydCtThROEDRaUXvrXM+WUZHlCbmYJHGzm3OfNTdX\n" - "v07/z3tjzThsujsOmqdV+6z2Dy9A9eXi4kPYyPZWsZ+RG4VhihtCbFqlNweCidSC\n" - "jrsMIFS9JnAe+f+br/0s\n" - "=qOa7\n" - "-----END PGP SIGNATURE-----\n" + "Thierry\n" + "-------------- next part --------------\n" + "A non-text attachment was scrubbed...\n" + "Name: not available\n" + "Type: application/pgp-signature\n" + "Size: 819 bytes\n" + "Desc: not available\n" + URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150108/6da51cd8/attachment-0001.sig> -c3cf40a5a79f9e6b3e113fd005b408cddc58cdebd4cd9e4f35d631a57b58da98 +2d34abfd99b9b5c9d81b43470f5e42f1af4d0784d21c957401a5fec84472aa6c
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.