From e7bebf7c805e160bfd633da5c8357527a4fee9f6 Mon Sep 17 00:00:00 2001 From: Vijay Hiremath Date: Wed, 15 Jul 2015 18:02:33 -0700 Subject: ADC: Add common priority for the ADC init Added common priority for the ADC init to ensure board level priority is defined for the ADC pre init. BUG=none TEST=make buildall -j BRANCH=none Change-Id: Id1649df6a68ab53bd110e58a0722bd4c70cbffc5 Signed-off-by: Vijay Hiremath Reviewed-on: https://chromium-review.googlesource.com/286040 Reviewed-by: Shawn N --- chip/it83xx/adc.c | 2 +- chip/lm4/adc.c | 2 +- chip/mec1322/adc.c | 2 +- chip/npcx/adc.c | 2 +- chip/stm32/adc-stm32f0.c | 2 +- chip/stm32/adc-stm32f3.c | 2 +- include/adc.h | 2 ++ 7 files changed, 8 insertions(+), 6 deletions(-) diff --git a/chip/it83xx/adc.c b/chip/it83xx/adc.c index bb59bda0ff..5c859b4ba2 100644 --- a/chip/it83xx/adc.c +++ b/chip/it83xx/adc.c @@ -168,4 +168,4 @@ static void adc_init(void) IT83XX_ADC_ADCCTL = 0x04; } -DECLARE_HOOK(HOOK_INIT, adc_init, HOOK_PRIO_DEFAULT); +DECLARE_HOOK(HOOK_INIT, adc_init, HOOK_PRIO_INIT_ADC); diff --git a/chip/lm4/adc.c b/chip/lm4/adc.c index f797317688..69338c61b0 100644 --- a/chip/lm4/adc.c +++ b/chip/lm4/adc.c @@ -284,4 +284,4 @@ static void adc_init(void) clock_disable_peripheral(CGC_OFFSET_ADC, 0x1, CGC_MODE_RUN | CGC_MODE_SLEEP); } -DECLARE_HOOK(HOOK_INIT, adc_init, HOOK_PRIO_DEFAULT); +DECLARE_HOOK(HOOK_INIT, adc_init, HOOK_PRIO_INIT_ADC); diff --git a/chip/mec1322/adc.c b/chip/mec1322/adc.c index 5b35307268..037f270428 100644 --- a/chip/mec1322/adc.c +++ b/chip/mec1322/adc.c @@ -94,7 +94,7 @@ static void adc_init(void) MEC1322_INT_BLK_EN |= 1 << 17; task_enable_irq(MEC1322_IRQ_ADC_SNGL); } -DECLARE_HOOK(HOOK_INIT, adc_init, HOOK_PRIO_DEFAULT); +DECLARE_HOOK(HOOK_INIT, adc_init, HOOK_PRIO_INIT_ADC); void adc_interrupt(void) { diff --git a/chip/npcx/adc.c b/chip/npcx/adc.c index 7096f9f1d1..9d498be555 100644 --- a/chip/npcx/adc.c +++ b/chip/npcx/adc.c @@ -235,4 +235,4 @@ static void adc_init(void) task_enable_irq(NPCX_IRQ_ADC); } -DECLARE_HOOK(HOOK_INIT, adc_init, HOOK_PRIO_DEFAULT); +DECLARE_HOOK(HOOK_INIT, adc_init, HOOK_PRIO_INIT_ADC); diff --git a/chip/stm32/adc-stm32f0.c b/chip/stm32/adc-stm32f0.c index c6e1d94b62..17cc8b7e2d 100644 --- a/chip/stm32/adc-stm32f0.c +++ b/chip/stm32/adc-stm32f0.c @@ -320,4 +320,4 @@ static void adc_init(void) while (!(STM32_ADC_ISR & STM32_ADC_ISR_ADRDY)) STM32_ADC_CR = STM32_ADC_CR_ADEN; } -DECLARE_HOOK(HOOK_INIT, adc_init, HOOK_PRIO_DEFAULT); +DECLARE_HOOK(HOOK_INIT, adc_init, HOOK_PRIO_INIT_ADC); diff --git a/chip/stm32/adc-stm32f3.c b/chip/stm32/adc-stm32f3.c index 072c71b9df..94212b2155 100644 --- a/chip/stm32/adc-stm32f3.c +++ b/chip/stm32/adc-stm32f3.c @@ -304,4 +304,4 @@ static void adc_init(void) STM32_ADC_SMPR1 = SMPR1_EXPAND(CONFIG_ADC_SAMPLE_TIME); STM32_ADC_SMPR2 = SMPR2_EXPAND(CONFIG_ADC_SAMPLE_TIME); } -DECLARE_HOOK(HOOK_INIT, adc_init, HOOK_PRIO_DEFAULT); +DECLARE_HOOK(HOOK_INIT, adc_init, HOOK_PRIO_INIT_ADC); diff --git a/include/adc.h b/include/adc.h index efca057445..f7fbb0d3ac 100644 --- a/include/adc.h +++ b/include/adc.h @@ -10,6 +10,8 @@ #include "common.h" +#define HOOK_PRIO_INIT_ADC HOOK_PRIO_DEFAULT /* ADC priority */ + #define ADC_READ_ERROR -1 /* Value returned by adc_read_channel() on error */ /* -- cgit v1.2.1