RE: [RFC][PATCH 3/3] clocksource: Add Freescale FlexTimer Module (FTM) timer support

2014-04-17 Thread li.xi...@freescale.com 
> > +   freq = clk_get_rate(ftm_clk);
> > +
> > +   calc_closest_cound_cyc(freq);
> > +
> > +   BUG_ON(ftm_clocksource_init(freq));
> > +
> > +   BUG_ON(ftm_clockevent_init(freq, irq));
> > +}
> > +CLOCKSOURCE_OF_DECLARE(vf610, "fsl,vf610-ftm-timer", ftm_timer_init);
> 
> 
> I am not a big fan of those BUG_ON every line. Could you please replace
> it by dev_err().
> 

While, for the FlexTimer driver, there hasn't any device creation and
registering, so I'll use pr_err() instead of dev_err()...

Thanks

BRs
Xiubo

RE: [RFC][PATCH 3/3] clocksource: Add Freescale FlexTimer Module (FTM) timer support

2014-04-17 Thread li.xi...@freescale.com 
> > Here using the FTM0 as clock event device and the FTM1 as clock
> > source device.
> 
> As it is a new driver, please add a more elaborated description of the
> timer.
> 

Please see the next version.


> > +#include 
> > +#include 
> > +#include 
> > +#include 
> > +#include 
> > +#include 
> > +#include 
> > +#include 
> > +#include 
> > +#include 
> > +#include 
> 
> Could you check all these headers are effectively needed ?
> 

Yes, I will.



> > +#define FTM_OFFSET(n)  (0x1000 * n)
> > +
> > +#define FTM_SC 0x00
> > +#define FTM_SC_CLK_SHIFT   3
> > +#define FTM_SC_CLK_MASK(0x3 << FTM_SC_CLK_SHIFT)
> > +#define FTM_SC_CLK(c)  ((c) << FTM_SC_CLK_SHIFT)
> > +#define FTM_SC_PS_MASK 0x7
> > +#define FTM_SC_TOIEBIT(6)
> > +#define FTM_SC_TOF BIT(7)
> > +
> > +#define FTM_CNT0x04
> > +#define FTM_MOD0x08
> > +
> > +#define FTM_CSC_BASE   0x0C
> > +#define FTM_CSC_MSBBIT(5)
> > +#define FTM_CSC_MSABIT(4)
> > +#define FTM_CSC_ELSB   BIT(3)
> > +#define FTM_CSC_ELSA   BIT(2)
> > +
> > +#define FTM_CV_BASE0x10
> > +#define FTM_CNTIN  0x4C
> > +#define FTM_STATUS 0x50
> > +
> > +#define FTM_MODE   0x54
> > +#define FTM_MODE_FTMEN BIT(0)
> > +#define FTM_MODE_WPDIS BIT(2)
> > +#define FTM_MODE_PWMSYNC   BIT(3)
> > +
> > +#define FTM_SYNC   0x58
> > +#define FTM_OUTINIT0x5C
> > +#define FTM_OUTMASK0x60
> > +#define FTM_COMBINE0x64
> > +#define FTM_DEADTIME   0x68
> > +#define FTM_EXTTRIG0x6C
> > +#define FTM_POL0x70
> > +#define FTM_FMS0x74
> > +#define FTM_FILTER 0x78
> > +#define FTM_FLTCTRL0x7C
> > +#define FTM_QDCTRL 0x80
> > +#define FTM_CONF   0x84
> > +#define FTM_FLTPOL 0x88
> > +#define FTM_SYNCONF0x8C
> > +#define FTM_INVCTRL0x90
> > +#define FTM_SWOCTRL0x94
> > +#define FTM_PWMLOAD0x98
> 
> Please remove the unused macros.
> 

Okay.


> > +
> > +   freq = clk_get_rate(ftm_clk);
> > +
> > +   calc_closest_cound_cyc(freq);
> > +
> > +   BUG_ON(ftm_clocksource_init(freq));
> > +
> > +   BUG_ON(ftm_clockevent_init(freq, irq));
> > +}
> > +CLOCKSOURCE_OF_DECLARE(vf610, "fsl,vf610-ftm-timer", ftm_timer_init);
> 
> 
> I am not a big fan of those BUG_ON every line. Could you please replace
> it by dev_err().
> 
> That is also not in the logic of a single zImage.
> 

Yes, if so, I will revise this.


Thanks,

BRs
Xiubo

Re: [RFC][PATCH 3/3] clocksource: Add Freescale FlexTimer Module (FTM) timer support

2014-04-17 Thread Daniel Lezcano 

On 04/16/2014 04:19 AM, Xiubo Li wrote:

The Freescale FlexTimer Module time reference is a 16-bit counter
that can be used as an unsigned or signed counter.one 16-bits
increase counter.

Here using the FTM0 as clock event device and the FTM1 as clock
source device.


As it is a new driver, please add a more elaborated description of the 
timer.



Signed-off-by: Xiubo Li 
Cc: Shawn Guo 
Cc: Jingchang Lu 
---
  drivers/clocksource/Kconfig |   5 +
  drivers/clocksource/Makefile|   1 +
  drivers/clocksource/fsl_ftm_timer.c | 238 
  3 files changed, 244 insertions(+)
  create mode 100644 drivers/clocksource/fsl_ftm_timer.c

diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index cd6950f..28321c5 100644
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -136,6 +136,11 @@ config CLKSRC_SAMSUNG_PWM
  for all devicetree enabled platforms. This driver will be
  needed only on systems that do not have the Exynos MCT available.

+config FSL_FTM_TIMER
+   bool
+   help
+ Support for Freescale FlexTimer Module (FTM) timer.
+
  config VF_PIT_TIMER
bool
help
diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile
index c7ca50a..ce0a967 100644
--- a/drivers/clocksource/Makefile
+++ b/drivers/clocksource/Makefile
@@ -31,6 +31,7 @@ obj-$(CONFIG_CADENCE_TTC_TIMER)   += cadence_ttc_timer.o
  obj-$(CONFIG_CLKSRC_EFM32)+= time-efm32.o
  obj-$(CONFIG_CLKSRC_EXYNOS_MCT)   += exynos_mct.o
  obj-$(CONFIG_CLKSRC_SAMSUNG_PWM)  += samsung_pwm_timer.o
+obj-$(CONFIG_FSL_FTM_TIMER)+= fsl_ftm_timer.o
  obj-$(CONFIG_VF_PIT_TIMER)+= vf_pit_timer.o

  obj-$(CONFIG_ARM_ARCH_TIMER)  += arm_arch_timer.o
diff --git a/drivers/clocksource/fsl_ftm_timer.c 
b/drivers/clocksource/fsl_ftm_timer.c
new file mode 100644
index 000..988449e
--- /dev/null
+++ b/drivers/clocksource/fsl_ftm_timer.c
@@ -0,0 +1,238 @@
+/*
+ * Freescale FlexTimer Module (FTM) timer driver.
+ *
+ * Copyright 2014 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ */
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 


Could you check all these headers are effectively needed ?


+#define FTM_OFFSET(n)  (0x1000 * n)
+
+#define FTM_SC 0x00
+#define FTM_SC_CLK_SHIFT   3
+#define FTM_SC_CLK_MASK(0x3 << FTM_SC_CLK_SHIFT)
+#define FTM_SC_CLK(c)  ((c) << FTM_SC_CLK_SHIFT)
+#define FTM_SC_PS_MASK 0x7
+#define FTM_SC_TOIEBIT(6)
+#define FTM_SC_TOF BIT(7)
+
+#define FTM_CNT0x04
+#define FTM_MOD0x08
+
+#define FTM_CSC_BASE   0x0C
+#define FTM_CSC_MSBBIT(5)
+#define FTM_CSC_MSABIT(4)
+#define FTM_CSC_ELSB   BIT(3)
+#define FTM_CSC_ELSA   BIT(2)
+
+#define FTM_CV_BASE0x10
+#define FTM_CNTIN  0x4C
+#define FTM_STATUS 0x50
+
+#define FTM_MODE   0x54
+#define FTM_MODE_FTMEN BIT(0)
+#define FTM_MODE_WPDIS BIT(2)
+#define FTM_MODE_PWMSYNC   BIT(3)
+
+#define FTM_SYNC   0x58
+#define FTM_OUTINIT0x5C
+#define FTM_OUTMASK0x60
+#define FTM_COMBINE0x64
+#define FTM_DEADTIME   0x68
+#define FTM_EXTTRIG0x6C
+#define FTM_POL0x70
+#define FTM_FMS0x74
+#define FTM_FILTER 0x78
+#define FTM_FLTCTRL0x7C
+#define FTM_QDCTRL 0x80
+#define FTM_CONF   0x84
+#define FTM_FLTPOL 0x88
+#define FTM_SYNCONF0x8C
+#define FTM_INVCTRL0x90
+#define FTM_SWOCTRL0x94
+#define FTM_PWMLOAD0x98


Please remove the unused macros.


+
+static void __iomem *clksrc_base;
+static void __iomem *clkevt_base;
+static unsigned long peroidic_cyc;
+
+static inline void __init ftm_timer_enable(void __iomem *base)
+{
+   u32 val;
+
+   /* select and enable counter clock source */
+   val = __raw_readl(base + FTM_SC);
+   val &= ~FTM_SC_CLK_MASK;
+   val |= FTM_SC_CLK(1);
+   __raw_writel(val, base + FTM_SC);
+}
+
+static u64 ftm_read_sched_clock(void)
+{
+   return __raw_readl(clksrc_base + FTM_CNT);
+}
+
+static int __init ftm_clocksource_init(unsigned long freq)
+{
+   int ret;
+
+   __raw_writel(0x00, clksrc_base + FTM_CNTIN);
+   __raw_writel(~0UL, clksrc_base + FTM_MOD);
+   __raw_writel(0x1, clksrc_base + FTM_CNT);
+
+   sched_clock_register(ftm_read_sched_clock, 16, freq);
+   ret = clocksource_mmio_init(clksrc_base + FTM_CNT, "fsl-ftm",
+   freq, 300, 16, clocksource_mmio_readl_up);
+   if (ret)
+   return ret;
+
+   ftm_timer_enable(clksrc_base);
+
+   return 0;
+}
+
+static inline void ftm_irq_acknowledge(void)
+{
+   u32 val;
+
+   val =

Re: [RFC][PATCH 3/3] clocksource: Add Freescale FlexTimer Module (FTM) timer support

2014-04-17 Thread Daniel Lezcano 

On 04/16/2014 04:19 AM, Xiubo Li wrote:

The Freescale FlexTimer Module time reference is a 16-bit counter
that can be used as an unsigned or signed counter.one 16-bits
increase counter.

Here using the FTM0 as clock event device and the FTM1 as clock
source device.


As it is a new driver, please add a more elaborated description of the 
timer.



Signed-off-by: Xiubo Li li.xi...@freescale.com
Cc: Shawn Guo shawn@linaro.org
Cc: Jingchang Lu b35...@freescale.com
---
  drivers/clocksource/Kconfig |   5 +
  drivers/clocksource/Makefile|   1 +
  drivers/clocksource/fsl_ftm_timer.c | 238 
  3 files changed, 244 insertions(+)
  create mode 100644 drivers/clocksource/fsl_ftm_timer.c

diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index cd6950f..28321c5 100644
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -136,6 +136,11 @@ config CLKSRC_SAMSUNG_PWM
  for all devicetree enabled platforms. This driver will be
  needed only on systems that do not have the Exynos MCT available.

+config FSL_FTM_TIMER
+   bool
+   help
+ Support for Freescale FlexTimer Module (FTM) timer.
+
  config VF_PIT_TIMER
bool
help
diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile
index c7ca50a..ce0a967 100644
--- a/drivers/clocksource/Makefile
+++ b/drivers/clocksource/Makefile
@@ -31,6 +31,7 @@ obj-$(CONFIG_CADENCE_TTC_TIMER)   += cadence_ttc_timer.o
  obj-$(CONFIG_CLKSRC_EFM32)+= time-efm32.o
  obj-$(CONFIG_CLKSRC_EXYNOS_MCT)   += exynos_mct.o
  obj-$(CONFIG_CLKSRC_SAMSUNG_PWM)  += samsung_pwm_timer.o
+obj-$(CONFIG_FSL_FTM_TIMER)+= fsl_ftm_timer.o
  obj-$(CONFIG_VF_PIT_TIMER)+= vf_pit_timer.o

  obj-$(CONFIG_ARM_ARCH_TIMER)  += arm_arch_timer.o
diff --git a/drivers/clocksource/fsl_ftm_timer.c 
b/drivers/clocksource/fsl_ftm_timer.c
new file mode 100644
index 000..988449e
--- /dev/null
+++ b/drivers/clocksource/fsl_ftm_timer.c
@@ -0,0 +1,238 @@
+/*
+ * Freescale FlexTimer Module (FTM) timer driver.
+ *
+ * Copyright 2014 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ */
+
+#include linux/clk.h
+#include linux/clockchips.h
+#include linux/clocksource.h
+#include linux/err.h
+#include linux/interrupt.h
+#include linux/io.h
+#include linux/kernel.h
+#include linux/module.h
+#include linux/of_address.h
+#include linux/of_irq.h
+#include linux/sched_clock.h


Could you check all these headers are effectively needed ?


+#define FTM_OFFSET(n)  (0x1000 * n)
+
+#define FTM_SC 0x00
+#define FTM_SC_CLK_SHIFT   3
+#define FTM_SC_CLK_MASK(0x3  FTM_SC_CLK_SHIFT)
+#define FTM_SC_CLK(c)  ((c)  FTM_SC_CLK_SHIFT)
+#define FTM_SC_PS_MASK 0x7
+#define FTM_SC_TOIEBIT(6)
+#define FTM_SC_TOF BIT(7)
+
+#define FTM_CNT0x04
+#define FTM_MOD0x08
+
+#define FTM_CSC_BASE   0x0C
+#define FTM_CSC_MSBBIT(5)
+#define FTM_CSC_MSABIT(4)
+#define FTM_CSC_ELSB   BIT(3)
+#define FTM_CSC_ELSA   BIT(2)
+
+#define FTM_CV_BASE0x10
+#define FTM_CNTIN  0x4C
+#define FTM_STATUS 0x50
+
+#define FTM_MODE   0x54
+#define FTM_MODE_FTMEN BIT(0)
+#define FTM_MODE_WPDIS BIT(2)
+#define FTM_MODE_PWMSYNC   BIT(3)
+
+#define FTM_SYNC   0x58
+#define FTM_OUTINIT0x5C
+#define FTM_OUTMASK0x60
+#define FTM_COMBINE0x64
+#define FTM_DEADTIME   0x68
+#define FTM_EXTTRIG0x6C
+#define FTM_POL0x70
+#define FTM_FMS0x74
+#define FTM_FILTER 0x78
+#define FTM_FLTCTRL0x7C
+#define FTM_QDCTRL 0x80
+#define FTM_CONF   0x84
+#define FTM_FLTPOL 0x88
+#define FTM_SYNCONF0x8C
+#define FTM_INVCTRL0x90
+#define FTM_SWOCTRL0x94
+#define FTM_PWMLOAD0x98


Please remove the unused macros.


+
+static void __iomem *clksrc_base;
+static void __iomem *clkevt_base;
+static unsigned long peroidic_cyc;
+
+static inline void __init ftm_timer_enable(void __iomem *base)
+{
+   u32 val;
+
+   /* select and enable counter clock source */
+   val = __raw_readl(base + FTM_SC);
+   val = ~FTM_SC_CLK_MASK;
+   val |= FTM_SC_CLK(1);
+   __raw_writel(val, base + FTM_SC);
+}
+
+static u64 ftm_read_sched_clock(void)
+{
+   return __raw_readl(clksrc_base + FTM_CNT);
+}
+
+static int __init ftm_clocksource_init(unsigned long freq)
+{
+   int ret;
+
+   __raw_writel(0x00, clksrc_base + FTM_CNTIN);
+   __raw_writel(~0UL, clksrc_base + FTM_MOD);
+   __raw_writel(0x1, clksrc_base + FTM_CNT);
+
+   sched_clock_register(ftm_read_sched_clock, 16, freq);
+   ret = clocksource_mmio_init(clksrc_base + FTM_CNT, fsl-ftm,
+   freq, 300, 16,

RE: [RFC][PATCH 3/3] clocksource: Add Freescale FlexTimer Module (FTM) timer support

2014-04-17 Thread li.xi...@freescale.com 
  Here using the FTM0 as clock event device and the FTM1 as clock
  source device.
 
 As it is a new driver, please add a more elaborated description of the
 timer.
 

Please see the next version.


  +#include linux/clk.h
  +#include linux/clockchips.h
  +#include linux/clocksource.h
  +#include linux/err.h
  +#include linux/interrupt.h
  +#include linux/io.h
  +#include linux/kernel.h
  +#include linux/module.h
  +#include linux/of_address.h
  +#include linux/of_irq.h
  +#include linux/sched_clock.h
 
 Could you check all these headers are effectively needed ?
 

Yes, I will.



  +#define FTM_OFFSET(n)  (0x1000 * n)
  +
  +#define FTM_SC 0x00
  +#define FTM_SC_CLK_SHIFT   3
  +#define FTM_SC_CLK_MASK(0x3  FTM_SC_CLK_SHIFT)
  +#define FTM_SC_CLK(c)  ((c)  FTM_SC_CLK_SHIFT)
  +#define FTM_SC_PS_MASK 0x7
  +#define FTM_SC_TOIEBIT(6)
  +#define FTM_SC_TOF BIT(7)
  +
  +#define FTM_CNT0x04
  +#define FTM_MOD0x08
  +
  +#define FTM_CSC_BASE   0x0C
  +#define FTM_CSC_MSBBIT(5)
  +#define FTM_CSC_MSABIT(4)
  +#define FTM_CSC_ELSB   BIT(3)
  +#define FTM_CSC_ELSA   BIT(2)
  +
  +#define FTM_CV_BASE0x10
  +#define FTM_CNTIN  0x4C
  +#define FTM_STATUS 0x50
  +
  +#define FTM_MODE   0x54
  +#define FTM_MODE_FTMEN BIT(0)
  +#define FTM_MODE_WPDIS BIT(2)
  +#define FTM_MODE_PWMSYNC   BIT(3)
  +
  +#define FTM_SYNC   0x58
  +#define FTM_OUTINIT0x5C
  +#define FTM_OUTMASK0x60
  +#define FTM_COMBINE0x64
  +#define FTM_DEADTIME   0x68
  +#define FTM_EXTTRIG0x6C
  +#define FTM_POL0x70
  +#define FTM_FMS0x74
  +#define FTM_FILTER 0x78
  +#define FTM_FLTCTRL0x7C
  +#define FTM_QDCTRL 0x80
  +#define FTM_CONF   0x84
  +#define FTM_FLTPOL 0x88
  +#define FTM_SYNCONF0x8C
  +#define FTM_INVCTRL0x90
  +#define FTM_SWOCTRL0x94
  +#define FTM_PWMLOAD0x98
 
 Please remove the unused macros.
 

Okay.


  +
  +   freq = clk_get_rate(ftm_clk);
  +
  +   calc_closest_cound_cyc(freq);
  +
  +   BUG_ON(ftm_clocksource_init(freq));
  +
  +   BUG_ON(ftm_clockevent_init(freq, irq));
  +}
  +CLOCKSOURCE_OF_DECLARE(vf610, fsl,vf610-ftm-timer, ftm_timer_init);
 
 
 I am not a big fan of those BUG_ON every line. Could you please replace
 it by dev_err().
 
 That is also not in the logic of a single zImage.
 

Yes, if so, I will revise this.


Thanks,

BRs
Xiubo

RE: [RFC][PATCH 3/3] clocksource: Add Freescale FlexTimer Module (FTM) timer support

2014-04-17 Thread li.xi...@freescale.com 
  +   freq = clk_get_rate(ftm_clk);
  +
  +   calc_closest_cound_cyc(freq);
  +
  +   BUG_ON(ftm_clocksource_init(freq));
  +
  +   BUG_ON(ftm_clockevent_init(freq, irq));
  +}
  +CLOCKSOURCE_OF_DECLARE(vf610, fsl,vf610-ftm-timer, ftm_timer_init);
 
 
 I am not a big fan of those BUG_ON every line. Could you please replace
 it by dev_err().
 

While, for the FlexTimer driver, there hasn't any device creation and
registering, so I'll use pr_err() instead of dev_err()...

Thanks

BRs
Xiubo

RE: [RFC][PATCH 3/3] clocksource: Add Freescale FlexTimer Module (FTM) timer support

2014-04-15 Thread li.xi...@freescale.com 
[...]
> > +static void ftm_set_mode(enum clock_event_mode mode,
> > +   struct clock_event_device *evt)
> > +{
> > +   switch (mode) {
> > +   case CLOCK_EVT_MODE_PERIODIC:
> > +   ftm_set_next_event(peroidic_cyc, evt);
> > +   break;
> > +   default:
> > +   break;
> 
> Remove this break;
> 

I'll revise this.


> > +   }
> > +}


[...]
> > +static void __init ftm_timer_init(struct device_node *np)
> > +{
> > +   struct clk *ftm_clk;
> > +   void __iomem *timer_base;
> > +   unsigned long freq;
> > +   int irq;
> > +
> > +   timer_base = of_iomap(np, 0);
> > +   BUG_ON(!timer_base);
> > +
> > +   clksrc_base = timer_base + FTM_OFFSET(1);
> > +   clkevt_base = timer_base + FTM_OFFSET(0);
> > +
> > +   irq = irq_of_parse_and_map(np, 0);
> > +   BUG_ON(irq <= 0);
> > +
> > +   ftm_clk = of_clk_get_by_name(np, "ftm0_counter_en");
> > +   BUG_ON(IS_ERR(ftm_clk));
> > +   BUG_ON(clk_prepare_enable(ftm_clk));
> > +
> > +   ftm_clk = of_clk_get_by_name(np, "ftm1_counter_en");
> > +   BUG_ON(IS_ERR(ftm_clk));
> > +   BUG_ON(clk_prepare_enable(ftm_clk));
> > +
> > +   ftm_clk = of_clk_get_by_name(np, "ftm0");
> > +   BUG_ON(IS_ERR(ftm_clk));
> > +   BUG_ON(clk_prepare_enable(ftm_clk));
> > +
> > +   ftm_clk = of_clk_get_by_name(np, "ftm1");
> 
> Why dts is not have ftm1 node?
> 

Because the 'ftm0: ftm@40038000' node is used to ftm0
and ftm1 device nodes at the same time.

May using 'ftm: ftm@40038000' will be much better ?

Thanks,

BRs
Xiubo



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

RE: [RFC][PATCH 3/3] clocksource: Add Freescale FlexTimer Module (FTM) timer support

2014-04-15 Thread dongsheng.w...@freescale.com 


> -Original Message-
> From: Xiubo Li [mailto:li.xi...@freescale.com]
> Sent: Wednesday, April 16, 2014 10:20 AM
> To: daniel.lezc...@linaro.org; t...@linutronix.de; shawn@linaro.org; Lu
> Jingchang-B35083; Jin Zhengxiong-R64188; Wang Dongsheng-B40534
> Cc: devicet...@vger.kernel.org; linux-arm-ker...@lists.infradead.org; linux-
> ker...@vger.kernel.org; Xiubo Li-B47053
> Subject: [RFC][PATCH 3/3] clocksource: Add Freescale FlexTimer Module (FTM)
> timer support
> 
> The Freescale FlexTimer Module time reference is a 16-bit counter
> that can be used as an unsigned or signed counter.one 16-bits
> increase counter.
> 
> Here using the FTM0 as clock event device and the FTM1 as clock
> source device.
> 
> Signed-off-by: Xiubo Li 
> Cc: Shawn Guo 
> Cc: Jingchang Lu 
> ---
>  drivers/clocksource/Kconfig |   5 +
>  drivers/clocksource/Makefile|   1 +
>  drivers/clocksource/fsl_ftm_timer.c | 238 
> 
>  3 files changed, 244 insertions(+)
>  create mode 100644 drivers/clocksource/fsl_ftm_timer.c
> 
> diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
> index cd6950f..28321c5 100644
> --- a/drivers/clocksource/Kconfig
> +++ b/drivers/clocksource/Kconfig
> @@ -136,6 +136,11 @@ config CLKSRC_SAMSUNG_PWM
> for all devicetree enabled platforms. This driver will be
> needed only on systems that do not have the Exynos MCT available.
> 
> +config FSL_FTM_TIMER
> + bool
> + help
> +   Support for Freescale FlexTimer Module (FTM) timer.
> +
>  config VF_PIT_TIMER
>   bool
>   help
> diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile
> index c7ca50a..ce0a967 100644
> --- a/drivers/clocksource/Makefile
> +++ b/drivers/clocksource/Makefile
> @@ -31,6 +31,7 @@ obj-$(CONFIG_CADENCE_TTC_TIMER) += cadence_ttc_timer.o
>  obj-$(CONFIG_CLKSRC_EFM32)   += time-efm32.o
>  obj-$(CONFIG_CLKSRC_EXYNOS_MCT)  += exynos_mct.o
>  obj-$(CONFIG_CLKSRC_SAMSUNG_PWM) += samsung_pwm_timer.o
> +obj-$(CONFIG_FSL_FTM_TIMER)  += fsl_ftm_timer.o
>  obj-$(CONFIG_VF_PIT_TIMER)   += vf_pit_timer.o
> 
>  obj-$(CONFIG_ARM_ARCH_TIMER) += arm_arch_timer.o
> diff --git a/drivers/clocksource/fsl_ftm_timer.c
> b/drivers/clocksource/fsl_ftm_timer.c
> new file mode 100644
> index 000..988449e
> --- /dev/null
> +++ b/drivers/clocksource/fsl_ftm_timer.c
> @@ -0,0 +1,238 @@
> +/*
> + * Freescale FlexTimer Module (FTM) timer driver.
> + *
> + * Copyright 2014 Freescale Semiconductor, Inc.
> + *
> + * This program is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License
> + * as published by the Free Software Foundation; either version 2
> + * of the License, or (at your option) any later version.
> + */
> +
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +
> +#define FTM_OFFSET(n)(0x1000 * n)
> +
> +#define FTM_SC   0x00
> +#define FTM_SC_CLK_SHIFT 3
> +#define FTM_SC_CLK_MASK  (0x3 << FTM_SC_CLK_SHIFT)
> +#define FTM_SC_CLK(c)((c) << FTM_SC_CLK_SHIFT)
> +#define FTM_SC_PS_MASK   0x7
> +#define FTM_SC_TOIE  BIT(6)
> +#define FTM_SC_TOF   BIT(7)
> +
> +#define FTM_CNT  0x04
> +#define FTM_MOD  0x08
> +
> +#define FTM_CSC_BASE 0x0C
> +#define FTM_CSC_MSB  BIT(5)
> +#define FTM_CSC_MSA  BIT(4)
> +#define FTM_CSC_ELSB BIT(3)
> +#define FTM_CSC_ELSA BIT(2)
> +
> +#define FTM_CV_BASE  0x10
> +#define FTM_CNTIN0x4C
> +#define FTM_STATUS   0x50
> +
> +#define FTM_MODE 0x54
> +#define FTM_MODE_FTMEN   BIT(0)
> +#define FTM_MODE_WPDIS   BIT(2)
> +#define FTM_MODE_PWMSYNC BIT(3)
> +
> +#define FTM_SYNC 0x58
> +#define FTM_OUTINIT  0x5C
> +#define FTM_OUTMASK  0x60
> +#define FTM_COMBINE  0x64
> +#define FTM_DEADTIME 0x68
> +#define FTM_EXTTRIG  0x6C
> +#define FTM_POL  0x70
> +#define FTM_FMS  0x74
> +#define FTM_FILTER   0x78
> +#define FTM_FLTCTRL  0x7C
> +#define FTM_QDCTRL   0x80
> +#define FTM_CONF 0x84
> +#define FTM_FLTPOL   0x88
> +#define FTM_SYNCONF  0x8C
> +#define FTM_INVCTRL  0x90
> +#define FTM_SWOCTRL  0x94
> +#define FTM_PWMLOAD  0x98
> +
> +static void __iomem *clksrc_base;
> +static void __iomem *clkevt_base;
> +static unsigned long peroidic_cyc;
> +
> +static inline void __init ftm_timer_enable(void __iomem *base)
> +{
> + u32 val;
> +
> + /* select and enable counter clock source */
> + val = __raw_readl(base + FTM_SC);
> + val &= ~FTM_SC_CLK_MASK;
> + val |= FTM_SC_CLK(1);
> + __raw_writel(val, base + FTM_SC);
> +}
> +
> +static u64 ftm_read_sched_clock(void)
> +{
> + return __raw_readl(clksrc_base + FTM_CNT);
> +}
> +
> +static int __init ftm_clocksource_init(unsigned long freq)
> +{
> + int ret;
> +
> + __raw_writel(0x00, clksrc_base + FTM_CNTIN);
> + __raw_writel(~0UL, clksrc_base +

RE: [RFC][PATCH 3/3] clocksource: Add Freescale FlexTimer Module (FTM) timer support

2014-04-15 Thread dongsheng.w...@freescale.com 


 -Original Message-
 From: Xiubo Li [mailto:li.xi...@freescale.com]
 Sent: Wednesday, April 16, 2014 10:20 AM
 To: daniel.lezc...@linaro.org; t...@linutronix.de; shawn@linaro.org; Lu
 Jingchang-B35083; Jin Zhengxiong-R64188; Wang Dongsheng-B40534
 Cc: devicet...@vger.kernel.org; linux-arm-ker...@lists.infradead.org; linux-
 ker...@vger.kernel.org; Xiubo Li-B47053
 Subject: [RFC][PATCH 3/3] clocksource: Add Freescale FlexTimer Module (FTM)
 timer support
 
 The Freescale FlexTimer Module time reference is a 16-bit counter
 that can be used as an unsigned or signed counter.one 16-bits
 increase counter.
 
 Here using the FTM0 as clock event device and the FTM1 as clock
 source device.
 
 Signed-off-by: Xiubo Li li.xi...@freescale.com
 Cc: Shawn Guo shawn@linaro.org
 Cc: Jingchang Lu b35...@freescale.com
 ---
  drivers/clocksource/Kconfig |   5 +
  drivers/clocksource/Makefile|   1 +
  drivers/clocksource/fsl_ftm_timer.c | 238 
 
  3 files changed, 244 insertions(+)
  create mode 100644 drivers/clocksource/fsl_ftm_timer.c
 
 diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
 index cd6950f..28321c5 100644
 --- a/drivers/clocksource/Kconfig
 +++ b/drivers/clocksource/Kconfig
 @@ -136,6 +136,11 @@ config CLKSRC_SAMSUNG_PWM
 for all devicetree enabled platforms. This driver will be
 needed only on systems that do not have the Exynos MCT available.
 
 +config FSL_FTM_TIMER
 + bool
 + help
 +   Support for Freescale FlexTimer Module (FTM) timer.
 +
  config VF_PIT_TIMER
   bool
   help
 diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile
 index c7ca50a..ce0a967 100644
 --- a/drivers/clocksource/Makefile
 +++ b/drivers/clocksource/Makefile
 @@ -31,6 +31,7 @@ obj-$(CONFIG_CADENCE_TTC_TIMER) += cadence_ttc_timer.o
  obj-$(CONFIG_CLKSRC_EFM32)   += time-efm32.o
  obj-$(CONFIG_CLKSRC_EXYNOS_MCT)  += exynos_mct.o
  obj-$(CONFIG_CLKSRC_SAMSUNG_PWM) += samsung_pwm_timer.o
 +obj-$(CONFIG_FSL_FTM_TIMER)  += fsl_ftm_timer.o
  obj-$(CONFIG_VF_PIT_TIMER)   += vf_pit_timer.o
 
  obj-$(CONFIG_ARM_ARCH_TIMER) += arm_arch_timer.o
 diff --git a/drivers/clocksource/fsl_ftm_timer.c
 b/drivers/clocksource/fsl_ftm_timer.c
 new file mode 100644
 index 000..988449e
 --- /dev/null
 +++ b/drivers/clocksource/fsl_ftm_timer.c
 @@ -0,0 +1,238 @@
 +/*
 + * Freescale FlexTimer Module (FTM) timer driver.
 + *
 + * Copyright 2014 Freescale Semiconductor, Inc.
 + *
 + * This program is free software; you can redistribute it and/or
 + * modify it under the terms of the GNU General Public License
 + * as published by the Free Software Foundation; either version 2
 + * of the License, or (at your option) any later version.
 + */
 +
 +#include linux/clk.h
 +#include linux/clockchips.h
 +#include linux/clocksource.h
 +#include linux/err.h
 +#include linux/interrupt.h
 +#include linux/io.h
 +#include linux/kernel.h
 +#include linux/module.h
 +#include linux/of_address.h
 +#include linux/of_irq.h
 +#include linux/sched_clock.h
 +
 +#define FTM_OFFSET(n)(0x1000 * n)
 +
 +#define FTM_SC   0x00
 +#define FTM_SC_CLK_SHIFT 3
 +#define FTM_SC_CLK_MASK  (0x3  FTM_SC_CLK_SHIFT)
 +#define FTM_SC_CLK(c)((c)  FTM_SC_CLK_SHIFT)
 +#define FTM_SC_PS_MASK   0x7
 +#define FTM_SC_TOIE  BIT(6)
 +#define FTM_SC_TOF   BIT(7)
 +
 +#define FTM_CNT  0x04
 +#define FTM_MOD  0x08
 +
 +#define FTM_CSC_BASE 0x0C
 +#define FTM_CSC_MSB  BIT(5)
 +#define FTM_CSC_MSA  BIT(4)
 +#define FTM_CSC_ELSB BIT(3)
 +#define FTM_CSC_ELSA BIT(2)
 +
 +#define FTM_CV_BASE  0x10
 +#define FTM_CNTIN0x4C
 +#define FTM_STATUS   0x50
 +
 +#define FTM_MODE 0x54
 +#define FTM_MODE_FTMEN   BIT(0)
 +#define FTM_MODE_WPDIS   BIT(2)
 +#define FTM_MODE_PWMSYNC BIT(3)
 +
 +#define FTM_SYNC 0x58
 +#define FTM_OUTINIT  0x5C
 +#define FTM_OUTMASK  0x60
 +#define FTM_COMBINE  0x64
 +#define FTM_DEADTIME 0x68
 +#define FTM_EXTTRIG  0x6C
 +#define FTM_POL  0x70
 +#define FTM_FMS  0x74
 +#define FTM_FILTER   0x78
 +#define FTM_FLTCTRL  0x7C
 +#define FTM_QDCTRL   0x80
 +#define FTM_CONF 0x84
 +#define FTM_FLTPOL   0x88
 +#define FTM_SYNCONF  0x8C
 +#define FTM_INVCTRL  0x90
 +#define FTM_SWOCTRL  0x94
 +#define FTM_PWMLOAD  0x98
 +
 +static void __iomem *clksrc_base;
 +static void __iomem *clkevt_base;
 +static unsigned long peroidic_cyc;
 +
 +static inline void __init ftm_timer_enable(void __iomem *base)
 +{
 + u32 val;
 +
 + /* select and enable counter clock source */
 + val = __raw_readl(base + FTM_SC);
 + val = ~FTM_SC_CLK_MASK;
 + val |= FTM_SC_CLK(1);
 + __raw_writel(val, base + FTM_SC);
 +}
 +
 +static u64 ftm_read_sched_clock(void)
 +{
 + return __raw_readl(clksrc_base + FTM_CNT);
 +}
 +
 +static int __init ftm_clocksource_init(unsigned long freq)
 +{
 + int ret;
 +
 + __raw_writel(0x00,

RE: [RFC][PATCH 3/3] clocksource: Add Freescale FlexTimer Module (FTM) timer support

2014-04-15 Thread li.xi...@freescale.com 
[...]
  +static void ftm_set_mode(enum clock_event_mode mode,
  +   struct clock_event_device *evt)
  +{
  +   switch (mode) {
  +   case CLOCK_EVT_MODE_PERIODIC:
  +   ftm_set_next_event(peroidic_cyc, evt);
  +   break;
  +   default:
  +   break;
 
 Remove this break;
 

I'll revise this.


  +   }
  +}


[...]
  +static void __init ftm_timer_init(struct device_node *np)
  +{
  +   struct clk *ftm_clk;
  +   void __iomem *timer_base;
  +   unsigned long freq;
  +   int irq;
  +
  +   timer_base = of_iomap(np, 0);
  +   BUG_ON(!timer_base);
  +
  +   clksrc_base = timer_base + FTM_OFFSET(1);
  +   clkevt_base = timer_base + FTM_OFFSET(0);
  +
  +   irq = irq_of_parse_and_map(np, 0);
  +   BUG_ON(irq = 0);
  +
  +   ftm_clk = of_clk_get_by_name(np, ftm0_counter_en);
  +   BUG_ON(IS_ERR(ftm_clk));
  +   BUG_ON(clk_prepare_enable(ftm_clk));
  +
  +   ftm_clk = of_clk_get_by_name(np, ftm1_counter_en);
  +   BUG_ON(IS_ERR(ftm_clk));
  +   BUG_ON(clk_prepare_enable(ftm_clk));
  +
  +   ftm_clk = of_clk_get_by_name(np, ftm0);
  +   BUG_ON(IS_ERR(ftm_clk));
  +   BUG_ON(clk_prepare_enable(ftm_clk));
  +
  +   ftm_clk = of_clk_get_by_name(np, ftm1);
 
 Why dts is not have ftm1 node?
 

Because the 'ftm0: ftm@40038000' node is used to ftm0
and ftm1 device nodes at the same time.

May using 'ftm: ftm@40038000' will be much better ?

Thanks,

BRs
Xiubo



--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/