From 1bb59bb68e7b1cbea6dbe89855643156f50eb3a6 Mon Sep 17 00:00:00 2001
From: "Peter A. Bigot" <pab@pabigot.com>
Date: Fri, 19 Jul 2019 10:19:02 -0500
Subject: [PATCH] dts: add label property to all jedec,spi-nor nodes

The property is required on all SPI clients, but was missing from
several devicetree nodes.  Set it, using the capitalized version of the
node alias when present, with "jedec,spi-nor#0" as the fallback.

Closes #17662

Signed-off-by: Peter A. Bigot <pab@pabigot.com>
---
 boards/arm/mimxrt1015_evk/mimxrt1015_evk.dts      | 1 +
 boards/arm/mimxrt1020_evk/mimxrt1020_evk.dts      | 1 +
 boards/arm/mimxrt1050_evk/mimxrt1050_evk_qspi.dts | 1 +
 boards/arm/mimxrt1060_evk/mimxrt1060_evk.dts      | 1 +
 boards/riscv32/hifive1/hifive1.dts                | 1 +
 boards/riscv32/hifive1_revb/hifive1_revb.dts      | 1 +
 boards/riscv32/qemu_riscv32/qemu_riscv32.dts      | 1 +
 boards/x86/arduino_101/arduino_101.dts            | 1 +
 dts/arm/nxp/nxp_rt1064.dtsi                       | 1 +
 9 files changed, 9 insertions(+)

