usb: hid: rename "interface-name" property to label

jfischer-no · carlescufi · commit b2c6298e7674 · 2025-06-25T14:21:17.000+02:00
The intention was to use the "interface-name" string property in the
interface string descriptor, but using the label property is acceptable
again upstream.

Signed-off-by: Johann Fischer &lt;johann.fischer@nordicsemi.no&gt;
diff --git a/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/app.overlay b/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/app.overlay
@@ -6,14 +6,14 @@
 	/* Configure DTS nodes used for USB next HID support. */
 	hid_dev_0: hid_dev_0 {
 		compatible = "zephyr,hid-device";
-		interface-name = "HID0";
+		label = "HID0";
 		protocol-code = "none";
 		in-polling-period-us = <1000>;
 		in-report-size = <64>;
 	};
 	hid_dev_1: hid_dev_1 {
 		compatible = "zephyr,hid-device";
-		interface-name = "HID1";
+		label = "HID1";
 		protocol-code = "none";
 		in-polling-period-us = <1000>;
 		in-report-size = <64>;
diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/app.overlay b/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/app.overlay
@@ -6,14 +6,14 @@
 	/* Configure DTS nodes used for USB next HID support. */
 	hid_dev_0: hid_dev_0 {
 		compatible = "zephyr,hid-device";
-		interface-name = "HID0";
+		label = "HID0";
 		protocol-code = "none";
 		in-polling-period-us = <1000>;
 		in-report-size = <64>;
 	};
 	hid_dev_1: hid_dev_1 {
 		compatible = "zephyr,hid-device";
-		interface-name = "HID1";
+		label = "HID1";
 		protocol-code = "none";
 		in-polling-period-us = <1000>;
 		in-report-size = <64>;
diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/app.overlay b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/app.overlay
@@ -2,14 +2,14 @@
 	/* Configure DTS nodes used for USB next HID support. */
 	hid_dev_0: hid_dev_0 {
 		compatible = "zephyr,hid-device";
-		interface-name = "HID0";
+		label = "HID0";
 		protocol-code = "none";
 		in-polling-period-us = <1000>;
 		in-report-size = <64>;
 	};
 	hid_dev_1: hid_dev_1 {
 		compatible = "zephyr,hid-device";
-		interface-name = "HID1";
+		label = "HID1";
 		protocol-code = "none";
 		in-polling-period-us = <1000>;
 		in-report-size = <64>;
diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/app_dongle_small.overlay b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/app_dongle_small.overlay
@@ -12,14 +12,14 @@
 	/* Configure DTS nodes used for USB next HID support. */
 	hid_dev_0: hid_dev_0 {
 		compatible = "zephyr,hid-device";
-		interface-name = "HID0";
+		label = "HID0";
 		protocol-code = "none";
 		in-polling-period-us = <1000>;
 		in-report-size = <64>;
 	};
 	hid_dev_1: hid_dev_1 {
 		compatible = "zephyr,hid-device";
-		interface-name = "HID1";
+		label = "HID1";
 		protocol-code = "none";
 		in-polling-period-us = <1000>;
 		in-report-size = <64>;
diff --git a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/app.overlay b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/app.overlay
@@ -2,14 +2,14 @@
 	/* Configure DTS nodes used for USB next HID support. */
 	hid_dev_0: hid_dev_0 {
 		compatible = "zephyr,hid-device";
-		interface-name = "HID0";
+		label = "HID0";
 		protocol-code = "none";
 		in-polling-period-us = <1000>;
 		in-report-size = <64>;
 	};
 	hid_dev_1: hid_dev_1 {
 		compatible = "zephyr,hid-device";
-		interface-name = "HID1";
+		label = "HID1";
 		protocol-code = "none";
 		in-polling-period-us = <1000>;
 		in-report-size = <64>;
diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app.overlay b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app.overlay
@@ -10,7 +10,7 @@
 	/* Configure DTS nodes used for USB next HID support. */
 	hid_dev_0: hid_dev_0 {
 		compatible = "zephyr,hid-device";
-		interface-name = "HID0";
+		label = "HID0";
 		protocol-code = "mouse";
 		in-polling-period-us = <1000>;
 		in-report-size = <64>;
diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_dongle.overlay b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_dongle.overlay
@@ -10,14 +10,14 @@
 	/* Configure DTS nodes used for USB next HID support. */
 	hid_dev_0: hid_dev_0 {
 		compatible = "zephyr,hid-device";
-		interface-name = "HID0";
+		label = "HID0";
 		protocol-code = "keyboard";
 		in-polling-period-us = <1000>;
 		in-report-size = <64>;
 	};
 	hid_dev_1: hid_dev_1 {
 		compatible = "zephyr,hid-device";
-		interface-name = "HID1";
+		label = "HID1";
 		protocol-code = "keyboard";
 		in-polling-period-us = <1000>;
 		in-report-size = <64>;
diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_keyboard.overlay b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_keyboard.overlay
@@ -10,7 +10,7 @@
 	/* Configure DTS nodes used for USB next HID support. */
 	hid_dev_0: hid_dev_0 {
 		compatible = "zephyr,hid-device";
-		interface-name = "HID0";
+		label = "HID0";
 		protocol-code = "keyboard";
 		in-polling-period-us = <1000>;
 		in-report-size = <64>;
diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_mcuboot_qspi.overlay b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_mcuboot_qspi.overlay
@@ -14,7 +14,7 @@
 	/* Configure DTS nodes used for USB next HID support. */
 	hid_dev_0: hid_dev_0 {
 		compatible = "zephyr,hid-device";
-		interface-name = "HID0";
+		label = "HID0";
 		protocol-code = "mouse";
 		in-polling-period-us = <1000>;
 		in-report-size = <64>;
diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app.overlay b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app.overlay
@@ -14,14 +14,14 @@
 	/* Configure DTS nodes used for USB next HID support. */
 	hid_dev_0: hid_dev_0 {
 		compatible = "zephyr,hid-device";
-		interface-name = "HID0";
+		label = "HID0";
 		protocol-code = "none";
 		in-polling-period-us = <1000>;
 		in-report-size = <64>;
 	};
 	hid_dev_1: hid_dev_1 {
 		compatible = "zephyr,hid-device";
-		interface-name = "HID1";
+		label = "HID1";
 		protocol-code = "none";
 		in-polling-period-us = <1000>;
 		in-report-size = <64>;
diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_3bleconn.overlay b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_3bleconn.overlay
@@ -10,42 +10,42 @@
 	/* Configure DTS nodes used for USB next HID support. */
 	hid_dev_0: hid_dev_0 {
 		compatible = "zephyr,hid-device";
-		interface-name = "HID0";
+		label = "HID0";
 		protocol-code = "none";
 		in-polling-period-us = <1000>;
 		in-report-size = <64>;
 	};
 	hid_dev_1: hid_dev_1 {
 		compatible = "zephyr,hid-device";
-		interface-name = "HID1";
+		label = "HID1";
 		protocol-code = "none";
 		in-polling-period-us = <1000>;
 		in-report-size = <64>;
 	};
 	hid_dev_2: hid_dev_2 {
 		compatible = "zephyr,hid-device";
-		interface-name = "HID2";
+		label = "HID2";
 		protocol-code = "none";
 		in-polling-period-us = <1000>;
 		in-report-size = <64>;
 	};
 	hid_dev_3: hid_dev_3 {
 		compatible = "zephyr,hid-device";
-		interface-name = "HID3";
+		label = "HID3";
 		protocol-code = "none";
 		in-polling-period-us = <1000>;
 		in-report-size = <64>;
 	};
 	hid_dev_4: hid_dev_4 {
 		compatible = "zephyr,hid-device";
-		interface-name = "HID4";
+		label = "HID4";
 		protocol-code = "none";
 		in-polling-period-us = <1000>;
 		in-report-size = <64>;
 	};
 	hid_dev_5: hid_dev_5 {
 		compatible = "zephyr,hid-device";
-		interface-name = "HID5";
+		label = "HID5";
 		protocol-code = "none";
 		in-polling-period-us = <1000>;
 		in-report-size = <64>;
diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_4llpmconn.overlay b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_4llpmconn.overlay
@@ -10,42 +10,42 @@
 	/* Configure DTS nodes used for USB next HID support. */
 	hid_dev_0: hid_dev_0 {
 		compatible = "zephyr,hid-device";
-		interface-name = "HID0";
+		label = "HID0";
 		protocol-code = "none";
 		in-polling-period-us = <1000>;
 		in-report-size = <64>;
 	};
 	hid_dev_1: hid_dev_1 {
 		compatible = "zephyr,hid-device";
-		interface-name = "HID1";
+		label = "HID1";
 		protocol-code = "none";
 		in-polling-period-us = <1000>;
 		in-report-size = <64>;
 	};
 	hid_dev_2: hid_dev_2 {
 		compatible = "zephyr,hid-device";
-		interface-name = "HID2";
+		label = "HID2";
 		protocol-code = "none";
 		in-polling-period-us = <1000>;
 		in-report-size = <64>;
 	};
 	hid_dev_3: hid_dev_3 {
 		compatible = "zephyr,hid-device";
-		interface-name = "HID3";
+		label = "HID3";
 		protocol-code = "none";
 		in-polling-period-us = <1000>;
 		in-report-size = <64>;
 	};
 	hid_dev_4: hid_dev_4 {
 		compatible = "zephyr,hid-device";
-		interface-name = "HID4";
+		label = "HID4";
 		protocol-code = "none";
 		in-polling-period-us = <1000>;
 		in-report-size = <64>;
 	};
 	hid_dev_5: hid_dev_5 {
 		compatible = "zephyr,hid-device";
-		interface-name = "HID5";
+		label = "HID5";
 		protocol-code = "none";
 		in-polling-period-us = <1000>;
 		in-report-size = <64>;
diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_release_4llpmconn.overlay b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_release_4llpmconn.overlay
@@ -10,42 +10,42 @@
 	/* Configure DTS nodes used for USB next HID support. */
 	hid_dev_0: hid_dev_0 {
 		compatible = "zephyr,hid-device";
-		interface-name = "HID0";
+		label = "HID0";
 		protocol-code = "none";
 		in-polling-period-us = <1000>;
 		in-report-size = <64>;
 	};
 	hid_dev_1: hid_dev_1 {
 		compatible = "zephyr,hid-device";
-		interface-name = "HID1";
+		label = "HID1";
 		protocol-code = "none";
 		in-polling-period-us = <1000>;
 		in-report-size = <64>;
 	};
 	hid_dev_2: hid_dev_2 {
 		compatible = "zephyr,hid-device";
-		interface-name = "HID2";
+		label = "HID2";
 		protocol-code = "none";
 		in-polling-period-us = <1000>;
 		in-report-size = <64>;
 	};
 	hid_dev_3: hid_dev_3 {
 		compatible = "zephyr,hid-device";
-		interface-name = "HID3";
+		label = "HID3";
 		protocol-code = "none";
 		in-polling-period-us = <1000>;
 		in-report-size = <64>;
 	};
 	hid_dev_4: hid_dev_4 {
 		compatible = "zephyr,hid-device";
-		interface-name = "HID4";
+		label = "HID4";
 		protocol-code = "none";
 		in-polling-period-us = <1000>;
 		in-report-size = <64>;
 	};
 	hid_dev_5: hid_dev_5 {
 		compatible = "zephyr,hid-device";
-		interface-name = "HID5";
+		label = "HID5";
 		protocol-code = "none";
 		in-polling-period-us = <1000>;
 		in-report-size = <64>;
diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/app.overlay b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/app.overlay
@@ -12,7 +12,7 @@
 	/* Configure DTS nodes used for USB next HID support. */
 	hid_dev_0: hid_dev_0 {
 		compatible = "zephyr,hid-device";
-		interface-name = "HID0";
+		label = "HID0";
 		protocol-code = "mouse";
 		in-polling-period-us = <1000>;
 		in-report-size = <64>;
diff --git a/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/app.overlay b/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/app.overlay
@@ -2,14 +2,14 @@
 	/* Configure DTS nodes used for USB next HID support. */
 	hid_dev_0: hid_dev_0 {
 		compatible = "zephyr,hid-device";
-		interface-name = "HID0";
+		label = "HID0";
 		protocol-code = "keyboard";
 		in-polling-period-us = <1000>;
 		in-report-size = <64>;
 	};
 	hid_dev_1: hid_dev_1 {
 		compatible = "zephyr,hid-device";
-		interface-name = "HID1";
+		label = "HID1";
 		protocol-code = "keyboard";
 		in-polling-period-us = <1000>;
 		in-report-size = <64>;
diff --git a/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/app.overlay b/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/app.overlay
@@ -9,7 +9,7 @@
 / {
 	hid_dev_0: hid_dev_0 {
 		compatible = "zephyr,hid-device";
-		interface-name = "HID0";
+		label = "HID0";
 		protocol-code = "mouse";
 		in-polling-period-us = <125>;
 		in-report-size = <64>;
diff --git a/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/app_dongle.overlay b/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/app_dongle.overlay
@@ -9,14 +9,14 @@
 / {
 	hid_dev_0: hid_dev_0 {
 		compatible = "zephyr,hid-device";
-		interface-name = "HID0";
+		label = "HID0";
 		protocol-code = "keyboard";
 		in-polling-period-us = <125>;
 		in-report-size = <64>;
 	};
 	hid_dev_1: hid_dev_1 {
 		compatible = "zephyr,hid-device";
-		interface-name = "HID1";
+		label = "HID1";
 		protocol-code = "keyboard";
 		in-polling-period-us = <125>;
 		in-report-size = <64>;
diff --git a/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/app_release.overlay b/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/app_release.overlay
@@ -9,7 +9,7 @@
 / {
 	hid_dev_0: hid_dev_0 {
 		compatible = "zephyr,hid-device";
-		interface-name = "HID0";
+		label = "HID0";
 		protocol-code = "mouse";
 		in-polling-period-us = <125>;
 		in-report-size = <64>;
diff --git a/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/app_release_dongle.overlay b/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/app_release_dongle.overlay
@@ -9,14 +9,14 @@
 / {
 	hid_dev_0: hid_dev_0 {
 		compatible = "zephyr,hid-device";
-		interface-name = "HID0";
+		label = "HID0";
 		protocol-code = "keyboard";
 		in-polling-period-us = <125>;
 		in-report-size = <64>;
 	};
 	hid_dev_1: hid_dev_1 {
 		compatible = "zephyr,hid-device";
-		interface-name = "HID1";
+		label = "HID1";
 		protocol-code = "keyboard";
 		in-polling-period-us = <125>;
 		in-report-size = <64>;
diff --git a/applications/nrf_desktop/configuration/nrf54lm20pdk_nrf54lm20a_cpuapp/boards/nrf54lm20pdk_nrf54lm20a_cpuapp.overlay b/applications/nrf_desktop/configuration/nrf54lm20pdk_nrf54lm20a_cpuapp/boards/nrf54lm20pdk_nrf54lm20a_cpuapp.overlay
@@ -9,7 +9,7 @@
 / {
 	hid_dev_0: hid_dev_0 {
 		compatible = "zephyr,hid-device";
-		interface-name = "HID0";
+		label = "HID0";
 		protocol-code = "mouse";
 		in-polling-period-us = <125>;
 		in-report-size = <64>;
diff --git a/applications/nrf_desktop/configuration/nrf54lm20pdk_nrf54lm20a_cpuapp/boards/nrf54lm20pdk_nrf54lm20a_cpuapp_release.overlay b/applications/nrf_desktop/configuration/nrf54lm20pdk_nrf54lm20a_cpuapp/boards/nrf54lm20pdk_nrf54lm20a_cpuapp_release.overlay
@@ -9,7 +9,7 @@
 / {
 	hid_dev_0: hid_dev_0 {
 		compatible = "zephyr,hid-device";
-		interface-name = "HID0";
+		label = "HID0";
 		protocol-code = "mouse";
 		in-polling-period-us = <125>;
 		in-report-size = <64>;
diff --git a/samples/zephyr/subsys/usb/hid-keyboard/app.overlay b/samples/zephyr/subsys/usb/hid-keyboard/app.overlay
@@ -1,7 +1,7 @@
 / {
 	hid_dev_0: hid_dev_0 {
 		compatible = "zephyr,hid-device";
-		interface-name = "HID0";
+		label = "HID0";
 		protocol-code = "keyboard";
 		in-report-size = <64>;
 		in-polling-period-us = <1000>;
diff --git a/samples/zephyr/subsys/usb/hid-keyboard/large_in_report.overlay b/samples/zephyr/subsys/usb/hid-keyboard/large_in_report.overlay
diff --git a/samples/zephyr/subsys/usb/hid-mouse/app.overlay b/samples/zephyr/subsys/usb/hid-mouse/app.overlay
