summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MAINTAINERS4
-rw-r--r--sound/soc/atmel/mchp-pdmc.c11
2 files changed, 8 insertions, 7 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 321e08ee8c5d..19625fe547cc 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7778,10 +7778,10 @@ F: drivers/net/ethernet/freescale/fs_enet/
F: include/linux/fs_enet_pd.h
FREESCALE SOC SOUND DRIVERS
-M: Nicolin Chen <nicoleotsuka@gmail.com>
+M: Shengjiu Wang <shengjiu.wang@gmail.com>
M: Xiubo Li <Xiubo.Lee@gmail.com>
R: Fabio Estevam <festevam@gmail.com>
-R: Shengjiu Wang <shengjiu.wang@gmail.com>
+R: Nicolin Chen <nicoleotsuka@gmail.com>
L: alsa-devel@alsa-project.org (moderated for non-subscribers)
L: linuxppc-dev@lists.ozlabs.org
S: Maintained
diff --git a/sound/soc/atmel/mchp-pdmc.c b/sound/soc/atmel/mchp-pdmc.c
index e0aec5fe8a26..1a7802fbf23c 100644
--- a/sound/soc/atmel/mchp-pdmc.c
+++ b/sound/soc/atmel/mchp-pdmc.c
@@ -879,13 +879,13 @@ static int mchp_pdmc_dt_init(struct mchp_pdmc *dd)
dd->mic_no = of_property_count_u32_elems(np, "microchip,mic-pos");
if (dd->mic_no < 0) {
- dev_err(dd->dev, "failed to get mchp,mic-pos: %d",
+ dev_err(dd->dev, "failed to get microchip,mic-pos: %d",
dd->mic_no);
return dd->mic_no;
}
if (!dd->mic_no || dd->mic_no % 2 ||
dd->mic_no / 2 > MCHP_PDMC_MAX_CHANNELS) {
- dev_err(dd->dev, "invalid array length for mchp,mic-pos: %d",
+ dev_err(dd->dev, "invalid array length for microchip,mic-pos: %d",
dd->mic_no);
return -EINVAL;
}
@@ -894,9 +894,10 @@ static int mchp_pdmc_dt_init(struct mchp_pdmc *dd)
dev_info(dd->dev, "%d PDM microphones declared\n", dd->mic_no);
- /* by default, we consider the order of microphones in mchp,mic-pos to
- * be the same with the channel mapping; 1st microphone channel 0, 2nd
- * microphone channel 1, etc.
+ /*
+ * by default, we consider the order of microphones in
+ * microchip,mic-pos to be the same with the channel mapping;
+ * 1st microphone channel 0, 2nd microphone channel 1, etc.
*/
for (i = 0; i < dd->mic_no; i++) {
int ds;