From 488f42588b6bf7d5b91c3a0003e5a9e1ffb78018 Mon Sep 17 00:00:00 2001 From: David Sidrane Date: Thu, 25 May 2017 16:50:42 -1000 Subject: [PATCH 1/3] Kinetis:Removed base address from kinetis_adc.h --- arch/arm/src/kinetis/chip/kinetis_adc.h | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm/src/kinetis/chip/kinetis_adc.h b/arch/arm/src/kinetis/chip/kinetis_adc.h index 6b3b74fa9c..536c254f5d 100644 --- a/arch/arm/src/kinetis/chip/kinetis_adc.h +++ b/arch/arm/src/kinetis/chip/kinetis_adc.h @@ -82,7 +82,6 @@ #define KINETIS_ADC_CLM0_OFFSET 0x006c /* ADC minus-side general calibration value register */ /* Register Addresses ***********************************************************************/ -# define KINETIS_ADC1_BASE 0x400bb000 /* Analog-to-digital converter (ADC) 1 */ #define KINETIS_ADC0_SC1A (KINETIS_ADC0_BASE+KINETIS_ADC_SC1A_OFFSET) #define KINETIS_ADC0_SC1B (KINETIS_ADC0_BASE+KINETIS_ADC_SC1B_OFFSET) From b4070209687ac10303c2f1b764e405d7c2535e61 Mon Sep 17 00:00:00 2001 From: David Sidrane Date: Thu, 25 May 2017 16:51:25 -1000 Subject: [PATCH 2/3] Kinetis:Fixed typo in kinetis_adc.h --- arch/arm/src/kinetis/chip/kinetis_adc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/src/kinetis/chip/kinetis_adc.h b/arch/arm/src/kinetis/chip/kinetis_adc.h index 536c254f5d..db33a33207 100644 --- a/arch/arm/src/kinetis/chip/kinetis_adc.h +++ b/arch/arm/src/kinetis/chip/kinetis_adc.h @@ -204,7 +204,7 @@ # define ADC_CFG1_ADIV_DIV1 (0 << ADC_CFG1_ADIV_SHIFT) /* Divider=1 rate=input clock */ # define ADC_CFG1_ADIV_DIV2 (1 << ADC_CFG1_ADIV_SHIFT) /* Divider=2 rate=input clock/2 */ # define ADC_CFG1_ADIV_DIV4 (2 << ADC_CFG1_ADIV_SHIFT) /* Divider=4 rate=input clock/4 */ -# define ADC_CFG1_ADIV_DIV5 (3 << ADC_CFG1_ADIV_SHIFT) /* Divider=8 rate=input clock/8 */ +# define ADC_CFG1_ADIV_DIV8 (3 << ADC_CFG1_ADIV_SHIFT) /* Divider=8 rate=input clock/8 */ #define ADC_CFG1_ADLPC (1 << 7) /* Bit 7: Low-power configuration */ /* Bits 8-31: Reserved */ /* Configuration register 2 */ From a077d0285bf05b55380a59237ac13a9a071d7571 Mon Sep 17 00:00:00 2001 From: David Sidrane Date: Thu, 25 May 2017 16:52:08 -1000 Subject: [PATCH 3/3] Kinetis:Added ADC channel macro --- arch/arm/src/kinetis/chip/kinetis_adc.h | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/src/kinetis/chip/kinetis_adc.h b/arch/arm/src/kinetis/chip/kinetis_adc.h index db33a33207..847bd9b7b7 100644 --- a/arch/arm/src/kinetis/chip/kinetis_adc.h +++ b/arch/arm/src/kinetis/chip/kinetis_adc.h @@ -151,6 +151,7 @@ #define ADC_SC1_ADCH_SHIFT (0) /* Bits 0-4: Input channel select */ #define ADC_SC1_ADCH_MASK (31 << ADC_SC1_ADCH_SHIFT) +# define ADC_SC1_ADCH(c) (((c) & 0x1f) << ADC_SC1_ADCH_SHIFT) # define ADC_SC1_ADCH_DADP0 (0 << ADC_SC1_ADCH_SHIFT) /* DIFF=0 DADP0; DIFF=1, DAD0 */ # define ADC_SC1_ADCH_DADP1 (1 << ADC_SC1_ADCH_SHIFT) /* DIFF=0 DADP1; DIFF=1, DAD1 */ # define ADC_SC1_ADCH_DADP2 (2 << ADC_SC1_ADCH_SHIFT) /* DIFF=0 DADP2; DIFF=1, DAD2 */