michaelh/zephyr
1
0
Fork 0
Code Releases Activity

rtc/dw: remove kconfigs that are SoC specific

Browse source 
Remove those kconfig options that are SoC specific, and
should not be configurable via kconfig.

This also separates IRQ_PRI into one for DW and one
for QMSI, to follow the convention of every other
drivers.

Change-Id: I338f819f71c18fa9e17015e8a588a3d0207350c6
Signed-off-by: Daniel Leung <daniel.leung@intel.com>
This commit is contained in:
Daniel Leung 2016-03-31 11:10:02 -07:00 • committed by Anas Nashif
commit 8a05b46325
7 changed files with 48 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

28
drivers/rtc/Kconfig
View file

@ -27,16 +27,6 @@ menuconfig RTC
if RTC
config RTC_IRQ
int "Interrupt number"
help
RTC interrupt number
config RTC_IRQ_PRI
int "Interrupt priority"
help
RTC interrupt priority.
config RTC_DRV_NAME
string "Driver instance name"
default "RTC_0"
@ -51,6 +41,18 @@ config RTC_QMSI
help
Build QMSI RTC driver.
config RTC_QMSI_IRQ
int "QMSI RTC Driver Interrupt number"
depends on RTC_QMSI
help
RTC interrupt number
config RTC_QMSI_IRQ_PRI
int "QMSI RTC Driver Interrupt priority"
depends on RTC_QMSI
help
RTC interrupt priority.
config RTC_DW
bool "Build Designware RTC Driver"
default n
@ -75,10 +77,10 @@ config RTC_DW_CLOCK_GATE_SUBSYS
depends on RTC_DW_CLOCK_GATE
default 0
config RTC_DW_BASE_ADDR
hex "Base address"
config RTC_DW_IRQ_PRI
int "DesignWare RTC Driver Interrupt priority"
depends on RTC_DW
help
Base address to access RTC DesignWare controller registers
RTC interrupt priority.
endif # RTC

6
drivers/rtc/rtc_dw.c
View file

@ -194,7 +194,7 @@ int rtc_dw_init(struct device *dev);
struct rtc_dw_runtime rtc_runtime;
struct rtc_dw_dev_config rtc_dev = {
.base_address = CONFIG_RTC_DW_BASE_ADDR,
.base_address = RTC_DW_BASE_ADDR,
#ifdef CONFIG_RTC_DW_CLOCK_GATE
.clock_data = UINT_TO_POINTER(CONFIG_RTC_DW_CLOCK_GATE_SUBSYS),
#endif
@ -206,9 +206,9 @@ DEVICE_INIT(rtc, CONFIG_RTC_DRV_NAME, &rtc_dw_init,
int rtc_dw_init(struct device *dev)
{
IRQ_CONNECT(CONFIG_RTC_IRQ, CONFIG_RTC_IRQ_PRI, rtc_dw_isr,
IRQ_CONNECT(RTC_DW_IRQ, CONFIG_RTC_DW_IRQ_PRI, rtc_dw_isr,
DEVICE_GET(rtc), 0);
irq_enable(CONFIG_RTC_IRQ);
irq_enable(RTC_DW_IRQ);
_rtc_dw_int_unmask();

4
drivers/rtc/rtc_qmsi.c
View file

@ -81,11 +81,11 @@ static struct rtc_driver_api api = {
static int rtc_qmsi_init(struct device *dev)
{
IRQ_CONNECT(CONFIG_RTC_IRQ, CONFIG_RTC_IRQ_PRI, qm_rtc_isr_0, 0,
IRQ_CONNECT(CONFIG_RTC_QMSI_IRQ, CONFIG_RTC_IRQ_PRI, qm_rtc_isr_0, 0,
IOAPIC_EDGE | IOAPIC_HIGH);
/* Unmask RTC interrupt */
irq_enable(CONFIG_RTC_IRQ);
irq_enable(CONFIG_RTC_QMSI_IRQ);
/* Route RTC interrupt to Lakemont */
QM_SCSS_INT->int_rtc_mask &= ~BIT(0);