ARM: davinci: use the new clocksource driver
Subsystems (3)
cover ARM: davinci: use the new clocksource driver
From: Bartosz Golaszewski <[email protected]>
Sekhar,
the following patches switch DaVinci to using the new clocksource driver which is now upstream. They are rebased on top of v5.3-rc1. Additionally the following two patches were reverted locally due to a regression in v5.3-rc1 about which the relevant maintainers have been already notified:
2eef1399a866 modules: fix BUG when load module with rodata=n 93651f80dcb6 modules: fix compile error if don't have strict module rwx
Bartosz Golaszewski (10):
ARM: davinci: enable the clocksource driver for DT mode
ARM: davinci: WARN_ON() if clk_get() fails
ARM: davinci: da850: switch to using the clocksource driver
ARM: davinci: da830: switch to using the clocksource driver
ARM: davinci: move timer definitions to davinci.h
ARM: davinci: dm355: switch to using the clocksource driver
ARM: davinci: dm365: switch to using the clocksource driver
ARM: davinci: dm644x: switch to using the clocksource driver
ARM: davinci: dm646x: switch to using the clocksource driver
ARM: davinci: remove legacy timer support
arch/arm/Kconfig | 1 + arch/arm/mach-davinci/Makefile | 3 +- arch/arm/mach-davinci/da830.c | 45 +-- arch/arm/mach-davinci/da850.c | 50 +-- arch/arm/mach-davinci/davinci.h | 3 + arch/arm/mach-davinci/devices-da8xx.c | 1 - arch/arm/mach-davinci/devices.c | 19 - arch/arm/mach-davinci/dm355.c | 28 +- arch/arm/mach-davinci/dm365.c | 26 +- arch/arm/mach-davinci/dm644x.c | 28 +- arch/arm/mach-davinci/dm646x.c | 28 +- arch/arm/mach-davinci/include/mach/common.h | 17 - arch/arm/mach-davinci/include/mach/time.h | 35 -- arch/arm/mach-davinci/time.c | 414 -------------------- 14 files changed, 110 insertions(+), 588 deletions(-) delete mode 100644 arch/arm/mach-davinci/include/mach/time.h delete mode 100644 arch/arm/mach-davinci/time.c
Signature · 1 line
2.21.0
PATCH RESEND 1/10 ARM: davinci: enable the clocksource driver for DT mode
From: Bartosz Golaszewski <[email protected]>
Switch all davinci boards supporting device tree to using the new clocksource driver: remove the previous OF_TIMER_DECLARE() from mach-davinci and select davinci-timer for ARCH_DAVINCI.
--- arch/arm/Kconfig | 1 + arch/arm/mach-davinci/time.c | 14 -------------- 2 files changed, 1 insertion(+), 14 deletions(-)
arch/arm/Kconfig +1 -0
@@ -583,6 +583,7 @@ config ARCH_DAVINCI select ARCH_HAS_HOLES_MEMORYMODEL select COMMON_CLK select CPU_ARM926T + select DAVINCI_TIMER select GENERIC_ALLOCATOR select GENERIC_CLOCKEVENTS select GENERIC_IRQ_CHIP
arch/arm/mach-davinci/time.c +0 -14
@@ -398,17 +398,3 @@ void __init davinci_timer_init(struct clk *timer_clk)for (i=0 ; i<ARRAY_SIZE (timers); i++)timer32_config (&timers[i]); } - -static int __init of_davinci_timer_init (struct device_node *np) -{ -struct clk *clk; - - clk =of_clk_get (np,0 ); -if (IS_ERR (clk)) -return PTR_ERR (clk); - -davinci_timer_init (clk); - -return 0 ; -} -TIMER_OF_DECLARE (davinci_timer,"ti,da830-timer" , of_davinci_timer_init);
Signature · 1 line
2.21.0
PATCH RESEND 2/10 ARM: davinci: WARN_ON() if clk_get() fails
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
Currently the timer code checks if the clock pointer passed to it is good (!IS_ERR(clk)). The new clocksource driver expects the clock to be functional and doesn't perform any checks so emit a warning if clk_get() fails. Apply this to all davinci platforms.
--- arch/arm/mach-davinci/da830.c | 4 ++++ arch/arm/mach-davinci/da850.c | 4 ++++ arch/arm/mach-davinci/dm355.c | 4 ++++ arch/arm/mach-davinci/dm365.c | 4 ++++ arch/arm/mach-davinci/dm644x.c | 4 ++++ arch/arm/mach-davinci/dm646x.c | 4 ++++ 6 files changed, 24 insertions(+)
arch/arm/mach-davinci/da830.c +4 -0
@@ -751,6 +751,10 @@ void __init da830_init_time(void)da830_pll_init (NULL , pll,NULL ); clk =clk_get (NULL ,"timer0" ); +if (WARN_ON (IS_ERR (clk))) { +pr_err ("Unable to get the timer clock\n" ); +return ; + }davinci_timer_init (clk); }
arch/arm/mach-davinci/da850.c +4 -0
@@ -681,6 +681,10 @@ void __init da850_init_time(void)da850_pll0_init (NULL , pll0, cfgchip); clk =clk_get (NULL ,"timer0" ); +if (WARN_ON (IS_ERR (clk))) { +pr_err ("Unable to get the timer clock\n" ); +return ; + }davinci_timer_init (clk); }
arch/arm/mach-davinci/dm355.c +4 -0
@@ -743,6 +743,10 @@ void __init dm355_init_time(void)dm355_psc_init (NULL , psc); clk =clk_get (NULL ,"timer0" ); +if (WARN_ON (IS_ERR (clk))) { +pr_err ("Unable to get the timer clock\n" ); +return ; + }davinci_timer_init (clk); }
arch/arm/mach-davinci/dm365.c +4 -0
@@ -784,6 +784,10 @@ void __init dm365_init_time(void)dm365_psc_init (NULL , psc); clk =clk_get (NULL ,"timer0" ); +if (WARN_ON (IS_ERR (clk))) { +pr_err ("Unable to get the timer clock\n" ); +return ; + }davinci_timer_init (clk); }
arch/arm/mach-davinci/dm644x.c +4 -0
@@ -679,6 +679,10 @@ void __init dm644x_init_time(void)dm644x_psc_init (NULL , psc); clk =clk_get (NULL ,"timer0" ); +if (WARN_ON (IS_ERR (clk))) { +pr_err ("Unable to get the timer clock\n" ); +return ; + }davinci_timer_init (clk); }
arch/arm/mach-davinci/dm646x.c +4 -0
@@ -663,6 +663,10 @@ void __init dm646x_init_time(unsigned long ref_clk_rate,dm646x_psc_init (NULL , psc); clk =clk_get (NULL ,"timer0" ); +if (WARN_ON (IS_ERR (clk))) { +pr_err ("Unable to get the timer clock\n" ); +return ; + }davinci_timer_init (clk); }
Signature · 1 line
2.21.0
PATCH RESEND 3/10 ARM: davinci: da850: switch to using the clocksource driver
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
We now have a proper clocksource driver for davinci. Switch the da850 platform to using it.
--- arch/arm/mach-davinci/da850.c | 46 ++++++++++------------------------- 1 file changed, 13 insertions(+), 33 deletions(-)
arch/arm/mach-davinci/da850.c +13 -33
@@ -35,7 +35,8 @@#include <mach/cputype.h> #include <mach/da8xx.h> #include <mach/pm.h> -#include <mach/time.h> + +#include <clocksource/timer-davinci.h> #include "irqs.h" #include "mux.h"
@@ -333,38 +334,16 @@ static struct davinci_id da850_ids[] = { }, }; -static struct davinci_timer_instance da850_timer_instance[4 ] = { - { - .base =DA8XX_TIMER64P0_BASE , - .bottom_irq =DAVINCI_INTC_IRQ (IRQ_DA8XX_TINT12_0 ), - .top_irq =DAVINCI_INTC_IRQ (IRQ_DA8XX_TINT34_0 ), - }, - { - .base =DA8XX_TIMER64P1_BASE , - .bottom_irq =DAVINCI_INTC_IRQ (IRQ_DA8XX_TINT12_1 ), - .top_irq =DAVINCI_INTC_IRQ (IRQ_DA8XX_TINT34_1 ), - }, - { - .base =DA850_TIMER64P2_BASE , - .bottom_irq =DAVINCI_INTC_IRQ (IRQ_DA850_TINT12_2 ), - .top_irq =DAVINCI_INTC_IRQ (IRQ_DA850_TINT34_2 ), - }, - { - .base =DA850_TIMER64P3_BASE , - .bottom_irq =DAVINCI_INTC_IRQ (IRQ_DA850_TINT12_3 ), - .top_irq =DAVINCI_INTC_IRQ (IRQ_DA850_TINT34_3 ), - }, -}; -/* -* T0_BOT: Timer 0, bottom : Used for clock_event -* T0_TOP: Timer 0, top : Used for clocksource -* T1_BOT, T1_TOP: Timer 1, bottom & top: Used for watchdog timer +* Bottom half of timer 0 is used for clock_event, top half for +* clocksource. */ -static struct davinci_timer_info da850_timer_info = { - .timers = da850_timer_instance, - .clockevent_id =T0_BOT , - .clocksource_id =T0_TOP , +static const struct davinci_timer_cfg da850_timer_cfg = { + .reg =DEFINE_RES_IO (DA8XX_TIMER64P0_BASE ,SZ_4K ), + .irq = { +DEFINE_RES_IRQ (DAVINCI_INTC_IRQ (IRQ_DA8XX_TINT12_0 )), +DEFINE_RES_IRQ (DAVINCI_INTC_IRQ (IRQ_DA8XX_TINT34_0 )), + }, };#ifdef CONFIG_CPU_FREQ
@@ -635,7 +614,6 @@ static const struct davinci_soc_info davinci_soc_info_da850 = { .pinmux_base = DA8XX_SYSCFG0_BASE + 0x120, .pinmux_pins = da850_pins, .pinmux_pins_num = ARRAY_SIZE(da850_pins), - .timer_info = &da850_timer_info, .emac_pdata = &da8xx_emac_pdata, .sram_dma = DA8XX_SHARED_RAM_BASE, .sram_len = SZ_128K,
@@ -672,6 +650,7 @@ void __init da850_init_time(void)void __iomem *pll0;struct regmap *cfgchip;struct clk *clk; +int rv;clk_register_fixed_rate (NULL ,"ref_clk" ,NULL ,0 ,DA850_REF_FREQ );
@@ -686,7 +665,8 @@ void __init da850_init_time(void)return ; } -davinci_timer_init (clk); + rv =davinci_timer_register (clk, &da850_timer_cfg); +WARN (rv,"Unable to register the timer: %d\n" , rv); }static struct resource da850_pll1_resources[] = {
Signature · 1 line
2.21.0
PATCH RESEND 4/10 ARM: davinci: da830: switch to using the clocksource driver
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
We now have a proper clocksource driver for davinci. Switch the da830 platform to using it.
--- arch/arm/mach-davinci/da830.c | 41 ++++++++++++----------------------- 1 file changed, 14 insertions(+), 27 deletions(-)
arch/arm/mach-davinci/da830.c +14 -27
@@ -21,7 +21,8 @@#include <mach/common.h> #include <mach/cputype.h> #include <mach/da8xx.h> -#include <mach/time.h> + +#include <clocksource/timer-davinci.h> #include "irqs.h" #include "mux.h"
@@ -676,32 +677,17 @@ int __init da830_register_gpio(void)return da8xx_register_gpio (&da830_gpio_platform_data); } -static struct davinci_timer_instance da830_timer_instance[2 ] = { - { - .base =DA8XX_TIMER64P0_BASE , - .bottom_irq =DAVINCI_INTC_IRQ (IRQ_DA8XX_TINT12_0 ), - .top_irq =DAVINCI_INTC_IRQ (IRQ_DA8XX_TINT34_0 ), - .cmp_off =DA830_CMP12_0 , - .cmp_irq =DAVINCI_INTC_IRQ (IRQ_DA830_T12CMPINT0_0 ), - }, - { - .base =DA8XX_TIMER64P1_BASE , - .bottom_irq =DAVINCI_INTC_IRQ (IRQ_DA8XX_TINT12_1 ), - .top_irq =DAVINCI_INTC_IRQ (IRQ_DA8XX_TINT34_1 ), - .cmp_off =DA830_CMP12_0 , - .cmp_irq =DAVINCI_INTC_IRQ (IRQ_DA830_T12CMPINT0_1 ), - }, -}; -/* -* T0_BOT: Timer 0, bottom : Used for clock_event & clocksource -* T0_TOP: Timer 0, top : Used by DSP -* T1_BOT, T1_TOP: Timer 1, bottom & top: Used for watchdog timer +* Bottom half of timer0 is used both for clock even and clocksource. +* Top half is used by DSP. */ -static struct davinci_timer_info da830_timer_info = { - .timers = da830_timer_instance, - .clockevent_id =T0_BOT , - .clocksource_id =T0_BOT , +static const struct davinci_timer_cfg da830_timer_cfg = { + .reg =DEFINE_RES_IO (DA8XX_TIMER64P0_BASE ,SZ_4K ), + .irq = { +DEFINE_RES_IRQ (DAVINCI_INTC_IRQ (IRQ_DA830_T12CMPINT0_0 )), +DEFINE_RES_IRQ (DAVINCI_INTC_IRQ (IRQ_DA8XX_TINT12_0 )), + }, + .cmp_off =DA830_CMP12_0 , };static const struct davinci_soc_info davinci_soc_info_da830 = {
@@ -713,7 +699,6 @@ static const struct davinci_soc_info davinci_soc_info_da830 = { .pinmux_base = DA8XX_SYSCFG0_BASE + 0x120, .pinmux_pins = da830_pins, .pinmux_pins_num = ARRAY_SIZE(da830_pins), - .timer_info = &da830_timer_info, .emac_pdata = &da8xx_emac_pdata, };
@@ -743,6 +728,7 @@ void __init da830_init_time(void) {void __iomem *pll;struct clk *clk; +int rv;clk_register_fixed_rate (NULL ,"ref_clk" ,NULL ,0 ,DA830_REF_FREQ );
@@ -756,7 +742,8 @@ void __init da830_init_time(void)return ; } -davinci_timer_init (clk); + rv =davinci_timer_register (clk, &da830_timer_cfg); +WARN (rv,"Unable to register the timer: %d\n" , rv); }static struct resource da830_psc0_resources[] = {
Signature · 1 line
2.21.0
PATCH RESEND 5/10 ARM: davinci: move timer definitions to davinci.h
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
Boards from the dm* family rely on register offset definitions from arch/arm/mach-davinci/include/mach/time.h. We'll be removing this file soon, so move the required defines to davinci.h where the rest of such constants live.
--- arch/arm/mach-davinci/davinci.h | 3 +++ arch/arm/mach-davinci/include/mach/time.h | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-)
arch/arm/mach-davinci/davinci.h +3 -0
@@ -60,6 +60,9 @@ void davinci_map_sysmod(void);#define DAVINCI_GPIO_BASE 0x01C67000int davinci_gpio_register (struct resource *res,int size,void *pdata); +#define DAVINCI_TIMER0_BASE (IO_PHYS + 0x21400) +#define DAVINCI_WDOG_BASE (IO_PHYS + 0x21C00) +/* DM355 base addresses */ #define DM355_ASYNC_EMIF_CONTROL_BASE 0x01e10000#define DM355_ASYNC_EMIF_DATA_CE0_BASE 0x02000000
arch/arm/mach-davinci/include/mach/time.h +0 -2
@@ -11,9 +11,7 @@#ifndef __ARCH_ARM_MACH_DAVINCI_TIME_H#define __ARCH_ARM_MACH_DAVINCI_TIME_H -#define DAVINCI_TIMER0_BASE (IO_PHYS + 0x21400)#define DAVINCI_TIMER1_BASE (IO_PHYS + 0x21800) -#define DAVINCI_WDOG_BASE (IO_PHYS + 0x21C00)enum { T0_BOT,
Signature · 1 line
2.21.0
PATCH RESEND 6/10 ARM: davinci: dm355: switch to using the clocksource driver
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
We now have a proper clocksource driver for davinci. Switch the dm355 platform to using it.
--- arch/arm/mach-davinci/dm355.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-)
arch/arm/mach-davinci/dm355.c +13 -11
@@ -30,7 +30,8 @@#include <mach/cputype.h> #include <mach/mux.h> #include <mach/serial.h> -#include <mach/time.h> + +#include <clocksource/timer-davinci.h> #include "asp.h" #include "davinci.h"
@@ -620,15 +621,15 @@ static struct davinci_id dm355_ids[] = { };/* -* T0_BOT: Timer 0, bottom: clockevent source for hrtimers -* T0_TOP: Timer 0, top : clocksource for generic timekeeping -* T1_BOT: Timer 1, bottom: (used by DSP in TI DSPLink code) -* T1_TOP: Timer 1, top : <unused> +* Bottom half of timer0 is used for clockevent, top half is used for +* clocksource. */ -static struct davinci_timer_info dm355_timer_info = { - .timers = davinci_timer_instance, - .clockevent_id =T0_BOT , - .clocksource_id =T0_TOP , +static const struct davinci_timer_cfg dm355_timer_cfg = { + .reg =DEFINE_RES_IO (DAVINCI_TIMER0_BASE ,SZ_4K ), + .irq = { +DEFINE_RES_IRQ (DAVINCI_INTC_IRQ (IRQ_TINT0_TINT12 )), +DEFINE_RES_IRQ (DAVINCI_INTC_IRQ (IRQ_TINT0_TINT34 )), + }, };static struct plat_serial8250_port dm355_serial0_platform_data[] = {
@@ -706,7 +707,6 @@ static const struct davinci_soc_info davinci_soc_info_dm355 = { .pinmux_base = DAVINCI_SYSTEM_MODULE_BASE, .pinmux_pins = dm355_pins, .pinmux_pins_num = ARRAY_SIZE(dm355_pins), - .timer_info = &dm355_timer_info, .sram_dma = 0x00010000, .sram_len = SZ_32K, };
@@ -733,6 +733,7 @@ void __init dm355_init_time(void) {void __iomem *pll1, *psc;struct clk *clk; +int rv;clk_register_fixed_rate (NULL ,"ref_clk" ,NULL ,0 ,DM355_REF_FREQ );
@@ -748,7 +749,8 @@ void __init dm355_init_time(void)return ; } -davinci_timer_init (clk); + rv =davinci_timer_register (clk, &dm355_timer_cfg); +WARN (rv,"Unable to register the timer: %d\n" , rv); }static struct resource dm355_pll2_resources[] = {
Signature · 1 line
2.21.0
PATCH RESEND 7/10 ARM: davinci: dm365: switch to using the clocksource driver
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
We now have a proper clocksource driver for davinci. Switch the dm365 platform to using it.
--- arch/arm/mach-davinci/dm365.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-)
arch/arm/mach-davinci/dm365.c +15 -7
@@ -35,7 +35,8 @@#include <mach/cputype.h> #include <mach/mux.h> #include <mach/serial.h> -#include <mach/time.h> + +#include <clocksource/timer-davinci.h> #include "asp.h" #include "davinci.h"
@@ -660,10 +661,16 @@ static struct davinci_id dm365_ids[] = { }, }; -static struct davinci_timer_info dm365_timer_info = { - .timers = davinci_timer_instance, - .clockevent_id =T0_BOT , - .clocksource_id =T0_TOP , +/* +* Bottom half of timer0 is used for clockevent, top half is used for +* clocksource. +*/ +static const struct davinci_timer_cfg dm365_timer_cfg = { + .reg =DEFINE_RES_IO (DAVINCI_TIMER0_BASE ,SZ_4K ), + .irq = { +DEFINE_RES_IRQ (DAVINCI_INTC_IRQ (IRQ_TINT0_TINT12 )), +DEFINE_RES_IRQ (DAVINCI_INTC_IRQ (IRQ_TINT0_TINT34 )), + }, };#define DM365_UART1_BASE (IO_PHYS + 0x106000)
@@ -723,7 +730,6 @@ static const struct davinci_soc_info davinci_soc_info_dm365 = { .pinmux_base = DAVINCI_SYSTEM_MODULE_BASE, .pinmux_pins = dm365_pins, .pinmux_pins_num = ARRAY_SIZE(dm365_pins), - .timer_info = &dm365_timer_info, .emac_pdata = &dm365_emac_pdata, .sram_dma = 0x00010000, .sram_len = SZ_32K,
@@ -771,6 +777,7 @@ void __init dm365_init_time(void) {void __iomem *pll1, *pll2, *psc;struct clk *clk; +int rv;clk_register_fixed_rate (NULL ,"ref_clk" ,NULL ,0 ,DM365_REF_FREQ );
@@ -789,7 +796,8 @@ void __init dm365_init_time(void)return ; } -davinci_timer_init (clk); + rv =davinci_timer_register (clk, &dm365_timer_cfg); +WARN (rv,"Unable to register the timer: %d\n" , rv); }void __init dm365_register_clocks (void )
Signature · 1 line
2.21.0
PATCH RESEND 8/10 ARM: davinci: dm644x: switch to using the clocksource driver
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
We now have a proper clocksource driver for davinci. Switch the dm644x platform to using it.
--- arch/arm/mach-davinci/dm644x.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-)
arch/arm/mach-davinci/dm644x.c +13 -11
@@ -27,7 +27,8 @@#include <mach/cputype.h> #include <mach/mux.h> #include <mach/serial.h> -#include <mach/time.h> + +#include <clocksource/timer-davinci.h> #include "asp.h" #include "davinci.h"
@@ -561,15 +562,15 @@ static struct davinci_id dm644x_ids[] = { };/* -* T0_BOT: Timer 0, bottom: clockevent source for hrtimers -* T0_TOP: Timer 0, top : clocksource for generic timekeeping -* T1_BOT: Timer 1, bottom: (used by DSP in TI DSPLink code) -* T1_TOP: Timer 1, top : <unused> +* Bottom half of timer0 is used for clockevent, top half is used for +* clocksource. */ -static struct davinci_timer_info dm644x_timer_info = { - .timers = davinci_timer_instance, - .clockevent_id =T0_BOT , - .clocksource_id =T0_TOP , +static const struct davinci_timer_cfg dm644x_timer_cfg = { + .reg =DEFINE_RES_IO (DAVINCI_TIMER0_BASE ,SZ_4K ), + .irq = { +DEFINE_RES_IRQ (DAVINCI_INTC_IRQ (IRQ_TINT0_TINT12 )), +DEFINE_RES_IRQ (DAVINCI_INTC_IRQ (IRQ_TINT0_TINT34 )), + }, };static struct plat_serial8250_port dm644x_serial0_platform_data[] = {
@@ -647,7 +648,6 @@ static const struct davinci_soc_info davinci_soc_info_dm644x = { .pinmux_base = DAVINCI_SYSTEM_MODULE_BASE, .pinmux_pins = dm644x_pins, .pinmux_pins_num = ARRAY_SIZE(dm644x_pins), - .timer_info = &dm644x_timer_info, .emac_pdata = &dm644x_emac_pdata, .sram_dma = 0x00008000, .sram_len = SZ_16K,
@@ -669,6 +669,7 @@ void __init dm644x_init_time(void) {void __iomem *pll1, *psc;struct clk *clk; +int rv;clk_register_fixed_rate (NULL ,"ref_clk" ,NULL ,0 ,DM644X_REF_FREQ );
@@ -684,7 +685,8 @@ void __init dm644x_init_time(void)return ; } -davinci_timer_init (clk); + rv =davinci_timer_register (clk, &dm644x_timer_cfg); +WARN (rv,"Unable to register the timer: %d\n" , rv); }static struct resource dm644x_pll2_resources[] = {
Signature · 1 line
2.21.0
PATCH RESEND 9/10 ARM: davinci: dm646x: switch to using the clocksource driver
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
We now have a proper clocksource driver for davinci. Switch the dm646x platform to using it.
--- arch/arm/mach-davinci/dm646x.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-)
arch/arm/mach-davinci/dm646x.c +13 -11
@@ -28,7 +28,8 @@#include <mach/cputype.h> #include <mach/mux.h> #include <mach/serial.h> -#include <mach/time.h> + +#include <clocksource/timer-davinci.h> #include "asp.h" #include "davinci.h"
@@ -501,15 +502,15 @@ static struct davinci_id dm646x_ids[] = { };/* -* T0_BOT: Timer 0, bottom: clockevent source for hrtimers -* T0_TOP: Timer 0, top : clocksource for generic timekeeping -* T1_BOT: Timer 1, bottom: (used by DSP in TI DSPLink code) -* T1_TOP: Timer 1, top : <unused> +* Bottom half of timer0 is used for clockevent, top half is used for +* clocksource. */ -static struct davinci_timer_info dm646x_timer_info = { - .timers = davinci_timer_instance, - .clockevent_id =T0_BOT , - .clocksource_id =T0_TOP , +static const struct davinci_timer_cfg dm646x_timer_cfg = { + .reg =DEFINE_RES_IO (DAVINCI_TIMER0_BASE ,SZ_4K ), + .irq = { +DEFINE_RES_IRQ (DAVINCI_INTC_IRQ (IRQ_TINT0_TINT12 )), +DEFINE_RES_IRQ (DAVINCI_INTC_IRQ (IRQ_TINT0_TINT34 )), + }, };static struct plat_serial8250_port dm646x_serial0_platform_data[] = {
@@ -587,7 +588,6 @@ static const struct davinci_soc_info davinci_soc_info_dm646x = { .pinmux_base = DAVINCI_SYSTEM_MODULE_BASE, .pinmux_pins = dm646x_pins, .pinmux_pins_num = ARRAY_SIZE(dm646x_pins), - .timer_info = &dm646x_timer_info, .emac_pdata = &dm646x_emac_pdata, .sram_dma = 0x10010000, .sram_len = SZ_32K,
@@ -652,6 +652,7 @@ void __init dm646x_init_time(unsigned long ref_clk_rate, {void __iomem *pll1, *psc;struct clk *clk; +int rv;clk_register_fixed_rate (NULL ,"ref_clk" ,NULL ,0 , ref_clk_rate);clk_register_fixed_rate (NULL ,"aux_clkin" ,NULL ,0 , aux_clkin_rate);
@@ -668,7 +669,8 @@ void __init dm646x_init_time(unsigned long ref_clk_rate,return ; } -davinci_timer_init (clk); + rv =davinci_timer_register (clk, &dm646x_timer_cfg); +WARN (rv,"Unable to register the timer: %d\n" , rv); }static struct resource dm646x_pll2_resources[] = {
Signature · 1 line
2.21.0
PATCH RESEND 10/10 ARM: davinci: remove legacy timer support
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
All platforms have now been switched to the new clocksource driver. Remove the old code and various no longer needed bits and pieces.
--- arch/arm/mach-davinci/Makefile | 3 +- arch/arm/mach-davinci/devices-da8xx.c | 1 - arch/arm/mach-davinci/devices.c | 19 - arch/arm/mach-davinci/include/mach/common.h | 17 - arch/arm/mach-davinci/include/mach/time.h | 33 -- arch/arm/mach-davinci/time.c | 400 -------------------- 6 files changed, 1 insertion(+), 472 deletions(-) delete mode 100644 arch/arm/mach-davinci/include/mach/time.h delete mode 100644 arch/arm/mach-davinci/time.c
arch/arm/mach-davinci/Makefile +1 -2
@@ -5,8 +5,7 @@ # # Common objects -obj-y := time.o serial.o usb.o \ - common.o sram.o +obj-y := serial.o usb.o common.o sram.o obj-$(CONFIG_DAVINCI_MUX) += mux.o
arch/arm/mach-davinci/devices-da8xx.c +0 -1
@@ -21,7 +21,6 @@#include <mach/common.h> #include <mach/cputype.h> #include <mach/da8xx.h> -#include <mach/time.h> #include "asp.h" #include "cpuidle.h"
arch/arm/mach-davinci/devices.c +0 -19
@@ -17,7 +17,6 @@#include <mach/hardware.h> #include <mach/cputype.h> #include <mach/mux.h> -#include <mach/time.h> #include "davinci.h" #include "irqs.h"
@@ -303,21 +302,3 @@ int davinci_gpio_register(struct resource *res, int size, void *pdata) davinci_gpio_device.dev.platform_data = pdata;return platform_device_register (&davinci_gpio_device); } - -/*-------------------------------------------------------------------------*/ - -/*-------------------------------------------------------------------------*/ - -struct davinci_timer_instance davinci_timer_instance[2 ] = { - { - .base =DAVINCI_TIMER0_BASE , - .bottom_irq =DAVINCI_INTC_IRQ (IRQ_TINT0_TINT12 ), - .top_irq =DAVINCI_INTC_IRQ (IRQ_TINT0_TINT34 ), - }, - { - .base =DAVINCI_TIMER1_BASE , - .bottom_irq =DAVINCI_INTC_IRQ (IRQ_TINT1_TINT12 ), - .top_irq =DAVINCI_INTC_IRQ (IRQ_TINT1_TINT34 ), - }, -}; -
arch/arm/mach-davinci/include/mach/common.h +0 -17
@@ -22,22 +22,6 @@#define DAVINCI_INTC_START NR_IRQS#define DAVINCI_INTC_IRQ (_irqnum) (DAVINCI_INTC_START + (_irqnum)) -void davinci_timer_init (struct clk *clk); - -struct davinci_timer_instance { -u32 base; -u32 bottom_irq; -u32 top_irq; -unsigned long cmp_off; -unsigned int cmp_irq; -}; - -struct davinci_timer_info { -struct davinci_timer_instance *timers; -unsigned int clockevent_id; -unsigned int clocksource_id; -}; -struct davinci_gpio_controller ;/*
@@ -58,7 +42,6 @@ struct davinci_soc_info {u32 pinmux_base;const struct mux_config *pinmux_pins;unsigned long pinmux_pins_num; -struct davinci_timer_info *timer_info;int gpio_type;u32 gpio_base;unsigned gpio_num;
arch/arm/mach-davinci/include/mach/time.h deleted +0 -33
@@ -1,33 +0,0 @@ -/* -* Local header file for DaVinci time code. -* -* Author: Kevin Hilman, MontaVista Software, Inc. <[email protected]> -* -* 2007 (c) MontaVista Software, Inc. This file is licensed under -* the terms of the GNU General Public License version 2. This program -* is licensed "as is" without any warranty of any kind, whether express -* or implied. -*/ -#ifndef __ARCH_ARM_MACH_DAVINCI_TIME_H -#define __ARCH_ARM_MACH_DAVINCI_TIME_H - -#define DAVINCI_TIMER1_BASE (IO_PHYS + 0x21800) - -enum { -T0_BOT , -T0_TOP , -T1_BOT , -T1_TOP , -NUM_TIMERS -}; - -#define IS_TIMER1 (id) (id & 0x2) -#define IS_TIMER0 (id) (!IS_TIMER1(id)) -#define IS_TIMER_TOP (id) ((id & 0x1)) -#define IS_TIMER_BOT (id) (!IS_TIMER_TOP(id)) - -#define ID_TO_TIMER (id) (IS_TIMER1(id) != 0) - -extern struct davinci_timer_instance davinci_timer_instance[]; - -#endif /* __ARCH_ARM_MACH_DAVINCI_TIME_H */
arch/arm/mach-davinci/time.c deleted +0 -400
400 lines not on this page · raw message
Signature · 1 line
2.21.0
pon., 22 lip 2019 o 15:17 Bartosz Golaszewski <[email protected]> napisał(a):
Quoted 43 lines
From: Bartosz Golaszewski <[email protected]>
Sekhar,
the following patches switch DaVinci to using the new clocksource driver which is now upstream. They are rebased on top of v5.3-rc1. Additionally the following two patches were reverted locally due to a regression in v5.3-rc1 about which the relevant maintainers have been already notified:
2eef1399a866modules: fix BUG when load module with rodata=n93651f80dcb6modules: fix compile error if don't have strict module rwxBartosz Golaszewski (10):
ARM: davinci: enable the clocksource driver for DT mode
ARM: davinci:WARN_ON()ifclk_get()fails
ARM: davinci: da850: switch to using the clocksource driver
ARM: davinci: da830: switch to using the clocksource driver
ARM: davinci: move timer definitions todavinci.h
ARM: davinci: dm355: switch to using the clocksource driver
ARM: davinci: dm365: switch to using the clocksource driver
ARM: davinci: dm644x: switch to using the clocksource driver
ARM: davinci: dm646x: switch to using the clocksource driver
ARM: davinci: remove legacy timer supportarch/arm/Kconfig | 1 + arch/arm/mach-davinci/Makefile | 3 +- arch/arm/mach-davinci/da830.c | 45 +-- arch/arm/mach-davinci/da850.c | 50 +-- arch/arm/mach-davinci/davinci.h | 3 + arch/arm/mach-davinci/devices-da8xx.c | 1 - arch/arm/mach-davinci/devices.c | 19 - arch/arm/mach-davinci/dm355.c | 28 +- arch/arm/mach-davinci/dm365.c | 26 +- arch/arm/mach-davinci/dm644x.c | 28 +- arch/arm/mach-davinci/dm646x.c | 28 +- arch/arm/mach-davinci/include/mach/common.h | 17 - arch/arm/mach-davinci/include/mach/time.h | 35 -- arch/arm/mach-davinci/time.c | 414 -------------------- 14 files changed, 110 insertions(+), 588 deletions(-) delete mode 100644 arch/arm/mach-davinci/include/mach/time.h delete mode 100644 arch/arm/mach-davinci/time.c
Quoted 3 lines
--
2.21.0
Hi Sekhar,
a gentle ping. Is this series good to go in for v5.4?
Bart
Quoted 44 lines · Bartosz Golaszewski
pon., 22 lip 2019 o 15:17 Bartosz Golaszewski <[email protected]> napisał(a):
Quoted 43 lines
From: Bartosz Golaszewski <[email protected]>
Sekhar,
the following patches switch DaVinci to using the new clocksource driver which is now upstream. They are rebased on top of v5.3-rc1. Additionally the following two patches were reverted locally due to a regression in v5.3-rc1 about which the relevant maintainers have been already notified:
2eef1399a866modules: fix BUG when load module with rodata=n93651f80dcb6modules: fix compile error if don't have strict module rwxBartosz Golaszewski (10):
ARM: davinci: enable the clocksource driver for DT mode
ARM: davinci:WARN_ON()ifclk_get()fails
ARM: davinci: da850: switch to using the clocksource driver
ARM: davinci: da830: switch to using the clocksource driver
ARM: davinci: move timer definitions todavinci.h
ARM: davinci: dm355: switch to using the clocksource driver
ARM: davinci: dm365: switch to using the clocksource driver
ARM: davinci: dm644x: switch to using the clocksource driver
ARM: davinci: dm646x: switch to using the clocksource driver
ARM: davinci: remove legacy timer supportarch/arm/Kconfig | 1 + arch/arm/mach-davinci/Makefile | 3 +- arch/arm/mach-davinci/da830.c | 45 +-- arch/arm/mach-davinci/da850.c | 50 +-- arch/arm/mach-davinci/davinci.h | 3 + arch/arm/mach-davinci/devices-da8xx.c | 1 - arch/arm/mach-davinci/devices.c | 19 - arch/arm/mach-davinci/dm355.c | 28 +- arch/arm/mach-davinci/dm365.c | 26 +- arch/arm/mach-davinci/dm644x.c | 28 +- arch/arm/mach-davinci/dm646x.c | 28 +- arch/arm/mach-davinci/include/mach/common.h | 17 - arch/arm/mach-davinci/include/mach/time.h | 35 -- arch/arm/mach-davinci/time.c | 414 -------------------- 14 files changed, 110 insertions(+), 588 deletions(-) delete mode 100644 arch/arm/mach-davinci/include/mach/time.h delete mode 100644 arch/arm/mach-davinci/time.c
Quoted 7 lines
Quoted 3 lines
--
2.21.0Hi Sekhar,
a gentle ping. Is this series good to go in for v5.4?
Hi Bartosz, a quick test shows that DM365 fails to boot after this. Can you please see if there is anything obviously wrong for that SoC. Rest seems to be okay.
Thanks,
Sekhar
śr., 7 sie 2019 o 21:28 Sekhar Nori <[email protected]> napisał(a):
Quoted 52 lines · Bartosz Golaszewski
Quoted 50 lines
pon., 22 lip 2019 o 15:17 Bartosz Golaszewski <[email protected]> napisał(a):
Quoted 43 lines
From: Bartosz Golaszewski <[email protected]>
Sekhar,
the following patches switch DaVinci to using the new clocksource driver which is now upstream. They are rebased on top of v5.3-rc1. Additionally the following two patches were reverted locally due to a regression in v5.3-rc1 about which the relevant maintainers have been already notified:
2eef1399a866modules: fix BUG when load module with rodata=n93651f80dcb6modules: fix compile error if don't have strict module rwxBartosz Golaszewski (10):
ARM: davinci: enable the clocksource driver for DT mode
ARM: davinci:WARN_ON()ifclk_get()fails
ARM: davinci: da850: switch to using the clocksource driver
ARM: davinci: da830: switch to using the clocksource driver
ARM: davinci: move timer definitions todavinci.h
ARM: davinci: dm355: switch to using the clocksource driver
ARM: davinci: dm365: switch to using the clocksource driver
ARM: davinci: dm644x: switch to using the clocksource driver
ARM: davinci: dm646x: switch to using the clocksource driver
ARM: davinci: remove legacy timer supportarch/arm/Kconfig | 1 + arch/arm/mach-davinci/Makefile | 3 +- arch/arm/mach-davinci/da830.c | 45 +-- arch/arm/mach-davinci/da850.c | 50 +-- arch/arm/mach-davinci/davinci.h | 3 + arch/arm/mach-davinci/devices-da8xx.c | 1 - arch/arm/mach-davinci/devices.c | 19 - arch/arm/mach-davinci/dm355.c | 28 +- arch/arm/mach-davinci/dm365.c | 26 +- arch/arm/mach-davinci/dm644x.c | 28 +- arch/arm/mach-davinci/dm646x.c | 28 +- arch/arm/mach-davinci/include/mach/common.h | 17 - arch/arm/mach-davinci/include/mach/time.h | 35 -- arch/arm/mach-davinci/time.c | 414 -------------------- 14 files changed, 110 insertions(+), 588 deletions(-) delete mode 100644 arch/arm/mach-davinci/include/mach/time.h delete mode 100644 arch/arm/mach-davinci/time.cQuoted 3 lines
--
2.21.0Hi Sekhar,
Quoted 8 lines
Quoted 1 line
a gentle ping. Is this series good to go in for v5.4?
Hi Bartosz, a quick test shows that DM365 fails to boot after this. Can you please see if there is anything obviously wrong for that SoC. Rest seems to be okay.
Thanks,
Sekhar
Hi Sekhar,
just verified on Kevin's dm365-evm rebased on top of v5.3-rc3 and it boots fine. I know that davinci failed to boot at v5.3-rc1.
Let me know if I can help with debugging.
Bart
Quoted 62 lines · Bartosz Golaszewski
śr., 7 sie 2019 o 21:28 Sekhar Nori <[email protected]> napisał(a):
Quoted 52 lines · Bartosz Golaszewski
Quoted 50 lines
pon., 22 lip 2019 o 15:17 Bartosz Golaszewski <[email protected]> napisał(a):
Quoted 43 lines
From: Bartosz Golaszewski <[email protected]>
Sekhar,
the following patches switch DaVinci to using the new clocksource driver which is now upstream. They are rebased on top of v5.3-rc1. Additionally the following two patches were reverted locally due to a regression in v5.3-rc1 about which the relevant maintainers have been already notified:
2eef1399a866modules: fix BUG when load module with rodata=n93651f80dcb6modules: fix compile error if don't have strict module rwxBartosz Golaszewski (10):
ARM: davinci: enable the clocksource driver for DT mode
ARM: davinci:WARN_ON()ifclk_get()fails
ARM: davinci: da850: switch to using the clocksource driver
ARM: davinci: da830: switch to using the clocksource driver
ARM: davinci: move timer definitions todavinci.h
ARM: davinci: dm355: switch to using the clocksource driver
ARM: davinci: dm365: switch to using the clocksource driver
ARM: davinci: dm644x: switch to using the clocksource driver
ARM: davinci: dm646x: switch to using the clocksource driver
ARM: davinci: remove legacy timer supportarch/arm/Kconfig | 1 + arch/arm/mach-davinci/Makefile | 3 +- arch/arm/mach-davinci/da830.c | 45 +-- arch/arm/mach-davinci/da850.c | 50 +-- arch/arm/mach-davinci/davinci.h | 3 + arch/arm/mach-davinci/devices-da8xx.c | 1 - arch/arm/mach-davinci/devices.c | 19 - arch/arm/mach-davinci/dm355.c | 28 +- arch/arm/mach-davinci/dm365.c | 26 +- arch/arm/mach-davinci/dm644x.c | 28 +- arch/arm/mach-davinci/dm646x.c | 28 +- arch/arm/mach-davinci/include/mach/common.h | 17 - arch/arm/mach-davinci/include/mach/time.h | 35 -- arch/arm/mach-davinci/time.c | 414 -------------------- 14 files changed, 110 insertions(+), 588 deletions(-) delete mode 100644 arch/arm/mach-davinci/include/mach/time.h delete mode 100644 arch/arm/mach-davinci/time.cQuoted 3 lines
--
2.21.0Hi Sekhar,
Quoted 8 lines
Quoted 1 line
a gentle ping. Is this series good to go in for v5.4?
Hi Bartosz, a quick test shows that DM365 fails to boot after this. Can you please see if there is anything obviously wrong for that SoC. Rest seems to be okay.
Thanks,
Sekhar
Quoted 6 lines
Hi Sekhar,
just verified on Kevin's dm365-evm rebased on top of v5.3-rc3 and it boots fine. I know that davinci failed to boot at v5.3-rc1.
Let me know if I can help with debugging.
Added series except 7/10 and 10/10 to v5.4/soc. Debug of DM365 issue is still going on offline. DM365 migration is postponed pending conclusion of that debug.
Thanks,
Sekhar