leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arc: use timer driver for ARC boards

Browse Source 
This commit replaces legacy timer code with usage of arc timer
driver.

It removes arch/arc/lib/time.c file and selects CONFIG_CLK,
CONFIG_TIMER and CONFIG_ARC_TIMER options for all ARC boards by default.
Therefore we remove CONFIG_CLK option from less common axs101 and
axs103 defconfigs.

Also it removes legacy CONFIG_SYS_TIMER_RATE config symbol from
axs10x.h, tb100.h and nsim.h configs files as it is no longer required.

Signed-off-by: Vlad Zakharov <vzakhar@synopsys.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Vlad Zakharov 2017-03-21 14:49:49 +03:00 committed by Alexey Brodkin
parent 0c77092e81
commit 3daa7c7b83
8 changed files with 3 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/Kconfig
View File

@ -13,6 +13,9 @@ config ARC
select HAVE_PRIVATE_LIBGCC select HAVE_PRIVATE_LIBGCC
select SUPPORT_OF_CONTROL select SUPPORT_OF_CONTROL
select ARCH_EARLY_INIT_R select ARCH_EARLY_INIT_R
select CLK
select TIMER
select ARC_TIMER
config ARM config ARM
bool "ARM architecture" bool "ARM architecture"

1
arch/arc/lib/Makefile
View File

@ -18,7 +18,6 @@ obj-y += memcmp.o
obj-y += memcpy-700.o obj-y += memcpy-700.o
obj-y += memset.o obj-y += memset.o
obj-y += reset.o obj-y += reset.o
obj-y += timer.o
obj-y += ints_low.o obj-y += ints_low.o
obj-y += init_helpers.o obj-y += init_helpers.o

24
arch/arc/lib/timer.c
View File

@ -1,24 +0,0 @@
/*
* Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved.
*
* SPDX-License-Identifier: GPL-2.0+
*/
#include <asm/arcregs.h>
#define NH_MODE (1 << 1) /* Disable timer if CPU is halted */
int timer_init(void)
{
write_aux_reg(ARC_AUX_TIMER0_CTRL, NH_MODE);
/* Set max value for counter/timer */
write_aux_reg(ARC_AUX_TIMER0_LIMIT, 0xffffffff);
/* Set initial count value and restart counter/timer */
write_aux_reg(ARC_AUX_TIMER0_CNT, 0);
return 0;
}
unsigned long timer_read_counter(void)
{
return read_aux_reg(ARC_AUX_TIMER0_CNT);
}

1
configs/axs101_defconfig
View File

@ -19,7 +19,6 @@ CONFIG_OF_CONTROL=y
CONFIG_OF_EMBED=y CONFIG_OF_EMBED=y
CONFIG_NET_RANDOM_ETHADDR=y CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_DM=y CONFIG_DM=y
CONFIG_CLK=y
CONFIG_SYS_I2C_DW=y CONFIG_SYS_I2C_DW=y
CONFIG_MMC=y CONFIG_MMC=y
CONFIG_MMC_DW=y CONFIG_MMC_DW=y

1
configs/axs103_defconfig
View File

@ -18,7 +18,6 @@ CONFIG_OF_CONTROL=y
CONFIG_OF_EMBED=y CONFIG_OF_EMBED=y
CONFIG_NET_RANDOM_ETHADDR=y CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_DM=y CONFIG_DM=y
CONFIG_CLK=y
CONFIG_SYS_I2C_DW=y CONFIG_SYS_I2C_DW=y
CONFIG_MMC=y CONFIG_MMC=y
CONFIG_MMC_DW=y CONFIG_MMC_DW=y

2
include/configs/axs10x.h
View File

@ -11,8 +11,6 @@
/* /*
* CPU configuration * CPU configuration
*/ */
#define CONFIG_SYS_TIMER_RATE CONFIG_SYS_CLK_FREQ
#define ARC_FPGA_PERIPHERAL_BASE 0xE0000000 #define ARC_FPGA_PERIPHERAL_BASE 0xE0000000
#define ARC_APB_PERIPHERAL_BASE 0xF0000000 #define ARC_APB_PERIPHERAL_BASE 0xF0000000
#define ARC_DWMMC_BASE (ARC_FPGA_PERIPHERAL_BASE + 0x15000) #define ARC_DWMMC_BASE (ARC_FPGA_PERIPHERAL_BASE + 0x15000)

5
include/configs/nsim.h
View File

@ -9,11 +9,6 @@
#include <linux/sizes.h> #include <linux/sizes.h>
/*
* CPU configuration
*/
#define CONFIG_SYS_TIMER_RATE CONFIG_SYS_CLK_FREQ
/* /*
* Memory configuration * Memory configuration
*/ */

5
include/configs/tb100.h
View File

@ -9,11 +9,6 @@
#include <linux/sizes.h> #include <linux/sizes.h>
/*
* CPU configuration
*/
#define CONFIG_SYS_TIMER_RATE CONFIG_SYS_CLK_FREQ
/* /*
* Memory configuration * Memory configuration
*/ */