From 96c7875f4074ed07a681d7ebc1dd6726cfa7e616 Mon Sep 17 00:00:00 2001
From: Maureen Helm <maureen.helm@intel.com>
Date: Mon, 25 Oct 2021 17:44:33 -0500
Subject: [PATCH] boards: arm: Configure DAC on bl653_dvk

Moves DAC dts node and driver configuration defaults from the
application level to the board level for the bl653_dvk board.

Signed-off-by: Maureen Helm <maureen.helm@intel.com>
---
 boards/arm/bl653_dvk/Kconfig.defconfig                 | 10 ++++++++++
 boards/arm/bl653_dvk/bl653_dvk.dts                     |  9 +++++++++
 samples/drivers/dac/boards/bl653_dvk.conf              |  6 ------
 samples/drivers/dac/boards/bl653_dvk.overlay           |  9 ++-------
 tests/drivers/dac/dac_api/boards/bl653_dvk.conf        |  7 -------
 tests/drivers/dac/dac_api/boards/bl653_dvk.overlay     | 10 ++--------
 tests/drivers/dac/dac_loopback/boards/bl653_dvk.conf   |  7 -------
 .../drivers/dac/dac_loopback/boards/bl653_dvk.overlay  | 10 ++--------
 8 files changed, 25 insertions(+), 43 deletions(-)
 delete mode 100644 samples/drivers/dac/boards/bl653_dvk.conf
 delete mode 100644 tests/drivers/dac/dac_api/boards/bl653_dvk.conf
 delete mode 100644 tests/drivers/dac/dac_loopback/boards/bl653_dvk.conf

diff --git a/boards/arm/bl653_dvk/Kconfig.defconfig b/boards/arm/bl653_dvk/Kconfig.defconfig
index d1c9e133040..ffc9f17b2e3 100644
--- a/boards/arm/bl653_dvk/Kconfig.defconfig
+++ b/boards/arm/bl653_dvk/Kconfig.defconfig
@@ -15,4 +15,14 @@ config IEEE802154_NRF5
 config BT_CTLR
 	default BT
 
+if DAC
+
+config DAC_MCP4725
+	default y
+
+config I2C
+	default y
+
+endif # DAC
+
 endif # BOARD_BL653_DVK
diff --git a/boards/arm/bl653_dvk/bl653_dvk.dts b/boards/arm/bl653_dvk/bl653_dvk.dts
index 490c2e98c4b..17fc865059d 100644
--- a/boards/arm/bl653_dvk/bl653_dvk.dts
+++ b/boards/arm/bl653_dvk/bl653_dvk.dts
@@ -106,6 +106,15 @@
 	status = "okay";
 	sda-pin = <26>;
 	scl-pin = <27>;
+
+	dac0: mcp4725@60 {
+		/* MCP4725 not populated at factory */
+		compatible = "microchip,mcp4725";
+		reg = <0x60>;
+		label = "MCP4725";
+		#io-channel-cells = <1>;
+		status = "disabled";
+	};
 };
 
 &pwm0 {
diff --git a/samples/drivers/dac/boards/bl653_dvk.conf b/samples/drivers/dac/boards/bl653_dvk.conf
deleted file mode 100644
index abc42c157a7..00000000000
--- a/samples/drivers/dac/boards/bl653_dvk.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2021 Laird Connectivity
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-CONFIG_DAC_MCP4725=y
diff --git a/samples/drivers/dac/boards/bl653_dvk.overlay b/samples/drivers/dac/boards/bl653_dvk.overlay
index 4e69a89be68..6c3674266aa 100644
--- a/samples/drivers/dac/boards/bl653_dvk.overlay
+++ b/samples/drivers/dac/boards/bl653_dvk.overlay
@@ -4,11 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-&i2c0 {
-	dac0: mcp4725@60 {
-		compatible = "microchip,mcp4725";
-		reg = <0x60>;
-		label = "MCP4725";
-		#io-channel-cells = <1>;
-	};
+&dac0 {
+	status = "okay";
 };
diff --git a/tests/drivers/dac/dac_api/boards/bl653_dvk.conf b/tests/drivers/dac/dac_api/boards/bl653_dvk.conf
deleted file mode 100644
index f8f6db471e5..00000000000
--- a/tests/drivers/dac/dac_api/boards/bl653_dvk.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Copyright (c) 2021 Laird Connectivity
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-CONFIG_I2C=y
-CONFIG_DAC_MCP4725=y
diff --git a/tests/drivers/dac/dac_api/boards/bl653_dvk.overlay b/tests/drivers/dac/dac_api/boards/bl653_dvk.overlay
index eec33e81505..6c3674266aa 100644
--- a/tests/drivers/dac/dac_api/boards/bl653_dvk.overlay
+++ b/tests/drivers/dac/dac_api/boards/bl653_dvk.overlay
@@ -4,12 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-&i2c0 {
-	dac0: mcp4725@60 {
-		/* MCP4725 not populated at factory */
-		compatible = "microchip,mcp4725";
-		reg = <0x60>;
-		label = "MCP4725";
-		#io-channel-cells = <1>;
-	};
+&dac0 {
+	status = "okay";
 };
diff --git a/tests/drivers/dac/dac_loopback/boards/bl653_dvk.conf b/tests/drivers/dac/dac_loopback/boards/bl653_dvk.conf
deleted file mode 100644
index f8f6db471e5..00000000000
--- a/tests/drivers/dac/dac_loopback/boards/bl653_dvk.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Copyright (c) 2021 Laird Connectivity
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-CONFIG_I2C=y
-CONFIG_DAC_MCP4725=y
diff --git a/tests/drivers/dac/dac_loopback/boards/bl653_dvk.overlay b/tests/drivers/dac/dac_loopback/boards/bl653_dvk.overlay
index eec33e81505..6c3674266aa 100644
--- a/tests/drivers/dac/dac_loopback/boards/bl653_dvk.overlay
+++ b/tests/drivers/dac/dac_loopback/boards/bl653_dvk.overlay
@@ -4,12 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-&i2c0 {
-	dac0: mcp4725@60 {
-		/* MCP4725 not populated at factory */
-		compatible = "microchip,mcp4725";
-		reg = <0x60>;
-		label = "MCP4725";
-		#io-channel-cells = <1>;
-	};
+&dac0 {
+	status = "okay";
 };