1 From 019b18d8dd0b7c6e8123ae6fb91235b21d80833b Mon Sep 17 00:00:00 2001
2 From: Annaliese McDermond <nh6z@nh6z.net>
3 Date: Wed, 3 Apr 2019 21:17:16 -0700
4 Subject: [PATCH 415/725] ASoC: tlv320aic32x4: Update copyright and use SPDX
7 commit 8a1d95c393d971e624fc28f11516b0bc3a7fa706 upstream.
9 Update the copyright dates and use the SPDX identifier instead
10 of reciting the license.
12 Signed-off-by: Annaliese McDermond <nh6z@nh6z.net>
13 Signed-off-by: Mark Brown <broonie@kernel.org>
15 sound/soc/codecs/tlv320aic32x4-i2c.c | 14 ++------------
16 sound/soc/codecs/tlv320aic32x4-spi.c | 14 ++------------
17 2 files changed, 4 insertions(+), 24 deletions(-)
19 --- a/sound/soc/codecs/tlv320aic32x4-i2c.c
20 +++ b/sound/soc/codecs/tlv320aic32x4-i2c.c
23 - * linux/sound/soc/codecs/tlv320aic32x4-i2c.c
24 +/* SPDX-License-Identifier: GPL-2.0
26 - * Copyright 2011 NW Digital Radio
27 + * Copyright 2011-2019 NW Digital Radio
29 * Author: Annaliese McDermond <nh6z@nh6z.net>
31 * Based on sound/soc/codecs/wm8974 and TI driver for kernel 2.6.27.
33 - * This program is free software; you can redistribute it and/or modify
34 - * it under the terms of the GNU General Public License as published by
35 - * the Free Software Foundation; either version 2 of the License, or
36 - * (at your option) any later version.
38 - * This program is distributed in the hope that it will be useful,
39 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
40 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
41 - * GNU General Public License for more details.
44 #include <linux/i2c.h>
45 --- a/sound/soc/codecs/tlv320aic32x4-spi.c
46 +++ b/sound/soc/codecs/tlv320aic32x4-spi.c
49 - * linux/sound/soc/codecs/tlv320aic32x4-spi.c
50 +/* SPDX-License-Identifier: GPL-2.0
52 - * Copyright 2011 NW Digital Radio
53 + * Copyright 2011-2019 NW Digital Radio
55 * Author: Annaliese McDermond <nh6z@nh6z.net>
57 * Based on sound/soc/codecs/wm8974 and TI driver for kernel 2.6.27.
59 - * This program is free software; you can redistribute it and/or modify
60 - * it under the terms of the GNU General Public License as published by
61 - * the Free Software Foundation; either version 2 of the License, or
62 - * (at your option) any later version.
64 - * This program is distributed in the hope that it will be useful,
65 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
66 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
67 - * GNU General Public License for more details.
70 #include <linux/spi/spi.h>