michaelh/zephyr
1
0
Fork 0
Code Releases Activity

qmsi: adc: use built-in qmsi driver

Browse source 
Fix naming and use a global driver name for instance.

Change-Id: I30a54cb9c20773e1b6fdc57b934aa564612a6c45
Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2016-04-17 08:50:07 +08:00
commit b3e02b406a
8 changed files with 26 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

4
arch/x86/soc/quark_d2000/Kconfig.defconfig
View file

@ -195,6 +195,10 @@ config AON_TIMER_IRQ_PRI
default 0
endif
if ADC
config ADC_QMSI
def_bool y
endif
if SPI_QMSI
config SPI_QMSI_PORT_0

5
arch/x86/soc/quark_se/Kconfig.defconfig
View file

@ -228,6 +228,11 @@ endif # SPI_QMSI
endif # SPI
if ADC
config ADC_QMSI
def_bool y
endif
if AIO_COMPARATOR
config AIO_QMSI_COMPARATOR

22
drivers/adc/Kconfig
View file

@ -57,7 +57,7 @@ config ADC_TI_ADC108S102_INIT_PRIORITY
config ADC_TI_ADC108S102_DRV_NAME
string "Driver's name"
depends on ADC_TI_ADC108S102
default "ADC"
default "ADC_0"
config ADC_TI_ADC108S102_SPI_PORT_NAME
string "Master SPI port name"
@ -98,9 +98,9 @@ menuconfig ADC_DW
if ADC_DW
config ADC_DW_NAME
config ADC_DW_DRV_NAME
string "Select a name to lookup the device"
default "ADC"
default "ADC_0"
depends on ADC_DW
config ADC_DW_RX_IRQ
@ -115,7 +115,7 @@ config ADC_DW_ERR_IRQ
depends on ADC_DW
default 18
config ADC_DW_PRI
config ADC_DW_IRQ_PRI
int
prompt "ADC interrupt priority"
depends on ADC_DW
@ -216,25 +216,19 @@ endif
menuconfig ADC_QMSI
bool "QMSI ADC Driver"
depends on QMSI_DRIVERS && ADC
depends on QMSI && ADC
default n
help
Enable the driver implementation of the QMSI ADC IP.
if ADC_QMSI
config ADC_QMSI_NAME
config ADC_QMSI_0_DRV_NAME
string "Select a name to lookup the device"
default "ADC"
default "ADC_0"
depends on ADC_QMSI
config ADC_IRQ
int
prompt "ADC interrupt request"
depends on ADC_QMSI
default 9
config ADC_PRI
config ADC_QMSI_0_IRQ_PRI
int
prompt "ADC interrupt priority"
depends on ADC_QMSI

6
drivers/adc/adc_dw.c
View file

@ -497,18 +497,18 @@ struct adc_config adc_config_dev = {
.config_func = adc_config_irq,
};
DEVICE_AND_API_INIT(adc_dw, CONFIG_ADC_DW_NAME, &adc_dw_init,
DEVICE_AND_API_INIT(adc_dw, CONFIG_ADC_DW_DRV_NAME, &adc_dw_init,
&adc_info_dev, &adc_config_dev,
SECONDARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT,
&api_funcs);
static void adc_config_irq(void)
{
IRQ_CONNECT(CONFIG_ADC_DW_RX_IRQ, CONFIG_ADC_DW_PRI, adc_dw_rx_isr,
IRQ_CONNECT(CONFIG_ADC_DW_RX_IRQ, CONFIG_ADC_DW_IRQ_PRI, adc_dw_rx_isr,
DEVICE_GET(adc_dw), 0);
irq_enable(CONFIG_ADC_DW_RX_IRQ);
IRQ_CONNECT(CONFIG_ADC_DW_ERR_IRQ, CONFIG_ADC_DW_PRI,
IRQ_CONNECT(CONFIG_ADC_DW_ERR_IRQ, CONFIG_ADC_DW_IRQ_PRI,
adc_dw_err_isr, DEVICE_GET(adc_dw), 0);
irq_enable(CONFIG_ADC_DW_ERR_IRQ);
}

6
drivers/adc/adc_qmsi.c
View file

@ -270,16 +270,16 @@ int adc_qmsi_init(struct device *dev)
struct adc_info adc_info_dev;
DEVICE_INIT(adc_qmsi, CONFIG_ADC_QMSI_NAME, &adc_qmsi_init,
DEVICE_INIT(adc_qmsi, CONFIG_ADC_QMSI_0_DRV_NAME, &adc_qmsi_init,
&adc_info_dev, NULL,
SECONDARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
static void adc_config_irq(void)
{
IRQ_CONNECT(CONFIG_ADC_IRQ, CONFIG_ADC_PRI, qm_adc_0_isr,
IRQ_CONNECT(QM_IRQ_ADC_0, CONFIG_ADC_0_IRQ_PRI, qm_adc_0_isr,
NULL, (IOAPIC_LEVEL | IOAPIC_HIGH));
irq_enable(CONFIG_ADC_IRQ);
irq_enable(QM_IRQ_ADC_0);
QM_SCSS_INT->int_adc_calib_mask &= ~BIT(0);
}

1
drivers/qmsi/Makefile
View file

@ -6,3 +6,4 @@ obj-$(CONFIG_PWM_QMSI) += drivers/qm_pwm.o
obj-$(CONFIG_AIO_QMSI_COMPARATOR) += drivers/qm_comparator.o
obj-$(CONFIG_AON_COUNTER_QMSI) += drivers/qm_aon_counters.o
obj-$(CONFIG_GPIO_QMSI) += drivers/qm_gpio.o
obj-$(CONFIG_ADC_QMSI) += drivers/qm_adc.o

6
samples/drivers/adc/src/adc.c
View file

@ -33,11 +33,7 @@
#define SLEEPTIME 2
#define SLEEPTICKS (SLEEPTIME * sys_clock_ticks_per_sec)
#if defined(CONFIG_ADC_DW)
#define ADC_DEVICE_NAME CONFIG_ADC_DW_NAME
#elif defined(CONFIG_ADC_TI_ADC108S102)
#define ADC_DEVICE_NAME CONFIG_ADC_TI_ADC108S102_DRV_NAME
#endif
#define ADC_DEVICE_NAME "ADC_0"
/*
* The analog input pin and channel number mapping

4
samples/drivers/adc/testcase.ini
View file

@ -1,6 +1,4 @@
[test]
build_only = true
tags = apps
arch_whitelist = x86 arc
platform_whitelist = galileo arduino_101_sss
platform_whitelist = galileo arduino_101_sss quark_d2000_crb