Commit ac5761a6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'next/timer' of git://git.linaro.org/people/arnd/arm-soc 

* 'next/timer' of git://git.linaro.org/people/arnd/arm-soc:
  clocksource: fixup ux500 build problems
  ARM: omap: use __devexit_p in dmtimer driver
  ARM: ux500: Reprogram timers upon resume
  ARM: plat-nomadik: timer: Export reset functions
  ARM: plat-nomadik: timer: Add support for periodic timers
  ARM: ux500: Move timer code to separate file
  ARM: ux500: add support for clocksource DBX500 PRCMU
  clocksource: add DBX500 PRCMU Timer support
  ARM: plat-nomadik: MTU sched_clock as an option
  ARM: OMAP: dmtimer: add error handling to export APIs
  ARM: OMAP: dmtimer: low-power mode support
  ARM: OMAP: dmtimer: skip reserved timers
  ARM: OMAP: dmtimer: pm_runtime support
  ARM: OMAP: dmtimer: switch-over to platform device driver
  ARM: OMAP: dmtimer: platform driver
  ARM: OMAP2+: dmtimer: convert to platform devices
  ARM: OMAP1: dmtimer: conversion to platform devices
  ARM: OMAP2+: dmtimer: add device names to flck nodes
  ARM: OMAP: Add support for dmtimer v2 ip
parents 25498e5b eed1e576

arch/arm/mach-omap1/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


# Common support

obj-y := io.o id.o sram.o time.o irq.o mux.o flash.o serial.o devices.o dma.o

obj-y += clock.o clock_data.o opp_data.o reset.o pm_bus.o

obj-y += clock.o clock_data.o opp_data.o reset.o pm_bus.o timer.o



obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o

arch/arm/mach-omap1/timer.c

0 → 100644
+173 −0
Original line number Diff line number Diff line 
/**

 * OMAP1 Dual-Mode Timers - platform device registration

 *

 * Contains first level initialization routines which internally

 * generates timer device information and registers with linux

 * device model. It also has low level function to chnage the timer

 * input clock source.

 *

 * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/

 * Tarun Kanti DebBarma <tarun.kanti@ti.com>

 * 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.

 *

 * This program is distributed "as is" WITHOUT ANY WARRANTY of any

 * kind, whether express or implied; without even the implied warranty

 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#include <linux/clk.h>

#include <linux/io.h>

#include <linux/err.h>

#include <linux/slab.h>

#include <linux/platform_device.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_src(struct platform_device *pdev,

				int source)

{

	int n = (pdev->id - 1) << 1;

	u32 l;



	l = __raw_readl(MOD_CONF_CTRL_1) & ~(0x03 << n);

	l |= source << n;

	__raw_writel(l, MOD_CONF_CTRL_1);



	return 0;

}





int __init omap1_dm_timer_init(void)

{

	int i;

	int ret;

	struct dmtimer_platform_data *pdata;

	struct platform_device *pdev;



	if (!cpu_is_omap16xx())

		return 0;



	for (i = 1; i <= OMAP1_DM_TIMER_COUNT; i++) {

		struct resource res[2];

		u32 base, irq;



		switch (i) {

		case 1:

			base = OMAP1610_GPTIMER1_BASE;

			irq = INT_1610_GPTIMER1;

			break;

		case 2:

			base = OMAP1610_GPTIMER2_BASE;

			irq = INT_1610_GPTIMER2;

			break;

		case 3:

			base = OMAP1610_GPTIMER3_BASE;

			irq = INT_1610_GPTIMER3;

			break;

		case 4:

			base = OMAP1610_GPTIMER4_BASE;

			irq = INT_1610_GPTIMER4;

			break;

		case 5:

			base = OMAP1610_GPTIMER5_BASE;

			irq = INT_1610_GPTIMER5;

			break;

		case 6:

			base = OMAP1610_GPTIMER6_BASE;

			irq = INT_1610_GPTIMER6;

			break;

		case 7:

			base = OMAP1610_GPTIMER7_BASE;

			irq = INT_1610_GPTIMER7;

			break;

		case 8:

			base = OMAP1610_GPTIMER8_BASE;

			irq = INT_1610_GPTIMER8;

			break;

		default:

			/*

			 * not supposed to reach here.

			 * this is to remove warning.

			 */

			return -EINVAL;

		}



		pdev = platform_device_alloc("omap_timer", i);

		if (!pdev) {

			pr_err("%s: Failed 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 + 0x46;

		res[0].flags = IORESOURCE_MEM;

		res[1].start = irq;

		res[1].end = irq;

		res[1].flags = IORESOURCE_IRQ;

		ret = platform_device_add_resources(pdev, res,

				ARRAY_SIZE(res));

		if (ret) {

			dev_err(&pdev->dev, "%s: Failed to add resources.\n",

				__func__);

			goto err_free_pdev;

		}



		pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);

		if (!pdata) {

			dev_err(&pdev->dev, "%s: Failed to allocate pdata.\n",

				__func__);

			ret = -ENOMEM;

			goto err_free_pdata;

		}



		pdata->set_timer_src = omap1_dm_timer_set_src;

		pdata->needs_manual_reset = 1;



		ret = platform_device_add_data(pdev, pdata, sizeof(*pdata));

		if (ret) {

			dev_err(&pdev->dev, "%s: Failed to add platform data.\n",

				__func__);

			goto err_free_pdata;

		}



		ret = platform_device_add(pdev);

		if (ret) {

			dev_err(&pdev->dev, "%s: Failed to add platform device.\n",

				__func__);

			goto err_free_pdata;

		}



		dev_dbg(&pdev->dev, " Registered.\n");

	}



	return 0;



