diff for duplicates of <000a01cbd71f$1f8ec780$5eac5680$@com> diff --git a/a/1.txt b/N1/1.txt index c1dec3f..7d0b552 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -11,8 +11,8 @@ S.B. Kim On Saturday, February 26, 2011 1:27 PM Kyungmin Park <kyungmin.park@samsung.com> wrote: > To: Sangbeom Kim -> Cc: linux-arm-kernel@lists.infradead.org; linux-samsung- -> soc@vger.kernel.org; kgene.kim@samsung.com; ben-linux@fluff.org +> Cc: linux-arm-kernel at lists.infradead.org; linux-samsung- +> soc at vger.kernel.org; kgene.kim at samsung.com; ben-linux at fluff.org > Subject: Re: [PATCH 2/3] ARM: S5P: Update machine initialization for HRT > > Acked-by: Kyungmin Park <kyungmin.park@samsung.com> @@ -33,18 +33,18 @@ On Saturday, February 26, 2011 1:27 PM Kyungmin Park > On Sat, Feb 26, 2011 at 11:45 AM, Sangbeom Kim <sbkim73@samsung.com> wrote: > > This patch update mach-s5p64x0 and mach-s5pv210 -> > machine initialization for hrt support +> > machine ?initialization for hrt support > > > > Signed-off-by: Sangbeom Kim <sbkim73@samsung.com> > > --- -> > arch/arm/mach-s5p64x0/mach-smdk6440.c | 4 +++- -> > arch/arm/mach-s5p64x0/mach-smdk6450.c | 4 +++- -> > arch/arm/mach-s5pv210/mach-aquila.c | 4 +++- -> > arch/arm/mach-s5pv210/mach-goni.c | 4 +++- -> > arch/arm/mach-s5pv210/mach-smdkc110.c | 4 +++- -> > arch/arm/mach-s5pv210/mach-smdkv210.c | 4 +++- -> > arch/arm/mach-s5pv210/mach-torbreck.c | 4 +++- -> > 7 files changed, 21 insertions(+), 7 deletions(-) +> > ?arch/arm/mach-s5p64x0/mach-smdk6440.c | ? ?4 +++- +> > ?arch/arm/mach-s5p64x0/mach-smdk6450.c | ? ?4 +++- +> > ?arch/arm/mach-s5pv210/mach-aquila.c ? | ? ?4 +++- +> > ?arch/arm/mach-s5pv210/mach-goni.c ? ? | ? ?4 +++- +> > ?arch/arm/mach-s5pv210/mach-smdkc110.c | ? ?4 +++- +> > ?arch/arm/mach-s5pv210/mach-smdkv210.c | ? ?4 +++- +> > ?arch/arm/mach-s5pv210/mach-torbreck.c | ? ?4 +++- +> > ?7 files changed, 21 insertions(+), 7 deletions(-) > > > > diff --git a/arch/arm/mach-s5p64x0/mach-smdk6440.c b/arch/arm/mach- > s5p64x0/mach-smdk6440.c @@ -52,217 +52,217 @@ wrote: > > --- a/arch/arm/mach-s5p64x0/mach-smdk6440.c > > +++ b/arch/arm/mach-s5p64x0/mach-smdk6440.c > > @@ -43,6 +43,7 @@ -> > #include <plat/pll.h> -> > #include <plat/adc.h> -> > #include <plat/ts.h> +> > ?#include <plat/pll.h> +> > ?#include <plat/adc.h> +> > ?#include <plat/ts.h> > > +#include <plat/s5p-time.h> > > -> > #define SMDK6440_UCON_DEFAULT (S3C2410_UCON_TXILEVEL | \ -> > S3C2410_UCON_RXILEVEL | \ +> > ?#define SMDK6440_UCON_DEFAULT ?(S3C2410_UCON_TXILEVEL | ? ? ? ?\ +> > ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?S3C2410_UCON_RXILEVEL | ? ? ? ? \ > > @@ -136,6 +137,7 @@ static void __init smdk6440_map_io(void) -> > s5p_init_io(NULL, 0, S5P64X0_SYS_ID); -> > s3c24xx_init_clocks(12000000); -> > s3c24xx_init_uarts(smdk6440_uartcfgs, +> > ? ? ? ?s5p_init_io(NULL, 0, S5P64X0_SYS_ID); +> > ? ? ? ?s3c24xx_init_clocks(12000000); +> > ? ? ? ?s3c24xx_init_uarts(smdk6440_uartcfgs, > ARRAY_SIZE(smdk6440_uartcfgs)); -> > + s5p_set_timer_source(S5P_PWM2, S5P_PWM4); -> > } +> > + ? ? ? s5p_set_timer_source(S5P_PWM2, S5P_PWM4); +> > ?} > > -> > static void __init smdk6440_machine_init(void) +> > ?static void __init smdk6440_machine_init(void) > > @@ -159,5 +161,5 @@ MACHINE_START(SMDK6440, "SMDK6440") -> > .init_irq = s5p6440_init_irq, -> > .map_io = smdk6440_map_io, -> > .init_machine = smdk6440_machine_init, -> > - .timer = &s3c24xx_timer, -> > + .timer = &s5p_timer, -> > MACHINE_END +> > ? ? ? ?.init_irq ? ? ? = s5p6440_init_irq, +> > ? ? ? ?.map_io ? ? ? ? = smdk6440_map_io, +> > ? ? ? ?.init_machine ? = smdk6440_machine_init, +> > - ? ? ? .timer ? ? ? ? ?= &s3c24xx_timer, +> > + ? ? ? .timer ? ? ? ? ?= &s5p_timer, +> > ?MACHINE_END > > diff --git a/arch/arm/mach-s5p64x0/mach-smdk6450.c b/arch/arm/mach- > s5p64x0/mach-smdk6450.c > > index 3a20de0..686ec56 100644 > > --- a/arch/arm/mach-s5p64x0/mach-smdk6450.c > > +++ b/arch/arm/mach-s5p64x0/mach-smdk6450.c > > @@ -43,6 +43,7 @@ -> > #include <plat/pll.h> -> > #include <plat/adc.h> -> > #include <plat/ts.h> +> > ?#include <plat/pll.h> +> > ?#include <plat/adc.h> +> > ?#include <plat/ts.h> > > +#include <plat/s5p-time.h> > > -> > #define SMDK6450_UCON_DEFAULT (S3C2410_UCON_TXILEVEL | \ -> > S3C2410_UCON_RXILEVEL | \ +> > ?#define SMDK6450_UCON_DEFAULT ?(S3C2410_UCON_TXILEVEL | ? ? ? ?\ +> > ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?S3C2410_UCON_RXILEVEL | ? ? ? ? \ > > @@ -155,6 +156,7 @@ static void __init smdk6450_map_io(void) -> > s5p_init_io(NULL, 0, S5P64X0_SYS_ID); -> > s3c24xx_init_clocks(19200000); -> > s3c24xx_init_uarts(smdk6450_uartcfgs, +> > ? ? ? ?s5p_init_io(NULL, 0, S5P64X0_SYS_ID); +> > ? ? ? ?s3c24xx_init_clocks(19200000); +> > ? ? ? ?s3c24xx_init_uarts(smdk6450_uartcfgs, > ARRAY_SIZE(smdk6450_uartcfgs)); -> > + s5p_set_timer_source(S5P_PWM2, S5P_PWM4); -> > } +> > + ? ? ? s5p_set_timer_source(S5P_PWM2, S5P_PWM4); +> > ?} > > -> > static void __init smdk6450_machine_init(void) +> > ?static void __init smdk6450_machine_init(void) > > @@ -178,5 +180,5 @@ MACHINE_START(SMDK6450, "SMDK6450") -> > .init_irq = s5p6450_init_irq, -> > .map_io = smdk6450_map_io, -> > .init_machine = smdk6450_machine_init, -> > - .timer = &s3c24xx_timer, -> > + .timer = &s5p_timer, -> > MACHINE_END +> > ? ? ? ?.init_irq ? ? ? = s5p6450_init_irq, +> > ? ? ? ?.map_io ? ? ? ? = smdk6450_map_io, +> > ? ? ? ?.init_machine ? = smdk6450_machine_init, +> > - ? ? ? .timer ? ? ? ? ?= &s3c24xx_timer, +> > + ? ? ? .timer ? ? ? ? ?= &s5p_timer, +> > ?MACHINE_END > > diff --git a/arch/arm/mach-s5pv210/mach-aquila.c b/arch/arm/mach- > s5pv210/mach-aquila.c > > index 557add4..fab84f3 100644 > > --- a/arch/arm/mach-s5pv210/mach-aquila.c > > +++ b/arch/arm/mach-s5pv210/mach-aquila.c > > @@ -39,6 +39,7 @@ -> > #include <plat/fb.h> -> > #include <plat/fimc-core.h> -> > #include <plat/sdhci.h> +> > ?#include <plat/fb.h> +> > ?#include <plat/fimc-core.h> +> > ?#include <plat/sdhci.h> > > +#include <plat/s5p-time.h> > > -> > /* Following are default values for UCON, ULCON and UFCON UART +> > ?/* Following are default values for UCON, ULCON and UFCON UART > registers */ -> > #define AQUILA_UCON_DEFAULT (S3C2410_UCON_TXILEVEL | \ +> > ?#define AQUILA_UCON_DEFAULT ? ?(S3C2410_UCON_TXILEVEL | ? ? ? ?\ > > @@ -664,6 +665,7 @@ static void __init aquila_map_io(void) -> > s5p_init_io(NULL, 0, S5P_VA_CHIPID); -> > s3c24xx_init_clocks(24000000); -> > s3c24xx_init_uarts(aquila_uartcfgs, ARRAY_SIZE(aquila_uartcfgs)); -> > + s5p_set_timer_source(S5P_PWM2, S5P_PWM4); -> > } +> > ? ? ? ?s5p_init_io(NULL, 0, S5P_VA_CHIPID); +> > ? ? ? ?s3c24xx_init_clocks(24000000); +> > ? ? ? ?s3c24xx_init_uarts(aquila_uartcfgs, ARRAY_SIZE(aquila_uartcfgs)); +> > + ? ? ? s5p_set_timer_source(S5P_PWM2, S5P_PWM4); +> > ?} > > -> > static void __init aquila_machine_init(void) +> > ?static void __init aquila_machine_init(void) > > @@ -698,5 +700,5 @@ MACHINE_START(AQUILA, "Aquila") -> > .init_irq = s5pv210_init_irq, -> > .map_io = aquila_map_io, -> > .init_machine = aquila_machine_init, -> > - .timer = &s3c24xx_timer, -> > + .timer = &s5p_timer, -> > MACHINE_END +> > ? ? ? ?.init_irq ? ? ? = s5pv210_init_irq, +> > ? ? ? ?.map_io ? ? ? ? = aquila_map_io, +> > ? ? ? ?.init_machine ? = aquila_machine_init, +> > - ? ? ? .timer ? ? ? ? ?= &s3c24xx_timer, +> > + ? ? ? .timer ? ? ? ? ?= &s5p_timer, +> > ?MACHINE_END > > diff --git a/arch/arm/mach-s5pv210/mach-goni.c b/arch/arm/mach- > s5pv210/mach-goni.c > > index 056f5c7..5eda4a1 100644 > > --- a/arch/arm/mach-s5pv210/mach-goni.c > > +++ b/arch/arm/mach-s5pv210/mach-goni.c > > @@ -45,6 +45,7 @@ -> > #include <plat/keypad.h> -> > #include <plat/sdhci.h> -> > #include <plat/clock.h> +> > ?#include <plat/keypad.h> +> > ?#include <plat/sdhci.h> +> > ?#include <plat/clock.h> > > +#include <plat/s5p-time.h> > > -> > /* Following are default values for UCON, ULCON and UFCON UART +> > ?/* Following are default values for UCON, ULCON and UFCON UART > registers */ -> > #define GONI_UCON_DEFAULT (S3C2410_UCON_TXILEVEL | \ +> > ?#define GONI_UCON_DEFAULT ? ? ?(S3C2410_UCON_TXILEVEL | ? ? ? ?\ > > @@ -823,6 +824,7 @@ static void __init goni_map_io(void) -> > s5p_init_io(NULL, 0, S5P_VA_CHIPID); -> > s3c24xx_init_clocks(24000000); -> > s3c24xx_init_uarts(goni_uartcfgs, ARRAY_SIZE(goni_uartcfgs)); -> > + s5p_set_timer_source(S5P_PWM2, S5P_PWM4); -> > } +> > ? ? ? ?s5p_init_io(NULL, 0, S5P_VA_CHIPID); +> > ? ? ? ?s3c24xx_init_clocks(24000000); +> > ? ? ? ?s3c24xx_init_uarts(goni_uartcfgs, ARRAY_SIZE(goni_uartcfgs)); +> > + ? ? ? s5p_set_timer_source(S5P_PWM2, S5P_PWM4); +> > ?} > > -> > static void __init goni_machine_init(void) +> > ?static void __init goni_machine_init(void) > > @@ -873,5 +875,5 @@ MACHINE_START(GONI, "GONI") -> > .init_irq = s5pv210_init_irq, -> > .map_io = goni_map_io, -> > .init_machine = goni_machine_init, -> > - .timer = &s3c24xx_timer, -> > + .timer = &s5p_timer, -> > MACHINE_END +> > ? ? ? ?.init_irq ? ? ? = s5pv210_init_irq, +> > ? ? ? ?.map_io ? ? ? ? = goni_map_io, +> > ? ? ? ?.init_machine ? = goni_machine_init, +> > - ? ? ? .timer ? ? ? ? ?= &s3c24xx_timer, +> > + ? ? ? .timer ? ? ? ? ?= &s5p_timer, +> > ?MACHINE_END > > diff --git a/arch/arm/mach-s5pv210/mach-smdkc110.c b/arch/arm/mach- > s5pv210/mach-smdkc110.c > > index ce11a02..f304383 100644 > > --- a/arch/arm/mach-s5pv210/mach-smdkc110.c > > +++ b/arch/arm/mach-s5pv210/mach-smdkc110.c > > @@ -30,6 +30,7 @@ -> > #include <plat/ata.h> -> > #include <plat/iic.h> -> > #include <plat/pm.h> +> > ?#include <plat/ata.h> +> > ?#include <plat/iic.h> +> > ?#include <plat/pm.h> > > +#include <plat/s5p-time.h> > > -> > /* Following are default values for UCON, ULCON and UFCON UART +> > ?/* Following are default values for UCON, ULCON and UFCON UART > registers */ -> > #define SMDKC110_UCON_DEFAULT (S3C2410_UCON_TXILEVEL | \ +> > ?#define SMDKC110_UCON_DEFAULT ?(S3C2410_UCON_TXILEVEL | ? ? ? ?\ > > @@ -111,6 +112,7 @@ static void __init smdkc110_map_io(void) -> > s5p_init_io(NULL, 0, S5P_VA_CHIPID); -> > s3c24xx_init_clocks(24000000); -> > s3c24xx_init_uarts(smdkv210_uartcfgs, +> > ? ? ? ?s5p_init_io(NULL, 0, S5P_VA_CHIPID); +> > ? ? ? ?s3c24xx_init_clocks(24000000); +> > ? ? ? ?s3c24xx_init_uarts(smdkv210_uartcfgs, > ARRAY_SIZE(smdkv210_uartcfgs)); -> > + s5p_set_timer_source(S5P_PWM2, S5P_PWM4); -> > } +> > + ? ? ? s5p_set_timer_source(S5P_PWM2, S5P_PWM4); +> > ?} > > -> > static void __init smdkc110_machine_init(void) +> > ?static void __init smdkc110_machine_init(void) > > @@ -138,5 +140,5 @@ MACHINE_START(SMDKC110, "SMDKC110") -> > .init_irq = s5pv210_init_irq, -> > .map_io = smdkc110_map_io, -> > .init_machine = smdkc110_machine_init, -> > - .timer = &s3c24xx_timer, -> > + .timer = &s5p_timer, -> > MACHINE_END +> > ? ? ? ?.init_irq ? ? ? = s5pv210_init_irq, +> > ? ? ? ?.map_io ? ? ? ? = smdkc110_map_io, +> > ? ? ? ?.init_machine ? = smdkc110_machine_init, +> > - ? ? ? .timer ? ? ? ? ?= &s3c24xx_timer, +> > + ? ? ? .timer ? ? ? ? ?= &s5p_timer, +> > ?MACHINE_END > > diff --git a/arch/arm/mach-s5pv210/mach-smdkv210.c b/arch/arm/mach- > s5pv210/mach-smdkv210.c > > index bc9fdb5..41080bf 100644 > > --- a/arch/arm/mach-s5pv210/mach-smdkv210.c > > +++ b/arch/arm/mach-s5pv210/mach-smdkv210.c > > @@ -43,6 +43,7 @@ -> > #include <plat/keypad.h> -> > #include <plat/pm.h> -> > #include <plat/fb.h> +> > ?#include <plat/keypad.h> +> > ?#include <plat/pm.h> +> > ?#include <plat/fb.h> > > +#include <plat/s5p-time.h> > > -> > /* Following are default values for UCON, ULCON and UFCON UART +> > ?/* Following are default values for UCON, ULCON and UFCON UART > registers */ -> > #define SMDKV210_UCON_DEFAULT (S3C2410_UCON_TXILEVEL | \ +> > ?#define SMDKV210_UCON_DEFAULT ?(S3C2410_UCON_TXILEVEL | ? ? ? ?\ > > @@ -272,6 +273,7 @@ static void __init smdkv210_map_io(void) -> > s5p_init_io(NULL, 0, S5P_VA_CHIPID); -> > s3c24xx_init_clocks(24000000); -> > s3c24xx_init_uarts(smdkv210_uartcfgs, +> > ? ? ? ?s5p_init_io(NULL, 0, S5P_VA_CHIPID); +> > ? ? ? ?s3c24xx_init_clocks(24000000); +> > ? ? ? ?s3c24xx_init_uarts(smdkv210_uartcfgs, > ARRAY_SIZE(smdkv210_uartcfgs)); -> > + s5p_set_timer_source(S5P_PWM2, S5P_PWM4); -> > } +> > + ? ? ? s5p_set_timer_source(S5P_PWM2, S5P_PWM4); +> > ?} > > -> > static void __init smdkv210_machine_init(void) +> > ?static void __init smdkv210_machine_init(void) > > @@ -306,5 +308,5 @@ MACHINE_START(SMDKV210, "SMDKV210") -> > .init_irq = s5pv210_init_irq, -> > .map_io = smdkv210_map_io, -> > .init_machine = smdkv210_machine_init, -> > - .timer = &s3c24xx_timer, -> > + .timer = &s5p_timer, -> > MACHINE_END +> > ? ? ? ?.init_irq ? ? ? = s5pv210_init_irq, +> > ? ? ? ?.map_io ? ? ? ? = smdkv210_map_io, +> > ? ? ? ?.init_machine ? = smdkv210_machine_init, +> > - ? ? ? .timer ? ? ? ? ?= &s3c24xx_timer, +> > + ? ? ? .timer ? ? ? ? ?= &s5p_timer, +> > ?MACHINE_END > > diff --git a/arch/arm/mach-s5pv210/mach-torbreck.c b/arch/arm/mach- > s5pv210/mach-torbreck.c > > index 043c938..b3516a1 100644 > > --- a/arch/arm/mach-s5pv210/mach-torbreck.c > > +++ b/arch/arm/mach-s5pv210/mach-torbreck.c > > @@ -27,6 +27,7 @@ -> > #include <plat/devs.h> -> > #include <plat/cpu.h> -> > #include <plat/iic.h> +> > ?#include <plat/devs.h> +> > ?#include <plat/cpu.h> +> > ?#include <plat/iic.h> > > +#include <plat/s5p-time.h> > > -> > /* Following are default values for UCON, ULCON and UFCON UART +> > ?/* Following are default values for UCON, ULCON and UFCON UART > registers */ -> > #define TORBRECK_UCON_DEFAULT (S3C2410_UCON_TXILEVEL | \ +> > ?#define TORBRECK_UCON_DEFAULT ?(S3C2410_UCON_TXILEVEL | ? ? ? ?\ > > @@ -104,6 +105,7 @@ static void __init torbreck_map_io(void) -> > s5p_init_io(NULL, 0, S5P_VA_CHIPID); -> > s3c24xx_init_clocks(24000000); -> > s3c24xx_init_uarts(torbreck_uartcfgs, +> > ? ? ? ?s5p_init_io(NULL, 0, S5P_VA_CHIPID); +> > ? ? ? ?s3c24xx_init_clocks(24000000); +> > ? ? ? ?s3c24xx_init_uarts(torbreck_uartcfgs, > ARRAY_SIZE(torbreck_uartcfgs)); -> > + s5p_set_timer_source(S5P_PWM2, S5P_PWM4); -> > } +> > + ? ? ? s5p_set_timer_source(S5P_PWM2, S5P_PWM4); +> > ?} > > -> > static void __init torbreck_machine_init(void) +> > ?static void __init torbreck_machine_init(void) > > @@ -127,5 +129,5 @@ MACHINE_START(TORBRECK, "TORBRECK") -> > .init_irq = s5pv210_init_irq, -> > .map_io = torbreck_map_io, -> > .init_machine = torbreck_machine_init, -> > - .timer = &s3c24xx_timer, -> > + .timer = &s5p_timer, -> > MACHINE_END +> > ? ? ? ?.init_irq ? ? ? = s5pv210_init_irq, +> > ? ? ? ?.map_io ? ? ? ? = torbreck_map_io, +> > ? ? ? ?.init_machine ? = torbreck_machine_init, +> > - ? ? ? .timer ? ? ? ? ?= &s3c24xx_timer, +> > + ? ? ? .timer ? ? ? ? ?= &s5p_timer, +> > ?MACHINE_END > > -- > > 1.7.1 > > > > -- > > 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 > > > -- > To unsubscribe from this list: send the line "unsubscribe linux-samsung- > soc" in -> the body of a message to majordomo@vger.kernel.org +> 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 65996bb..b40d427 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,14 +1,10 @@ "ref\01298688357-20775-1-git-send-email-sbkim73@samsung.com\0" "ref\01298688357-20775-3-git-send-email-sbkim73@samsung.com\0" "ref\0AANLkTinfPE5Ksbyy7bsPcKXi7Ak1mMKs9orjGrFebzdx@mail.gmail.com\0" - "From\0Sangbeom Kim <sbkim73@samsung.com>\0" - "Subject\0RE: [PATCH 2/3] ARM: S5P: Update machine initialization for HRT\0" + "From\0sbkim73@samsung.com (Sangbeom Kim)\0" + "Subject\0[PATCH 2/3] ARM: S5P: Update machine initialization for HRT\0" "Date\0Mon, 28 Feb 2011 17:11:34 +0900\0" - "To\0'Kyungmin Park' <kmpark@infradead.org>\0" - "Cc\0linux-arm-kernel@lists.infradead.org" - linux-samsung-soc@vger.kernel.org - kgene.kim@samsung.com - " ben-linux@fluff.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hi kyungmin,\n" @@ -24,8 +20,8 @@ "On Saturday, February 26, 2011 1:27 PM Kyungmin Park\n" "<kyungmin.park@samsung.com> wrote:\n" "> To: Sangbeom Kim\n" - "> Cc: linux-arm-kernel@lists.infradead.org; linux-samsung-\n" - "> soc@vger.kernel.org; kgene.kim@samsung.com; ben-linux@fluff.org\n" + "> Cc: linux-arm-kernel at lists.infradead.org; linux-samsung-\n" + "> soc at vger.kernel.org; kgene.kim at samsung.com; ben-linux at fluff.org\n" "> Subject: Re: [PATCH 2/3] ARM: S5P: Update machine initialization for HRT\n" "> \n" "> Acked-by: Kyungmin Park <kyungmin.park@samsung.com>\n" @@ -46,18 +42,18 @@ "> On Sat, Feb 26, 2011 at 11:45 AM, Sangbeom Kim <sbkim73@samsung.com>\n" "wrote:\n" "> > This patch update mach-s5p64x0 and mach-s5pv210\n" - "> > machine \302\240initialization for hrt support\n" + "> > machine ?initialization for hrt support\n" "> >\n" "> > Signed-off-by: Sangbeom Kim <sbkim73@samsung.com>\n" "> > ---\n" - "> > \302\240arch/arm/mach-s5p64x0/mach-smdk6440.c | \302\240 \302\2404 +++-\n" - "> > \302\240arch/arm/mach-s5p64x0/mach-smdk6450.c | \302\240 \302\2404 +++-\n" - "> > \302\240arch/arm/mach-s5pv210/mach-aquila.c \302\240 | \302\240 \302\2404 +++-\n" - "> > \302\240arch/arm/mach-s5pv210/mach-goni.c \302\240 \302\240 | \302\240 \302\2404 +++-\n" - "> > \302\240arch/arm/mach-s5pv210/mach-smdkc110.c | \302\240 \302\2404 +++-\n" - "> > \302\240arch/arm/mach-s5pv210/mach-smdkv210.c | \302\240 \302\2404 +++-\n" - "> > \302\240arch/arm/mach-s5pv210/mach-torbreck.c | \302\240 \302\2404 +++-\n" - "> > \302\2407 files changed, 21 insertions(+), 7 deletions(-)\n" + "> > ?arch/arm/mach-s5p64x0/mach-smdk6440.c | ? ?4 +++-\n" + "> > ?arch/arm/mach-s5p64x0/mach-smdk6450.c | ? ?4 +++-\n" + "> > ?arch/arm/mach-s5pv210/mach-aquila.c ? | ? ?4 +++-\n" + "> > ?arch/arm/mach-s5pv210/mach-goni.c ? ? | ? ?4 +++-\n" + "> > ?arch/arm/mach-s5pv210/mach-smdkc110.c | ? ?4 +++-\n" + "> > ?arch/arm/mach-s5pv210/mach-smdkv210.c | ? ?4 +++-\n" + "> > ?arch/arm/mach-s5pv210/mach-torbreck.c | ? ?4 +++-\n" + "> > ?7 files changed, 21 insertions(+), 7 deletions(-)\n" "> >\n" "> > diff --git a/arch/arm/mach-s5p64x0/mach-smdk6440.c b/arch/arm/mach-\n" "> s5p64x0/mach-smdk6440.c\n" @@ -65,219 +61,219 @@ "> > --- a/arch/arm/mach-s5p64x0/mach-smdk6440.c\n" "> > +++ b/arch/arm/mach-s5p64x0/mach-smdk6440.c\n" "> > @@ -43,6 +43,7 @@\n" - "> > \302\240#include <plat/pll.h>\n" - "> > \302\240#include <plat/adc.h>\n" - "> > \302\240#include <plat/ts.h>\n" + "> > ?#include <plat/pll.h>\n" + "> > ?#include <plat/adc.h>\n" + "> > ?#include <plat/ts.h>\n" "> > +#include <plat/s5p-time.h>\n" "> >\n" - "> > \302\240#define SMDK6440_UCON_DEFAULT \302\240(S3C2410_UCON_TXILEVEL | \302\240 \302\240 \302\240 \302\240\\\n" - "> > \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240S3C2410_UCON_RXILEVEL | \302\240 \302\240 \302\240 \302\240 \\\n" + "> > ?#define SMDK6440_UCON_DEFAULT ?(S3C2410_UCON_TXILEVEL | ? ? ? ?\\\n" + "> > ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?S3C2410_UCON_RXILEVEL | ? ? ? ? \\\n" "> > @@ -136,6 +137,7 @@ static void __init smdk6440_map_io(void)\n" - "> > \302\240 \302\240 \302\240 \302\240s5p_init_io(NULL, 0, S5P64X0_SYS_ID);\n" - "> > \302\240 \302\240 \302\240 \302\240s3c24xx_init_clocks(12000000);\n" - "> > \302\240 \302\240 \302\240 \302\240s3c24xx_init_uarts(smdk6440_uartcfgs,\n" + "> > ? ? ? ?s5p_init_io(NULL, 0, S5P64X0_SYS_ID);\n" + "> > ? ? ? ?s3c24xx_init_clocks(12000000);\n" + "> > ? ? ? ?s3c24xx_init_uarts(smdk6440_uartcfgs,\n" "> ARRAY_SIZE(smdk6440_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 smdk6440_machine_init(void)\n" + "> > ?static void __init smdk6440_machine_init(void)\n" "> > @@ -159,5 +161,5 @@ MACHINE_START(SMDK6440, \"SMDK6440\")\n" - "> > \302\240 \302\240 \302\240 \302\240.init_irq \302\240 \302\240 \302\240 = s5p6440_init_irq,\n" - "> > \302\240 \302\240 \302\240 \302\240.map_io \302\240 \302\240 \302\240 \302\240 = smdk6440_map_io,\n" - "> > \302\240 \302\240 \302\240 \302\240.init_machine \302\240 = smdk6440_machine_init,\n" - "> > - \302\240 \302\240 \302\240 .timer \302\240 \302\240 \302\240 \302\240 \302\240= &s3c24xx_timer,\n" - "> > + \302\240 \302\240 \302\240 .timer \302\240 \302\240 \302\240 \302\240 \302\240= &s5p_timer,\n" - "> > \302\240MACHINE_END\n" + "> > ? ? ? ?.init_irq ? ? ? = s5p6440_init_irq,\n" + "> > ? ? ? ?.map_io ? ? ? ? = smdk6440_map_io,\n" + "> > ? ? ? ?.init_machine ? = smdk6440_machine_init,\n" + "> > - ? ? ? .timer ? ? ? ? ?= &s3c24xx_timer,\n" + "> > + ? ? ? .timer ? ? ? ? ?= &s5p_timer,\n" + "> > ?MACHINE_END\n" "> > diff --git a/arch/arm/mach-s5p64x0/mach-smdk6450.c b/arch/arm/mach-\n" "> s5p64x0/mach-smdk6450.c\n" "> > index 3a20de0..686ec56 100644\n" "> > --- a/arch/arm/mach-s5p64x0/mach-smdk6450.c\n" "> > +++ b/arch/arm/mach-s5p64x0/mach-smdk6450.c\n" "> > @@ -43,6 +43,7 @@\n" - "> > \302\240#include <plat/pll.h>\n" - "> > \302\240#include <plat/adc.h>\n" - "> > \302\240#include <plat/ts.h>\n" + "> > ?#include <plat/pll.h>\n" + "> > ?#include <plat/adc.h>\n" + "> > ?#include <plat/ts.h>\n" "> > +#include <plat/s5p-time.h>\n" "> >\n" - "> > \302\240#define SMDK6450_UCON_DEFAULT \302\240(S3C2410_UCON_TXILEVEL | \302\240 \302\240 \302\240 \302\240\\\n" - "> > \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240S3C2410_UCON_RXILEVEL | \302\240 \302\240 \302\240 \302\240 \\\n" + "> > ?#define SMDK6450_UCON_DEFAULT ?(S3C2410_UCON_TXILEVEL | ? ? ? ?\\\n" + "> > ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?S3C2410_UCON_RXILEVEL | ? ? ? ? \\\n" "> > @@ -155,6 +156,7 @@ static void __init smdk6450_map_io(void)\n" - "> > \302\240 \302\240 \302\240 \302\240s5p_init_io(NULL, 0, S5P64X0_SYS_ID);\n" - "> > \302\240 \302\240 \302\240 \302\240s3c24xx_init_clocks(19200000);\n" - "> > \302\240 \302\240 \302\240 \302\240s3c24xx_init_uarts(smdk6450_uartcfgs,\n" + "> > ? ? ? ?s5p_init_io(NULL, 0, S5P64X0_SYS_ID);\n" + "> > ? ? ? ?s3c24xx_init_clocks(19200000);\n" + "> > ? ? ? ?s3c24xx_init_uarts(smdk6450_uartcfgs,\n" "> ARRAY_SIZE(smdk6450_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 smdk6450_machine_init(void)\n" + "> > ?static void __init smdk6450_machine_init(void)\n" "> > @@ -178,5 +180,5 @@ MACHINE_START(SMDK6450, \"SMDK6450\")\n" - "> > \302\240 \302\240 \302\240 \302\240.init_irq \302\240 \302\240 \302\240 = s5p6450_init_irq,\n" - "> > \302\240 \302\240 \302\240 \302\240.map_io \302\240 \302\240 \302\240 \302\240 = smdk6450_map_io,\n" - "> > \302\240 \302\240 \302\240 \302\240.init_machine \302\240 = smdk6450_machine_init,\n" - "> > - \302\240 \302\240 \302\240 .timer \302\240 \302\240 \302\240 \302\240 \302\240= &s3c24xx_timer,\n" - "> > + \302\240 \302\240 \302\240 .timer \302\240 \302\240 \302\240 \302\240 \302\240= &s5p_timer,\n" - "> > \302\240MACHINE_END\n" + "> > ? ? ? ?.init_irq ? ? ? = s5p6450_init_irq,\n" + "> > ? ? ? ?.map_io ? ? ? ? = smdk6450_map_io,\n" + "> > ? ? ? ?.init_machine ? = smdk6450_machine_init,\n" + "> > - ? ? ? .timer ? ? ? ? ?= &s3c24xx_timer,\n" + "> > + ? ? ? .timer ? ? ? ? ?= &s5p_timer,\n" + "> > ?MACHINE_END\n" "> > diff --git a/arch/arm/mach-s5pv210/mach-aquila.c b/arch/arm/mach-\n" "> s5pv210/mach-aquila.c\n" "> > index 557add4..fab84f3 100644\n" "> > --- a/arch/arm/mach-s5pv210/mach-aquila.c\n" "> > +++ b/arch/arm/mach-s5pv210/mach-aquila.c\n" "> > @@ -39,6 +39,7 @@\n" - "> > \302\240#include <plat/fb.h>\n" - "> > \302\240#include <plat/fimc-core.h>\n" - "> > \302\240#include <plat/sdhci.h>\n" + "> > ?#include <plat/fb.h>\n" + "> > ?#include <plat/fimc-core.h>\n" + "> > ?#include <plat/sdhci.h>\n" "> > +#include <plat/s5p-time.h>\n" "> >\n" - "> > \302\240/* Following are default values for UCON, ULCON and UFCON UART\n" + "> > ?/* Following are default values for UCON, ULCON and UFCON UART\n" "> registers */\n" - "> > \302\240#define AQUILA_UCON_DEFAULT \302\240 \302\240(S3C2410_UCON_TXILEVEL | \302\240 \302\240 \302\240 \302\240\\\n" + "> > ?#define AQUILA_UCON_DEFAULT ? ?(S3C2410_UCON_TXILEVEL | ? ? ? ?\\\n" "> > @@ -664,6 +665,7 @@ static void __init aquila_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(aquila_uartcfgs, ARRAY_SIZE(aquila_uartcfgs));\n" - "> > + \302\240 \302\240 \302\240 s5p_set_timer_source(S5P_PWM2, S5P_PWM4);\n" - "> > \302\240}\n" + "> > ? ? ? ?s5p_init_io(NULL, 0, S5P_VA_CHIPID);\n" + "> > ? ? ? ?s3c24xx_init_clocks(24000000);\n" + "> > ? ? ? ?s3c24xx_init_uarts(aquila_uartcfgs, ARRAY_SIZE(aquila_uartcfgs));\n" + "> > + ? ? ? s5p_set_timer_source(S5P_PWM2, S5P_PWM4);\n" + "> > ?}\n" "> >\n" - "> > \302\240static void __init aquila_machine_init(void)\n" + "> > ?static void __init aquila_machine_init(void)\n" "> > @@ -698,5 +700,5 @@ MACHINE_START(AQUILA, \"Aquila\")\n" - "> > \302\240 \302\240 \302\240 \302\240.init_irq \302\240 \302\240 \302\240 = s5pv210_init_irq,\n" - "> > \302\240 \302\240 \302\240 \302\240.map_io \302\240 \302\240 \302\240 \302\240 = aquila_map_io,\n" - "> > \302\240 \302\240 \302\240 \302\240.init_machine \302\240 = aquila_machine_init,\n" - "> > - \302\240 \302\240 \302\240 .timer \302\240 \302\240 \302\240 \302\240 \302\240= &s3c24xx_timer,\n" - "> > + \302\240 \302\240 \302\240 .timer \302\240 \302\240 \302\240 \302\240 \302\240= &s5p_timer,\n" - "> > \302\240MACHINE_END\n" + "> > ? ? ? ?.init_irq ? ? ? = s5pv210_init_irq,\n" + "> > ? ? ? ?.map_io ? ? ? ? = aquila_map_io,\n" + "> > ? ? ? ?.init_machine ? = aquila_machine_init,\n" + "> > - ? ? ? .timer ? ? ? ? ?= &s3c24xx_timer,\n" + "> > + ? ? ? .timer ? ? ? ? ?= &s5p_timer,\n" + "> > ?MACHINE_END\n" "> > diff --git a/arch/arm/mach-s5pv210/mach-goni.c b/arch/arm/mach-\n" "> s5pv210/mach-goni.c\n" "> > index 056f5c7..5eda4a1 100644\n" "> > --- a/arch/arm/mach-s5pv210/mach-goni.c\n" "> > +++ b/arch/arm/mach-s5pv210/mach-goni.c\n" "> > @@ -45,6 +45,7 @@\n" - "> > \302\240#include <plat/keypad.h>\n" - "> > \302\240#include <plat/sdhci.h>\n" - "> > \302\240#include <plat/clock.h>\n" + "> > ?#include <plat/keypad.h>\n" + "> > ?#include <plat/sdhci.h>\n" + "> > ?#include <plat/clock.h>\n" "> > +#include <plat/s5p-time.h>\n" "> >\n" - "> > \302\240/* Following are default values for UCON, ULCON and UFCON UART\n" + "> > ?/* Following are default values for UCON, ULCON and UFCON UART\n" "> registers */\n" - "> > \302\240#define GONI_UCON_DEFAULT \302\240 \302\240 \302\240(S3C2410_UCON_TXILEVEL | \302\240 \302\240 \302\240 \302\240\\\n" + "> > ?#define GONI_UCON_DEFAULT ? ? ?(S3C2410_UCON_TXILEVEL | ? ? ? ?\\\n" "> > @@ -823,6 +824,7 @@ static void __init goni_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(goni_uartcfgs, ARRAY_SIZE(goni_uartcfgs));\n" - "> > + \302\240 \302\240 \302\240 s5p_set_timer_source(S5P_PWM2, S5P_PWM4);\n" - "> > \302\240}\n" + "> > ? ? ? ?s5p_init_io(NULL, 0, S5P_VA_CHIPID);\n" + "> > ? ? ? ?s3c24xx_init_clocks(24000000);\n" + "> > ? ? ? ?s3c24xx_init_uarts(goni_uartcfgs, ARRAY_SIZE(goni_uartcfgs));\n" + "> > + ? ? ? s5p_set_timer_source(S5P_PWM2, S5P_PWM4);\n" + "> > ?}\n" "> >\n" - "> > \302\240static void __init goni_machine_init(void)\n" + "> > ?static void __init goni_machine_init(void)\n" "> > @@ -873,5 +875,5 @@ MACHINE_START(GONI, \"GONI\")\n" - "> > \302\240 \302\240 \302\240 \302\240.init_irq \302\240 \302\240 \302\240 = s5pv210_init_irq,\n" - "> > \302\240 \302\240 \302\240 \302\240.map_io \302\240 \302\240 \302\240 \302\240 = goni_map_io,\n" - "> > \302\240 \302\240 \302\240 \302\240.init_machine \302\240 = goni_machine_init,\n" - "> > - \302\240 \302\240 \302\240 .timer \302\240 \302\240 \302\240 \302\240 \302\240= &s3c24xx_timer,\n" - "> > + \302\240 \302\240 \302\240 .timer \302\240 \302\240 \302\240 \302\240 \302\240= &s5p_timer,\n" - "> > \302\240MACHINE_END\n" + "> > ? ? ? ?.init_irq ? ? ? = s5pv210_init_irq,\n" + "> > ? ? ? ?.map_io ? ? ? ? = goni_map_io,\n" + "> > ? ? ? ?.init_machine ? = goni_machine_init,\n" + "> > - ? ? ? .timer ? ? ? ? ?= &s3c24xx_timer,\n" + "> > + ? ? ? .timer ? ? ? ? ?= &s5p_timer,\n" + "> > ?MACHINE_END\n" "> > diff --git a/arch/arm/mach-s5pv210/mach-smdkc110.c b/arch/arm/mach-\n" "> s5pv210/mach-smdkc110.c\n" "> > index ce11a02..f304383 100644\n" "> > --- a/arch/arm/mach-s5pv210/mach-smdkc110.c\n" "> > +++ b/arch/arm/mach-s5pv210/mach-smdkc110.c\n" "> > @@ -30,6 +30,7 @@\n" - "> > \302\240#include <plat/ata.h>\n" - "> > \302\240#include <plat/iic.h>\n" - "> > \302\240#include <plat/pm.h>\n" + "> > ?#include <plat/ata.h>\n" + "> > ?#include <plat/iic.h>\n" + "> > ?#include <plat/pm.h>\n" "> > +#include <plat/s5p-time.h>\n" "> >\n" - "> > \302\240/* Following are default values for UCON, ULCON and UFCON UART\n" + "> > ?/* Following are default values for UCON, ULCON and UFCON UART\n" "> registers */\n" - "> > \302\240#define SMDKC110_UCON_DEFAULT \302\240(S3C2410_UCON_TXILEVEL | \302\240 \302\240 \302\240 \302\240\\\n" + "> > ?#define SMDKC110_UCON_DEFAULT ?(S3C2410_UCON_TXILEVEL | ? ? ? ?\\\n" "> > @@ -111,6 +112,7 @@ static void __init smdkc110_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(smdkv210_uartcfgs,\n" + "> > ? ? ? ?s5p_init_io(NULL, 0, S5P_VA_CHIPID);\n" + "> > ? ? ? ?s3c24xx_init_clocks(24000000);\n" + "> > ? ? ? ?s3c24xx_init_uarts(smdkv210_uartcfgs,\n" "> ARRAY_SIZE(smdkv210_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 smdkc110_machine_init(void)\n" + "> > ?static void __init smdkc110_machine_init(void)\n" "> > @@ -138,5 +140,5 @@ MACHINE_START(SMDKC110, \"SMDKC110\")\n" - "> > \302\240 \302\240 \302\240 \302\240.init_irq \302\240 \302\240 \302\240 = s5pv210_init_irq,\n" - "> > \302\240 \302\240 \302\240 \302\240.map_io \302\240 \302\240 \302\240 \302\240 = smdkc110_map_io,\n" - "> > \302\240 \302\240 \302\240 \302\240.init_machine \302\240 = smdkc110_machine_init,\n" - "> > - \302\240 \302\240 \302\240 .timer \302\240 \302\240 \302\240 \302\240 \302\240= &s3c24xx_timer,\n" - "> > + \302\240 \302\240 \302\240 .timer \302\240 \302\240 \302\240 \302\240 \302\240= &s5p_timer,\n" - "> > \302\240MACHINE_END\n" + "> > ? ? ? ?.init_irq ? ? ? = s5pv210_init_irq,\n" + "> > ? ? ? ?.map_io ? ? ? ? = smdkc110_map_io,\n" + "> > ? ? ? ?.init_machine ? = smdkc110_machine_init,\n" + "> > - ? ? ? .timer ? ? ? ? ?= &s3c24xx_timer,\n" + "> > + ? ? ? .timer ? ? ? ? ?= &s5p_timer,\n" + "> > ?MACHINE_END\n" "> > diff --git a/arch/arm/mach-s5pv210/mach-smdkv210.c b/arch/arm/mach-\n" "> s5pv210/mach-smdkv210.c\n" "> > index bc9fdb5..41080bf 100644\n" "> > --- a/arch/arm/mach-s5pv210/mach-smdkv210.c\n" "> > +++ b/arch/arm/mach-s5pv210/mach-smdkv210.c\n" "> > @@ -43,6 +43,7 @@\n" - "> > \302\240#include <plat/keypad.h>\n" - "> > \302\240#include <plat/pm.h>\n" - "> > \302\240#include <plat/fb.h>\n" + "> > ?#include <plat/keypad.h>\n" + "> > ?#include <plat/pm.h>\n" + "> > ?#include <plat/fb.h>\n" "> > +#include <plat/s5p-time.h>\n" "> >\n" - "> > \302\240/* Following are default values for UCON, ULCON and UFCON UART\n" + "> > ?/* Following are default values for UCON, ULCON and UFCON UART\n" "> registers */\n" - "> > \302\240#define SMDKV210_UCON_DEFAULT \302\240(S3C2410_UCON_TXILEVEL | \302\240 \302\240 \302\240 \302\240\\\n" + "> > ?#define SMDKV210_UCON_DEFAULT ?(S3C2410_UCON_TXILEVEL | ? ? ? ?\\\n" "> > @@ -272,6 +273,7 @@ static void __init smdkv210_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(smdkv210_uartcfgs,\n" + "> > ? ? ? ?s5p_init_io(NULL, 0, S5P_VA_CHIPID);\n" + "> > ? ? ? ?s3c24xx_init_clocks(24000000);\n" + "> > ? ? ? ?s3c24xx_init_uarts(smdkv210_uartcfgs,\n" "> ARRAY_SIZE(smdkv210_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 smdkv210_machine_init(void)\n" + "> > ?static void __init smdkv210_machine_init(void)\n" "> > @@ -306,5 +308,5 @@ MACHINE_START(SMDKV210, \"SMDKV210\")\n" - "> > \302\240 \302\240 \302\240 \302\240.init_irq \302\240 \302\240 \302\240 = s5pv210_init_irq,\n" - "> > \302\240 \302\240 \302\240 \302\240.map_io \302\240 \302\240 \302\240 \302\240 = smdkv210_map_io,\n" - "> > \302\240 \302\240 \302\240 \302\240.init_machine \302\240 = smdkv210_machine_init,\n" - "> > - \302\240 \302\240 \302\240 .timer \302\240 \302\240 \302\240 \302\240 \302\240= &s3c24xx_timer,\n" - "> > + \302\240 \302\240 \302\240 .timer \302\240 \302\240 \302\240 \302\240 \302\240= &s5p_timer,\n" - "> > \302\240MACHINE_END\n" + "> > ? ? ? ?.init_irq ? ? ? = s5pv210_init_irq,\n" + "> > ? ? ? ?.map_io ? ? ? ? = smdkv210_map_io,\n" + "> > ? ? ? ?.init_machine ? = smdkv210_machine_init,\n" + "> > - ? ? ? .timer ? ? ? ? ?= &s3c24xx_timer,\n" + "> > + ? ? ? .timer ? ? ? ? ?= &s5p_timer,\n" + "> > ?MACHINE_END\n" "> > diff --git a/arch/arm/mach-s5pv210/mach-torbreck.c b/arch/arm/mach-\n" "> s5pv210/mach-torbreck.c\n" "> > index 043c938..b3516a1 100644\n" "> > --- a/arch/arm/mach-s5pv210/mach-torbreck.c\n" "> > +++ b/arch/arm/mach-s5pv210/mach-torbreck.c\n" "> > @@ -27,6 +27,7 @@\n" - "> > \302\240#include <plat/devs.h>\n" - "> > \302\240#include <plat/cpu.h>\n" - "> > \302\240#include <plat/iic.h>\n" + "> > ?#include <plat/devs.h>\n" + "> > ?#include <plat/cpu.h>\n" + "> > ?#include <plat/iic.h>\n" "> > +#include <plat/s5p-time.h>\n" "> >\n" - "> > \302\240/* Following are default values for UCON, ULCON and UFCON UART\n" + "> > ?/* Following are default values for UCON, ULCON and UFCON UART\n" "> registers */\n" - "> > \302\240#define TORBRECK_UCON_DEFAULT \302\240(S3C2410_UCON_TXILEVEL | \302\240 \302\240 \302\240 \302\240\\\n" + "> > ?#define TORBRECK_UCON_DEFAULT ?(S3C2410_UCON_TXILEVEL | ? ? ? ?\\\n" "> > @@ -104,6 +105,7 @@ static void __init torbreck_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(torbreck_uartcfgs,\n" + "> > ? ? ? ?s5p_init_io(NULL, 0, S5P_VA_CHIPID);\n" + "> > ? ? ? ?s3c24xx_init_clocks(24000000);\n" + "> > ? ? ? ?s3c24xx_init_uarts(torbreck_uartcfgs,\n" "> ARRAY_SIZE(torbreck_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 torbreck_machine_init(void)\n" + "> > ?static void __init torbreck_machine_init(void)\n" "> > @@ -127,5 +129,5 @@ MACHINE_START(TORBRECK, \"TORBRECK\")\n" - "> > \302\240 \302\240 \302\240 \302\240.init_irq \302\240 \302\240 \302\240 = s5pv210_init_irq,\n" - "> > \302\240 \302\240 \302\240 \302\240.map_io \302\240 \302\240 \302\240 \302\240 = torbreck_map_io,\n" - "> > \302\240 \302\240 \302\240 \302\240.init_machine \302\240 = torbreck_machine_init,\n" - "> > - \302\240 \302\240 \302\240 .timer \302\240 \302\240 \302\240 \302\240 \302\240= &s3c24xx_timer,\n" - "> > + \302\240 \302\240 \302\240 .timer \302\240 \302\240 \302\240 \302\240 \302\240= &s5p_timer,\n" - "> > \302\240MACHINE_END\n" + "> > ? ? ? ?.init_irq ? ? ? = s5pv210_init_irq,\n" + "> > ? ? ? ?.map_io ? ? ? ? = torbreck_map_io,\n" + "> > ? ? ? ?.init_machine ? = torbreck_machine_init,\n" + "> > - ? ? ? .timer ? ? ? ? ?= &s3c24xx_timer,\n" + "> > + ? ? ? .timer ? ? ? ? ?= &s5p_timer,\n" + "> > ?MACHINE_END\n" "> > --\n" "> > 1.7.1\n" "> >\n" "> > --\n" "> > To unsubscribe from this list: send the line \"unsubscribe linux-samsung-\n" "> 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" "> >\n" "> --\n" "> To unsubscribe from this list: send the line \"unsubscribe linux-samsung-\n" "> soc\" in\n" - "> the body of a message to majordomo@vger.kernel.org\n" + "> the body of a message to majordomo at vger.kernel.org\n" > More majordomo info at http://vger.kernel.org/majordomo-info.html -b0f453750c01cd79ace687c419250fccab617ac275e0567fac977691a4fb3615 +93ba360a13932b517d5756d92f193db706a057594f78e5f1f5e3402c6eb51045
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.