[PATCH 0/3] ASoC: msm8916-wcd: license and documentation fixes

[PATCH 0/3] ASoC: msm8916-wcd: license and documentation fixes

[Johan Hovold]

This series adds the missing license information to the
msm8916-wcd-analog driver and converts it's digital counterpart to SPDX.

Included is also a fix of the binding example for the analog driver.

Johan


Johan Hovold (3):
  ASoC: msm8916-wcd-analog: add missing license information
  ASoC: msm8916-wcd-digital: convert license header to SPDX
  dt-bindings: sound: msm8916-wcd-analog: fix example regulator names

 .../bindings/sound/qcom,msm8916-wcd-analog.txt      |  7 ++++---
 sound/soc/codecs/msm8916-wcd-analog.c               |  5 +++++
 sound/soc/codecs/msm8916-wcd-digital.c              | 13 +++----------
 3 files changed, 12 insertions(+), 13 deletions(-)

-- 
2.20.1

[PATCH 1/3] ASoC: msm8916-wcd-analog: add missing license information

[Johan Hovold]

Add the missing license and copyright information which never made it
into the analog driver when the original driver was split in two as part
of the review process.

Link: https://lkml.kernel.org/r/1465582725-30183-3-git-send-email-srinivas.kandagatla@linaro.org
Fixes: 585e881e5b9e ("ASoC: codecs: Add msm8916-wcd analog codec")
Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
---
 sound/soc/codecs/msm8916-wcd-analog.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/sound/soc/codecs/msm8916-wcd-analog.c b/sound/soc/codecs/msm8916-wcd-analog.c
index b7cf7cce95fe..1261ddff75eb 100644
--- a/sound/soc/codecs/msm8916-wcd-analog.c
+++ b/sound/soc/codecs/msm8916-wcd-analog.c
@@ -1,3 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (c) 2016, The Linux Foundation. All rights reserved.
+ */
+
 #include <linux/module.h>
 #include <linux/err.h>
 #include <linux/kernel.h>
-- 
2.20.1

[PATCH 2/3] ASoC: msm8916-wcd-digital: convert license header to SPDX

[Johan Hovold]

Convert the GPLv2-only license header to SPDX.

Signed-off-by: Johan Hovold <johan@kernel.org>
---
 sound/soc/codecs/msm8916-wcd-digital.c | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/sound/soc/codecs/msm8916-wcd-digital.c b/sound/soc/codecs/msm8916-wcd-digital.c
index 3063dedd21cf..5273996b40d5 100644
--- a/sound/soc/codecs/msm8916-wcd-digital.c
+++ b/sound/soc/codecs/msm8916-wcd-digital.c
@@ -1,13 +1,6 @@
-/* Copyright (c) 2016, The Linux Foundation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 and
- * only version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (c) 2016, The Linux Foundation. All rights reserved.
  */
 
 #include <linux/module.h>
-- 
2.20.1

[PATCH 3/3] dt-bindings: sound: msm8916-wcd-analog: fix example regulator names

[Johan Hovold]

Fix upper-case regulator names in the binding example which do not match
the corresponding required properties.

While at it, add a blank line after the required-properties section to
improve readability.

Signed-off-by: Johan Hovold <johan@kernel.org>
---
 .../devicetree/bindings/sound/qcom,msm8916-wcd-analog.txt  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Documentation/devicetree/bindings/sound/qcom,msm8916-wcd-analog.txt b/Documentation/devicetree/bindings/sound/qcom,msm8916-wcd-analog.txt
index fdcea3d12ee5..e7d17dda55db 100644
--- a/Documentation/devicetree/bindings/sound/qcom,msm8916-wcd-analog.txt
+++ b/Documentation/devicetree/bindings/sound/qcom,msm8916-wcd-analog.txt
@@ -30,6 +30,7 @@ Required properties
  - vdd-cdc-io-supply: phandle to VDD_CDC_IO regulator DT node.
  - vdd-cdc-tx-rx-cx-supply: phandle to VDD_CDC_TX/RX/CX regulator DT node.
  - vdd-micbias-supply: phandle of VDD_MICBIAS supply's regulator DT node.
+
 Optional Properties:
  - qcom,mbhc-vthreshold-low: Array of 5 threshold voltages in mV for 5 buttons
 			     detection on headset when the mbhc is powered up
@@ -92,9 +93,9 @@ spmi_bus {
 				  "cdc_ear_cnp_int",
 				  "cdc_hphr_cnp_int",
 				  "cdc_hphl_cnp_int";
-	               VDD-CDC-IO-supply = <&pm8916_l5>;
-	               VDD-CDC-TX-RX-CX-supply = <&pm8916_l5>;
-	               VDD-MICBIAS-supply = <&pm8916_l13>;
+	               vdd-cdc-io-supply = <&pm8916_l5>;
+	               vdd-cdc-tx-rx-cx-supply = <&pm8916_l5>;
+	               vdd-micbias-supply = <&pm8916_l13>;
 	               #sound-dai-cells = <1>;
 	};
 };