err_free_pdata:

	kfree(pdata);



err_free_pdev:

	platform_device_unregister(pdev);



	return ret;

}

arch_initcall(omap1_dm_timer_init);

arch/arm/mach-omap2/clock2420_data.c

+48 −0
Original line number Diff line number Diff line
@@ -1898,6 +1898,54 @@ static struct omap_clk omap2420_clks[] = { 
	CLK(NULL,	"pka_ick",	&pka_ick,	CK_242X),

	CLK(NULL,	"usb_fck",	&usb_fck,	CK_242X),

	CLK("musb-hdrc",	"fck",	&osc_ck,	CK_242X),

	CLK("omap_timer.1",	"fck",	&gpt1_fck,	CK_242X),

	CLK("omap_timer.2",	"fck",	&gpt2_fck,	CK_242X),

	CLK("omap_timer.3",	"fck",	&gpt3_fck,	CK_242X),

	CLK("omap_timer.4",	"fck",	&gpt4_fck,	CK_242X),

	CLK("omap_timer.5",	"fck",	&gpt5_fck,	CK_242X),

	CLK("omap_timer.6",	"fck",	&gpt6_fck,	CK_242X),

	CLK("omap_timer.7",	"fck",	&gpt7_fck,	CK_242X),

	CLK("omap_timer.8",	"fck",	&gpt8_fck,	CK_242X),

	CLK("omap_timer.9",	"fck",	&gpt9_fck,	CK_242X),

	CLK("omap_timer.10",	"fck",	&gpt10_fck,	CK_242X),

	CLK("omap_timer.11",	"fck",	&gpt11_fck,	CK_242X),

	CLK("omap_timer.12",	"fck",	&gpt12_fck,	CK_242X),

	CLK("omap_timer.1",	"32k_ck",	&func_32k_ck,	CK_243X),

	CLK("omap_timer.2",	"32k_ck",	&func_32k_ck,	CK_243X),

	CLK("omap_timer.3",	"32k_ck",	&func_32k_ck,	CK_243X),

	CLK("omap_timer.4",	"32k_ck",	&func_32k_ck,	CK_243X),

	CLK("omap_timer.5",	"32k_ck",	&func_32k_ck,	CK_243X),

	CLK("omap_timer.6",	"32k_ck",	&func_32k_ck,	CK_243X),

	CLK("omap_timer.7",	"32k_ck",	&func_32k_ck,	CK_243X),

	CLK("omap_timer.8",	"32k_ck",	&func_32k_ck,	CK_243X),

	CLK("omap_timer.9",	"32k_ck",	&func_32k_ck,	CK_243X),

	CLK("omap_timer.10",	"32k_ck",	&func_32k_ck,	CK_243X),

	CLK("omap_timer.11",	"32k_ck",	&func_32k_ck,	CK_243X),

	CLK("omap_timer.12",	"32k_ck",	&func_32k_ck,	CK_243X),

	CLK("omap_timer.1",	"sys_ck",	&sys_ck,	CK_243X),

	CLK("omap_timer.2",	"sys_ck",	&sys_ck,	CK_243X),

	CLK("omap_timer.3",	"sys_ck",	&sys_ck,	CK_243X),

	CLK("omap_timer.4",	"sys_ck",	&sys_ck,	CK_243X),

	CLK("omap_timer.5",	"sys_ck",	&sys_ck,	CK_243X),

	CLK("omap_timer.6",	"sys_ck",	&sys_ck,	CK_243X),

	CLK("omap_timer.7",	"sys_ck",	&sys_ck,	CK_243X),

	CLK("omap_timer.8",	"sys_ck",	&sys_ck,	CK_243X),

	CLK("omap_timer.9",	"sys_ck",	&sys_ck,	CK_243X),

	CLK("omap_timer.10",	"sys_ck",	&sys_ck,	CK_243X),

	CLK("omap_timer.11",	"sys_ck",	&sys_ck,	CK_243X),

	CLK("omap_timer.12",	"sys_ck",	&sys_ck,	CK_243X),

	CLK("omap_timer.1",	"alt_ck",	&alt_ck,	CK_243X),

	CLK("omap_timer.2",	"alt_ck",	&alt_ck,	CK_243X),

	CLK("omap_timer.3",	"alt_ck",	&alt_ck,	CK_243X),

	CLK("omap_timer.4",	"alt_ck",	&alt_ck,	CK_243X),

	CLK("omap_timer.5",	"alt_ck",	&alt_ck,	CK_243X),

	CLK("omap_timer.6",	"alt_ck",	&alt_ck,	CK_243X),

	CLK("omap_timer.7",	"alt_ck",	&alt_ck,	CK_243X),

	CLK("omap_timer.8",	"alt_ck",	&alt_ck,	CK_243X),

	CLK("omap_timer.9",	"alt_ck",	&alt_ck,	CK_243X),

	CLK("omap_timer.10",	"alt_ck",	&alt_ck,	CK_243X),

	CLK("omap_timer.11",	"alt_ck",	&alt_ck,	CK_243X),

	CLK("omap_timer.12",	"alt_ck",	&alt_ck,	CK_243X),

};



