From: Tom Rini Date: Thu, 12 May 2022 21:22:26 +0000 (-0400) Subject: arm: omap2plus: Move CONFIG_SYS_PTV out of CONFIG namespace X-Git-Tag: v2022.10-rc1~17^2~27^2~51 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12f613cf0e823b278917faf58643383bf309e668;p=pandora-u-boot.git arm: omap2plus: Move CONFIG_SYS_PTV out of CONFIG namespace This is always defined to 2, and referenced in two places. Move the define to and make sure the code that uses this includes that file. Make not include that file, as we don't need to be doing so. Signed-off-by: Tom Rini --- diff --git a/arch/arm/include/asm/arch-omap4/clock.h b/arch/arm/include/asm/arch-omap4/clock.h index 0a626fe647a..4054dd8edcb 100644 --- a/arch/arm/include/asm/arch-omap4/clock.h +++ b/arch/arm/include/asm/arch-omap4/clock.h @@ -7,7 +7,6 @@ */ #ifndef _CLOCKS_OMAP4_H_ #define _CLOCKS_OMAP4_H_ -#include /* * Assuming a maximum of 1.5 GHz ARM speed and a minimum of 2 cycles per diff --git a/arch/arm/include/asm/arch-omap5/clock.h b/arch/arm/include/asm/arch-omap5/clock.h index a00626e357c..b18ef459dec 100644 --- a/arch/arm/include/asm/arch-omap5/clock.h +++ b/arch/arm/include/asm/arch-omap5/clock.h @@ -8,7 +8,6 @@ */ #ifndef _CLOCKS_OMAP5_H_ #define _CLOCKS_OMAP5_H_ -#include /* * Assuming a maximum of 1.5 GHz ARM speed and a minimum of 2 cycles per diff --git a/arch/arm/include/asm/omap_common.h b/arch/arm/include/asm/omap_common.h index 264a2e717a7..17fdfbcffb7 100644 --- a/arch/arm/include/asm/omap_common.h +++ b/arch/arm/include/asm/omap_common.h @@ -13,6 +13,7 @@ #include #define NUM_SYS_CLKS 7 +#define SYS_PTV 2 /* Divisor: 2^(PTV+1) => 8 */ struct bd_info; diff --git a/arch/arm/mach-omap2/sata.c b/arch/arm/mach-omap2/sata.c index 4672dc534c5..53c39ce1fb6 100644 --- a/arch/arm/mach-omap2/sata.c +++ b/arch/arm/mach-omap2/sata.c @@ -13,6 +13,7 @@ #include #include #include +#include #include "pipe3-phy.h" static struct pipe3_dpll_map dpll_map_sata[] = { diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index 82b10f6b248..00d91c10136 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c @@ -22,6 +22,7 @@ #include #include #include +#include #include DECLARE_GLOBAL_DATA_PTR; @@ -33,7 +34,7 @@ static ulong get_timer_masked(void); * Nothing really to do with interrupts, just starts up a counter. */ -#define TIMER_CLOCK (V_SCLK / (2 << CONFIG_SYS_PTV)) +#define TIMER_CLOCK (V_SCLK / (2 << SYS_PTV)) #define TIMER_OVERFLOW_VAL 0xffffffff #define TIMER_LOAD_VAL 0 @@ -42,7 +43,7 @@ int timer_init(void) /* start the counter ticking up, reload value on overflow */ writel(TIMER_LOAD_VAL, &timer_base->tldr); /* enable timer */ - writel((CONFIG_SYS_PTV << 2) | TCLR_PRE | TCLR_AR | TCLR_ST, + writel((SYS_PTV << 2) | TCLR_PRE | TCLR_AR | TCLR_ST, &timer_base->tclr); return 0; diff --git a/drivers/timer/omap-timer.c b/drivers/timer/omap-timer.c index 25a6108fef2..aa2e4360c1b 100644 --- a/drivers/timer/omap-timer.c +++ b/drivers/timer/omap-timer.c @@ -11,6 +11,7 @@ #include #include #include +#include #include /* Timer register bits */ @@ -61,13 +62,13 @@ static int omap_timer_probe(struct udevice *dev) if (!uc_priv->clock_rate) uc_priv->clock_rate = V_SCLK; - uc_priv->clock_rate /= (2 << CONFIG_SYS_PTV); + uc_priv->clock_rate /= (2 << SYS_PTV); /* start the counter ticking up, reload value on overflow */ writel(0, &priv->regs->tldr); writel(0, &priv->regs->tcrr); /* enable timer */ - writel((CONFIG_SYS_PTV << 2) | TCLR_PRE_EN | TCLR_AUTO_RELOAD | + writel((SYS_PTV << 2) | TCLR_PRE_EN | TCLR_AUTO_RELOAD | TCLR_START, &priv->regs->tclr); return 0; diff --git a/include/configs/bur_am335x_common.h b/include/configs/bur_am335x_common.h index 5fc8ce622b1..1c3c86eb59f 100644 --- a/include/configs/bur_am335x_common.h +++ b/include/configs/bur_am335x_common.h @@ -24,7 +24,6 @@ #define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */ /* Timer information */ -#define CONFIG_SYS_PTV 2 /* Divisor: 2^(PTV+1) => 8 */ #define CONFIG_SYS_TIMERBASE 0x48040000 /* Use Timer2 */ #include diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index f273e243e55..f33dd19ea36 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -153,7 +153,6 @@ * This rate is divided by a local divisor. */ #define CONFIG_SYS_TIMERBASE (OMAP34XX_GPT2) -#define CONFIG_SYS_PTV 2 /* Divisor: 2^(PTV+1) => 8 */ /* * Physical Memory Map diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index 322fd24302f..2b4d05b7165 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -42,7 +42,6 @@ GENERATED_GBL_DATA_SIZE) /* Platform/Board specific defs */ #define CONFIG_SYS_TIMERBASE 0x48040000 /* Use Timer2 */ -#define CONFIG_SYS_PTV 2 /* Divisor: 2^(PTV+1) => 8 */ /* NS16550 Configuration */ #define CONFIG_SYS_NS16550_SERIAL diff --git a/include/configs/sniper.h b/include/configs/sniper.h index 2a2609d9668..2daaadd3146 100644 --- a/include/configs/sniper.h +++ b/include/configs/sniper.h @@ -16,7 +16,6 @@ */ #define CONFIG_SYS_TIMERBASE OMAP34XX_GPT2 -#define CONFIG_SYS_PTV 2 #define V_NS16550_CLK 48000000 #define V_OSCK 26000000 diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h index 3ce2c1fdc0a..ff5bbad90e7 100644 --- a/include/configs/ti814x_evm.h +++ b/include/configs/ti814x_evm.h @@ -77,7 +77,6 @@ * Platform/Board specific defs */ #define CONFIG_SYS_TIMERBASE 0x4802E000 -#define CONFIG_SYS_PTV 2 /* Divisor: 2^(PTV+1) => 8 */ /* NS16550 Configuration */ #define CONFIG_SYS_NS16550_SERIAL diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h index c2dfdebcd5b..ba3bc43aa0e 100644 --- a/include/configs/ti816x_evm.h +++ b/include/configs/ti816x_evm.h @@ -28,7 +28,6 @@ * Platform/Board specific defs */ #define CONFIG_SYS_TIMERBASE 0x4802E000 -#define CONFIG_SYS_PTV 2 /* Divisor: 2^(PTV+1) => 8 */ /* * NS16550 Configuration diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index 90dfb1feeb7..cd136f696a4 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -71,9 +71,6 @@ GENERATED_GBL_DATA_SIZE) #endif -/* Timer information. */ -#define CONFIG_SYS_PTV 2 /* Divisor: 2^(PTV+1) => 8 */ - /* If DM_I2C, enable non-DM I2C support */ /*