Merge remote-tracking branches 'asoc/topic/cs4271', 'asoc/topic/cs53l30', 'asoc/…

…topic/da7213' and 'asoc/topic/da7218' into asoc-next

Merge remote-tracking branches 'asoc/topic/cs4271', 'asoc/topic/cs53l30', 'asoc/…
…topic/da7213' and 'asoc/topic/da7218' into asoc-next
Mark Brown
5 parents c7a9dd3cb6 177e27133a 92f468d2c5 0e54153b66 679d026932
Showing 4 changed files Side-by-side Diff
sound/soc/codecs/cs4271.c
sound/soc/codecs/cs53l30.c
sound/soc/codecs/da7213.c
sound/soc/codecs/da7218.c
@@ -674,8 +674,6 @@
 		cs4271->gpio_nreset = cs4271plat->gpio_nreset;
  
 	if (gpio_is_valid(cs4271->gpio_nreset)) {
-		int ret;
-
 		ret = devm_gpio_request(dev, cs4271->gpio_nreset,
 					"CS4271 Reset");
 		if (ret < 0)
@@ -747,7 +747,7 @@
 	8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000
 };
  
-static struct snd_pcm_hw_constraint_list src_constraints = {
+static const struct snd_pcm_hw_constraint_list src_constraints = {
 	.count = ARRAY_SIZE(cs53l30_src_rates),
 	.list = cs53l30_src_rates,
 };
@@ -13,6 +13,8 @@
  */
  
 #include <linux/acpi.h>
+#include <linux/of_device.h>
+#include <linux/property.h>
 #include <linux/clk.h>
 #include <linux/delay.h>
 #include <linux/i2c.h>
  
  
@@ -1606,12 +1608,12 @@
 }
  
 static struct da7213_platform_data
-	*da7213_of_to_pdata(struct snd_soc_codec *codec)
+	*da7213_fw_to_pdata(struct snd_soc_codec *codec)
 {
-	struct device_node *np = codec->dev->of_node;
+	struct device *dev = codec->dev;
 	struct da7213_platform_data *pdata;
-	const char *of_str;
-	u32 of_val32;
+	const char *fw_str;
+	u32 fw_val32;
  
 	pdata = devm_kzalloc(codec->dev, sizeof(*pdata), GFP_KERNEL);
 	if (!pdata) {
  
  
  
  
  
@@ -1619,29 +1621,29 @@
 		return NULL;
 	}
  
-	if (of_property_read_u32(np, "dlg,micbias1-lvl", &of_val32) >= 0)
-		pdata->micbias1_lvl = da7213_of_micbias_lvl(codec, of_val32);
+	if (device_property_read_u32(dev, "dlg,micbias1-lvl", &fw_val32) >= 0)
+		pdata->micbias1_lvl = da7213_of_micbias_lvl(codec, fw_val32);
 	else
 		pdata->micbias1_lvl = DA7213_MICBIAS_2_2V;
  
-	if (of_property_read_u32(np, "dlg,micbias2-lvl", &of_val32) >= 0)
-		pdata->micbias2_lvl = da7213_of_micbias_lvl(codec, of_val32);
+	if (device_property_read_u32(dev, "dlg,micbias2-lvl", &fw_val32) >= 0)
+		pdata->micbias2_lvl = da7213_of_micbias_lvl(codec, fw_val32);
 	else
 		pdata->micbias2_lvl = DA7213_MICBIAS_2_2V;
  
-	if (!of_property_read_string(np, "dlg,dmic-data-sel", &of_str))
-		pdata->dmic_data_sel = da7213_of_dmic_data_sel(codec, of_str);
+	if (!device_property_read_string(dev, "dlg,dmic-data-sel", &fw_str))
+		pdata->dmic_data_sel = da7213_of_dmic_data_sel(codec, fw_str);
 	else
 		pdata->dmic_data_sel = DA7213_DMIC_DATA_LRISE_RFALL;
  
-	if (!of_property_read_string(np, "dlg,dmic-samplephase", &of_str))
+	if (!device_property_read_string(dev, "dlg,dmic-samplephase", &fw_str))
 		pdata->dmic_samplephase =
-			da7213_of_dmic_samplephase(codec, of_str);
+			da7213_of_dmic_samplephase(codec, fw_str);
 	else
 		pdata->dmic_samplephase = DA7213_DMIC_SAMPLE_ON_CLKEDGE;
  
-	if (of_property_read_u32(np, "dlg,dmic-clkrate", &of_val32) >= 0)
-		pdata->dmic_clk_rate = da7213_of_dmic_clkrate(codec, of_val32);
+	if (device_property_read_u32(dev, "dlg,dmic-clkrate", &fw_val32) >= 0)
+		pdata->dmic_clk_rate = da7213_of_dmic_clkrate(codec, fw_val32);
 	else
 		pdata->dmic_clk_rate = DA7213_DMIC_CLK_3_0MHZ;
  
@@ -1713,10 +1715,9 @@
 			    DA7213_LINE_AMP_OE, DA7213_LINE_AMP_OE);
  
 	/* Handle DT/Platform data */
