diff for duplicates of <00a301cc736d$2d9c4fb0$88d4ef10$%kim@samsung.com> diff --git a/a/1.txt b/N1/1.txt index 675e27f..48f8480 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -46,9 +46,9 @@ source. > > > Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> > > > Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> > > > --- -> > > arch/arm/mach-exynos4/Kconfig | 3 +++ -> > > arch/arm/mach-exynos4/mach-universal_c210.c | 4 +++- -> > > 2 files changed, 6 insertions(+), 1 deletions(-) +> > > ?arch/arm/mach-exynos4/Kconfig ? ? ? ? ? ? ? | ? ?3 +++ +> > > ?arch/arm/mach-exynos4/mach-universal_c210.c | ? ?4 +++- +> > > ?2 files changed, 6 insertions(+), 1 deletions(-) > > > > > > diff --git a/arch/arm/mach-exynos4/Kconfig b/arch/arm/mach-exynos4/Kconfig @@ -56,15 +56,15 @@ b/arch/arm/mach-exynos4/Kconfig > > > --- a/arch/arm/mach-exynos4/Kconfig > > > +++ b/arch/arm/mach-exynos4/Kconfig > > > @@ -173,6 +173,9 @@ config MACH_ARMLEX4210 -> > > config MACH_UNIVERSAL_C210 -> > > bool "Mobile UNIVERSAL_C210 Board" -> > > select CPU_EXYNOS4210 -> > > + select S5P_HRT -> > > + select CLKSRC_MMIO -> > > + select HAVE_SCHED_CLOCK -> > > select S5P_GPIO_INT -> > > select S5P_DEV_FIMC0 -> > > select S5P_DEV_FIMC1 +> > > ?config MACH_UNIVERSAL_C210 +> > > ? ? ? ?bool "Mobile UNIVERSAL_C210 Board" +> > > ? ? ? ?select CPU_EXYNOS4210 +> > > + ? ? ? select S5P_HRT +> > > + ? ? ? select CLKSRC_MMIO +> > > + ? ? ? select HAVE_SCHED_CLOCK +> > > ? ? ? ?select S5P_GPIO_INT +> > > ? ? ? ?select S5P_DEV_FIMC0 +> > > ? ? ? ?select S5P_DEV_FIMC1 > > > diff --git a/arch/arm/mach-exynos4/mach-universal_c210.c b/arch/arm/mach- > > exynos4/mach-universal_c210.c @@ -72,37 +72,37 @@ b/arch/arm/mach- > > > --- a/arch/arm/mach-exynos4/mach-universal_c210.c > > > +++ b/arch/arm/mach-exynos4/mach-universal_c210.c > > > @@ -34,6 +34,7 @@ -> > > #include <plat/mfc.h> -> > > #include <plat/sdhci.h> -> > > #include <plat/pd.h> +> > > ?#include <plat/mfc.h> +> > > ?#include <plat/sdhci.h> +> > > ?#include <plat/pd.h> > > > +#include <plat/s5p-time.h> > > > -> > > #include <mach/map.h> +> > > ?#include <mach/map.h> > > > > > > @@ -730,6 +731,7 @@ static void __init universal_map_io(void) -> > > s5p_init_io(NULL, 0, S5P_VA_CHIPID); -> > > s3c24xx_init_clocks(24000000); -> > > s3c24xx_init_uarts(universal_uartcfgs, +> > > ? ? ? ?s5p_init_io(NULL, 0, S5P_VA_CHIPID); +> > > ? ? ? ?s3c24xx_init_clocks(24000000); +> > > ? ? ? ?s3c24xx_init_uarts(universal_uartcfgs, ARRAY_SIZE(universal_uartcfgs)); -> > > + s5p_set_timer_source(S5P_PWM2, S5P_PWM4); -> > > } +> > > + ? ? ? s5p_set_timer_source(S5P_PWM2, S5P_PWM4); +> > > ?} > > > -> > > static void __init universal_reserve(void) +> > > ?static void __init universal_reserve(void) > > > @@ -766,6 +768,6 @@ MACHINE_START(UNIVERSAL_C210, > > "UNIVERSAL_C210") -> > > .init_irq = exynos4_init_irq, -> > > .map_io = universal_map_io, -> > > .init_machine = universal_machine_init, -> > > - .timer = &exynos4_timer, -> > > + .timer = &s5p_timer, -> > > .reserve = &universal_reserve, -> > > MACHINE_END +> > > ? ? ? ?.init_irq ? ? ? = exynos4_init_irq, +> > > ? ? ? ?.map_io ? ? ? ? = universal_map_io, +> > > ? ? ? ?.init_machine ? = universal_machine_init, +> > > - ? ? ? .timer ? ? ? ? ?= &exynos4_timer, +> > > + ? ? ? .timer ? ? ? ? ?= &s5p_timer, +> > > ? ? ? ?.reserve ? ? ? ?= &universal_reserve, +> > > ?MACHINE_END > > > -- > > > 1.7.1.569.g6f426 > > > > > > -- > > > To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in -> > > the body of a message to majordomo@vger.kernel.org -> > > More majordomo info at http://vger.kernel.org/majordomo-info.html +> > > the body of a message to majordomo at vger.kernel.org +> > > More majordomo info at ?http://vger.kernel.org/majordomo-info.html > > > diff --git a/a/content_digest b/N1/content_digest index b6b2e57..4c391f4 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,17 +1,10 @@ "ref\01311659456-6659-1-git-send-email-m.szyprowski@samsung.com\0" "ref\01311659456-6659-3-git-send-email-m.szyprowski@samsung.com\0" "ref\0CAH9JG2V6Sfjmjupj5oBd_5vziBa4iezBpRfK9tNECrFO5sSfLw@mail.gmail.com\0" - "From\0Kukjin Kim <kgene.kim@samsung.com>\0" - "Subject\0RE: [PATCH 2/2] ARM: Exynos4: use s5p-timer for UniversalC210 board\0" + "From\0kgene.kim@samsung.com (Kukjin Kim)\0" + "Subject\0[PATCH 2/2] ARM: Exynos4: use s5p-timer for UniversalC210 board\0" "Date\0Thu, 15 Sep 2011 15:03:23 +0900\0" - "To\0'Kukjin Kim' <kgene.kim@samsung.com>" - 'Kyungmin Park' <kmpark@infradead.org> - 'Marek Szyprowski' <m.szyprowski@samsung.com> - " 'arm-linux' <linux-arm-kernel@lists.infradead.org>\0" - "Cc\0linux-samsung-soc@vger.kernel.org" - 'Angus Ainslie' <angus.ainslie@linaro.org> - 'Arnd Bergmann' <arnd@arndb.de> - " chaos.youn@samsung.com\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Kukjin Kim wrote:\n" @@ -62,9 +55,9 @@ "> > > Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>\n" "> > > Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>\n" "> > > ---\n" - "> > > \302\240arch/arm/mach-exynos4/Kconfig \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 | \302\240 \302\2403 +++\n" - "> > > \302\240arch/arm/mach-exynos4/mach-universal_c210.c | \302\240 \302\2404 +++-\n" - "> > > \302\2402 files changed, 6 insertions(+), 1 deletions(-)\n" + "> > > ?arch/arm/mach-exynos4/Kconfig ? ? ? ? ? ? ? | ? ?3 +++\n" + "> > > ?arch/arm/mach-exynos4/mach-universal_c210.c | ? ?4 +++-\n" + "> > > ?2 files changed, 6 insertions(+), 1 deletions(-)\n" "> > >\n" "> > > diff --git a/arch/arm/mach-exynos4/Kconfig\n" "b/arch/arm/mach-exynos4/Kconfig\n" @@ -72,15 +65,15 @@ "> > > --- a/arch/arm/mach-exynos4/Kconfig\n" "> > > +++ b/arch/arm/mach-exynos4/Kconfig\n" "> > > @@ -173,6 +173,9 @@ config MACH_ARMLEX4210\n" - "> > > \302\240config MACH_UNIVERSAL_C210\n" - "> > > \302\240 \302\240 \302\240 \302\240bool \"Mobile UNIVERSAL_C210 Board\"\n" - "> > > \302\240 \302\240 \302\240 \302\240select CPU_EXYNOS4210\n" - "> > > + \302\240 \302\240 \302\240 select S5P_HRT\n" - "> > > + \302\240 \302\240 \302\240 select CLKSRC_MMIO\n" - "> > > + \302\240 \302\240 \302\240 select HAVE_SCHED_CLOCK\n" - "> > > \302\240 \302\240 \302\240 \302\240select S5P_GPIO_INT\n" - "> > > \302\240 \302\240 \302\240 \302\240select S5P_DEV_FIMC0\n" - "> > > \302\240 \302\240 \302\240 \302\240select S5P_DEV_FIMC1\n" + "> > > ?config MACH_UNIVERSAL_C210\n" + "> > > ? ? ? ?bool \"Mobile UNIVERSAL_C210 Board\"\n" + "> > > ? ? ? ?select CPU_EXYNOS4210\n" + "> > > + ? ? ? select S5P_HRT\n" + "> > > + ? ? ? select CLKSRC_MMIO\n" + "> > > + ? ? ? select HAVE_SCHED_CLOCK\n" + "> > > ? ? ? ?select S5P_GPIO_INT\n" + "> > > ? ? ? ?select S5P_DEV_FIMC0\n" + "> > > ? ? ? ?select S5P_DEV_FIMC1\n" "> > > diff --git a/arch/arm/mach-exynos4/mach-universal_c210.c\n" "b/arch/arm/mach-\n" "> > exynos4/mach-universal_c210.c\n" @@ -88,39 +81,39 @@ "> > > --- a/arch/arm/mach-exynos4/mach-universal_c210.c\n" "> > > +++ b/arch/arm/mach-exynos4/mach-universal_c210.c\n" "> > > @@ -34,6 +34,7 @@\n" - "> > > \302\240#include <plat/mfc.h>\n" - "> > > \302\240#include <plat/sdhci.h>\n" - "> > > \302\240#include <plat/pd.h>\n" + "> > > ?#include <plat/mfc.h>\n" + "> > > ?#include <plat/sdhci.h>\n" + "> > > ?#include <plat/pd.h>\n" "> > > +#include <plat/s5p-time.h>\n" "> > >\n" - "> > > \302\240#include <mach/map.h>\n" + "> > > ?#include <mach/map.h>\n" "> > >\n" "> > > @@ -730,6 +731,7 @@ static void __init universal_map_io(void)\n" - "> > > \302\240 \302\240 \302\240 \302\240s5p_init_io(NULL, 0, S5P_VA_CHIPID);\n" - "> > > \302\240 \302\240 \302\240 \302\240s3c24xx_init_clocks(24000000);\n" - "> > > \302\240 \302\240 \302\240 \302\240s3c24xx_init_uarts(universal_uartcfgs,\n" + "> > > ? ? ? ?s5p_init_io(NULL, 0, S5P_VA_CHIPID);\n" + "> > > ? ? ? ?s3c24xx_init_clocks(24000000);\n" + "> > > ? ? ? ?s3c24xx_init_uarts(universal_uartcfgs,\n" "ARRAY_SIZE(universal_uartcfgs));\n" - "> > > + \302\240 \302\240 \302\240 s5p_set_timer_source(S5P_PWM2, S5P_PWM4);\n" - "> > > \302\240}\n" + "> > > + ? ? ? s5p_set_timer_source(S5P_PWM2, S5P_PWM4);\n" + "> > > ?}\n" "> > >\n" - "> > > \302\240static void __init universal_reserve(void)\n" + "> > > ?static void __init universal_reserve(void)\n" "> > > @@ -766,6 +768,6 @@ MACHINE_START(UNIVERSAL_C210,\n" "> > \"UNIVERSAL_C210\")\n" - "> > > \302\240 \302\240 \302\240 \302\240.init_irq \302\240 \302\240 \302\240 = exynos4_init_irq,\n" - "> > > \302\240 \302\240 \302\240 \302\240.map_io \302\240 \302\240 \302\240 \302\240 = universal_map_io,\n" - "> > > \302\240 \302\240 \302\240 \302\240.init_machine \302\240 = universal_machine_init,\n" - "> > > - \302\240 \302\240 \302\240 .timer \302\240 \302\240 \302\240 \302\240 \302\240= &exynos4_timer,\n" - "> > > + \302\240 \302\240 \302\240 .timer \302\240 \302\240 \302\240 \302\240 \302\240= &s5p_timer,\n" - "> > > \302\240 \302\240 \302\240 \302\240.reserve \302\240 \302\240 \302\240 \302\240= &universal_reserve,\n" - "> > > \302\240MACHINE_END\n" + "> > > ? ? ? ?.init_irq ? ? ? = exynos4_init_irq,\n" + "> > > ? ? ? ?.map_io ? ? ? ? = universal_map_io,\n" + "> > > ? ? ? ?.init_machine ? = universal_machine_init,\n" + "> > > - ? ? ? .timer ? ? ? ? ?= &exynos4_timer,\n" + "> > > + ? ? ? .timer ? ? ? ? ?= &s5p_timer,\n" + "> > > ? ? ? ?.reserve ? ? ? ?= &universal_reserve,\n" + "> > > ?MACHINE_END\n" "> > > --\n" "> > > 1.7.1.569.g6f426\n" "> > >\n" "> > > --\n" "> > > To unsubscribe from this list: send the line \"unsubscribe\n" "linux-samsung-soc\" in\n" - "> > > the body of a message to majordomo@vger.kernel.org\n" - "> > > More majordomo info at \302\240http://vger.kernel.org/majordomo-info.html\n" + "> > > the body of a message to majordomo at vger.kernel.org\n" + "> > > More majordomo info at ?http://vger.kernel.org/majordomo-info.html\n" > > > -2c54051d3aa268e9a6a051bc5df9b5a4a2da4727def373665f0ab5c389587968 +9dffd695b60133123250fc3800233fd20e8633cfdcaa10f1fa00dfd90dbe2117
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.