/*

arch/arm/mach-omap2/clock2430_data.c

+48 −0
Original line number Diff line number Diff line
@@ -1998,6 +1998,54 @@ static struct omap_clk omap2430_clks[] = { 
	CLK(NULL,	"mdm_intc_ick",	&mdm_intc_ick,	CK_243X),

	CLK("omap_hsmmc.0", "mmchsdb_fck",	&mmchsdb1_fck,	CK_243X),

	CLK("omap_hsmmc.1", "mmchsdb_fck",	&mmchsdb2_fck,	CK_243X),

	CLK("omap_timer.1",     "fck",  &gpt1_fck,      CK_243X),

	CLK("omap_timer.2",     "fck",  &gpt2_fck,      CK_243X),

	CLK("omap_timer.3",     "fck",  &gpt3_fck,      CK_243X),

	CLK("omap_timer.4",     "fck",  &gpt4_fck,      CK_243X),

	CLK("omap_timer.5",     "fck",  &gpt5_fck,      CK_243X),

	CLK("omap_timer.6",     "fck",  &gpt6_fck,      CK_243X),

	CLK("omap_timer.7",     "fck",  &gpt7_fck,      CK_243X),

	CLK("omap_timer.8",     "fck",  &gpt8_fck,      CK_243X),

	CLK("omap_timer.9",     "fck",  &gpt9_fck,      CK_243X),

	CLK("omap_timer.10",    "fck",  &gpt10_fck,     CK_243X),

	CLK("omap_timer.11",    "fck",  &gpt11_fck,     CK_243X),

	CLK("omap_timer.12",    "fck",  &gpt12_fck,     CK_243X),

	CLK("omap_timer.1",	"32k_ck",  &func_32k_ck,   CK_243X),

	CLK("omap_timer.2",	"32k_ck",  &func_32k_ck,   CK_243X),

	CLK("omap_timer.3",	"32k_ck",  &func_32k_ck,   CK_243X),

	CLK("omap_timer.4",	"32k_ck",  &func_32k_ck,   CK_243X),

	CLK("omap_timer.5",	"32k_ck",  &func_32k_ck,   CK_243X),

	CLK("omap_timer.6",	"32k_ck",  &func_32k_ck,   CK_243X),

	CLK("omap_timer.7",	"32k_ck",  &func_32k_ck,   CK_243X),

	CLK("omap_timer.8",	"32k_ck",  &func_32k_ck,   CK_243X),

	CLK("omap_timer.9",	"32k_ck",  &func_32k_ck,   CK_243X),

	CLK("omap_timer.10",	"32k_ck",  &func_32k_ck,   CK_243X),

	CLK("omap_timer.11",	"32k_ck",  &func_32k_ck,   CK_243X),

	CLK("omap_timer.12",	"32k_ck",  &func_32k_ck,   CK_243X),

	CLK("omap_timer.1",	"sys_ck",	&sys_ck,	CK_243X),

	CLK("omap_timer.2",	"sys_ck",	&sys_ck,	CK_243X),

	CLK("omap_timer.3",	"sys_ck",	&sys_ck,	CK_243X),

	CLK("omap_timer.4",	"sys_ck",	&sys_ck,	CK_243X),

	CLK("omap_timer.5",	"sys_ck",	&sys_ck,	CK_243X),

	CLK("omap_timer.6",	"sys_ck",	&sys_ck,	CK_243X),

	CLK("omap_timer.7",	"sys_ck",	&sys_ck,	CK_243X),

	CLK("omap_timer.8",	"sys_ck",	&sys_ck,	CK_243X),

	CLK("omap_timer.9",	"sys_ck",	&sys_ck,	CK_243X),

	CLK("omap_timer.10",	"sys_ck",	&sys_ck,	CK_243X),

	CLK("omap_timer.11",	"sys_ck",	&sys_ck,	CK_243X),

	CLK("omap_timer.12",	"sys_ck",	&sys_ck,	CK_243X),

	CLK("omap_timer.1",	"alt_ck",	&alt_ck,	CK_243X),

	CLK("omap_timer.2",	"alt_ck",	&alt_ck,	CK_243X),

	CLK("omap_timer.3",	"alt_ck",	&alt_ck,	CK_243X),

	CLK("omap_timer.4",	"alt_ck",	&alt_ck,	CK_243X),

	CLK("omap_timer.5",	"alt_ck",	&alt_ck,	CK_243X),

	CLK("omap_timer.6",	"alt_ck",	&alt_ck,	CK_243X),

	CLK("omap_timer.7",	"alt_ck",	&alt_ck,	CK_243X),

	CLK("omap_timer.8",	"alt_ck",	&alt_ck,	CK_243X),

	CLK("omap_timer.9",	"alt_ck",	&alt_ck,	CK_243X),

	CLK("omap_timer.10",	"alt_ck",	&alt_ck,	CK_243X),

	CLK("omap_timer.11",	"alt_ck",	&alt_ck,	CK_243X),

	CLK("omap_timer.12",	"alt_ck",	&alt_ck,	CK_243X),

};



/*

arch/arm/mach-omap2/clock3xxx_data.c

+36 −0
Original line number Diff line number Diff line
@@ -3464,6 +3464,42 @@ static struct omap_clk omap3xxx_clks[] = { 
	CLK("musb-am35x",	"fck",		&hsotgusb_fck_am35xx,	CK_AM35XX),

	CLK(NULL,	"hecc_ck",	&hecc_ck,	CK_AM35XX),

	CLK(NULL,	"uart4_ick",	&uart4_ick_am35xx,	CK_AM35XX),

	CLK("omap_timer.1",	"fck",	&gpt1_fck,	CK_3XXX),

	CLK("omap_timer.2",	"fck",	&gpt2_fck,	CK_3XXX),

	CLK("omap_timer.3",	"fck",	&gpt3_fck,	CK_3XXX),

	CLK("omap_timer.4",	"fck",	&gpt4_fck,	CK_3XXX),

	CLK("omap_timer.5",	"fck",	&gpt5_fck,	CK_3XXX),

	CLK("omap_timer.6",	"fck",	&gpt6_fck,	CK_3XXX),

	CLK("omap_timer.7",	"fck",	&gpt7_fck,	CK_3XXX),

	CLK("omap_timer.8",	"fck",	&gpt8_fck,	CK_3XXX),

	CLK("omap_timer.9",	"fck",	&gpt9_fck,	CK_3XXX),

	CLK("omap_timer.10",    "fck",  &gpt10_fck,     CK_3XXX),

	CLK("omap_timer.11",    "fck",  &gpt11_fck,     CK_3XXX),

	CLK("omap_timer.12",    "fck",  &gpt12_fck,     CK_3XXX),

	CLK("omap_timer.1",	"32k_ck",	&omap_32k_fck,  CK_3XXX),

	CLK("omap_timer.2",	"32k_ck",	&omap_32k_fck,  CK_3XXX),

	CLK("omap_timer.3",	"32k_ck",	&omap_32k_fck,  CK_3XXX),

	CLK("omap_timer.4",	"32k_ck",	&omap_32k_fck,  CK_3XXX),

	CLK("omap_timer.5",	"32k_ck",	&omap_32k_fck,  CK_3XXX),

	CLK("omap_timer.6",	"32k_ck",	&omap_32k_fck,  CK_3XXX),

	CLK("omap_timer.7",	"32k_ck",	&omap_32k_fck,  CK_3XXX),

	CLK("omap_timer.8",	"32k_ck",	&omap_32k_fck,  CK_3XXX),

	CLK("omap_timer.9",	"32k_ck",	&omap_32k_fck,  CK_3XXX),

	CLK("omap_timer.10",	"32k_ck",	&omap_32k_fck,  CK_3XXX),

	CLK("omap_timer.11",	"32k_ck",	&omap_32k_fck,  CK_3XXX),

	CLK("omap_timer.12",	"32k_ck",	&omap_32k_fck,  CK_3XXX),

	CLK("omap_timer.1",	"sys_ck",	&sys_ck,	CK_3XXX),

	CLK("omap_timer.2",	"sys_ck",	&sys_ck,	CK_3XXX),

	CLK("omap_timer.3",	"sys_ck",	&sys_ck,	CK_3XXX),

	CLK("omap_timer.4",	"sys_ck",	&sys_ck,	CK_3XXX),

	CLK("omap_timer.5",	"sys_ck",	&sys_ck,	CK_3XXX),

	CLK("omap_timer.6",	"sys_ck",	&sys_ck,	CK_3XXX),

	CLK("omap_timer.7",	"sys_ck",	&sys_ck,	CK_3XXX),

	CLK("omap_timer.8",	"sys_ck",	&sys_ck,	CK_3XXX),

	CLK("omap_timer.9",	"sys_ck",	&sys_ck,	CK_3XXX),

	CLK("omap_timer.10",	"sys_ck",	&sys_ck,	CK_3XXX),

	CLK("omap_timer.11",	"sys_ck",	&sys_ck,	CK_3XXX),

	CLK("omap_timer.12",	"sys_ck",	&sys_ck,	CK_3XXX),

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE