diff for duplicates of <52173A3E.2040509@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 9c41240..6c1be61 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -16,11 +16,3 @@ It will move coherency_init(), l2x0_of_init(), and mvebu_mbus_dt_init() to .init_early hook. Sebastian - --------------- next part -------------- -A non-text attachment was scrubbed... -Name: arm-of_clk_init-mvebu-proposal.diff -Type: text/x-patch -Size: 1292 bytes -Desc: not available -URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130823/dee253c6/attachment-0001.bin> diff --git a/N1/2.hdr b/N1/2.hdr new file mode 100644 index 0000000..8eb44b8 --- /dev/null +++ b/N1/2.hdr @@ -0,0 +1,5 @@ +Content-Type: text/x-patch; + name="arm-of_clk_init-mvebu-proposal.diff" +Content-Transfer-Encoding: 7bit +Content-Disposition: attachment; + filename="arm-of_clk_init-mvebu-proposal.diff" diff --git a/N1/2.txt b/N1/2.txt new file mode 100644 index 0000000..8aaa8a2 --- /dev/null +++ b/N1/2.txt @@ -0,0 +1,38 @@ +diff --git a/arch/arm/mach-mvebu/armada-370-xp.c b/arch/arm/mach-mvebu/armada-370-xp.c +index 829b573..82e3ec0 100644 +--- a/arch/arm/mach-mvebu/armada-370-xp.c ++++ b/arch/arm/mach-mvebu/armada-370-xp.c +@@ -14,11 +14,9 @@ + + #include <linux/kernel.h> + #include <linux/init.h> +-#include <linux/clk-provider.h> + #include <linux/of_address.h> + #include <linux/of_platform.h> + #include <linux/io.h> +-#include <linux/time-armada-370-xp.h> + #include <linux/dma-mapping.h> + #include <linux/mbus.h> + #include <asm/hardware/cache-l2x0.h> +@@ -34,10 +32,8 @@ static void __init armada_370_xp_map_io(void) + debug_ll_io_init(); + } + +-static void __init armada_370_xp_timer_and_clk_init(void) ++static void __init armada_370_xp_init_early(void) + { +- of_clk_init(NULL); +- armada_370_xp_timer_init(); + coherency_init(); + BUG_ON(mvebu_mbus_dt_init()); + #ifdef CONFIG_CACHE_L2X0 +@@ -58,8 +54,8 @@ static const char * const armada_370_xp_dt_compat[] = { + DT_MACHINE_START(ARMADA_XP_DT, "Marvell Armada 370/XP (Device Tree)") + .smp = smp_ops(armada_xp_smp_ops), + .init_machine = armada_370_xp_dt_init, ++ .init_early = armada_370_xp_init_early, + .map_io = armada_370_xp_map_io, +- .init_time = armada_370_xp_timer_and_clk_init, + .restart = mvebu_restart, + .dt_compat = armada_370_xp_dt_compat, + MACHINE_END diff --git a/a/content_digest b/N1/content_digest index 45f0797..f40cc8b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,11 +1,15 @@ "ref\01376964271-22715-1-git-send-email-sebastian.hesselbarth@gmail.com\0" "ref\01376964271-22715-9-git-send-email-sebastian.hesselbarth@gmail.com\0" "ref\052173408.1000702@free-electrons.com\0" - "From\0sebastian.hesselbarth@gmail.com (Sebastian Hesselbarth)\0" - "Subject\0[RFC 08/17] ARM: mvebu: remove custom .init_time hook\0" + "From\0Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>\0" + "Subject\0Re: [RFC 08/17] ARM: mvebu: remove custom .init_time hook\0" "Date\0Fri, 23 Aug 2013 12:32:30 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" - "\00:1\0" + "To\0Gregory CLEMENT <gregory.clement@free-electrons.com>\0" + "Cc\0Russell King <linux@arm.linux.org.uk>" + Arnd Bergmann <arnd@arndb.de> + linux-arm-kernel@lists.infradead.org + " linux-kernel@vger.kernel.org\0" + "\01:1\0" "b\0" "On 08/23/13 12:06, Gregory CLEMENT wrote:\n" "> On 20/08/2013 04:04, Sebastian Hesselbarth wrote:\n" @@ -24,14 +28,47 @@ "It will move coherency_init(), l2x0_of_init(), and mvebu_mbus_dt_init()\n" "to .init_early hook.\n" "\n" - "Sebastian\n" - "\n" - "-------------- next part --------------\n" - "A non-text attachment was scrubbed...\n" - "Name: arm-of_clk_init-mvebu-proposal.diff\n" - "Type: text/x-patch\n" - "Size: 1292 bytes\n" - "Desc: not available\n" - URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130823/dee253c6/attachment-0001.bin> + Sebastian + "\01:2\0" + "fn\0arm-of_clk_init-mvebu-proposal.diff\0" + "b\0" + "diff --git a/arch/arm/mach-mvebu/armada-370-xp.c b/arch/arm/mach-mvebu/armada-370-xp.c\n" + "index 829b573..82e3ec0 100644\n" + "--- a/arch/arm/mach-mvebu/armada-370-xp.c\n" + "+++ b/arch/arm/mach-mvebu/armada-370-xp.c\n" + "@@ -14,11 +14,9 @@\n" + " \n" + " #include <linux/kernel.h>\n" + " #include <linux/init.h>\n" + "-#include <linux/clk-provider.h>\n" + " #include <linux/of_address.h>\n" + " #include <linux/of_platform.h>\n" + " #include <linux/io.h>\n" + "-#include <linux/time-armada-370-xp.h>\n" + " #include <linux/dma-mapping.h>\n" + " #include <linux/mbus.h>\n" + " #include <asm/hardware/cache-l2x0.h>\n" + "@@ -34,10 +32,8 @@ static void __init armada_370_xp_map_io(void)\n" + " \tdebug_ll_io_init();\n" + " }\n" + " \n" + "-static void __init armada_370_xp_timer_and_clk_init(void)\n" + "+static void __init armada_370_xp_init_early(void)\n" + " {\n" + "-\tof_clk_init(NULL);\n" + "-\tarmada_370_xp_timer_init();\n" + " \tcoherency_init();\n" + " \tBUG_ON(mvebu_mbus_dt_init());\n" + " #ifdef CONFIG_CACHE_L2X0\n" + "@@ -58,8 +54,8 @@ static const char * const armada_370_xp_dt_compat[] = {\n" + " DT_MACHINE_START(ARMADA_XP_DT, \"Marvell Armada 370/XP (Device Tree)\")\n" + " \t.smp\t\t= smp_ops(armada_xp_smp_ops),\n" + " \t.init_machine\t= armada_370_xp_dt_init,\n" + "+\t.init_early\t= armada_370_xp_init_early,\n" + " \t.map_io\t\t= armada_370_xp_map_io,\n" + "-\t.init_time\t= armada_370_xp_timer_and_clk_init,\n" + " \t.restart\t= mvebu_restart,\n" + " \t.dt_compat\t= armada_370_xp_dt_compat,\n" + MACHINE_END -e4772f492e82485399e65482aed60dc14b1c8d81c902adb412f8c03cdb1a7032 +7130e8219c7f2aa3e86682e1292fb46fba3becd6f2f9c68f990ae50d99869c79
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.