[PATCH] dmtimer: hwmod: OMAP1: device registration

[PATCH] dmtimer: hwmod: OMAP1: device registration

[Tarun Kanti DebBarma]

This patch converts OMAP1 dual mode timers into platform devices,
adds support for registering them through generic linux platform
device layer.

Signed-off-by: Partha Basak <p-basak2@ti.com>
Signed-off-by: Thara Gopinath <thara@ti.com>
Signed-off-by: Tarun Kanti DebBarma <tarun.kanti@ti.com>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Cc: Tony Lindgren <tony@atomide.com>
---
 arch/arm/mach-omap1/Makefile   |    2 +-
 arch/arm/mach-omap1/dmtimer.c  |  146 ++++++++++++++++++++++++++++++++++++++++
 arch/arm/mach-omap1/timer32k.c |    3 -
 3 files changed, 147 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 arch/arm/mach-omap1/Makefile
 create mode 100755 arch/arm/mach-omap1/dmtimer.c
 mode change 100644 => 100755 arch/arm/mach-omap1/timer32k.c

diff --git a/arch/arm/mach-omap1/Makefile b/arch/arm/mach-omap1/Makefile
old mode 100644
new mode 100755
index 9a304d8..0001659
--- a/arch/arm/mach-omap1/Makefile
+++ b/arch/arm/mach-omap1/Makefile
@@ -4,7 +4,7 @@
 
 # Common support
 obj-y := io.o id.o sram.o irq.o mux.o flash.o serial.o devices.o
-obj-y += clock.o clock_data.o opp_data.o
+obj-y += clock.o clock_data.o opp_data.o dmtimer.o
 
 obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o
 