-	if (codec->dev->of_node)
-		da7213->pdata = da7213_of_to_pdata(codec);
-	else
-		da7213->pdata = dev_get_platdata(codec->dev);
+	da7213->pdata = dev_get_platdata(codec->dev);
+	if (!da7213->pdata)
+		da7213->pdata = da7213_fw_to_pdata(codec);
  
 	/* Set platform data values */
 	if (da7213->pdata) {
@@ -1457,7 +1457,7 @@
 				++i;
 				msleep(DA7218_SRM_CHECK_DELAY);
 			}
-		} while ((i < DA7218_SRM_CHECK_TRIES) & (!success));
+		} while ((i < DA7218_SRM_CHECK_TRIES) && (!success));
  
 		if (!success)
 			dev_warn(codec->dev, "SRM failed to lock\n");
...	...	@@ -674,8 +674,6 @@
674	674	cs4271->gpio_nreset = cs4271plat->gpio_nreset;
675	675
676	676	if (gpio_is_valid(cs4271->gpio_nreset)) {
677		- int ret;
678		-
679	677	ret = devm_gpio_request(dev, cs4271->gpio_nreset,
680	678	"CS4271 Reset");
681	679	if (ret < 0)
...	...	@@ -747,7 +747,7 @@
747	747	8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000
748	748	};
749	749
750		-static struct snd_pcm_hw_constraint_list src_constraints = {
	750	+static const struct snd_pcm_hw_constraint_list src_constraints = {
751	751	.count = ARRAY_SIZE(cs53l30_src_rates),
752	752	.list = cs53l30_src_rates,
753	753	};
...	...	@@ -13,6 +13,8 @@
13	13	*/
14	14
15	15	#include <linux/acpi.h>
	16	+#include <linux/of_device.h>
	17	+#include <linux/property.h>
16	18	#include <linux/clk.h>
17	19	#include <linux/delay.h>
18	20	#include <linux/i2c.h>
19	21
20	22
...	...	@@ -1606,12 +1608,12 @@
1606	1608	}
1607	1609
1608	1610	static struct da7213_platform_data
1609		- da7213_of_to_pdata(struct snd_soc_codec codec)
	1611	+ da7213_fw_to_pdata(struct snd_soc_codec codec)
