Merged in raiden00/nuttx (pull request #464)

Master

Approved-by: Gregory Nutt <gnutt@nuttx.org>

arch/arm/include/stm32/chip.h

@@ -1700,7 +1700,7 @@
 #  define STM32_NUSBOTG                  0   /* (0) No USB */
 #  define STM32_NGPIO                    25  /* GPIOA-F */
 #  define STM32_NADC                     2   /* (3) 12-bit ADC1-2 */
-#  define STM32_NDAC                     2   /* (2) 12-bit DAC1-2 */
+#  define STM32_NDAC                     3   /* (2) 12-bit DAC1 CH1/CH2 and DAC2 CH1 */
 #  define STM32_NCMP                     2   /* (2) Ultra-fast analog comparators: COMP2 and COMP4 */
 #  define STM32_NPGA                     1   /* (1) Operational amplifiers: OPAMP */
 #  define STM32_NCAPSENSE                14  /* (14) No capacitive sensing channels */
@@ -1744,7 +1744,7 @@
 #  define STM32_NUSBOTG                  0   /* (0) No USB */
 #  define STM32_NGPIO                    37  /* GPIOA-F */
 #  define STM32_NADC                     3   /* (3) 12-bit ADC1-3 */
-#  define STM32_NDAC                     2   /* (2) 12-bit DAC1-2 */
+#  define STM32_NDAC                     3   /* (2) 12-bit DAC1 CH1/CH2 and DAC2 CH1 */
 #  define STM32_NCMP                     3   /* (3) Ultra-fast analog comparators: COMP2, COMP4 and COMP6 */
 #  define STM32_NPGA                     1   /* (1) Operational amplifiers: OPAMP */
 #  define STM32_NCAPSENSE                17  /* (17) No capacitive sensing channels */
@@ -1788,7 +1788,7 @@
 #  define STM32_NUSBOTG                  0   /* (0) No USB */
 #  define STM32_NGPIO                    51  /* GPIOA-F */
 #  define STM32_NADC                     3   /* (3) 12-bit ADC1-3 */
-#  define STM32_NDAC                     2   /* (3) 12-bit DAC1-2 */
+#  define STM32_NDAC                     3   /* (2) 12-bit DAC1 CH1/CH2 and DAC2 CH1 */
 #  define STM32_NCMP                     3   /* (3) Ultra-fast analog comparators: COMP2, COMP4 and COMP6 */
 #  define STM32_NPGA                     1   /* (1) Operational amplifiers: OPAMP */
 #  define STM32_NCAPSENSE                18  /* (18) No capacitive sensing channels */

arch/arm/src/stm32/Kconfig

@@ -2262,12 +2262,32 @@ config STM32_DAC1
 	depends on STM32_HAVE_DAC1
 	select STM32_DAC
 
+if STM32_DAC1
+
+config STM32_DAC1CH1
+  bool "DAC1CH1"
+	default n
+
+config STM32_DAC1CH2
+  bool "DAC1CH2"
+	default n
+
+endif #STM32_DAC1
+
 config STM32_DAC2
 	bool "DAC2"
 	default n
 	depends on STM32_HAVE_DAC2
 	select STM32_DAC
 
+if STM32_DAC2
+
+config STM32_DAC2CH1
+  bool "DAC2CH1"
+	default n
+
+endif #STM32_DAC2
+
 config STM32_DCMI
 	bool "DCMI"
 	default n
@@ -5817,9 +5837,9 @@ endmenu
 menu "DAC Configuration"
 	depends on STM32_DAC1 || STM32_DAC2
 
-config STM32_DAC1_DMA
-	bool "DAC1 DMA"
-	depends on STM32_DAC1
+config STM32_DAC1CH1_DMA
+	bool "DAC1CH1 DMA"
+	depends on STM32_DAC1CH1
 	default n
 	---help---
 		If DMA is selected, then a timer and output frequency must also be
@@ -5827,21 +5847,21 @@ config STM32_DAC1_DMA
 		supported by and EXTI trigger, but this feature is not currently
 		supported by the driver.
 
-if STM32_DAC1_DMA
+if STM32_DAC1CH1_DMA
 
-config STM32_DAC1_TIMER
-	int "DAC1 timer"
+config STM32_DAC1CH1_TIMER
+	int "DAC1CH1 timer"
 	range 2 8
 
-config STM32_DAC1_TIMER_FREQUENCY
-	int "DAC1 timer frequency"
+config STM32_DAC1CH1_TIMER_FREQUENCY
+	int "DAC1CH1 timer frequency"
 	default 0
 
 endif
 
-config STM32_DAC2_DMA
-	bool "DAC2 DMA"
-	depends on STM32_DAC2
+config STM32_DAC1CH2_DMA
+	bool "DAC1CH2 DMA"
+	depends on STM32_DAC1CH2
 	default n
 	---help---
 		If DMA is selected, then a timer and output frequency must also be
@@ -5849,15 +5869,37 @@ config STM32_DAC2_DMA
 		supported by and EXTI trigger, but this feature is not currently
 		supported by the driver.
 
-if STM32_DAC2_DMA
+if STM32_DAC1CH2_DMA
 
-config STM32_DAC2_TIMER
-	int "DAC2 timer"
+config STM32_DAC1CH2_TIMER
+	int "DAC1CH2 timer"
+	range 2 8
+
+config STM32_DAC1CH2_TIMER_FREQUENCY
+	int "DAC1CH2 timer frequency"
+	default 0
+
+endif
+
+config STM32_DAC2CH1_DMA
+	bool "DAC2CH1 DMA"
+	depends on STM32_DAC2CH1
+	default n
+	---help---
+		If DMA is selected, then a timer and output frequency must also be
+		provided to support the DMA transfer.  The DMA transfer could be
+		supported by and EXTI trigger, but this feature is not currently
+		supported by the driver.
+
+if STM32_DAC2CH1_DMA
+
+config STM32_DAC2CH1_TIMER
+	int "DAC2CH1 timer"
 	default 0
 	range 2 8
 
-config STM32_DAC2_TIMER_FREQUENCY
-	int "DAC2 timer frequency"
+config STM32_DAC2CH1_TIMER_FREQUENCY
+	int "DAC2CH1 timer frequency"
 	default 0
 
 endif