6.12-stable patches

added patches:
	asoc-soc-core-stop-using-of_property_read_bool-for-non-boolean-properties.patch

diff --git a/queue-6.12/asoc-soc-core-stop-using-of_property_read_bool-for-non-boolean-properties.patch b/queue-6.12/asoc-soc-core-stop-using-of_property_read_bool-for-non-boolean-properties.patch
new file mode 100644 (file)
index 0000000..6056dc3
--- /dev/null
+++ b/queue-6.12/asoc-soc-core-stop-using-of_property_read_bool-for-non-boolean-properties.patch
@@ -0,0 +1,95 @@
+From 6eab7034579917f207ca6d8e3f4e11e85e0ab7d5 Mon Sep 17 00:00:00 2001
+From: Geert Uytterhoeven <geert+renesas@glider.be>
+Date: Wed, 22 Jan 2025 09:21:27 +0100
+Subject: ASoC: soc-core: Stop using of_property_read_bool() for non-boolean properties
+
+From: Geert Uytterhoeven <geert+renesas@glider.be>
+
+commit 6eab7034579917f207ca6d8e3f4e11e85e0ab7d5 upstream.
+
+On R-Car:
+
+    OF: /sound: Read of boolean property 'simple-audio-card,bitclock-master' with a value.
+    OF: /sound: Read of boolean property 'simple-audio-card,frame-master' with a value.
+
+or:
+
+    OF: /soc/sound@ec500000/ports/port@0/endpoint: Read of boolean property 'bitclock-master' with a value.
+    OF: /soc/sound@ec500000/ports/port@0/endpoint: Read of boolean property 'frame-master' with a value.
+
+The use of of_property_read_bool() for non-boolean properties is
+deprecated in favor of of_property_present() when testing for property
+presence.
+
+Replace testing for presence before calling of_property_read_u32() by
+testing for an -EINVAL return value from the latter, to simplify the
+code.
+
+Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
+Link: https://patch.msgid.link/db10e96fbda121e7456d70e97a013cbfc9755f4d.1737533954.git.geert+renesas@glider.be
+Signed-off-by: Mark Brown <broonie@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ sound/soc/soc-core.c |   32 +++++++++++++-------------------
+ 1 file changed, 13 insertions(+), 19 deletions(-)
+
+--- a/sound/soc/soc-core.c
++++ b/sound/soc/soc-core.c
+@@ -3057,7 +3057,7 @@ int snd_soc_of_parse_pin_switches(struct
+       unsigned int i, nb_controls;
+       int ret;
+ 
+-      if (!of_property_read_bool(dev->of_node, prop))
++      if (!of_property_present(dev->of_node, prop))
+               return 0;
+ 
+       strings = devm_kcalloc(dev, nb_controls_max,
+@@ -3131,23 +3131,17 @@ int snd_soc_of_parse_tdm_slot(struct dev
+       if (rx_mask)
+               snd_soc_of_get_slot_mask(np, "dai-tdm-slot-rx-mask", rx_mask);
+ 
+-      if (of_property_read_bool(np, "dai-tdm-slot-num")) {
+-              ret = of_property_read_u32(np, "dai-tdm-slot-num", &val);
+-              if (ret)
+-                      return ret;
+-
+-              if (slots)
+-                      *slots = val;
+-      }
+-
+-      if (of_property_read_bool(np, "dai-tdm-slot-width")) {
+-              ret = of_property_read_u32(np, "dai-tdm-slot-width", &val);
+-              if (ret)
+-                      return ret;
++      ret = of_property_read_u32(np, "dai-tdm-slot-num", &val);
++      if (ret && ret != -EINVAL)
++              return ret;
++      if (!ret && slots)
++              *slots = val;
+ 
+-              if (slot_width)
+-                      *slot_width = val;
+-      }
++      ret = of_property_read_u32(np, "dai-tdm-slot-width", &val);
++      if (ret && ret != -EINVAL)
++              return ret;
++      if (!ret && slot_width)
++              *slot_width = val;
+ 
+       return 0;
+ }
+@@ -3411,12 +3405,12 @@ unsigned int snd_soc_daifmt_parse_clock_
+        * check "[prefix]frame-master"
+        */
+       snprintf(prop, sizeof(prop), "%sbitclock-master", prefix);
+-      bit = of_property_read_bool(np, prop);
++      bit = of_property_present(np, prop);
+       if (bit && bitclkmaster)
+               *bitclkmaster = of_parse_phandle(np, prop, 0);
+ 
+       snprintf(prop, sizeof(prop), "%sframe-master", prefix);
+-      frame = of_property_read_bool(np, prop);
++      frame = of_property_present(np, prop);
+       if (frame && framemaster)
+               *framemaster = of_parse_phandle(np, prop, 0);
+ 

diff --git a/queue-6.12/series b/queue-6.12/series
index 841e82df81825ef7b00983a4300451054592532a..754444f9e5a2dffd4d2a1db3093957bcaa404cc0 100644 (file)
--- a/queue-6.12/series
+++ b/queue-6.12/series
@@ -49,3 +49,4 @@ cpufreq-avoid-using-inconsistent-policy-min-and-policy-max.patch
 cpufreq-fix-setting-policy-limits-when-frequency-tables-are-used.patch
 tracing-fix-oob-write-in-trace_seq_to_buffer.patch
 drm-amd-display-default-ips-to-rcg_in_active_ips2_in_off.patch
+asoc-soc-core-stop-using-of_property_read_bool-for-non-boolean-properties.patch