From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sangbeom Kim Subject: RE: [PATCH v4 5/8] ARM: S5PV310: Add Timer support Date: Tue, 27 Jul 2010 13:12:16 +0900 Message-ID: <00ce01cb2d41$e8a913b0$b9fb3b10$@com> References: <1280148176-8985-1-git-send-email-kgene.kim@samsung.com> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Received: from mailout1.samsung.com ([203.254.224.24]:46109 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750770Ab0G0EMM convert rfc822-to-8bit (ORCPT ); Tue, 27 Jul 2010 00:12:12 -0400 Received: from epmmp2 (mailout1.samsung.com [203.254.224.24]) by mailout1.samsung.com (Sun Java(tm) System Messaging Server 7u3-15.01 64bit (built Feb 12 2010)) with ESMTP id <0L67006Q17O9GB40@mailout1.samsung.com> for linux-samsung-soc@vger.kernel.org; Tue, 27 Jul 2010 13:12:09 +0900 (KST) Received: from sbkim735 ([12.23.103.65]) by mmp2.samsung.com (iPlanet Messaging Server 5.2 Patch 2 (built Jul 14 2004)) with ESMTPA id <0L6700L7R7O9M2@mmp2.samsung.com> for linux-samsung-soc@vger.kernel.org; Tue, 27 Jul 2010 13:12:09 +0900 (KST) In-reply-to: Content-language: ko Sender: linux-samsung-soc-owner@vger.kernel.org List-Id: linux-samsung-soc@vger.kernel.org To: 'Kyungmin Park' , 'Kukjin Kim' Cc: 'Hyuk Lee' , linux-samsung-soc@vger.kernel.org, 'Changhwan Youn' , ben-linux@fluff.org, linux-arm-kernel@lists.infradead.org Hi! Kyungmin, After booting, clock event is generated by 2 arm private timers. What do you mean by 'change the pwm2 pin to i2c functions' ? What do you use for I2C emulation? (TOUT2 or gpio) Could you explain it in detail? Thanks and regards, Sangbeom Kim Kyungmin Park wrote: >Can you confirm that during boot time, change the pwm2 pin to i2c >functions and still it's working correctly? > >1. pwm2 is used for clock event at first boot. >2. during i2c init, pwm2 pin is changed to i2c functionality. > >then where can get the clockevent? > >Another possible scenarios is that. >pwm2 pin is changed to i2c function at bootloader to access the i2c ch= ips. >Then below code is working? > >Thank you, >Kyungmin Park > >On Mon, Jul 26, 2010 at 9:42 PM, Kukjin Kim wr= ote: >> From: Changhwan Youn >> >> This patch adds timer support for S5PV310. =A0Until now, all S5P SoC= s >> use CONFIG_ARCH_USES_GETTIMEOFFSET macro as a default configuration. >> Instead,S5PV310 implements clocksource and clock_event_device to >> support the high resolution timer and tickless system. >> >> Signed-off-by: Changhwan Youn >> Signed-off-by: Hyuk Lee >> Signed-off-by: Kukjin Kim >> --- >> Changes since v3: >> >> - Changes clock source from PWM2 to PWM4 because PWM4 cannot be used= for >> =A0other purpose such as external output function through GPIO. >> >> =A0arch/arm/mach-s5pv310/include/mach/pwm-clock.h | =A0 70 ++++++ >> =A0arch/arm/mach-s5pv310/localtimer.c =A0 =A0 =A0 =A0 =A0 =A0 | =A0 = 25 ++ >> =A0arch/arm/mach-s5pv310/time.c =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = | =A0287 >++++++++++++++++++++++++ >> =A0arch/arm/plat-s5p/include/plat/s5pv310.h =A0 =A0 =A0 | =A0 =A01 + >> =A0arch/arm/plat-samsung/Makefile =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 | = =A0 =A02 +- >> =A05 files changed, 384 insertions(+), 1 deletions(-) >> =A0create mode 100644 arch/arm/mach-s5pv310/include/mach/pwm-clock.h >> =A0create mode 100644 arch/arm/mach-s5pv310/localtimer.c >> =A0create mode 100644 arch/arm/mach-s5pv310/time.c >> >> diff --git a/arch/arm/mach-s5pv310/include/mach/pwm-clock.h >b/arch/arm/mach-s5pv310/include/mach/pwm-clock.h >> new file mode 100644 >> index 0000000..7e6da27 >> --- /dev/null >> +++ b/arch/arm/mach-s5pv310/include/mach/pwm-clock.h >> @@ -0,0 +1,70 @@ >> +/* linux/arch/arm/mach-s5pv310/include/mach/pwm-clock.h >> + * >> + * Copyright (c) 2010 Samsung Electronics Co., Ltd. >> + * =A0 =A0 =A0 =A0 =A0 =A0 http://www.samsung.com/ >> + * >> + * Copyright 2008 Openmoko, Inc. >> + * Copyright 2008 Simtec Electronics >> + * =A0 =A0 =A0Ben Dooks >> + * =A0 =A0 =A0http://armlinux.simtec.co.uk/ >> + * >> + * Based on arch/arm/mach-s3c64xx/include/mach/pwm-clock.h >> + * >> + * S5PV310 - pwm clock and timer support >> + * >> + * This program is free software; you can redistribute it and/or mo= dify >> + * it under the terms of the GNU General Public License version 2 a= s >> + * published by the Free Software Foundation. >> +*/ >> + >> +#ifndef __ASM_ARCH_PWMCLK_H >> +#define __ASM_ARCH_PWMCLK_H __FILE__ >> + >> +/** >> + * pwm_cfg_src_is_tclk() - return whether the given mux config is a= tclk >> + * @tcfg: The timer TCFG1 register bits shifted down to 0. >> + * >> + * Return true if the given configuration from TCFG1 is a TCLK inst= ead >> + * any of the TDIV clocks. >> + */ >> +static inline int pwm_cfg_src_is_tclk(unsigned long tcfg) >> +{ >> + =A0 =A0 =A0 return tcfg =3D=3D S3C64XX_TCFG1_MUX_TCLK; >> +} >> + >> +/** >> + * tcfg_to_divisor() - convert tcfg1 setting to a divisor >> + * @tcfg1: The tcfg1 setting, shifted down. >> + * >> + * Get the divisor value for the given tcfg1 setting. We assume the >> + * caller has already checked to see if this is not a TCLK source. >> + */ >> +static inline unsigned long tcfg_to_divisor(unsigned long tcfg1) >> +{ >> + =A0 =A0 =A0 return 1 << tcfg1; >> +} >> + >> +/** >> + * pwm_tdiv_has_div1() - does the tdiv setting have a /1 >> + * >> + * Return true if we have a /1 in the tdiv setting. >> + */ >> +static inline unsigned int pwm_tdiv_has_div1(void) >> +{ >> + =A0 =A0 =A0 return 1; >> +} >> + >> +/** >> + * pwm_tdiv_div_bits() - calculate TCFG1 divisor value. >> + * @div: The divisor to calculate the bit information for. >> + * >> + * Turn a divisor into the necessary bit field for TCFG1. >> + */ >> +static inline unsigned long pwm_tdiv_div_bits(unsigned int div) >> +{ >> + =A0 =A0 =A0 return ilog2(div); >> +} >> + >> +#define S3C_TCFG1_MUX_TCLK S3C64XX_TCFG1_MUX_TCLK >> + >> +#endif /* __ASM_ARCH_PWMCLK_H */ >> diff --git a/arch/arm/mach-s5pv310/localtimer.c b/arch/arm/mach- >s5pv310/localtimer.c >> new file mode 100644 >> index 0000000..2784036 >> --- /dev/null >> +++ b/arch/arm/mach-s5pv310/localtimer.c >> @@ -0,0 +1,25 @@ >> +/* linux/arch/arm/mach-s5pv310/localtimer.c >> + * >> + * Cloned from linux/arch/arm/mach-realview/localtimer.c >> + * >> + * =A0Copyright (C) 2002 ARM Ltd. >> + * =A0All Rights Reserved >> + * >> + * This program is free software; you can redistribute it and/or mo= dify >> + * it under the terms of the GNU General Public License version 2 a= s >> + * published by the Free Software Foundation. >> +*/ >> + >> +#include >> + >> +#include >> +#include >> + >> +/* >> + * Setup the local clock events for a CPU. >> + */ >> +void __cpuinit local_timer_setup(struct clock_event_device *evt) >> +{ >> + =A0 =A0 =A0 evt->irq =3D IRQ_LOCALTIMER; >> + =A0 =A0 =A0 twd_timer_setup(evt); >> +} >> diff --git a/arch/arm/mach-s5pv310/time.c b/arch/arm/mach-s5pv310/ti= me.c >> new file mode 100644 >> index 0000000..01b012a >> --- /dev/null >> +++ b/arch/arm/mach-s5pv310/time.c >> @@ -0,0 +1,287 @@ >> +/* linux/arch/arm/mach-s5pv310/time.c >> + * >> + * Copyright (c) 2010 Samsung Electronics Co., Ltd. >> + * =A0 =A0 =A0 =A0 =A0 =A0 http://www.samsung.com >> + * >> + * S5PV310 (and compatible) HRT support >> + * PWM 2/4 is used for this feature >> + * >> + * This program is free software; you can redistribute it and/or mo= dify >> + * it under the terms of the GNU General Public License version 2 a= s >> + * published by the Free Software Foundation. >> +*/ >> + >> +#include >> +#include >> +#include >> +#include >> +#include >> +#include >> +#include >> + >> +#include >> + >> +#include >> +#include >> +#include >> + >> +static unsigned long clock_count_per_tick; >> + >> +static struct clk *tin2; >> +static struct clk *tin4; >> +static struct clk *tdiv2; >> +static struct clk *tdiv4; >> +static struct clk *timerclk; >> + >> +static void s5pv310_pwm_stop(unsigned int pwm_id) >> +{ >> + =A0 =A0 =A0 unsigned long tcon; >> + >> + =A0 =A0 =A0 tcon =3D __raw_readl(S3C2410_TCON); >> + >> + =A0 =A0 =A0 switch (pwm_id) { >> + =A0 =A0 =A0 case 2: >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 tcon &=3D ~S3C2410_TCON_T2START; >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 break; >> + =A0 =A0 =A0 case 4: >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 tcon &=3D ~S3C2410_TCON_T4START; >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 break; >> + =A0 =A0 =A0 default: >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 break; >> + =A0 =A0 =A0 } >> + =A0 =A0 =A0 __raw_writel(tcon, S3C2410_TCON); >> +} >> + >> +static void s5pv310_pwm_init(unsigned int pwm_id, unsigned long tcn= t) >> +{ >> + =A0 =A0 =A0 unsigned long tcon; >> + >> + =A0 =A0 =A0 tcon =3D __raw_readl(S3C2410_TCON); >> + >> + =A0 =A0 =A0 /* timers reload after counting zero, so reduce the co= unt by 1 */ >> + =A0 =A0 =A0 tcnt--; >> + >> + =A0 =A0 =A0 /* ensure timer is stopped... */ >> + =A0 =A0 =A0 switch (pwm_id) { >> + =A0 =A0 =A0 case 2: >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 tcon &=3D ~(0xf<<12); >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 tcon |=3D S3C2410_TCON_T2MANUALUPD; >> + >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 __raw_writel(tcnt, S3C2410_TCNTB(2)); >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 __raw_writel(tcnt, S3C2410_TCMPB(2)); >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 __raw_writel(tcon, S3C2410_TCON); >> + >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 break; >> + =A0 =A0 =A0 case 4: >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 tcon &=3D ~(7<<20); >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 tcon |=3D S3C2410_TCON_T4MANUALUPD; >> + >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 __raw_writel(tcnt, S3C2410_TCNTB(4)); >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 __raw_writel(tcnt, S3C2410_TCMPB(4)); >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 __raw_writel(tcon, S3C2410_TCON); >> + >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 break; >> + =A0 =A0 =A0 default: >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 break; >> + =A0 =A0 =A0 } >> +} >> + >> +static inline void s5pv310_pwm_start(unsigned int pwm_id, bool peri= odic) >> +{ >> + =A0 =A0 =A0 unsigned long tcon; >> + >> + =A0 =A0 =A0 tcon =A0=3D __raw_readl(S3C2410_TCON); >> + >> + =A0 =A0 =A0 switch (pwm_id) { >> + =A0 =A0 =A0 case 2: >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 tcon |=3D S3C2410_TCON_T2START; >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 tcon &=3D ~S3C2410_TCON_T2MANUALUPD; >> + >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (periodic) >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 tcon |=3D S3C2410_TCON= _T2RELOAD; >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 else >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 tcon &=3D ~S3C2410_TCO= N_T2RELOAD; >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 break; >> + =A0 =A0 =A0 case 4: >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 tcon |=3D S3C2410_TCON_T4START; >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 tcon &=3D ~S3C2410_TCON_T4MANUALUPD; >> + >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (periodic) >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 tcon |=3D S3C2410_TCON= _T4RELOAD; >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 else >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 tcon &=3D ~S3C2410_TCO= N_T4RELOAD; >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 break; >> + =A0 =A0 =A0 default: >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 break; >> + =A0 =A0 =A0 } >> + =A0 =A0 =A0 __raw_writel(tcon, S3C2410_TCON); >> +} >> + >> +static int s5pv310_pwm_set_next_event(unsigned long cycles, >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 =A0 struct clock_event_device *evt) >> +{ >> + =A0 =A0 =A0 s5pv310_pwm_init(2, cycles); >> + =A0 =A0 =A0 s5pv310_pwm_start(2, 0); >> + =A0 =A0 =A0 return 0; >> +} >> + >> +static void s5pv310_pwm_set_mode(enum clock_event_mode mode, >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct= clock_event_device *evt) >> +{ >> + =A0 =A0 =A0 s5pv310_pwm_stop(2); >> + >> + =A0 =A0 =A0 switch (mode) { >> + =A0 =A0 =A0 case CLOCK_EVT_MODE_PERIODIC: >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 s5pv310_pwm_init(2, clock_count_per_ti= ck); >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 s5pv310_pwm_start(2, 1); >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 break; >> + =A0 =A0 =A0 case CLOCK_EVT_MODE_ONESHOT: >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 break; >> + =A0 =A0 =A0 case CLOCK_EVT_MODE_UNUSED: >> + =A0 =A0 =A0 case CLOCK_EVT_MODE_SHUTDOWN: >> + =A0 =A0 =A0 case CLOCK_EVT_MODE_RESUME: >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 break; >> + =A0 =A0 =A0 } >> +} >> + >> +static struct clock_event_device pwm_event_device =3D { >> + =A0 =A0 =A0 .name =A0 =A0 =A0 =A0 =A0 =3D "pwm_timer2", >> + =A0 =A0 =A0 .features =A0 =A0 =A0 =3D CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT, >> + =A0 =A0 =A0 .rating =A0 =A0 =A0 =A0 =3D 200, >> + =A0 =A0 =A0 .shift =A0 =A0 =A0 =A0 =A0=3D 32, >> + =A0 =A0 =A0 .set_next_event =3D s5pv310_pwm_set_next_event, >> + =A0 =A0 =A0 .set_mode =A0 =A0 =A0 =3D s5pv310_pwm_set_mode, >> +}; >> + >> +irqreturn_t s5pv310_clock_event_isr(int irq, void *dev_id) >> +{ >> + =A0 =A0 =A0 struct clock_event_device *evt =3D &pwm_event_device; >> + >> + =A0 =A0 =A0 evt->event_handler(evt); >> + >> + =A0 =A0 =A0 return IRQ_HANDLED; >> +} >> + >> +static struct irqaction s5pv310_clock_event_irq =3D { >> + =A0 =A0 =A0 .name =A0 =A0 =A0 =A0 =A0 =3D "pwm_timer2_irq", >> + =A0 =A0 =A0 .flags =A0 =A0 =A0 =A0 =A0=3D IRQF_DISABLED | IRQF_TIM= ER | IRQF_IRQPOLL, >> + =A0 =A0 =A0 .handler =A0 =A0 =A0 =A0=3D s5pv310_clock_event_isr, >> +}; >> + >> +static void __init s5pv310_clockevent_init(void) >> +{ >> + =A0 =A0 =A0 unsigned long pclk; >> + =A0 =A0 =A0 unsigned long clock_rate; >> + =A0 =A0 =A0 struct clk *tscaler; >> + >> + =A0 =A0 =A0 pclk =3D clk_get_rate(timerclk); >> + >> + =A0 =A0 =A0 /* configure clock tick */ >> + >> + =A0 =A0 =A0 tscaler =3D clk_get_parent(tdiv2); >> + >> + =A0 =A0 =A0 clk_set_rate(tscaler, pclk / 2); >> + =A0 =A0 =A0 clk_set_rate(tdiv2, pclk / 2); >> + =A0 =A0 =A0 clk_set_parent(tin2, tdiv2); >> + >> + =A0 =A0 =A0 clock_rate =3D clk_get_rate(tin2); >> + >> + =A0 =A0 =A0 clock_count_per_tick =3D clock_rate / HZ; >> + >> + =A0 =A0 =A0 pwm_event_device.mult =3D >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 div_sc(clock_rate, NSEC_PER_SEC, pwm_e= vent_device.shift); >> + =A0 =A0 =A0 pwm_event_device.max_delta_ns =3D >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 clockevent_delta2ns(-1, &pwm_event_dev= ice); >> + =A0 =A0 =A0 pwm_event_device.min_delta_ns =3D >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 clockevent_delta2ns(1, &pwm_event_devi= ce); >> + >> + =A0 =A0 =A0 pwm_event_device.cpumask =3D cpumask_of(0); >> + =A0 =A0 =A0 clockevents_register_device(&pwm_event_device); >> + >> + =A0 =A0 =A0 setup_irq(IRQ_TIMER2, &s5pv310_clock_event_irq); >> +} >> + >> +static cycle_t s5pv310_pwm4_read(struct clocksource *cs) >> +{ >> + =A0 =A0 =A0 return (cycle_t) ~__raw_readl(S3C_TIMERREG(0x40)); >> +} >> + >> +struct clocksource pwm_clocksource =3D { >> + =A0 =A0 =A0 .name =A0 =A0 =A0 =A0 =A0 =3D "pwm_timer4", >> + =A0 =A0 =A0 .rating =A0 =A0 =A0 =A0 =3D 250, >> + =A0 =A0 =A0 .read =A0 =A0 =A0 =A0 =A0 =3D s5pv310_pwm4_read, >> + =A0 =A0 =A0 .mask =A0 =A0 =A0 =A0 =A0 =3D CLOCKSOURCE_MASK(32), >> + =A0 =A0 =A0 .shift =A0 =A0 =A0 =A0 =A0=3D 20, >> + =A0 =A0 =A0 .flags =A0 =A0 =A0 =A0 =A0=3D CLOCK_SOURCE_IS_CONTINUO= US , >> +}; >> + >> +static void __init s5pv310_clocksource_init(void) >> +{ >> + =A0 =A0 =A0 unsigned long pclk; >> + =A0 =A0 =A0 unsigned long clock_rate; >> + >> + =A0 =A0 =A0 pclk =3D clk_get_rate(timerclk); >> + >> + =A0 =A0 =A0 clk_set_rate(tdiv4, pclk / 2); >> + =A0 =A0 =A0 clk_set_parent(tin4, tdiv4); >> + >> + =A0 =A0 =A0 clock_rate =3D clk_get_rate(tin4); >> + >> + =A0 =A0 =A0 s5pv310_pwm_init(4, ~0); >> + =A0 =A0 =A0 s5pv310_pwm_start(4, 1); >> + >> + =A0 =A0 =A0 pwm_clocksource.mult =3D >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 clocksource_khz2mult(clock_rate/1000, >pwm_clocksource.shift); >> + >> + =A0 =A0 =A0 if (clocksource_register(&pwm_clocksource)) >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 panic("%s: can't register clocksource\= n", >pwm_clocksource.name); >> +} >> + >> +static void __init s5pv310_timer_resources(void) >> +{ >> + =A0 =A0 =A0 struct platform_device tmpdev; >> + >> + =A0 =A0 =A0 tmpdev.dev.bus =3D &platform_bus_type; >> + >> + =A0 =A0 =A0 timerclk =3D clk_get(NULL, "timers"); >> + =A0 =A0 =A0 if (IS_ERR(timerclk)) >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 panic("failed to get timers clock for = system timer"); >> + >> + =A0 =A0 =A0 clk_enable(timerclk); >> + >> + =A0 =A0 =A0 tmpdev.id =3D 2; >> + =A0 =A0 =A0 tin2 =3D clk_get(&tmpdev.dev, "pwm-tin"); >> + =A0 =A0 =A0 if (IS_ERR(tin2)) >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 panic("failed to get pwm-tin2 clock fo= r system timer"); >> + >> + =A0 =A0 =A0 tdiv2 =3D clk_get(&tmpdev.dev, "pwm-tdiv"); >> + =A0 =A0 =A0 if (IS_ERR(tdiv2)) >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 panic("failed to get pwm-tdiv2 clock f= or system timer"); >> + =A0 =A0 =A0 clk_enable(tin2); >> + >> + =A0 =A0 =A0 tmpdev.id =3D 4; >> + =A0 =A0 =A0 tin4 =3D clk_get(&tmpdev.dev, "pwm-tin"); >> + =A0 =A0 =A0 if (IS_ERR(tin4)) >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 panic("failed to get pwm-tin4 clock fo= r system timer"); >> + >> + =A0 =A0 =A0 tdiv4 =3D clk_get(&tmpdev.dev, "pwm-tdiv"); >> + =A0 =A0 =A0 if (IS_ERR(tdiv4)) >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 panic("failed to get pwm-tdiv4 clock f= or system timer"); >> + >> + =A0 =A0 =A0 clk_enable(tin4); >> +} >> + >> +static void __init s5pv310_timer_init(void) >> +{ >> +#ifdef CONFIG_LOCAL_TIMERS >> + =A0 =A0 =A0 twd_base =3D S5P_VA_TWD; >> +#endif >> + >> + =A0 =A0 =A0 s5pv310_timer_resources(); >> + =A0 =A0 =A0 s5pv310_clockevent_init(); >> + =A0 =A0 =A0 s5pv310_clocksource_init(); >> +} >> + >> +struct sys_timer s5pv310_timer =3D { >> + =A0 =A0 =A0 .init =A0 =A0 =A0 =A0 =A0 =3D s5pv310_timer_init, >> +}; >> diff --git a/arch/arm/plat-s5p/include/plat/s5pv310.h b/arch/arm/pla= t- >s5p/include/plat/s5pv310.h >> index d2f05e1..769c991 100644 >> --- a/arch/arm/plat-s5p/include/plat/s5pv310.h >> +++ b/arch/arm/plat-s5p/include/plat/s5pv310.h >> @@ -22,6 +22,7 @@ extern =A0int s5pv310_init(void); >> =A0extern void s5pv310_init_irq(void); >> =A0extern void s5pv310_map_io(void); >> =A0extern void s5pv310_init_clocks(int xtal); >> +extern struct sys_timer s5pv310_timer; >> >> =A0#define s5pv310_init_uarts s5pv310_common_init_uarts >> >> diff --git a/arch/arm/plat-samsung/Makefile b/arch/arm/plat- >samsung/Makefile >> index b1d82cc..0d5bf8a 100644 >> --- a/arch/arm/plat-samsung/Makefile >> +++ b/arch/arm/plat-samsung/Makefile >> @@ -12,7 +12,7 @@ obj- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0:=3D >> =A0# Objects we always build independent of SoC choice >> >> =A0obj-y =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0+=3D ini= t.o >> -obj-y =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0+=3D time.= o >> +obj-$(CONFIG_ARCH_USES_GETTIMEOFFSET) =A0 +=3D time.o >> =A0obj-y =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0+=3D clo= ck.o >> =A0obj-y =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0+=3D pwm= -clock.o >> =A0obj-y =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0+=3D gpi= o.o >> -- >> 1.6.2.5 >> >> -- >> To unsubscribe from this list: send the line "unsubscribe linux-sams= ung- >soc" in >> the body of a message to majordomo@vger.kernel.org >> More majordomo info at =A0http://vger.kernel.org/majordomo-info.html >> > >_______________________________________________ >linux-arm-kernel mailing list >linux-arm-kernel@lists.infradead.org >http://lists.infradead.org/mailman/listinfo/linux-arm-kernel From mboxrd@z Thu Jan 1 00:00:00 1970 From: sbkim73@samsung.com (Sangbeom Kim) Date: Tue, 27 Jul 2010 13:12:16 +0900 Subject: [PATCH v4 5/8] ARM: S5PV310: Add Timer support In-Reply-To: References: <1280148176-8985-1-git-send-email-kgene.kim@samsung.com> Message-ID: <00ce01cb2d41$e8a913b0$b9fb3b10$@com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi! Kyungmin, After booting, clock event is generated by 2 arm private timers. What do you mean by 'change the pwm2 pin to i2c functions' ? What do you use for I2C emulation? (TOUT2 or gpio) Could you explain it in detail? Thanks and regards, Sangbeom Kim Kyungmin Park wrote: >Can you confirm that during boot time, change the pwm2 pin to i2c >functions and still it's working correctly? > >1. pwm2 is used for clock event at first boot. >2. during i2c init, pwm2 pin is changed to i2c functionality. > >then where can get the clockevent? > >Another possible scenarios is that. >pwm2 pin is changed to i2c function at bootloader to access the i2c chips. >Then below code is working? > >Thank you, >Kyungmin Park > >On Mon, Jul 26, 2010 at 9:42 PM, Kukjin Kim wrote: >> From: Changhwan Youn >> >> This patch adds timer support for S5PV310. ?Until now, all S5P SoCs >> use CONFIG_ARCH_USES_GETTIMEOFFSET macro as a default configuration. >> Instead,S5PV310 implements clocksource and clock_event_device to >> support the high resolution timer and tickless system. >> >> Signed-off-by: Changhwan Youn >> Signed-off-by: Hyuk Lee >> Signed-off-by: Kukjin Kim >> --- >> Changes since v3: >> >> - Changes clock source from PWM2 to PWM4 because PWM4 cannot be used for >> ?other purpose such as external output function through GPIO. >> >> ?arch/arm/mach-s5pv310/include/mach/pwm-clock.h | ? 70 ++++++ >> ?arch/arm/mach-s5pv310/localtimer.c ? ? ? ? ? ? | ? 25 ++ >> ?arch/arm/mach-s5pv310/time.c ? ? ? ? ? ? ? ? ? | ?287 >++++++++++++++++++++++++ >> ?arch/arm/plat-s5p/include/plat/s5pv310.h ? ? ? | ? ?1 + >> ?arch/arm/plat-samsung/Makefile ? ? ? ? ? ? ? ? | ? ?2 +- >> ?5 files changed, 384 insertions(+), 1 deletions(-) >> ?create mode 100644 arch/arm/mach-s5pv310/include/mach/pwm-clock.h >> ?create mode 100644 arch/arm/mach-s5pv310/localtimer.c >> ?create mode 100644 arch/arm/mach-s5pv310/time.c >> >> diff --git a/arch/arm/mach-s5pv310/include/mach/pwm-clock.h >b/arch/arm/mach-s5pv310/include/mach/pwm-clock.h >> new file mode 100644 >> index 0000000..7e6da27 >> --- /dev/null >> +++ b/arch/arm/mach-s5pv310/include/mach/pwm-clock.h >> @@ -0,0 +1,70 @@ >> +/* linux/arch/arm/mach-s5pv310/include/mach/pwm-clock.h >> + * >> + * Copyright (c) 2010 Samsung Electronics Co., Ltd. >> + * ? ? ? ? ? ? http://www.samsung.com/ >> + * >> + * Copyright 2008 Openmoko, Inc. >> + * Copyright 2008 Simtec Electronics >> + * ? ? ?Ben Dooks >> + * ? ? ?http://armlinux.simtec.co.uk/ >> + * >> + * Based on arch/arm/mach-s3c64xx/include/mach/pwm-clock.h >> + * >> + * S5PV310 - pwm clock and timer support >> + * >> + * This program is free software; you can redistribute it and/or modify >> + * it under the terms of the GNU General Public License version 2 as >> + * published by the Free Software Foundation. >> +*/ >> + >> +#ifndef __ASM_ARCH_PWMCLK_H >> +#define __ASM_ARCH_PWMCLK_H __FILE__ >> + >> +/** >> + * pwm_cfg_src_is_tclk() - return whether the given mux config is a tclk >> + * @tcfg: The timer TCFG1 register bits shifted down to 0. >> + * >> + * Return true if the given configuration from TCFG1 is a TCLK instead >> + * any of the TDIV clocks. >> + */ >> +static inline int pwm_cfg_src_is_tclk(unsigned long tcfg) >> +{ >> + ? ? ? return tcfg == S3C64XX_TCFG1_MUX_TCLK; >> +} >> + >> +/** >> + * tcfg_to_divisor() - convert tcfg1 setting to a divisor >> + * @tcfg1: The tcfg1 setting, shifted down. >> + * >> + * Get the divisor value for the given tcfg1 setting. We assume the >> + * caller has already checked to see if this is not a TCLK source. >> + */ >> +static inline unsigned long tcfg_to_divisor(unsigned long tcfg1) >> +{ >> + ? ? ? return 1 << tcfg1; >> +} >> + >> +/** >> + * pwm_tdiv_has_div1() - does the tdiv setting have a /1 >> + * >> + * Return true if we have a /1 in the tdiv setting. >> + */ >> +static inline unsigned int pwm_tdiv_has_div1(void) >> +{ >> + ? ? ? return 1; >> +} >> + >> +/** >> + * pwm_tdiv_div_bits() - calculate TCFG1 divisor value. >> + * @div: The divisor to calculate the bit information for. >> + * >> + * Turn a divisor into the necessary bit field for TCFG1. >> + */ >> +static inline unsigned long pwm_tdiv_div_bits(unsigned int div) >> +{ >> + ? ? ? return ilog2(div); >> +} >> + >> +#define S3C_TCFG1_MUX_TCLK S3C64XX_TCFG1_MUX_TCLK >> + >> +#endif /* __ASM_ARCH_PWMCLK_H */ >> diff --git a/arch/arm/mach-s5pv310/localtimer.c b/arch/arm/mach- >s5pv310/localtimer.c >> new file mode 100644 >> index 0000000..2784036 >> --- /dev/null >> +++ b/arch/arm/mach-s5pv310/localtimer.c >> @@ -0,0 +1,25 @@ >> +/* linux/arch/arm/mach-s5pv310/localtimer.c >> + * >> + * Cloned from linux/arch/arm/mach-realview/localtimer.c >> + * >> + * ?Copyright (C) 2002 ARM Ltd. >> + * ?All Rights Reserved >> + * >> + * This program is free software; you can redistribute it and/or modify >> + * it under the terms of the GNU General Public License version 2 as >> + * published by the Free Software Foundation. >> +*/ >> + >> +#include >> + >> +#include >> +#include >> + >> +/* >> + * Setup the local clock events for a CPU. >> + */ >> +void __cpuinit local_timer_setup(struct clock_event_device *evt) >> +{ >> + ? ? ? evt->irq = IRQ_LOCALTIMER; >> + ? ? ? twd_timer_setup(evt); >> +} >> diff --git a/arch/arm/mach-s5pv310/time.c b/arch/arm/mach-s5pv310/time.c >> new file mode 100644 >> index 0000000..01b012a >> --- /dev/null >> +++ b/arch/arm/mach-s5pv310/time.c >> @@ -0,0 +1,287 @@ >> +/* linux/arch/arm/mach-s5pv310/time.c >> + * >> + * Copyright (c) 2010 Samsung Electronics Co., Ltd. >> + * ? ? ? ? ? ? http://www.samsung.com >> + * >> + * S5PV310 (and compatible) HRT support >> + * PWM 2/4 is used for this feature >> + * >> + * This program is free software; you can redistribute it and/or modify >> + * it under the terms of the GNU General Public License version 2 as >> + * published by the Free Software Foundation. >> +*/ >> + >> +#include >> +#include >> +#include >> +#include >> +#include >> +#include >> +#include >> + >> +#include >> + >> +#include >> +#include >> +#include >> + >> +static unsigned long clock_count_per_tick; >> + >> +static struct clk *tin2; >> +static struct clk *tin4; >> +static struct clk *tdiv2; >> +static struct clk *tdiv4; >> +static struct clk *timerclk; >> + >> +static void s5pv310_pwm_stop(unsigned int pwm_id) >> +{ >> + ? ? ? unsigned long tcon; >> + >> + ? ? ? tcon = __raw_readl(S3C2410_TCON); >> + >> + ? ? ? switch (pwm_id) { >> + ? ? ? case 2: >> + ? ? ? ? ? ? ? tcon &= ~S3C2410_TCON_T2START; >> + ? ? ? ? ? ? ? break; >> + ? ? ? case 4: >> + ? ? ? ? ? ? ? tcon &= ~S3C2410_TCON_T4START; >> + ? ? ? ? ? ? ? break; >> + ? ? ? default: >> + ? ? ? ? ? ? ? break; >> + ? ? ? } >> + ? ? ? __raw_writel(tcon, S3C2410_TCON); >> +} >> + >> +static void s5pv310_pwm_init(unsigned int pwm_id, unsigned long tcnt) >> +{ >> + ? ? ? unsigned long tcon; >> + >> + ? ? ? tcon = __raw_readl(S3C2410_TCON); >> + >> + ? ? ? /* timers reload after counting zero, so reduce the count by 1 */ >> + ? ? ? tcnt--; >> + >> + ? ? ? /* ensure timer is stopped... */ >> + ? ? ? switch (pwm_id) { >> + ? ? ? case 2: >> + ? ? ? ? ? ? ? tcon &= ~(0xf<<12); >> + ? ? ? ? ? ? ? tcon |= S3C2410_TCON_T2MANUALUPD; >> + >> + ? ? ? ? ? ? ? __raw_writel(tcnt, S3C2410_TCNTB(2)); >> + ? ? ? ? ? ? ? __raw_writel(tcnt, S3C2410_TCMPB(2)); >> + ? ? ? ? ? ? ? __raw_writel(tcon, S3C2410_TCON); >> + >> + ? ? ? ? ? ? ? break; >> + ? ? ? case 4: >> + ? ? ? ? ? ? ? tcon &= ~(7<<20); >> + ? ? ? ? ? ? ? tcon |= S3C2410_TCON_T4MANUALUPD; >> + >> + ? ? ? ? ? ? ? __raw_writel(tcnt, S3C2410_TCNTB(4)); >> + ? ? ? ? ? ? ? __raw_writel(tcnt, S3C2410_TCMPB(4)); >> + ? ? ? ? ? ? ? __raw_writel(tcon, S3C2410_TCON); >> + >> + ? ? ? ? ? ? ? break; >> + ? ? ? default: >> + ? ? ? ? ? ? ? break; >> + ? ? ? } >> +} >> + >> +static inline void s5pv310_pwm_start(unsigned int pwm_id, bool periodic) >> +{ >> + ? ? ? unsigned long tcon; >> + >> + ? ? ? tcon ?= __raw_readl(S3C2410_TCON); >> + >> + ? ? ? switch (pwm_id) { >> + ? ? ? case 2: >> + ? ? ? ? ? ? ? tcon |= S3C2410_TCON_T2START; >> + ? ? ? ? ? ? ? tcon &= ~S3C2410_TCON_T2MANUALUPD; >> + >> + ? ? ? ? ? ? ? if (periodic) >> + ? ? ? ? ? ? ? ? ? ? ? tcon |= S3C2410_TCON_T2RELOAD; >> + ? ? ? ? ? ? ? else >> + ? ? ? ? ? ? ? ? ? ? ? tcon &= ~S3C2410_TCON_T2RELOAD; >> + ? ? ? ? ? ? ? break; >> + ? ? ? case 4: >> + ? ? ? ? ? ? ? tcon |= S3C2410_TCON_T4START; >> + ? ? ? ? ? ? ? tcon &= ~S3C2410_TCON_T4MANUALUPD; >> + >> + ? ? ? ? ? ? ? if (periodic) >> + ? ? ? ? ? ? ? ? ? ? ? tcon |= S3C2410_TCON_T4RELOAD; >> + ? ? ? ? ? ? ? else >> + ? ? ? ? ? ? ? ? ? ? ? tcon &= ~S3C2410_TCON_T4RELOAD; >> + ? ? ? ? ? ? ? break; >> + ? ? ? default: >> + ? ? ? ? ? ? ? break; >> + ? ? ? } >> + ? ? ? __raw_writel(tcon, S3C2410_TCON); >> +} >> + >> +static int s5pv310_pwm_set_next_event(unsigned long cycles, >> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? struct clock_event_device *evt) >> +{ >> + ? ? ? s5pv310_pwm_init(2, cycles); >> + ? ? ? s5pv310_pwm_start(2, 0); >> + ? ? ? return 0; >> +} >> + >> +static void s5pv310_pwm_set_mode(enum clock_event_mode mode, >> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? struct clock_event_device *evt) >> +{ >> + ? ? ? s5pv310_pwm_stop(2); >> + >> + ? ? ? switch (mode) { >> + ? ? ? case CLOCK_EVT_MODE_PERIODIC: >> + ? ? ? ? ? ? ? s5pv310_pwm_init(2, clock_count_per_tick); >> + ? ? ? ? ? ? ? s5pv310_pwm_start(2, 1); >> + ? ? ? ? ? ? ? break; >> + ? ? ? case CLOCK_EVT_MODE_ONESHOT: >> + ? ? ? ? ? ? ? break; >> + ? ? ? case CLOCK_EVT_MODE_UNUSED: >> + ? ? ? case CLOCK_EVT_MODE_SHUTDOWN: >> + ? ? ? case CLOCK_EVT_MODE_RESUME: >> + ? ? ? ? ? ? ? break; >> + ? ? ? } >> +} >> + >> +static struct clock_event_device pwm_event_device = { >> + ? ? ? .name ? ? ? ? ? = "pwm_timer2", >> + ? ? ? .features ? ? ? = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT, >> + ? ? ? .rating ? ? ? ? = 200, >> + ? ? ? .shift ? ? ? ? ?= 32, >> + ? ? ? .set_next_event = s5pv310_pwm_set_next_event, >> + ? ? ? .set_mode ? ? ? = s5pv310_pwm_set_mode, >> +}; >> + >> +irqreturn_t s5pv310_clock_event_isr(int irq, void *dev_id) >> +{ >> + ? ? ? struct clock_event_device *evt = &pwm_event_device; >> + >> + ? ? ? evt->event_handler(evt); >> + >> + ? ? ? return IRQ_HANDLED; >> +} >> + >> +static struct irqaction s5pv310_clock_event_irq = { >> + ? ? ? .name ? ? ? ? ? = "pwm_timer2_irq", >> + ? ? ? .flags ? ? ? ? ?= IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL, >> + ? ? ? .handler ? ? ? ?= s5pv310_clock_event_isr, >> +}; >> + >> +static void __init s5pv310_clockevent_init(void) >> +{ >> + ? ? ? unsigned long pclk; >> + ? ? ? unsigned long clock_rate; >> + ? ? ? struct clk *tscaler; >> + >> + ? ? ? pclk = clk_get_rate(timerclk); >> + >> + ? ? ? /* configure clock tick */ >> + >> + ? ? ? tscaler = clk_get_parent(tdiv2); >> + >> + ? ? ? clk_set_rate(tscaler, pclk / 2); >> + ? ? ? clk_set_rate(tdiv2, pclk / 2); >> + ? ? ? clk_set_parent(tin2, tdiv2); >> + >> + ? ? ? clock_rate = clk_get_rate(tin2); >> + >> + ? ? ? clock_count_per_tick = clock_rate / HZ; >> + >> + ? ? ? pwm_event_device.mult = >> + ? ? ? ? ? ? ? div_sc(clock_rate, NSEC_PER_SEC, pwm_event_device.shift); >> + ? ? ? pwm_event_device.max_delta_ns = >> + ? ? ? ? ? ? ? clockevent_delta2ns(-1, &pwm_event_device); >> + ? ? ? pwm_event_device.min_delta_ns = >> + ? ? ? ? ? ? ? clockevent_delta2ns(1, &pwm_event_device); >> + >> + ? ? ? pwm_event_device.cpumask = cpumask_of(0); >> + ? ? ? clockevents_register_device(&pwm_event_device); >> + >> + ? ? ? setup_irq(IRQ_TIMER2, &s5pv310_clock_event_irq); >> +} >> + >> +static cycle_t s5pv310_pwm4_read(struct clocksource *cs) >> +{ >> + ? ? ? return (cycle_t) ~__raw_readl(S3C_TIMERREG(0x40)); >> +} >> + >> +struct clocksource pwm_clocksource = { >> + ? ? ? .name ? ? ? ? ? = "pwm_timer4", >> + ? ? ? .rating ? ? ? ? = 250, >> + ? ? ? .read ? ? ? ? ? = s5pv310_pwm4_read, >> + ? ? ? .mask ? ? ? ? ? = CLOCKSOURCE_MASK(32), >> + ? ? ? .shift ? ? ? ? ?= 20, >> + ? ? ? .flags ? ? ? ? ?= CLOCK_SOURCE_IS_CONTINUOUS , >> +}; >> + >> +static void __init s5pv310_clocksource_init(void) >> +{ >> + ? ? ? unsigned long pclk; >> + ? ? ? unsigned long clock_rate; >> + >> + ? ? ? pclk = clk_get_rate(timerclk); >> + >> + ? ? ? clk_set_rate(tdiv4, pclk / 2); >> + ? ? ? clk_set_parent(tin4, tdiv4); >> + >> + ? ? ? clock_rate = clk_get_rate(tin4); >> + >> + ? ? ? s5pv310_pwm_init(4, ~0); >> + ? ? ? s5pv310_pwm_start(4, 1); >> + >> + ? ? ? pwm_clocksource.mult = >> + ? ? ? ? ? ? ? clocksource_khz2mult(clock_rate/1000, >pwm_clocksource.shift); >> + >> + ? ? ? if (clocksource_register(&pwm_clocksource)) >> + ? ? ? ? ? ? ? panic("%s: can't register clocksource\n", >pwm_clocksource.name); >> +} >> + >> +static void __init s5pv310_timer_resources(void) >> +{ >> + ? ? ? struct platform_device tmpdev; >> + >> + ? ? ? tmpdev.dev.bus = &platform_bus_type; >> + >> + ? ? ? timerclk = clk_get(NULL, "timers"); >> + ? ? ? if (IS_ERR(timerclk)) >> + ? ? ? ? ? ? ? panic("failed to get timers clock for system timer"); >> + >> + ? ? ? clk_enable(timerclk); >> + >> + ? ? ? tmpdev.id = 2; >> + ? ? ? tin2 = clk_get(&tmpdev.dev, "pwm-tin"); >> + ? ? ? if (IS_ERR(tin2)) >> + ? ? ? ? ? ? ? panic("failed to get pwm-tin2 clock for system timer"); >> + >> + ? ? ? tdiv2 = clk_get(&tmpdev.dev, "pwm-tdiv"); >> + ? ? ? if (IS_ERR(tdiv2)) >> + ? ? ? ? ? ? ? panic("failed to get pwm-tdiv2 clock for system timer"); >> + ? ? ? clk_enable(tin2); >> + >> + ? ? ? tmpdev.id = 4; >> + ? ? ? tin4 = clk_get(&tmpdev.dev, "pwm-tin"); >> + ? ? ? if (IS_ERR(tin4)) >> + ? ? ? ? ? ? ? panic("failed to get pwm-tin4 clock for system timer"); >> + >> + ? ? ? tdiv4 = clk_get(&tmpdev.dev, "pwm-tdiv"); >> + ? ? ? if (IS_ERR(tdiv4)) >> + ? ? ? ? ? ? ? panic("failed to get pwm-tdiv4 clock for system timer"); >> + >> + ? ? ? clk_enable(tin4); >> +} >> + >> +static void __init s5pv310_timer_init(void) >> +{ >> +#ifdef CONFIG_LOCAL_TIMERS >> + ? ? ? twd_base = S5P_VA_TWD; >> +#endif >> + >> + ? ? ? s5pv310_timer_resources(); >> + ? ? ? s5pv310_clockevent_init(); >> + ? ? ? s5pv310_clocksource_init(); >> +} >> + >> +struct sys_timer s5pv310_timer = { >> + ? ? ? .init ? ? ? ? ? = s5pv310_timer_init, >> +}; >> diff --git a/arch/arm/plat-s5p/include/plat/s5pv310.h b/arch/arm/plat- >s5p/include/plat/s5pv310.h >> index d2f05e1..769c991 100644 >> --- a/arch/arm/plat-s5p/include/plat/s5pv310.h >> +++ b/arch/arm/plat-s5p/include/plat/s5pv310.h >> @@ -22,6 +22,7 @@ extern ?int s5pv310_init(void); >> ?extern void s5pv310_init_irq(void); >> ?extern void s5pv310_map_io(void); >> ?extern void s5pv310_init_clocks(int xtal); >> +extern struct sys_timer s5pv310_timer; >> >> ?#define s5pv310_init_uarts s5pv310_common_init_uarts >> >> diff --git a/arch/arm/plat-samsung/Makefile b/arch/arm/plat- >samsung/Makefile >> index b1d82cc..0d5bf8a 100644 >> --- a/arch/arm/plat-samsung/Makefile >> +++ b/arch/arm/plat-samsung/Makefile >> @@ -12,7 +12,7 @@ obj- ? ? ? ? ? ? ? ? ? ? ? ? ?:= >> ?# Objects we always build independent of SoC choice >> >> ?obj-y ? ? ? ? ? ? ? ? ? ? ? ? ?+= init.o >> -obj-y ? ? ? ? ? ? ? ? ? ? ? ? ?+= time.o >> +obj-$(CONFIG_ARCH_USES_GETTIMEOFFSET) ? += time.o >> ?obj-y ? ? ? ? ? ? ? ? ? ? ? ? ?+= clock.o >> ?obj-y ? ? ? ? ? ? ? ? ? ? ? ? ?+= pwm-clock.o >> ?obj-y ? ? ? ? ? ? ? ? ? ? ? ? ?+= gpio.o >> -- >> 1.6.2.5 >> >> -- >> To unsubscribe from this list: send the line "unsubscribe linux-samsung- >soc" in >> the body of a message to majordomo at vger.kernel.org >> More majordomo info at ?http://vger.kernel.org/majordomo-info.html >> > >_______________________________________________ >linux-arm-kernel mailing list >linux-arm-kernel at lists.infradead.org >http://lists.infradead.org/mailman/listinfo/linux-arm-kernel