-- 
2.20.1

Re: [PATCH 1/3] ASoC: msm8916-wcd-analog: add missing license information

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 375 bytes --]

On Thu, Feb 07, 2019 at 05:57:53PM +0100, Johan Hovold wrote:

> +++ b/sound/soc/codecs/msm8916-wcd-analog.c
> @@ -1,3 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * Copyright (c) 2016, The Linux Foundation. All rights reserved.
> + */

Please use a C++ comment for the whole thing so it looks more consistent
with the rest of ASoC (and a bit neater in general).

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Applied "dt-bindings: sound: msm8916-wcd-analog: fix example regulator names" to the asoc tree

[Mark Brown]

The patch

   dt-bindings: sound: msm8916-wcd-analog: fix example regulator names

has been applied to the asoc tree at

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git 

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.  

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark

From 510135535382db7f5ee8727818172e42c9c9cbd5 Mon Sep 17 00:00:00 2001
From: Johan Hovold <johan@kernel.org>
Date: Thu, 7 Feb 2019 17:57:55 +0100
Subject: [PATCH] dt-bindings: sound: msm8916-wcd-analog: fix example regulator
 names

Fix upper-case regulator names in the binding example which do not match
the corresponding required properties.

While at it, add a blank line after the required-properties section to
improve readability.

Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 .../devicetree/bindings/sound/qcom,msm8916-wcd-analog.txt  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Documentation/devicetree/bindings/sound/qcom,msm8916-wcd-analog.txt b/Documentation/devicetree/bindings/sound/qcom,msm8916-wcd-analog.txt
index fdcea3d12ee5..e7d17dda55db 100644
--- a/Documentation/devicetree/bindings/sound/qcom,msm8916-wcd-analog.txt
+++ b/Documentation/devicetree/bindings/sound/qcom,msm8916-wcd-analog.txt
@@ -30,6 +30,7 @@ Required properties
  - vdd-cdc-io-supply: phandle to VDD_CDC_IO regulator DT node.
  - vdd-cdc-tx-rx-cx-supply: phandle to VDD_CDC_TX/RX/CX regulator DT node.
  - vdd-micbias-supply: phandle of VDD_MICBIAS supply's regulator DT node.
+
 Optional Properties:
  - qcom,mbhc-vthreshold-low: Array of 5 threshold voltages in mV for 5 buttons
 			     detection on headset when the mbhc is powered up
@@ -92,9 +93,9 @@ spmi_bus {
 				  "cdc_ear_cnp_int",
 				  "cdc_hphr_cnp_int",
 				  "cdc_hphl_cnp_int";
-	               VDD-CDC-IO-supply = <&pm8916_l5>;
-	               VDD-CDC-TX-RX-CX-supply = <&pm8916_l5>;
-	               VDD-MICBIAS-supply = <&pm8916_l13>;
+	               vdd-cdc-io-supply = <&pm8916_l5>;
+	               vdd-cdc-tx-rx-cx-supply = <&pm8916_l5>;
+	               vdd-micbias-supply = <&pm8916_l13>;
 	               #sound-dai-cells = <1>;
 	};
 };
-- 
2.20.1

Re: [PATCH 1/3] ASoC: msm8916-wcd-analog: add missing license information

[Johan Hovold]

On Fri, Feb 08, 2019 at 11:53:41AM +0000, Mark Brown wrote:
> On Thu, Feb 07, 2019 at 05:57:53PM +0100, Johan Hovold wrote:
> 
> > +++ b/sound/soc/codecs/msm8916-wcd-analog.c
> > @@ -1,3 +1,8 @@
> > +// SPDX-License-Identifier: GPL-2.0
> > +/*
> > + * Copyright (c) 2016, The Linux Foundation. All rights reserved.
> > + */
> 
> Please use a C++ comment for the whole thing so it looks more consistent
> with the rest of ASoC (and a bit neater in general).

Ah, yes, that makes sense for consistency since you've already enforced
that style. And while I don't think the all-c++-comment headers look
better in general, for the single copyright statement case it's not too
bad.

v2 under way.

Johan

Re: [PATCH 1/3] ASoC: msm8916-wcd-analog: add missing license information

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 334 bytes --]

On Fri, Feb 08, 2019 at 04:15:02PM +0100, Johan Hovold wrote:

> Ah, yes, that makes sense for consistency since you've already enforced
> that style. And while I don't think the all-c++-comment headers look
> better in general, for the single copyright statement case it's not too
> bad.

Yeah, I'm not really actively a fan either.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]