diff --git a/boards/arm/mimxrt1015_evk/mimxrt1015_evk.dts b/boards/arm/mimxrt1015_evk/mimxrt1015_evk.dts
index 112313daa96..c0e077b50b7 100644
--- a/boards/arm/mimxrt1015_evk/mimxrt1015_evk.dts
+++ b/boards/arm/mimxrt1015_evk/mimxrt1015_evk.dts
@@ -53,6 +53,7 @@ arduino_serial: &uart4 {};
 	reg = <0x402a8000 0x4000>, <0x60000000 0x1000000>;
 	at25sf128a: at25sf128a@0 {
 		compatible = "adesto,at25sf128a", "jedec,spi-nor";
+		label = "AT25SF128A";
 		reg = <0>;
 		spi-max-frequency = <133000000>;
 		status = "okay";
diff --git a/boards/arm/mimxrt1020_evk/mimxrt1020_evk.dts b/boards/arm/mimxrt1020_evk/mimxrt1020_evk.dts
index 9412d90a55f..56cf4e43d09 100644
--- a/boards/arm/mimxrt1020_evk/mimxrt1020_evk.dts
+++ b/boards/arm/mimxrt1020_evk/mimxrt1020_evk.dts
@@ -61,6 +61,7 @@ arduino_serial: &uart2 {};
 	reg = <0x402a8000 0x4000>, <0x60000000 0x800000>;
 	is25wp064: is25wp064@0 {
 		compatible = "issi,is25wp064", "jedec,spi-nor";
+		label = "IS25WP064";
 		reg = <0>;
 		spi-max-frequency = <133000000>;
 		status = "okay";
diff --git a/boards/arm/mimxrt1050_evk/mimxrt1050_evk_qspi.dts b/boards/arm/mimxrt1050_evk/mimxrt1050_evk_qspi.dts
index 86d75f2aaa1..71a679dea02 100644
--- a/boards/arm/mimxrt1050_evk/mimxrt1050_evk_qspi.dts
+++ b/boards/arm/mimxrt1050_evk/mimxrt1050_evk_qspi.dts
@@ -12,6 +12,7 @@
 	reg = <0x402a8000 0x4000>, <0x60000000 0x800000>;
 	is25wp064: is25wp064@0 {
 		compatible = "issi,is25wp064", "jedec,spi-nor";
+		label = "IS25WP064";
 		reg = <0>;
 		spi-max-frequency = <133000000>;
 		status = "okay";
diff --git a/boards/arm/mimxrt1060_evk/mimxrt1060_evk.dts b/boards/arm/mimxrt1060_evk/mimxrt1060_evk.dts
index 6556165ea72..acbabe56406 100644
--- a/boards/arm/mimxrt1060_evk/mimxrt1060_evk.dts
+++ b/boards/arm/mimxrt1060_evk/mimxrt1060_evk.dts
@@ -67,6 +67,7 @@ arduino_serial: &uart3 {};
 	reg = <0x402a8000 0x4000>, <0x60000000 0x800000>;
 	is25wp064: is25wp064@0 {
 		compatible = "issi,is25wp064", "jedec,spi-nor";
+		label = "IS25WP064";
 		reg = <0>;
 		spi-max-frequency = <133000000>;
 		status = "okay";
diff --git a/boards/riscv32/hifive1/hifive1.dts b/boards/riscv32/hifive1/hifive1.dts
index 979a9c6add5..c4f88d16c2f 100644
--- a/boards/riscv32/hifive1/hifive1.dts
+++ b/boards/riscv32/hifive1/hifive1.dts
@@ -63,6 +63,7 @@
 	reg = <0x10014000 0x1000 0x20400000 0xc00000>;
 	flash0: flash@0 {
 		compatible = "issi,is25lp128", "jedec,spi-nor";
+		label = "FLASH0";
 		jedec-id = <0x96 0x60 0x18>;
 		reg = <0>;
 		spi-max-frequency = <133000000>;
diff --git a/boards/riscv32/hifive1_revb/hifive1_revb.dts b/boards/riscv32/hifive1_revb/hifive1_revb.dts
index 60f921fbf87..246e451f464 100644
--- a/boards/riscv32/hifive1_revb/hifive1_revb.dts
+++ b/boards/riscv32/hifive1_revb/hifive1_revb.dts
@@ -61,6 +61,7 @@
 	reg = <0x10014000 0x1000 0x20010000 0x3c0900>;
 	flash0: flash@0 {
 		compatible = "issi,is25lp128", "jedec,spi-nor";
+		label = "FLASH0";
 		jedec-id = <0x96 0x60 0x18>;
 		reg = <0>;
 		spi-max-frequency = <133000000>;
diff --git a/boards/riscv32/qemu_riscv32/qemu_riscv32.dts b/boards/riscv32/qemu_riscv32/qemu_riscv32.dts
index 40a78cc0844..c463db6deaf 100644
--- a/boards/riscv32/qemu_riscv32/qemu_riscv32.dts
+++ b/boards/riscv32/qemu_riscv32/qemu_riscv32.dts
@@ -39,6 +39,7 @@
 	reg = <0x10014000 0x1000 0x20400000 0xc00000>;
 	flash0: flash@0 {
 		compatible = "issi,is25lp128", "jedec,spi-nor";
+		label = "FLASH0";
 		jedec-id = <0x96 0x60 0x18>;
 		reg = <0>;
 		// Dummy entry
diff --git a/boards/x86/arduino_101/arduino_101.dts b/boards/x86/arduino_101/arduino_101.dts
index b1dcb3f8ed2..5a781973866 100644
--- a/boards/x86/arduino_101/arduino_101.dts
+++ b/boards/x86/arduino_101/arduino_101.dts
@@ -66,6 +66,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "winbond,w25q16", "jedec,spi-nor";
+		label = "W25Q16";
 		reg = <0>;
 		spi-max-frequency = <8000000>;
 	};
diff --git a/dts/arm/nxp/nxp_rt1064.dtsi b/dts/arm/nxp/nxp_rt1064.dtsi
index a6867f59767..3eb7b936ae6 100644
--- a/dts/arm/nxp/nxp_rt1064.dtsi
+++ b/dts/arm/nxp/nxp_rt1064.dtsi
@@ -11,6 +11,7 @@
 	/* WINBOND */
 	w25q32jvwj0: w25q32jvwj@0 {
 		compatible = "winbond,w25q32jvwj", "jedec,spi-nor";
+		label = "W25Q32JVWJ0";
 		reg = <0>;
 		spi-max-frequency = <133000000>;
 		status = "okay";