From a3c4d22e7908afaffe189d0101fc22083722db42 Mon Sep 17 00:00:00 2001
From: Lars Knudsen <larsgk@gmail.com>
Date: Fri, 29 Dec 2023 08:34:45 +0100
Subject: [PATCH] boards: bbc_microbit_v2: Add buzzer

Tie pwm1 to buzzer pin and adjust sample.

Signed-off-by: Lars Knudsen <larsgk@gmail.com>
---
 .../bbc_microbit_v2-pinctrl.dtsi              | 13 +++++++++
 .../arm/bbc_microbit_v2/bbc_microbit_v2.dts   |  8 ++++++
 samples/boards/bbc_microbit/sound/README.rst  | 27 +++++++++++++++----
 .../sound/boards/bbc_microbit_v2.overlay      |  6 +++++
 samples/boards/bbc_microbit/sound/prj.conf    |  1 -
 samples/boards/bbc_microbit/sound/sample.yaml |  4 ++-
 6 files changed, 52 insertions(+), 7 deletions(-)
 create mode 100644 samples/boards/bbc_microbit/sound/boards/bbc_microbit_v2.overlay

diff --git a/boards/arm/bbc_microbit_v2/bbc_microbit_v2-pinctrl.dtsi b/boards/arm/bbc_microbit_v2/bbc_microbit_v2-pinctrl.dtsi
index a91c7674688a..d61a30d944be 100644
--- a/boards/arm/bbc_microbit_v2/bbc_microbit_v2-pinctrl.dtsi
+++ b/boards/arm/bbc_microbit_v2/bbc_microbit_v2-pinctrl.dtsi
@@ -34,4 +34,17 @@
 		};
 	};
 
+	pwm1_default: pwm1_default {
+		group1 {
+			psels = <NRF_PSEL(PWM_OUT0, 0, 0)>;
+			nordic,invert;
+		};
+	};
+
+	pwm1_sleep: pwm1_sleep {
+		group1 {
+			psels = <NRF_PSEL(PWM_OUT0, 0, 0)>;
+			low-power-enable;
+		};
+	};
 };
diff --git a/boards/arm/bbc_microbit_v2/bbc_microbit_v2.dts b/boards/arm/bbc_microbit_v2/bbc_microbit_v2.dts
index d802907c9737..f123d003217e 100644
--- a/boards/arm/bbc_microbit_v2/bbc_microbit_v2.dts
+++ b/boards/arm/bbc_microbit_v2/bbc_microbit_v2.dts
@@ -113,6 +113,14 @@
 	status = "okay";
 };
 
+&pwm1 {
+	/* buzzer */
+	status = "okay";
+	pinctrl-0 = <&pwm1_default>;
+	pinctrl-1 = <&pwm1_sleep>;
+	pinctrl-names = "default", "sleep";
+};
+
 &uart0 {
 	compatible = "nordic,nrf-uart";
 	status = "okay";
diff --git a/samples/boards/bbc_microbit/sound/README.rst b/samples/boards/bbc_microbit/sound/README.rst
index 33373f0b5455..b02faffb2d6a 100644
--- a/samples/boards/bbc_microbit/sound/README.rst
+++ b/samples/boards/bbc_microbit/sound/README.rst
@@ -7,29 +7,46 @@ Overview
 ********
 
 This sample demonstrates how to use a piezo buzzer connected
-to port P0 on the edge connector of the BBC micro:bit board.
+to port P0 on the edge connector of the **BBC micro:bit v1** or
+using the on-board buzzer on the **BBC micro:bit v2**.
 
 Requirements
 ************
 
-A separate piezo buzzer connected to the board. One example is the MI:Power
-board that has a piezo buzzer in addition to a coin-cell battery. Resellers of
-this board can be fairly easily found using online search.
+Using **BBC micro:bit v1**, a separate piezo buzzer must be connected to the board.
+One example is the MI:Power board that has a piezo buzzer in addition to a
+coin-cell battery. Resellers of this board can be fairly easily found using online search.
+
+The upgraded **BBC micro:bit v2** board does not need a separate buzzer as it has one
+built-in on the backside of the board (marked as 'speaker').
+
 
 Building and running
 ********************
 
 The sample can be built as follows:
 
+Building for a BBC micro:bit v1
+-------------------------------
+
 .. zephyr-app-commands::
    :zephyr-app: samples/boards/bbc_microbit/sound
    :board: bbc_microbit
    :goals: build flash
    :compact:
 
+Building for a BBC micro:bit v2
+-------------------------------
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/boards/bbc_microbit/sound
+   :board: bbc_microbit_v2
+   :goals: build flash
+   :compact:
+
 Sample Output
 =============
 
-This sample outputs sounds through a connected piezo buzzer based on
+This sample outputs sounds through a piezo buzzer based on
 button presses of the two main buttons. For each press the current
 output frequency will be printed on the 5x5 LED display.
diff --git a/samples/boards/bbc_microbit/sound/boards/bbc_microbit_v2.overlay b/samples/boards/bbc_microbit/sound/boards/bbc_microbit_v2.overlay
new file mode 100644
index 000000000000..33e471dc6b52
--- /dev/null
+++ b/samples/boards/bbc_microbit/sound/boards/bbc_microbit_v2.overlay
@@ -0,0 +1,6 @@
+/ {
+	zephyr,user {
+		/* period cell corresponds to initial period */
+		pwms = <&pwm1 0 PWM_USEC(1500) PWM_POLARITY_NORMAL>;
+	};
+};
diff --git a/samples/boards/bbc_microbit/sound/prj.conf b/samples/boards/bbc_microbit/sound/prj.conf
index 2341a68c528c..d62777871294 100644
--- a/samples/boards/bbc_microbit/sound/prj.conf
+++ b/samples/boards/bbc_microbit/sound/prj.conf
@@ -2,4 +2,3 @@ CONFIG_GPIO=y
 CONFIG_DISPLAY=y
 CONFIG_MICROBIT_DISPLAY=y
 CONFIG_PWM=y
-CONFIG_PWM_NRF_SW=y
diff --git a/samples/boards/bbc_microbit/sound/sample.yaml b/samples/boards/bbc_microbit/sound/sample.yaml
index 241fce89d8c9..8a819a03a1df 100644
--- a/samples/boards/bbc_microbit/sound/sample.yaml
+++ b/samples/boards/bbc_microbit/sound/sample.yaml
@@ -2,5 +2,7 @@ sample:
   name: BBC micro:bit Sound
 tests:
   sample.board.bbc_microbit.sound:
-    platform_allow: bbc_microbit
+    platform_allow:
+      - bbc_microbit
+      - bbc_microbit_v2
     tags: sound