diff --git a/arch/arm/mach-omap1/dmtimer.c b/arch/arm/mach-omap1/dmtimer.c
new file mode 100755
index 0000000..b06d096
--- /dev/null
+++ b/arch/arm/mach-omap1/dmtimer.c
@@ -0,0 +1,146 @@
+/**
+ * OMAP1 Dual-Mode Timers
+ *
+ * Copyright (C) 2010 Texas Instruments, Inc.
+ * Thara Gopinath <thara@ti.com>
+ *
+ * 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 <linux/clk.h>
+#include <linux/io.h>
+#include <linux/err.h>
+#include <linux/slab.h>
+#include <mach/irqs.h>
+#include <plat/dmtimer.h>
+
+#define OMAP1610_GPTIMER1_BASE		0xfffb1400
+#define OMAP1610_GPTIMER2_BASE          0xfffb1c00
+#define OMAP1610_GPTIMER3_BASE          0xfffb2400
+#define OMAP1610_GPTIMER4_BASE          0xfffb2c00
+#define OMAP1610_GPTIMER5_BASE          0xfffb3400
+#define OMAP1610_GPTIMER6_BASE          0xfffb3c00
+#define OMAP1610_GPTIMER7_BASE          0xfffb7400
+#define OMAP1610_GPTIMER8_BASE          0xfffbd400
+
+#define OMAP1_DM_TIMER_COUNT	8
+
+static int omap1_dm_timer_set_clk(struct platform_device *pdev,
+				int source)
+{
+	int n = (pdev->id) << 1;
+	u32 l;
+
+	l = omap_readl(MOD_CONF_CTRL_1) & ~(0x03 << n);
+	l |= source << n;
+	omap_writel(l, MOD_CONF_CTRL_1);
+
+	return 0;
+}
+
+int __init omap1_dm_timer_init(void)
+{
+	int i;
+
+	if (!cpu_is_omap16xx())
+		return 0;
+
+	for (i = 0; i < OMAP1_DM_TIMER_COUNT; i++) {
+		struct platform_device *pdev;
+		struct omap_dmtimer_platform_data *pdata;
+		struct resource res[2];
+		u32 base, irq;
+		int ret;
+
+		switch (i) {
+		case 0:
+			base = OMAP1610_GPTIMER1_BASE;
+			irq = INT_1610_GPTIMER1;
+			break;
+		case 1:
+			base = OMAP1610_GPTIMER2_BASE;
+			irq = INT_1610_GPTIMER2;
+			break;
+		case 2:
+			base = OMAP1610_GPTIMER3_BASE;
+			irq = INT_1610_GPTIMER3;
+			break;
+		case 3:
+			base = OMAP1610_GPTIMER4_BASE;
+			irq = INT_1610_GPTIMER4;
+			break;
+		case 4:
+			base = OMAP1610_GPTIMER5_BASE;
+			irq = INT_1610_GPTIMER5;
+			break;
+		case 5:
+			base = OMAP1610_GPTIMER6_BASE;
+			irq = INT_1610_GPTIMER6;
+			break;
+		case 6:
+			base = OMAP1610_GPTIMER7_BASE;
+			irq = INT_1610_GPTIMER7;
+			break;
+		case 7:
+			base = OMAP1610_GPTIMER8_BASE;
+			irq = INT_1610_GPTIMER8;
+			break;
+		default:
+			/* Should never reach here */
+			return  -EINVAL;
+		}
+
+		pdev = platform_device_alloc("dmtimer", i);
+		if (!pdev) {
+			pr_err("%s: Unable to device alloc for dmtimer%d\n",
+				__func__, i);
+			return -ENOMEM;
+		}
+
+		memset(res, 0, 2 * sizeof(struct resource));
+		res[0].start = base;
+		res[0].end = base + 0xff;
+		res[0].flags = IORESOURCE_MEM;
+		res[1].start = res[1].end = irq;
+		res[1].flags = IORESOURCE_IRQ;
+		ret = platform_device_add_resources(pdev, res,
+				ARRAY_SIZE(res));
+		if (ret) {
+			pr_err("%s: Unable to add resources for %s%d\n",
+				__func__, pdev->name, pdev->id);
+			goto exit_device_put;
+		}
+
+		pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);
+		if (!pdata) {
+			pr_err("%s: Unable to allocate pdata for %s%d\n",
+				__func__, pdev->name, pdev->id);
+			ret = -ENOMEM;
+			goto exit_device_put;
+		}
+
+		pdata->omap_dm_set_source_clk = omap1_dm_timer_set_clk;
+		ret = platform_device_add_data(pdev, pdata, sizeof(*pdata));
+		if (ret) {
+			pr_err("%s: Unable to add platform data for %s%d\n",
+				__func__, pdev->name, pdev->id);
+			goto exit_release_pdata;
+		}
+		ret = platform_device_add(pdev);
+		if (ret) {
+			pr_err("%s: Unable to add platform device for %s%d\n",
+				__func__, pdev->name, pdev->id);
+			goto exit_release_pdata;
+		}
+		continue;
+exit_release_pdata:
+		kfree(pdata);
+exit_device_put:
+		platform_device_put(pdev);
+		return ret;
+	}
+	return 0;
+}
+arch_initcall(omap1_dm_timer_init);
diff --git a/arch/arm/mach-omap1/timer32k.c b/arch/arm/mach-omap1/timer32k.c
old mode 100644
new mode 100755
index 20cfbcc..6b8ab9b
--- a/arch/arm/mach-omap1/timer32k.c
+++ b/arch/arm/mach-omap1/timer32k.c
@@ -183,9 +183,6 @@ static __init void omap_init_32k_timer(void)
  */
 static void __init omap_timer_init(void)
 {
-#ifdef CONFIG_OMAP_DM_TIMER
-	omap_dm_timer_init();
-#endif
 	omap_init_32k_timer();
 }
 
-- 
1.6.0.4

Re: [PATCH] dmtimer: hwmod: OMAP1: device registration

[Kevin Hilman]

Tarun Kanti DebBarma <tarun.kanti@ti.com> writes:

> This patch converts OMAP1 dual mode timers into platform devices,
> adds support for registering them through generic linux platform
> device layer.

"...and changes the init sequence ordering from a sys_timer to an
arch_initcall" (more on this below...)

