diff for duplicates of <54BE06FD.2020702@samsung.com> diff --git a/a/1.txt b/N1/1.txt index b3e8c2f..62e0633 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -38,7 +38,7 @@ working on Exynos5250 based SMDK board. > --- a/arch/arm/boot/dts/exynos4.dtsi > +++ b/arch/arm/boot/dts/exynos4.dtsi > @@ -141,6 +141,9 @@ -> pmu_system_controller: system-controller@10020000 { +> pmu_system_controller: system-controller at 10020000 { > compatible = "samsung,exynos4210-pmu", "syscon"; > reg = <0x10020000 0x4000>; > + interrupt-controller; @@ -46,9 +46,9 @@ working on Exynos5250 based SMDK board. > + interrupt-parent = <&gic>; > }; > -> dsi_0: dsi@11C80000 { +> dsi_0: dsi at 11C80000 { > @@ -253,6 +256,7 @@ -> rtc@10070000 { +> rtc at 10070000 { > compatible = "samsung,s3c6410-rtc"; > reg = <0x10070000 0x100>; > + interrupt-parent = <&pmu_system_controller>; @@ -68,9 +68,9 @@ working on Exynos5250 based SMDK board. > + interrupt-parent = <&gic>; > }; > -> sysreg_system_controller: syscon@10050000 { +> sysreg_system_controller: syscon at 10050000 { > @@ -230,6 +233,7 @@ -> rtc: rtc@101E0000 { +> rtc: rtc at 101E0000 { > clocks = <&clock CLK_RTC>; > clock-names = "rtc"; > + interrupt-parent = <&pmu_system_controller>; @@ -82,7 +82,7 @@ working on Exynos5250 based SMDK board. > --- a/arch/arm/boot/dts/exynos5420.dtsi > +++ b/arch/arm/boot/dts/exynos5420.dtsi > @@ -309,6 +309,7 @@ -> rtc: rtc@101E0000 { +> rtc: rtc at 101E0000 { > clocks = <&clock CLK_RTC>; > clock-names = "rtc"; > + interrupt-parent = <&pmu_system_controller>; @@ -98,7 +98,7 @@ working on Exynos5250 based SMDK board. > + interrupt-parent = <&gic>; > }; > -> sysreg_system_controller: syscon@10050000 { +> sysreg_system_controller: syscon at 10050000 { > diff --git a/arch/arm/mach-exynos/exynos.c b/arch/arm/mach-exynos/exynos.c > index c13d083..e417fdc 100644 > --- a/arch/arm/mach-exynos/exynos.c diff --git a/a/content_digest b/N1/content_digest index da2d719..192183c 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,32 +1,9 @@ "ref\01421660655-21394-1-git-send-email-marc.zyngier@arm.com\0" "ref\01421660655-21394-16-git-send-email-marc.zyngier@arm.com\0" - "From\0Pankaj Dubey <pankaj.dubey@samsung.com>\0" - "Subject\0Re: [PATCH v4 15/21] ARM: exynos4/5: convert pmu wakeup to stacked domains\0" + "From\0pankaj.dubey@samsung.com (Pankaj Dubey)\0" + "Subject\0[PATCH v4 15/21] ARM: exynos4/5: convert pmu wakeup to stacked domains\0" "Date\0Tue, 20 Jan 2015 13:12:53 +0530\0" - "To\0Marc Zyngier <marc.zyngier@arm.com>" - Stephen Warren <swarren@wwwdotorg.org> - Thierry Reding <thierry.reding@gmail.com> - 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>\0" - "Cc\0Stefan Agner <stefan@agner.ch>" - linux-arm-kernel@lists.infradead.org - linux-samsung-soc@vger.kernel.org - linux-omap@vger.kernel.org - " Chanwoo Choi <cw00.choi@samsung.com>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hi Marc,\n" @@ -69,7 +46,7 @@ "> --- a/arch/arm/boot/dts/exynos4.dtsi\n" "> +++ b/arch/arm/boot/dts/exynos4.dtsi\n" "> @@ -141,6 +141,9 @@\n" - "> \tpmu_system_controller: system-controller@10020000 {\n" + "> \tpmu_system_controller: system-controller at 10020000 {\n" "> \t\tcompatible = \"samsung,exynos4210-pmu\", \"syscon\";\n" "> \t\treg = <0x10020000 0x4000>;\n" "> +\t\tinterrupt-controller;\n" @@ -77,9 +54,9 @@ "> +\t\tinterrupt-parent = <&gic>;\n" "> \t};\n" ">\n" - "> \tdsi_0: dsi@11C80000 {\n" + "> \tdsi_0: dsi at 11C80000 {\n" "> @@ -253,6 +256,7 @@\n" - "> \trtc@10070000 {\n" + "> \trtc at 10070000 {\n" "> \t\tcompatible = \"samsung,s3c6410-rtc\";\n" "> \t\treg = <0x10070000 0x100>;\n" "> +\t\tinterrupt-parent = <&pmu_system_controller>;\n" @@ -99,9 +76,9 @@ "> +\t\tinterrupt-parent = <&gic>;\n" "> \t};\n" ">\n" - "> \tsysreg_system_controller: syscon@10050000 {\n" + "> \tsysreg_system_controller: syscon at 10050000 {\n" "> @@ -230,6 +233,7 @@\n" - "> \trtc: rtc@101E0000 {\n" + "> \trtc: rtc at 101E0000 {\n" "> \t\tclocks = <&clock CLK_RTC>;\n" "> \t\tclock-names = \"rtc\";\n" "> +\t\tinterrupt-parent = <&pmu_system_controller>;\n" @@ -113,7 +90,7 @@ "> --- a/arch/arm/boot/dts/exynos5420.dtsi\n" "> +++ b/arch/arm/boot/dts/exynos5420.dtsi\n" "> @@ -309,6 +309,7 @@\n" - "> \trtc: rtc@101E0000 {\n" + "> \trtc: rtc at 101E0000 {\n" "> \t\tclocks = <&clock CLK_RTC>;\n" "> \t\tclock-names = \"rtc\";\n" "> +\t\tinterrupt-parent = <&pmu_system_controller>;\n" @@ -129,7 +106,7 @@ "> +\t\tinterrupt-parent = <&gic>;\n" "> \t};\n" ">\n" - "> \tsysreg_system_controller: syscon@10050000 {\n" + "> \tsysreg_system_controller: syscon at 10050000 {\n" "> diff --git a/arch/arm/mach-exynos/exynos.c b/arch/arm/mach-exynos/exynos.c\n" "> index c13d083..e417fdc 100644\n" "> --- a/arch/arm/mach-exynos/exynos.c\n" @@ -166,4 +143,4 @@ "Thanks,\n" Pankaj Dubey -eee16664f84f05cb1c72001cba4487744746a4b16451ac41682a165a7aa7aa9f +79a82765bc14dd2286a3f3e93dc67edc6d38311cdc96a15a28fd9f238162a911
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.