diff --git a/arch/arm/mach-omap/Kconfig b/arch/arm/mach-omap/Kconfig index c451cf0..5ab0143 100644 --- a/arch/arm/mach-omap/Kconfig +++ b/arch/arm/mach-omap/Kconfig @@ -43,7 +43,7 @@ select CPU_V7 select GENERIC_GPIO select OFTREE - select OMAP_CLOCK_SOURCE_DMTIMER + select CLOCKSOURCE_TI_DM select ARM_USE_COMPRESSED_DTB help Say Y here if you are using Texas Instrument's AM33xx based platform @@ -52,9 +52,6 @@ config OMAP_CLOCK_SOURCE_S32K bool -config OMAP_CLOCK_SOURCE_DMTIMER - bool - config OMAP_GPMC prompt "Support for GPMC configuration" bool diff --git a/arch/arm/mach-omap/Makefile b/arch/arm/mach-omap/Makefile index a84e94e..4ce8e10 100644 --- a/arch/arm/mach-omap/Makefile +++ b/arch/arm/mach-omap/Makefile @@ -18,7 +18,6 @@ obj-$(CONFIG_ARCH_OMAP) += syslib.o omap_devices.o omap_generic.o omap_fb.o pbl-$(CONFIG_ARCH_OMAP) += syslib.o obj-$(CONFIG_OMAP_CLOCK_SOURCE_S32K) += s32k_clksource.o -obj-$(CONFIG_OMAP_CLOCK_SOURCE_DMTIMER) += dmtimer.o obj-$(CONFIG_ARCH_OMAP3) += omap3_generic.o auxcr.o pbl-$(CONFIG_ARCH_OMAP3) += omap3_generic.o auxcr.o obj-$(CONFIG_ARCH_OMAP4) += omap4_generic.o omap4_clock.o diff --git a/arch/arm/mach-omap/am33xx_generic.c b/arch/arm/mach-omap/am33xx_generic.c index 5137462..c446431 100644 --- a/arch/arm/mach-omap/am33xx_generic.c +++ b/arch/arm/mach-omap/am33xx_generic.c @@ -256,7 +256,10 @@ int am33xx_devices_init(void) { - return am33xx_gpio_init(); + am33xx_gpio_init(); + add_generic_device("omap-dmtimer", 0, NULL, AM33XX_DMTIMER2_BASE, 0x400, + IORESOURCE_MEM, NULL); + return 0; } /* UART Defines */ diff --git a/arch/arm/mach-omap/dmtimer.c b/arch/arm/mach-omap/dmtimer.c deleted file mode 100644 index e223b8c..0000000 --- a/arch/arm/mach-omap/dmtimer.c +++ /dev/null @@ -1,98 +0,0 @@ -/** - * @file - * @brief Support DMTimer counter - * - * FileName: arch/arm/mach-omap/dmtimer.c - */ -/* - * This File is based on arch/arm/mach-omap/s32k_clksource.c - * (C) Copyright 2008 - * Texas Instruments, - * Nishanth Menon - * - * (C) Copyright 2012 Phytec Messtechnik GmbH - * Author: Teresa Gámez - * (C) Copyright 2015 Phytec Messtechnik GmbH - * Author: Daniel Schultz - * - * 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. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - */ - -#include -#include -#include -#include -#include - -#include - -#define CLK_RC32K 32768 - -#define TIDR 0x0 -#define TIOCP_CFG 0x10 -#define IRQ_EOI 0x20 -#define IRQSTATUS_RAW 0x24 -#define IRQSTATUS 0x28 -#define IRQSTATUS_SET 0x2c -#define IRQSTATUS_CLR 0x30 -#define IRQWAKEEN 0x34 -#define TCLR 0x38 -#define TCRR 0x3C -#define TLDR 0x40 -#define TTGR 0x44 -#define TWPS 0x48 -#define TMAR 0x4C -#define TCAR1 0x50 -#define TSICR 0x54 -#define TCAR2 0x58 - -static void *base = (void *)AM33XX_DMTIMER2_BASE; - -/** - * @brief Provide a simple counter read - * - * @return DMTimer counter - */ -static uint64_t dmtimer_read(void) -{ - return readl(base + TCRR); -} - -static struct clocksource dmtimer_cs = { - .read = dmtimer_read, - .mask = CLOCKSOURCE_MASK(32), - .shift = 10, -}; - -/** - * @brief Initialize the Clock - * - * Enable dmtimer. - * - * @return result of @ref init_clock - */ -static int dmtimer_init(void) -{ - u64 clk_speed; - - clk_speed = am33xx_get_osc_clock(); - clk_speed *= 1000; - dmtimer_cs.mult = clocksource_hz2mult(clk_speed, dmtimer_cs.shift); - - /* Enable counter */ - writel(0x3, base + TCLR); - - return init_clock(&dmtimer_cs); -} - -/* Run me at boot time */ -core_initcall(dmtimer_init); diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index 337a7a2..2228d44 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -88,4 +88,7 @@ help Enables the support for the dw_apb timer. +config CLOCKSOURCE_TI_DM + bool + endmenu diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile index ab78f07..3b154cb 100644 --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile @@ -15,3 +15,4 @@ obj-$(CONFIG_CLOCKSOURCE_ARM_GLOBAL_TIMER) += arm_global_timer.o obj-$(CONFIG_CLOCKSOURCE_IMX_GPT) += timer-imx-gpt.o obj-$(CONFIG_CLOCKSOURCE_DW_APB_TIMER) += dw_apb_timer.o +obj-$(CONFIG_CLOCKSOURCE_TI_DM) += timer-ti-dm.o \ No newline at end of file diff --git a/drivers/clocksource/timer-ti-dm.c b/drivers/clocksource/timer-ti-dm.c new file mode 100644 index 0000000..f41f0bb --- /dev/null +++ b/drivers/clocksource/timer-ti-dm.c @@ -0,0 +1,119 @@ +/** + * @file + * @brief Support DMTimer counter + * + * FileName: arch/arm/mach-omap/dmtimer.c + */ +/* + * This File is based on arch/arm/mach-omap/s32k_clksource.c + * (C) Copyright 2008 + * Texas Instruments, + * Nishanth Menon + * + * (C) Copyright 2012 Phytec Messtechnik GmbH + * Author: Teresa Gámez + * (C) Copyright 2015 Phytec Messtechnik GmbH + * Author: Daniel Schultz + * + * 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. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + */ + +#include +#include +#include +#include +#include +#include + +#include + +#define CLK_RC32K 32768 + +#define TIDR 0x0 +#define TIOCP_CFG 0x10 +#define IRQ_EOI 0x20 +#define IRQSTATUS_RAW 0x24 +#define IRQSTATUS 0x28 +#define IRQSTATUS_SET 0x2c +#define IRQSTATUS_CLR 0x30 +#define IRQWAKEEN 0x34 +#define TCLR 0x38 +#define TCRR 0x3C +#define TLDR 0x40 +#define TTGR 0x44 +#define TWPS 0x48 +#define TMAR 0x4C +#define TCAR1 0x50 +#define TSICR 0x54 +#define TCAR2 0x58 + +static void *base; + +/** + * @brief Provide a simple counter read + * + * @return DMTimer counter + */ +static uint64_t dmtimer_read(void) +{ + return readl(base + TCRR); +} + +static struct clocksource dmtimer_cs = { + .read = dmtimer_read, + .mask = CLOCKSOURCE_MASK(32), + .shift = 10, +}; + +static int omap_dmtimer_probe(struct device_d *dev) +{ + struct resource *iores; + u64 clk_speed; + + /* one timer is enough */ + if (base) + return 0; + + iores = dev_request_mem_resource(dev, 0); + if (IS_ERR(iores)) + return PTR_ERR(iores); + base = IOMEM(iores->start); + + clk_speed = am33xx_get_osc_clock(); + clk_speed *= 1000; + dmtimer_cs.mult = clocksource_hz2mult(clk_speed, dmtimer_cs.shift); + + /* Enable counter */ + writel(0x3, base + TCLR); + + return init_clock(&dmtimer_cs); +} + +static __maybe_unused struct of_device_id omap_dmtimer_dt_ids[] = { + { + .compatible = "ti,am335x-timer", + }, { + /* sentinel */ + } +}; + +static struct driver_d omap_dmtimer_driver = { + .name = "omap-dmtimer", + .probe = omap_dmtimer_probe, + .of_compatible = DRV_OF_COMPAT(omap_dmtimer_dt_ids), +}; + +static int omap_dmtimer_init(void) +{ + return platform_driver_register(&omap_dmtimer_driver); +} +postcore_initcall(omap_dmtimer_init);