> Signed-off-by: Partha Basak <p-basak2@ti.com>
> Signed-off-by: Thara Gopinath <thara@ti.com>
> Signed-off-by: Tarun Kanti DebBarma <tarun.kanti@ti.com>
> Cc: Paul Walmsley <paul@pwsan.com>
> Cc: Kevin Hilman <khilman@deeprootsystems.com>
> Cc: Tony Lindgren <tony@atomide.com>

Tested on ... ?

> ---
>  arch/arm/mach-omap1/Makefile   |    2 +-
>  arch/arm/mach-omap1/dmtimer.c  |  146 ++++++++++++++++++++++++++++++++++++++++
>  arch/arm/mach-omap1/timer32k.c |    3 -
>  3 files changed, 147 insertions(+), 4 deletions(-)
>  mode change 100644 => 100755 arch/arm/mach-omap1/Makefile
>  create mode 100755 arch/arm/mach-omap1/dmtimer.c
>  mode change 100644 => 100755 arch/arm/mach-omap1/timer32k.c
>
> diff --git a/arch/arm/mach-omap1/Makefile b/arch/arm/mach-omap1/Makefile
> old mode 100644
> new mode 100755
> index 9a304d8..0001659
> --- a/arch/arm/mach-omap1/Makefile
> +++ b/arch/arm/mach-omap1/Makefile
> @@ -4,7 +4,7 @@
>  
>  # Common support
>  obj-y := io.o id.o sram.o irq.o mux.o flash.o serial.o devices.o
> -obj-y += clock.o clock_data.o opp_data.o
> +obj-y += clock.o clock_data.o opp_data.o dmtimer.o
>  
>  obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o
>  
> diff --git a/arch/arm/mach-omap1/dmtimer.c b/arch/arm/mach-omap1/dmtimer.c
> new file mode 100755
> index 0000000..b06d096
> --- /dev/null
> +++ b/arch/arm/mach-omap1/dmtimer.c
> @@ -0,0 +1,146 @@
> +/**
> + * OMAP1 Dual-Mode Timers
> + *
> + * Copyright (C) 2010 Texas Instruments, Inc.
> + * Thara Gopinath <thara@ti.com>
> + *
> + * 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 <linux/clk.h>
> +#include <linux/io.h>
> +#include <linux/err.h>
> +#include <linux/slab.h>
> +#include <mach/irqs.h>
> +#include <plat/dmtimer.h>
> +
> +#define OMAP1610_GPTIMER1_BASE		0xfffb1400
> +#define OMAP1610_GPTIMER2_BASE          0xfffb1c00
> +#define OMAP1610_GPTIMER3_BASE          0xfffb2400
> +#define OMAP1610_GPTIMER4_BASE          0xfffb2c00
> +#define OMAP1610_GPTIMER5_BASE          0xfffb3400
> +#define OMAP1610_GPTIMER6_BASE          0xfffb3c00
> +#define OMAP1610_GPTIMER7_BASE          0xfffb7400
> +#define OMAP1610_GPTIMER8_BASE          0xfffbd400
> +
> +#define OMAP1_DM_TIMER_COUNT	8
> +
> +static int omap1_dm_timer_set_clk(struct platform_device *pdev,
> +				int source)
> +{
> +	int n = (pdev->id) << 1;
> +	u32 l;
> +
> +	l = omap_readl(MOD_CONF_CTRL_1) & ~(0x03 << n);
> +	l |= source << n;
> +	omap_writel(l, MOD_CONF_CTRL_1);
> +
> +	return 0;
> +}
> +
> +int __init omap1_dm_timer_init(void)
> +{
> +	int i;
> +
> +	if (!cpu_is_omap16xx())
> +		return 0;
> +
> +	for (i = 0; i < OMAP1_DM_TIMER_COUNT; i++) {
> +		struct platform_device *pdev;
> +		struct omap_dmtimer_platform_data *pdata;
> +		struct resource res[2];
> +		u32 base, irq;
> +		int ret;
> +
> +		switch (i) {
> +		case 0:
> +			base = OMAP1610_GPTIMER1_BASE;
> +			irq = INT_1610_GPTIMER1;
> +			break;
> +		case 1:
> +			base = OMAP1610_GPTIMER2_BASE;
> +			irq = INT_1610_GPTIMER2;
> +			break;
> +		case 2:
> +			base = OMAP1610_GPTIMER3_BASE;
> +			irq = INT_1610_GPTIMER3;
> +			break;
> +		case 3:
> +			base = OMAP1610_GPTIMER4_BASE;
> +			irq = INT_1610_GPTIMER4;
> +			break;
> +		case 4:
> +			base = OMAP1610_GPTIMER5_BASE;
> +			irq = INT_1610_GPTIMER5;
> +			break;
> +		case 5:
> +			base = OMAP1610_GPTIMER6_BASE;
> +			irq = INT_1610_GPTIMER6;
> +			break;
> +		case 6:
> +			base = OMAP1610_GPTIMER7_BASE;
> +			irq = INT_1610_GPTIMER7;
> +			break;
> +		case 7:
> +			base = OMAP1610_GPTIMER8_BASE;
> +			irq = INT_1610_GPTIMER8;
> +			break;
> +		default:
> +			/* Should never reach here */
> +			return  -EINVAL;
> +		}

IMO, this would be much cleaner to just have a static list of
platform_devices with the base and IRQ resources hard coded and use

   platform_add_devices(..., ARRAY_SIZE(...)) 

instead of looping over the allocate/init/register 

> +		pdev = platform_device_alloc("dmtimer", i);
> +		if (!pdev) {
> +			pr_err("%s: Unable to device alloc for dmtimer%d\n",
> +				__func__, i);
> +			return -ENOMEM;
> +		}
> +
> +		memset(res, 0, 2 * sizeof(struct resource));
> +		res[0].start = base;
> +		res[0].end = base + 0xff;
> +		res[0].flags = IORESOURCE_MEM;
> +		res[1].start = res[1].end = irq;
> +		res[1].flags = IORESOURCE_IRQ;
> +		ret = platform_device_add_resources(pdev, res,
> +				ARRAY_SIZE(res));
> +		if (ret) {
> +			pr_err("%s: Unable to add resources for %s%d\n",
> +				__func__, pdev->name, pdev->id);
> +			goto exit_device_put;
> +		}
> +
> +		pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);
> +		if (!pdata) {
> +			pr_err("%s: Unable to allocate pdata for %s%d\n",
> +				__func__, pdev->name, pdev->id);
> +			ret = -ENOMEM;
> +			goto exit_device_put;
> +		}
> +
> +		pdata->omap_dm_set_source_clk = omap1_dm_timer_set_clk;
> +		ret = platform_device_add_data(pdev, pdata, sizeof(*pdata));
> +		if (ret) {
> +			pr_err("%s: Unable to add platform data for %s%d\n",
> +				__func__, pdev->name, pdev->id);
> +			goto exit_release_pdata;
> +		}
> +		ret = platform_device_add(pdev);
> +		if (ret) {
> +			pr_err("%s: Unable to add platform device for %s%d\n",
> +				__func__, pdev->name, pdev->id);
> +			goto exit_release_pdata;
> +		}
> +		continue;
> +exit_release_pdata:
> +		kfree(pdata);
> +exit_device_put:
> +		platform_device_put(pdev);
> +		return ret;
> +	}
> +	return 0;
> +}
> +arch_initcall(omap1_dm_timer_init);
> diff --git a/arch/arm/mach-omap1/timer32k.c b/arch/arm/mach-omap1/timer32k.c
> old mode 100644
> new mode 100755
> index 20cfbcc..6b8ab9b
> --- a/arch/arm/mach-omap1/timer32k.c
> +++ b/arch/arm/mach-omap1/timer32k.c
> @@ -183,9 +183,6 @@ static __init void omap_init_32k_timer(void)
>   */
>  static void __init omap_timer_init(void)
>  {
> -#ifdef CONFIG_OMAP_DM_TIMER
> -	omap_dm_timer_init();
> -#endif
>  	omap_init_32k_timer();
>  }

You change the init sequence here from a sys_timer to an
arch_initcall(), yet there is no description in the changelog, or 
an explanation of why things still work, etc.

Please add to your changelog a description of this change, and why it still
works.

Thanks,

Kevin