diff for duplicates of <5093891D.6070302@ti.com> diff --git a/a/1.1.hdr b/a/1.1.hdr deleted file mode 100644 index 7e2eb38..0000000 --- a/a/1.1.hdr +++ /dev/null @@ -1,2 +0,0 @@ -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: quoted-printable diff --git a/a/1.2.hdr b/a/1.2.hdr deleted file mode 100644 index 56ee0b6..0000000 --- a/a/1.2.hdr +++ /dev/null @@ -1,5 +0,0 @@ -Content-Type: text/x-patch; - name="0001-ARM-OMAP-Remove-omap_init_consistent_dma_size.patch" -Content-Transfer-Encoding: quoted-printable -Content-Disposition: attachment; - filename="0001-ARM-OMAP-Remove-omap_init_consistent_dma_size.patch" diff --git a/a/1.2.txt b/a/1.2.txt deleted file mode 100644 index c11bab4..0000000 --- a/a/1.2.txt +++ /dev/null @@ -1,138 +0,0 @@ -From 65c22c93928fbaaae846dd7df53343050bbcfc64 Mon Sep 17 00:00:00 2001 -From: Tomi Valkeinen <tomi.valkeinen@ti.com> -Date: Fri, 2 Nov 2012 10:36:13 +0200 -Subject: [PATCH] ARM: OMAP: Remove omap_init_consistent_dma_size() - -The only thing omap_init_consistent_dma_size() does is increase the -consistent DMA size if CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE is defined. -Increasing the consistent DMA size should no longer be needed with CMA -in place. - -This patch removes omap_init_consistent_dma_size() and also -arch/arm/mach-omap2/io.c:omap_common_init_early() which becomes an empty -function. - -Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> ---- - arch/arm/mach-omap1/io.c | 1 - - arch/arm/mach-omap2/io.c | 12 ------------ - arch/arm/plat-omap/common.c | 7 ------- - arch/arm/plat-omap/include/plat/dma.h | 1 - - 4 files changed, 21 deletions(-) - -diff --git a/arch/arm/mach-omap1/io.c b/arch/arm/mach-omap1/io.c -index 6a5baab..b3d0fb3 100644 ---- a/arch/arm/mach-omap1/io.c -+++ b/arch/arm/mach-omap1/io.c -@@ -134,7 +134,6 @@ void __init omap1_init_early(void) - */ - omap1_clk_init(); - omap1_mux_init(); -- omap_init_consistent_dma_size(); - } - - void __init omap1_init_late(void) -diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c -index 4234d28..2597846 100644 ---- a/arch/arm/mach-omap2/io.c -+++ b/arch/arm/mach-omap2/io.c -@@ -354,11 +354,6 @@ static int _set_hwmod_postsetup_state(struct omap_hwmod *oh, void *data) - return omap_hwmod_set_postsetup_state(oh, *(u8 *)data); - } - --static void __init omap_common_init_early(void) --{ -- omap_init_consistent_dma_size(); --} -- - static void __init omap_hwmod_init_postsetup(void) - { - u8 postsetup_state; -@@ -379,7 +374,6 @@ void __init omap2420_init_early(void) - { - omap2_set_globals_242x(); - omap2xxx_check_revision(); -- omap_common_init_early(); - omap2xxx_voltagedomains_init(); - omap242x_powerdomains_init(); - omap242x_clockdomains_init(); -@@ -401,7 +395,6 @@ void __init omap2430_init_early(void) - { - omap2_set_globals_243x(); - omap2xxx_check_revision(); -- omap_common_init_early(); - omap2xxx_voltagedomains_init(); - omap243x_powerdomains_init(); - omap243x_clockdomains_init(); -@@ -428,7 +421,6 @@ void __init omap3_init_early(void) - omap2_set_globals_3xxx(); - omap3xxx_check_revision(); - omap3xxx_check_features(); -- omap_common_init_early(); - omap3xxx_voltagedomains_init(); - omap3xxx_powerdomains_init(); - omap3xxx_clockdomains_init(); -@@ -462,7 +454,6 @@ void __init ti81xx_init_early(void) - omap2_set_globals_ti81xx(); - omap3xxx_check_revision(); - ti81xx_check_features(); -- omap_common_init_early(); - omap3xxx_voltagedomains_init(); - omap3xxx_powerdomains_init(); - omap3xxx_clockdomains_init(); -@@ -520,7 +511,6 @@ void __init am33xx_init_early(void) - omap2_set_globals_am33xx(); - omap3xxx_check_revision(); - ti81xx_check_features(); -- omap_common_init_early(); - am33xx_voltagedomains_init(); - am33xx_powerdomains_init(); - am33xx_clockdomains_init(); -@@ -536,7 +526,6 @@ void __init omap4430_init_early(void) - omap2_set_globals_443x(); - omap4xxx_check_revision(); - omap4xxx_check_features(); -- omap_common_init_early(); - omap44xx_voltagedomains_init(); - omap44xx_powerdomains_init(); - omap44xx_clockdomains_init(); -@@ -558,7 +547,6 @@ void __init omap5_init_early(void) - { - omap2_set_globals_5xxx(); - omap5xxx_check_revision(); -- omap_common_init_early(); - } - #endif - -diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c -index 111315a..ab44d34 100644 ---- a/arch/arm/plat-omap/common.c -+++ b/arch/arm/plat-omap/common.c -@@ -31,13 +31,6 @@ void __init omap_reserve(void) - omap_barrier_reserve_memblock(); - } - --void __init omap_init_consistent_dma_size(void) --{ --#ifdef CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE -- init_consistent_dma_size(CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE << 20); --#endif --} -- - /* - * Stub function for OMAP2 so that common files - * continue to build when custom builds are used -diff --git a/arch/arm/plat-omap/include/plat/dma.h b/arch/arm/plat-omap/include/plat/dma.h -index 0a87b05..f1b2ad3 100644 ---- a/arch/arm/plat-omap/include/plat/dma.h -+++ b/arch/arm/plat-omap/include/plat/dma.h -@@ -449,7 +449,6 @@ struct omap_system_dma_plat_info { - u32 (*dma_read)(int reg, int lch); - }; - --extern void __init omap_init_consistent_dma_size(void); - extern void omap_set_dma_priority(int lch, int dst_port, int priority); - extern int omap_request_dma(int dev_id, const char *dev_name, - void (*callback)(int lch, u16 ch_status, void *data), --- -1.7.10.4 diff --git a/a/1.1.txt b/N1/1.txt similarity index 90% rename from a/1.1.txt rename to N1/1.txt index 0a7a8ce..f4a6f42 100644 --- a/a/1.1.txt +++ b/N1/1.txt @@ -50,7 +50,7 @@ in my tree later. -From 65c22c93928fbaaae846dd7df53343050bbcfc64 Mon Sep 17 00:00:00 2001 +>From 65c22c93928fbaaae846dd7df53343050bbcfc64 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen <tomi.valkeinen@ti.com> Date: Fri, 2 Nov 2012 10:36:13 +0200 Subject: [PATCH] ARM: OMAP: Remove omap_init_consistent_dma_size() @@ -190,3 +190,21 @@ index 0a87b05..f1b2ad3 100644 void (*callback)(int lch, u16 ch_status, void *data), -- 1.7.10.4 + + + + +-------------- next part -------------- +A non-text attachment was scrubbed... +Name: 0001-ARM-OMAP-Remove-omap_init_consistent_dma_size.patch +Type: text/x-patch +Size: 4526 bytes +Desc: not available +URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20121102/5d1308d7/attachment-0001.bin> +-------------- next part -------------- +A non-text attachment was scrubbed... +Name: signature.asc +Type: application/pgp-signature +Size: 897 bytes +Desc: OpenPGP digital signature +URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20121102/5d1308d7/attachment-0001.sig> diff --git a/a/2.bin b/a/2.bin deleted file mode 100644 index f5698e6..0000000 --- a/a/2.bin +++ /dev/null @@ -1,18 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.11 (GNU/Linux) -Comment: Using GnuPG with Mozilla - http://www.enigmail.net/ - -iQIcBAEBAgAGBQJQk4khAAoJEPo9qoy8lh71a+MP/RWrN5S8YxIlth9sFyQ/TOUo -4f0WWHQlHomSKZH+/27kHuFLlJvsntK8fETbVECsHztXJAx8W6H1vgHTmlbt5j+T -MxDYJVZP4fkRtatLueuZs7ZLLj9PFqz/azbX4WBYFNQkkAJz9LYUxvgSxfZZGP3z -g9m95xf2U9dGAB3rZT60ArbzSydDzmOe6zWx2myiIVzokoYMp4HzYMOJwX+Wum+X -U5tiR71M/h1/9ohnSQQAFPxGcN7B3e9FCBJ53fjgJYEHunWdg4R7u4ZMMt0js5/E -wCew5oXfjnEBQnsGrqIx8b9JCpJamX6kkXmKdn2Vt8sJzk4OV5P2PMFpv7xl/ZAU -cROWrMNgtNJWsFp7bojMj/fE2oR/CE0oonkKlTkqIcdC82qKc2tdHJ/OoVEs0nsG -SkUGGV+NAcddk6Ay4qqwDS8QG4p6XAjn6ZB75W3IRY8IBxlecFVR8PqYZsOxR5/r -SVYd1/mTRoaFwRk0+WqGVcDKhpqERPNWysf8wIuHhiiR8NzStI/pPLpP8wRccHhm -y+CNK8DiQzU2V1AjYL7Zmk0KPMF81xFnOhLcirUFTN3i/LP7wqLTTQirjw9yqwXw -ZjG9BqXDS//R07lRAO9xy7iYKN1MRB0ojexbOBIsGoheVTRiJO4mOVmbtftozAaW -xEL5T6Y4spNUWpPps2EU -=LqmZ ------END PGP SIGNATURE----- diff --git a/a/2.hdr b/a/2.hdr deleted file mode 100644 index a198b95..0000000 --- a/a/2.hdr +++ /dev/null @@ -1,3 +0,0 @@ -Content-Type: application/pgp-signature; name="signature.asc" -Content-Description: OpenPGP digital signature -Content-Disposition: attachment; filename="signature.asc" diff --git a/a/content_digest b/N1/content_digest index 9dc54a1..afc8e2a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,14 +1,11 @@ "ref\020121101224703.2103.95474.stgit@muffinssi.local\0" "ref\020121101224828.2103.82950.stgit@muffinssi.local\0" "ref\050936A6E.3020202@ti.com\0" - "From\0Tomi Valkeinen <tomi.valkeinen@ti.com>\0" - "Subject\0Re: [PATCH 3/3] ARM: OMAP: Remove plat-omap/common.c\0" + "From\0tomi.valkeinen@ti.com (Tomi Valkeinen)\0" + "Subject\0[PATCH 3/3] ARM: OMAP: Remove plat-omap/common.c\0" "Date\0Fri, 2 Nov 2012 10:49:33 +0200\0" - "To\0Santosh Shilimkar <santosh.shilimkar@ti.com>" - " Tony Lindgren <tony@atomide.com>\0" - "Cc\0linux-arm-kernel@lists.infradead.org" - " linux-omap@vger.kernel.org\0" - "\02:1.1\0" + "To\0linux-arm-kernel@lists.infradead.org\0" + "\00:1\0" "b\0" "On 2012-11-02 08:38, Santosh Shilimkar wrote:\n" "> Tony,\n" @@ -62,7 +59,7 @@ "\n" "\n" "\n" - "From 65c22c93928fbaaae846dd7df53343050bbcfc64 Mon Sep 17 00:00:00 2001\n" + ">From 65c22c93928fbaaae846dd7df53343050bbcfc64 Mon Sep 17 00:00:00 2001\n" "From: Tomi Valkeinen <tomi.valkeinen@ti.com>\n" "Date: Fri, 2 Nov 2012 10:36:13 +0200\n" "Subject: [PATCH] ARM: OMAP: Remove omap_init_consistent_dma_size()\n" @@ -201,169 +198,24 @@ " extern int omap_request_dma(int dev_id, const char *dev_name,\n" " \t\t\tvoid (*callback)(int lch, u16 ch_status, void *data),\n" "-- \n" - 1.7.10.4 - "\02:1.2\0" - "fn\00001-ARM-OMAP-Remove-omap_init_consistent_dma_size.patch\0" - "b\0" - "From 65c22c93928fbaaae846dd7df53343050bbcfc64 Mon Sep 17 00:00:00 2001\n" - "From: Tomi Valkeinen <tomi.valkeinen@ti.com>\n" - "Date: Fri, 2 Nov 2012 10:36:13 +0200\n" - "Subject: [PATCH] ARM: OMAP: Remove omap_init_consistent_dma_size()\n" - "\n" - "The only thing omap_init_consistent_dma_size() does is increase the\n" - "consistent DMA size if CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE is defined.\n" - "Increasing the consistent DMA size should no longer be needed with CMA\n" - "in place.\n" + "1.7.10.4\n" "\n" - "This patch removes omap_init_consistent_dma_size() and also\n" - "arch/arm/mach-omap2/io.c:omap_common_init_early() which becomes an empty\n" - "function.\n" "\n" - "Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>\n" - "---\n" - " arch/arm/mach-omap1/io.c | 1 -\n" - " arch/arm/mach-omap2/io.c | 12 ------------\n" - " arch/arm/plat-omap/common.c | 7 -------\n" - " arch/arm/plat-omap/include/plat/dma.h | 1 -\n" - " 4 files changed, 21 deletions(-)\n" "\n" - "diff --git a/arch/arm/mach-omap1/io.c b/arch/arm/mach-omap1/io.c\n" - "index 6a5baab..b3d0fb3 100644\n" - "--- a/arch/arm/mach-omap1/io.c\n" - "+++ b/arch/arm/mach-omap1/io.c\n" - "@@ -134,7 +134,6 @@ void __init omap1_init_early(void)\n" - " \t */\n" - " \tomap1_clk_init();\n" - " \tomap1_mux_init();\n" - "-\tomap_init_consistent_dma_size();\n" - " }\n" - " \n" - " void __init omap1_init_late(void)\n" - "diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c\n" - "index 4234d28..2597846 100644\n" - "--- a/arch/arm/mach-omap2/io.c\n" - "+++ b/arch/arm/mach-omap2/io.c\n" - "@@ -354,11 +354,6 @@ static int _set_hwmod_postsetup_state(struct omap_hwmod *oh, void *data)\n" - " \treturn omap_hwmod_set_postsetup_state(oh, *(u8 *)data);\n" - " }\n" - " \n" - "-static void __init omap_common_init_early(void)\n" - "-{\n" - "-\tomap_init_consistent_dma_size();\n" - "-}\n" - "-\n" - " static void __init omap_hwmod_init_postsetup(void)\n" - " {\n" - " \tu8 postsetup_state;\n" - "@@ -379,7 +374,6 @@ void __init omap2420_init_early(void)\n" - " {\n" - " \tomap2_set_globals_242x();\n" - " \tomap2xxx_check_revision();\n" - "-\tomap_common_init_early();\n" - " \tomap2xxx_voltagedomains_init();\n" - " \tomap242x_powerdomains_init();\n" - " \tomap242x_clockdomains_init();\n" - "@@ -401,7 +395,6 @@ void __init omap2430_init_early(void)\n" - " {\n" - " \tomap2_set_globals_243x();\n" - " \tomap2xxx_check_revision();\n" - "-\tomap_common_init_early();\n" - " \tomap2xxx_voltagedomains_init();\n" - " \tomap243x_powerdomains_init();\n" - " \tomap243x_clockdomains_init();\n" - "@@ -428,7 +421,6 @@ void __init omap3_init_early(void)\n" - " \tomap2_set_globals_3xxx();\n" - " \tomap3xxx_check_revision();\n" - " \tomap3xxx_check_features();\n" - "-\tomap_common_init_early();\n" - " \tomap3xxx_voltagedomains_init();\n" - " \tomap3xxx_powerdomains_init();\n" - " \tomap3xxx_clockdomains_init();\n" - "@@ -462,7 +454,6 @@ void __init ti81xx_init_early(void)\n" - " \tomap2_set_globals_ti81xx();\n" - " \tomap3xxx_check_revision();\n" - " \tti81xx_check_features();\n" - "-\tomap_common_init_early();\n" - " \tomap3xxx_voltagedomains_init();\n" - " \tomap3xxx_powerdomains_init();\n" - " \tomap3xxx_clockdomains_init();\n" - "@@ -520,7 +511,6 @@ void __init am33xx_init_early(void)\n" - " \tomap2_set_globals_am33xx();\n" - " \tomap3xxx_check_revision();\n" - " \tti81xx_check_features();\n" - "-\tomap_common_init_early();\n" - " \tam33xx_voltagedomains_init();\n" - " \tam33xx_powerdomains_init();\n" - " \tam33xx_clockdomains_init();\n" - "@@ -536,7 +526,6 @@ void __init omap4430_init_early(void)\n" - " \tomap2_set_globals_443x();\n" - " \tomap4xxx_check_revision();\n" - " \tomap4xxx_check_features();\n" - "-\tomap_common_init_early();\n" - " \tomap44xx_voltagedomains_init();\n" - " \tomap44xx_powerdomains_init();\n" - " \tomap44xx_clockdomains_init();\n" - "@@ -558,7 +547,6 @@ void __init omap5_init_early(void)\n" - " {\n" - " \tomap2_set_globals_5xxx();\n" - " \tomap5xxx_check_revision();\n" - "-\tomap_common_init_early();\n" - " }\n" - " #endif\n" - " \n" - "diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c\n" - "index 111315a..ab44d34 100644\n" - "--- a/arch/arm/plat-omap/common.c\n" - "+++ b/arch/arm/plat-omap/common.c\n" - "@@ -31,13 +31,6 @@ void __init omap_reserve(void)\n" - " \tomap_barrier_reserve_memblock();\n" - " }\n" - " \n" - "-void __init omap_init_consistent_dma_size(void)\n" - "-{\n" - "-#ifdef CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE\n" - "-\tinit_consistent_dma_size(CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE << 20);\n" - "-#endif\n" - "-}\n" - "-\n" - " /*\n" - " * Stub function for OMAP2 so that common files\n" - " * continue to build when custom builds are used\n" - "diff --git a/arch/arm/plat-omap/include/plat/dma.h b/arch/arm/plat-omap/include/plat/dma.h\n" - "index 0a87b05..f1b2ad3 100644\n" - "--- a/arch/arm/plat-omap/include/plat/dma.h\n" - "+++ b/arch/arm/plat-omap/include/plat/dma.h\n" - "@@ -449,7 +449,6 @@ struct omap_system_dma_plat_info {\n" - " \tu32 (*dma_read)(int reg, int lch);\n" - " };\n" - " \n" - "-extern void __init omap_init_consistent_dma_size(void);\n" - " extern void omap_set_dma_priority(int lch, int dst_port, int priority);\n" - " extern int omap_request_dma(int dev_id, const char *dev_name,\n" - " \t\t\tvoid (*callback)(int lch, u16 ch_status, void *data),\n" - "-- \n" - 1.7.10.4 - "\01:2\0" - "fn\0signature.asc\0" - "d\0OpenPGP digital signature\0" - "b\0" - "-----BEGIN PGP SIGNATURE-----\n" - "Version: GnuPG v1.4.11 (GNU/Linux)\n" - "Comment: Using GnuPG with Mozilla - http://www.enigmail.net/\n" "\n" - "iQIcBAEBAgAGBQJQk4khAAoJEPo9qoy8lh71a+MP/RWrN5S8YxIlth9sFyQ/TOUo\n" - "4f0WWHQlHomSKZH+/27kHuFLlJvsntK8fETbVECsHztXJAx8W6H1vgHTmlbt5j+T\n" - "MxDYJVZP4fkRtatLueuZs7ZLLj9PFqz/azbX4WBYFNQkkAJz9LYUxvgSxfZZGP3z\n" - "g9m95xf2U9dGAB3rZT60ArbzSydDzmOe6zWx2myiIVzokoYMp4HzYMOJwX+Wum+X\n" - "U5tiR71M/h1/9ohnSQQAFPxGcN7B3e9FCBJ53fjgJYEHunWdg4R7u4ZMMt0js5/E\n" - "wCew5oXfjnEBQnsGrqIx8b9JCpJamX6kkXmKdn2Vt8sJzk4OV5P2PMFpv7xl/ZAU\n" - "cROWrMNgtNJWsFp7bojMj/fE2oR/CE0oonkKlTkqIcdC82qKc2tdHJ/OoVEs0nsG\n" - "SkUGGV+NAcddk6Ay4qqwDS8QG4p6XAjn6ZB75W3IRY8IBxlecFVR8PqYZsOxR5/r\n" - "SVYd1/mTRoaFwRk0+WqGVcDKhpqERPNWysf8wIuHhiiR8NzStI/pPLpP8wRccHhm\n" - "y+CNK8DiQzU2V1AjYL7Zmk0KPMF81xFnOhLcirUFTN3i/LP7wqLTTQirjw9yqwXw\n" - "ZjG9BqXDS//R07lRAO9xy7iYKN1MRB0ojexbOBIsGoheVTRiJO4mOVmbtftozAaW\n" - "xEL5T6Y4spNUWpPps2EU\n" - "=LqmZ\n" - "-----END PGP SIGNATURE-----\n" + "-------------- next part --------------\n" + "A non-text attachment was scrubbed...\n" + "Name: 0001-ARM-OMAP-Remove-omap_init_consistent_dma_size.patch\n" + "Type: text/x-patch\n" + "Size: 4526 bytes\n" + "Desc: not available\n" + "URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20121102/5d1308d7/attachment-0001.bin>\n" + "-------------- next part --------------\n" + "A non-text attachment was scrubbed...\n" + "Name: signature.asc\n" + "Type: application/pgp-signature\n" + "Size: 897 bytes\n" + "Desc: OpenPGP digital signature\n" + URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20121102/5d1308d7/attachment-0001.sig> -ea4d7a46aa5eaef3ad855ab1378897125adf9a38a425062b41f38b8b911d049e +94c258548f76269e68a1059e8a07cbf93abb611268c4f8966e1b7ce9aca254cd
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.