diff --git a/boards/arm/stm32l4/nucleo-l432kc/include/board.h b/boards/arm/stm32l4/nucleo-l432kc/include/board.h index ed5066477af..8d79a89c0c7 100644 --- a/boards/arm/stm32l4/nucleo-l432kc/include/board.h +++ b/boards/arm/stm32l4/nucleo-l432kc/include/board.h @@ -221,12 +221,6 @@ #define LED_ASSERTION 2 #define LED_PANIC 1 -/* DAC - * Default is PA4 (same as ADC, do not use both at the same time) - */ - -#define GPIO_DAC1_OUT GPIO_DAC1_OUT_1 - /* Quadrature encoder * Default is to use timer 5 (32-bit) and encoder on PA0/PA1 */ diff --git a/boards/arm/stm32l4/nucleo-l432kc/src/Makefile b/boards/arm/stm32l4/nucleo-l432kc/src/Makefile index 17c0d0540e2..a6bda0369cd 100644 --- a/boards/arm/stm32l4/nucleo-l432kc/src/Makefile +++ b/boards/arm/stm32l4/nucleo-l432kc/src/Makefile @@ -55,10 +55,6 @@ ifeq ($(CONFIG_STM32L4_ADC),y) CSRCS += stm32_adc.c endif -ifeq ($(CONFIG_DAC),y) -CSRCS += stm32_dac.c -endif - ifeq ($(CONFIG_DAC7571),y) CSRCS += stm32_dac7571.c endif diff --git a/boards/arm/stm32l4/nucleo-l432kc/src/nucleo-l432kc.h b/boards/arm/stm32l4/nucleo-l432kc/src/nucleo-l432kc.h index 3f3251bad2c..06d721d628e 100644 --- a/boards/arm/stm32l4/nucleo-l432kc/src/nucleo-l432kc.h +++ b/boards/arm/stm32l4/nucleo-l432kc/src/nucleo-l432kc.h @@ -190,18 +190,6 @@ int stm32l4_pwm_setup(void); int stm32l4_adc_setup(void); #endif -/**************************************************************************** - * Name: stm32l4_dac_setup - * - * Description: - * Initialize DAC and register the DAC driver. - * - ****************************************************************************/ - -#ifdef CONFIG_DAC -int stm32l4_dac_setup(void); -#endif - /**************************************************************************** * Name: stm32_dac7571initialize * diff --git a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_appinit.c b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_appinit.c index 842dd368557..bbe75916217 100644 --- a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_appinit.c +++ b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_appinit.c @@ -242,12 +242,6 @@ int board_app_initialize(uintptr_t arg) } #endif -#ifdef CONFIG_DAC - ainfo("Initializing DAC\n"); - - stm32l4_dac_setup(); -#endif /* CONFIG_DAC */ - #ifdef CONFIG_DAC7571 /* Initialize and register DAC7571 */ diff --git a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_dac.c b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_dac.c deleted file mode 100644 index 074420a132f..00000000000 --- a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_dac.c +++ /dev/null @@ -1,97 +0,0 @@ -/***************************************************************************** - * boards/arm/stm32l4/nucleo-l432kc/src/stm32_dac.c - * - * Copyright (C) 2017 Haltian Ltd. All rights reserved. - * Authors: Juha Niskanen - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name NuttX nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - *****************************************************************************/ - -/***************************************************************************** - * Included Files - *****************************************************************************/ - -#include -#include -#include - -#include -#include - -#include "stm32l4_gpio.h" -#include "stm32l4_dac.h" -#include "nucleo-l432kc.h" - -#include - -/***************************************************************************** - * Private Data - *****************************************************************************/ - -static struct dac_dev_s *g_dac; - -/***************************************************************************** - * Public Functions - *****************************************************************************/ - -/***************************************************************************** - * Name: stm32l4_dac_setup - *****************************************************************************/ - -int stm32l4_dac_setup(void) -{ - static bool initialized = false; - - if (!initialized) - { -#ifdef CONFIG_STM32L4_DAC1 - int ret; - - g_dac = stm32l4_dacinitialize(0); - if (g_dac == NULL) - { - aerr("ERROR: Failed to get DAC interface\n"); - return -ENODEV; - } - - /* Register the DAC driver at "/dev/dac0" */ - - ret = dac_register("/dev/dac0", g_dac); - if (ret < 0) - { - aerr("ERROR: dac_register failed: %d\n", ret); - return ret; - } - -#endif - initialized = true; - } - - return OK; -}