1610	1612	{
1611		- struct device_node *np = codec->dev->of_node;
	1613	+ struct device *dev = codec->dev;
1612	1614	struct da7213_platform_data *pdata;
1613		- const char *of_str;
1614		- u32 of_val32;
	1615	+ const char *fw_str;
	1616	+ u32 fw_val32;
1615	1617
1616	1618	pdata = devm_kzalloc(codec->dev, sizeof(*pdata), GFP_KERNEL);
1617	1619	if (!pdata) {
1618	1620
1619	1621
1620	1622
1621	1623
1622	1624
...	...	@@ -1619,29 +1621,29 @@
1619	1621	return NULL;
1620	1622	}
1621	1623
1622		- if (of_property_read_u32(np, "dlg,micbias1-lvl", &of_val32) >= 0)
1623		- pdata->micbias1_lvl = da7213_of_micbias_lvl(codec, of_val32);
	1624	+ if (device_property_read_u32(dev, "dlg,micbias1-lvl", &fw_val32) >= 0)
	1625	+ pdata->micbias1_lvl = da7213_of_micbias_lvl(codec, fw_val32);
1624	1626	else
1625	1627	pdata->micbias1_lvl = DA7213_MICBIAS_2_2V;
1626	1628
1627		- if (of_property_read_u32(np, "dlg,micbias2-lvl", &of_val32) >= 0)
1628		- pdata->micbias2_lvl = da7213_of_micbias_lvl(codec, of_val32);
	1629	+ if (device_property_read_u32(dev, "dlg,micbias2-lvl", &fw_val32) >= 0)
	1630	+ pdata->micbias2_lvl = da7213_of_micbias_lvl(codec, fw_val32);
1629	1631	else
1630	1632	pdata->micbias2_lvl = DA7213_MICBIAS_2_2V;
1631	1633
1632		- if (!of_property_read_string(np, "dlg,dmic-data-sel", &of_str))
1633		- pdata->dmic_data_sel = da7213_of_dmic_data_sel(codec, of_str);
	1634	+ if (!device_property_read_string(dev, "dlg,dmic-data-sel", &fw_str))
	1635	+ pdata->dmic_data_sel = da7213_of_dmic_data_sel(codec, fw_str);
1634	1636	else
1635	1637	pdata->dmic_data_sel = DA7213_DMIC_DATA_LRISE_RFALL;
1636	1638
1637		- if (!of_property_read_string(np, "dlg,dmic-samplephase", &of_str))
	1639	+ if (!device_property_read_string(dev, "dlg,dmic-samplephase", &fw_str))
1638	1640	pdata->dmic_samplephase =
1639		- da7213_of_dmic_samplephase(codec, of_str);
	1641	+ da7213_of_dmic_samplephase(codec, fw_str);
1640	1642	else
1641	1643	pdata->dmic_samplephase = DA7213_DMIC_SAMPLE_ON_CLKEDGE;
1642	1644
1643		- if (of_property_read_u32(np, "dlg,dmic-clkrate", &of_val32) >= 0)
1644		- pdata->dmic_clk_rate = da7213_of_dmic_clkrate(codec, of_val32);
	1645	+ if (device_property_read_u32(dev, "dlg,dmic-clkrate", &fw_val32) >= 0)
	1646	+ pdata->dmic_clk_rate = da7213_of_dmic_clkrate(codec, fw_val32);
1645	1647	else
1646	1648	pdata->dmic_clk_rate = DA7213_DMIC_CLK_3_0MHZ;
1647	1649
...	...	@@ -1713,10 +1715,9 @@
1713	1715	DA7213_LINE_AMP_OE, DA7213_LINE_AMP_OE);
1714	1716
1715	1717	/* Handle DT/Platform data */
1716		- if (codec->dev->of_node)
1717		- da7213->pdata = da7213_of_to_pdata(codec);
1718		- else
1719		- da7213->pdata = dev_get_platdata(codec->dev);
	1718	+ da7213->pdata = dev_get_platdata(codec->dev);
	1719	+ if (!da7213->pdata)
	1720	+ da7213->pdata = da7213_fw_to_pdata(codec);
1720	1721
1721	1722	/* Set platform data values */
1722	1723	if (da7213->pdata) {
...	...	@@ -1457,7 +1457,7 @@
1457	1457	++i;
1458	1458	msleep(DA7218_SRM_CHECK_DELAY);
1459	1459	}
1460		- } while ((i < DA7218_SRM_CHECK_TRIES) & (!success));
	1460	+ } while ((i < DA7218_SRM_CHECK_TRIES) && (!success));
1461	1461
1462	1462	if (!success)
1463	1463	dev_warn(codec->dev, "SRM failed to lock\n");