ASoC: Drop or replace of_gpio.h
Subsystems (11)
v2 cover ASoC: Drop or replace of_gpio.h
Replace or drop the legacy header that is subject to remove. Not all of them were compile-tested, the series might have hidden compilation errors.
In v3:
- moved aw88399 from the "Remove ..." patch to the "Replace ..." (LKP)
In v2:
- added tags (Kuninori, Charles)
- ripped out TAS2781 (it's a mess from GPIO handling perspective)
Andy Shevchenko (6):
ASoC: codecs: Remove unused of_gpio.h
ASoC: fsl: Remove unused of_gpio.h
ASoC: rockchip: Remove unused of_gpio.h
ASoC: codecs: Replace of_gpio.h by proper one
ASoC: generic: Replace of_gpio.h by proper one
ASoC: samsung: Replace of_gpio.h by proper one
sound/soc/codecs/ak4118.c | 1 - sound/soc/codecs/ak4458.c | 1 - sound/soc/codecs/aw88395/aw88395.c | 2 +- sound/soc/codecs/aw88399.c | 2 +- sound/soc/codecs/cs53l30.c | 1 - sound/soc/codecs/max98390.c | 1 - sound/soc/codecs/pcm3168a.c | 1 - sound/soc/codecs/rk817_codec.c | 1 - sound/soc/codecs/tas2552.c | 1 - sound/soc/codecs/tas2764.c | 1 - sound/soc/codecs/tas2770.c | 1 - sound/soc/codecs/tas2780.c | 1 - sound/soc/codecs/tlv320adc3xxx.c | 1 - sound/soc/codecs/tlv320adcx140.c | 1 - sound/soc/codecs/tlv320aic31xx.c | 1 - sound/soc/codecs/ts3a227e.c | 1 - sound/soc/codecs/wsa883x.c | 1 - sound/soc/fsl/imx-es8328.c | 1 - sound/soc/fsl/imx-rpmsg.c | 2 -- sound/soc/generic/audio-graph-card2-custom-sample.c | 3 ++- sound/soc/rockchip/rockchip_i2s.c | 1 - sound/soc/rockchip/rockchip_spdif.c | 1 - sound/soc/samsung/aries_wm8994.c | 2 +- 23 files changed, 5 insertions(+), 24 deletions(-)
Signature · 1 line
2.43.0.rc1.1336.g36b5255a03ac
PATCH v2 1/6 ASoC: codecs: Remove unused of_gpio.h
of_gpio.h is deprecated and subject to remove. The drivers in question don't use it, simply remove the unused header.
--- sound/soc/codecs/ak4118.c | 1 - sound/soc/codecs/ak4458.c | 1 - sound/soc/codecs/aw88399.c | 2 +- sound/soc/codecs/cs53l30.c | 1 - sound/soc/codecs/max98390.c | 1 - sound/soc/codecs/pcm3168a.c | 1 - sound/soc/codecs/rk817_codec.c | 1 - sound/soc/codecs/tas2552.c | 1 - sound/soc/codecs/tas2764.c | 1 - sound/soc/codecs/tas2770.c | 1 - sound/soc/codecs/tas2780.c | 1 - sound/soc/codecs/tlv320adc3xxx.c | 1 - sound/soc/codecs/tlv320adcx140.c | 1 - sound/soc/codecs/tlv320aic31xx.c | 1 - sound/soc/codecs/ts3a227e.c | 1 - sound/soc/codecs/wsa883x.c | 1 - 16 files changed, 1 insertion(+), 16 deletions(-)
sound/soc/codecs/ak4118.c +0 -1
@@ -9,7 +9,6 @@#include <linux/gpio/consumer.h> #include <linux/module.h> #include <linux/of.h> -#include <linux/of_gpio.h> #include <linux/regmap.h> #include <linux/slab.h>
sound/soc/codecs/ak4458.c +0 -1
@@ -10,7 +10,6 @@#include <linux/i2c.h> #include <linux/module.h> #include <linux/of.h> -#include <linux/of_gpio.h> #include <linux/pm_runtime.h> #include <linux/regulator/consumer.h> #include <linux/reset.h>
sound/soc/codecs/aw88399.c +1 -1
@@ -10,7 +10,7 @@#include <linux/crc32.h> #include <linux/i2c.h> #include <linux/firmware.h> -#include <linux/of_gpio.h> +#include <linux/of_gpio.h> #include <linux/regmap.h> #include <sound/soc.h> #include "aw88399.h"
sound/soc/codecs/cs53l30.c +0 -1
@@ -12,7 +12,6 @@#include <linux/delay.h> #include <linux/i2c.h> #include <linux/module.h> -#include <linux/of_gpio.h> #include <linux/gpio/consumer.h> #include <linux/regulator/consumer.h> #include <sound/pcm_params.h>
sound/soc/codecs/max98390.c +0 -1
@@ -13,7 +13,6 @@#include <linux/gpio/consumer.h> #include <linux/i2c.h> #include <linux/module.h> -#include <linux/of_gpio.h> #include <linux/regmap.h> #include <linux/slab.h> #include <linux/time.h>
sound/soc/codecs/pcm3168a.c +0 -1
@@ -11,7 +11,6 @@#include <linux/delay.h> #include <linux/gpio/consumer.h> #include <linux/module.h> -#include <linux/of_gpio.h> #include <linux/pm_runtime.h> #include <linux/regulator/consumer.h>
sound/soc/codecs/rk817_codec.c +0 -1
@@ -10,7 +10,6 @@#include <linux/mfd/rk808.h> #include <linux/module.h> #include <linux/of.h> -#include <linux/of_gpio.h> #include <linux/platform_device.h> #include <linux/regmap.h> #include <sound/core.h>
sound/soc/codecs/tas2552.c +0 -1
@@ -13,7 +13,6 @@#include <linux/device.h> #include <linux/i2c.h> #include <linux/gpio.h> -#include <linux/of_gpio.h> #include <linux/pm_runtime.h> #include <linux/regmap.h> #include <linux/slab.h>
sound/soc/codecs/tas2764.c +0 -1
@@ -15,7 +15,6 @@#include <linux/regulator/consumer.h> #include <linux/regmap.h> #include <linux/of.h> -#include <linux/of_gpio.h> #include <linux/slab.h> #include <sound/soc.h> #include <sound/pcm.h>
sound/soc/codecs/tas2770.c +0 -1
@@ -20,7 +20,6 @@#include <linux/firmware.h> #include <linux/regmap.h> #include <linux/of.h> -#include <linux/of_gpio.h> #include <linux/slab.h> #include <sound/soc.h> #include <sound/pcm.h>
sound/soc/codecs/tas2780.c +0 -1
@@ -11,7 +11,6 @@#include <linux/gpio/consumer.h> #include <linux/regmap.h> #include <linux/of.h> -#include <linux/of_gpio.h> #include <sound/soc.h> #include <sound/pcm.h> #include <sound/pcm_params.h>
sound/soc/codecs/tlv320adc3xxx.c +0 -1
@@ -25,7 +25,6 @@#include <linux/i2c.h> #include <linux/platform_device.h> #include <linux/cdev.h> -#include <linux/of_gpio.h> #include <linux/slab.h> #include <sound/core.h> #include <sound/pcm.h>
sound/soc/codecs/tlv320adcx140.c +0 -1
@@ -12,7 +12,6 @@#include <linux/regulator/consumer.h> #include <linux/acpi.h> #include <linux/of.h> -#include <linux/of_gpio.h> #include <linux/slab.h> #include <sound/core.h> #include <sound/pcm.h>
sound/soc/codecs/tlv320aic31xx.c +0 -1
@@ -23,7 +23,6 @@#include <linux/regulator/consumer.h> #include <linux/acpi.h> #include <linux/of.h> -#include <linux/of_gpio.h> #include <linux/slab.h> #include <sound/core.h> #include <sound/jack.h>
sound/soc/codecs/ts3a227e.c +0 -1
@@ -10,7 +10,6 @@#include <linux/init.h> #include <linux/input.h> #include <linux/module.h> -#include <linux/of_gpio.h> #include <linux/regmap.h> #include <linux/acpi.h>
sound/soc/codecs/wsa883x.c +0 -1
@@ -9,7 +9,6 @@#include <linux/init.h> #include <linux/kernel.h> #include <linux/module.h> -#include <linux/of_gpio.h> #include <linux/pm_runtime.h> #include <linux/printk.h> #include <linux/regmap.h>
Signature · 1 line
2.43.0.rc1.1336.g36b5255a03ac
PATCH v2 2/6 ASoC: fsl: Remove unused of_gpio.h
In reply to Andy Shevchenkoof_gpio.h is deprecated and subject to remove. The drivers in question don't use it, simply remove the unused header.
--- sound/soc/fsl/imx-es8328.c | 1 - sound/soc/fsl/imx-rpmsg.c | 2 -- 2 files changed, 3 deletions(-)
sound/soc/fsl/imx-es8328.c +0 -1
@@ -8,7 +8,6 @@#include <linux/of.h> #include <linux/of_platform.h> #include <linux/i2c.h> -#include <linux/of_gpio.h> #include <sound/soc.h> #include <sound/jack.h>
sound/soc/fsl/imx-rpmsg.c +0 -2
@@ -5,9 +5,7 @@#include <linux/of_platform.h> #include <linux/of_reserved_mem.h> #include <linux/i2c.h> -#include <linux/of_gpio.h> #include <linux/slab.h> -#include <linux/gpio.h> #include <linux/clk.h> #include <sound/soc.h> #include <sound/jack.h>
Signature · 1 line
2.43.0.rc1.1336.g36b5255a03ac
PATCH v2 3/6 ASoC: rockchip: Remove unused of_gpio.h
In reply to Andy Shevchenkoof_gpio.h is deprecated and subject to remove. The drivers in question don't use it, simply remove the unused header.
--- sound/soc/rockchip/rockchip_i2s.c | 1 - sound/soc/rockchip/rockchip_spdif.c | 1 - 2 files changed, 2 deletions(-)
sound/soc/rockchip/rockchip_i2s.c +0 -1
@@ -11,7 +11,6 @@#include <linux/mfd/syscon.h> #include <linux/delay.h> #include <linux/of.h> -#include <linux/of_gpio.h> #include <linux/clk.h> #include <linux/pinctrl/consumer.h> #include <linux/pm_runtime.h>
sound/soc/rockchip/rockchip_spdif.c +0 -1
@@ -11,7 +11,6 @@#include <linux/module.h> #include <linux/delay.h> -#include <linux/of_gpio.h> #include <linux/clk.h> #include <linux/pm_runtime.h> #include <linux/mfd/syscon.h>
Signature · 1 line
2.43.0.rc1.1336.g36b5255a03ac
Re: [PATCH v2 3/6] ASoC: rockchip: Remove unused of_gpio.h
Am Mittwoch, 5. Juni 2024, 23:27:26 CEST schrieb Andy Shevchenko:
Quoted 4 lines
of_gpio.his deprecated and subject to remove. The drivers in question don't use it, simply remove the unused header.Signed-off-by Andy Shevchenko <[email protected]>
PATCH v2 4/6 ASoC: codecs: Replace of_gpio.h by proper one
In reply to Andy Shevchenkoof_gpio.h is deprecated and subject to remove.
The driver doesn't use it directly, replace it
with what is really being used.
--- sound/soc/codecs/aw88395/aw88395.c | 2 +- sound/soc/codecs/aw88399.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
sound/soc/codecs/aw88395/aw88395.c +1 -1
@@ -8,9 +8,9 @@// Author: Weidong Wang <[email protected]> // +#include <linux/gpio/consumer.h> #include <linux/i2c.h> #include <linux/firmware.h> -#include <linux/of_gpio.h> #include <linux/regmap.h> #include <sound/soc.h> #include "aw88395.h"
sound/soc/codecs/aw88399.c +1 -1
@@ -8,9 +8,9 @@// #include <linux/crc32.h> +#include <linux/gpio/consumer.h> #include <linux/i2c.h> #include <linux/firmware.h> -#include <linux/of_gpio.h> #include <linux/regmap.h> #include <sound/soc.h> #include "aw88399.h"
Signature · 1 line
2.43.0.rc1.1336.g36b5255a03ac
PATCH v2 5/6 ASoC: generic: Replace of_gpio.h by proper one
In reply to Andy Shevchenkoof_gpio.h is deprecated and subject to remove.
The driver doesn't use it directly, replace it
with what is really being used.
--- sound/soc/generic/audio-graph-card2-custom-sample.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
sound/soc/generic/audio-graph-card2-custom-sample.c +2 -1
@@ -5,8 +5,9 @@// Copyright (C) 2020 Renesas Electronics Corp. // Copyright (C) 2020 Kuninori Morimoto <[email protected]> // +#include <linux/device.h> +#include <linux/mod_devicetable.h> #include <linux/module.h> -#include <linux/of_gpio.h> #include <linux/platform_device.h> #include <sound/graph_card.h>
Signature · 1 line
2.43.0.rc1.1336.g36b5255a03ac
PATCH v2 6/6 ASoC: samsung: Replace of_gpio.h by proper one
In reply to Andy Shevchenkoof_gpio.h is deprecated and subject to remove.
The driver doesn't use it directly, replace it
with what is really being used.
--- sound/soc/samsung/aries_wm8994.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/samsung/aries_wm8994.c +1 -1
@@ -1,11 +1,11 @@// SPDX-License-Identifier: GPL-2.0+ #include <linux/extcon.h> +#include <linux/gpio/consumer.h> #include <linux/iio/consumer.h> #include <linux/input-event-codes.h> #include <linux/mfd/wm8994/registers.h> #include <linux/module.h> #include <linux/of.h> -#include <linux/of_gpio.h> #include <linux/regulator/consumer.h> #include <sound/jack.h> #include <sound/pcm_params.h>
Signature · 1 line
2.43.0.rc1.1336.g36b5255a03ac