Convert over the Mediatek codecs to use GPIO descriptors.
One few-liner affects gpiolib-of.h, I don't think there
will be conflicts so I suggest that all of this can be
merged through ASoC after review.
Signed-off-by: Linus Walleij <[email protected]>
---
Linus Walleij (8):
gpiolib: of: Add quirk for mt2701-cs42448 ASoC sound
ASoC: mediatek: mt2701-cs42448: Convert to GPIO descriptors
ASoC: mt8173-max98090: Drop unused include
ASoC: mt8173-rt5650-rt5514: Drop unused includes
ASoC: mt8173-rt5650-rt5676: Drop unused includes
ASoC: mt8173-rt5650: Drop unused includes
ASoC: mt8186-mt6366-rt1019-rt5682s: Drop unused include
ASoC: mt8192-afe-gpio: Drop unused include
drivers/gpio/gpiolib-of.c | 4 ++
sound/soc/mediatek/mt2701/mt2701-cs42448.c | 54 +++++++++-------------
sound/soc/mediatek/mt8173/mt8173-max98090.c | 1 -
sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c | 2 -
sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c | 2 -
sound/soc/mediatek/mt8173/mt8173-rt5650.c | 2 -
sound/soc/mediatek/mt8186/mt8186-afe-gpio.c | 1 -
.../mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c | 1 -
sound/soc/mediatek/mt8192/mt8192-afe-gpio.c | 1 -
9 files changed, 26 insertions(+), 42 deletions(-)
---
base-commit: 0bb80ecc33a8fb5a682236443c1e740d5c917d1d
change-id: 20231006-descriptors-asoc-mediatek-01c3ff4005db
Best regards,
--
Linus Walleij <[email protected]>
This driver includes the legacy GPIO header <linux/gpio.h> but
is not using any symbols from it. AFE has a custom GPIO
implementation that is not using the kernel GPIO framework,
so it need not include it either.
Signed-off-by: Linus Walleij <[email protected]>
---
sound/soc/mediatek/mt8186/mt8186-afe-gpio.c | 1 -
sound/soc/mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c | 1 -
2 files changed, 2 deletions(-)
diff --git a/sound/soc/mediatek/mt8186/mt8186-afe-gpio.c b/sound/soc/mediatek/mt8186/mt8186-afe-gpio.c
index f12e91cc4fcf..9e86e7079718 100644
--- a/sound/soc/mediatek/mt8186/mt8186-afe-gpio.c
+++ b/sound/soc/mediatek/mt8186/mt8186-afe-gpio.c
@@ -5,7 +5,6 @@
// Copyright (c) 2022 MediaTek Inc.
// Author: Jiaxin Yu <[email protected]>
-#include <linux/gpio.h>
#include <linux/pinctrl/consumer.h>
#include "mt8186-afe-common.h"
diff --git a/sound/soc/mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c b/sound/soc/mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c
index 9c11016f032c..87ec39a5e1f4 100644
--- a/sound/soc/mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c
+++ b/sound/soc/mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c
@@ -7,7 +7,6 @@
// Author: Jiaxin Yu <[email protected]>
//
-#include <linux/gpio.h>
#include <linux/gpio/consumer.h>
#include <linux/input.h>
#include <linux/module.h>
--
2.34.1
This driver includes the legacy GPIO header <linux/gpio.h> and
<linux/of_gpio.h> but does not use any symbols from either of
them so drop the includes.
Signed-off-by: Linus Walleij <[email protected]>
---
sound/soc/mediatek/mt8173/mt8173-rt5650.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/sound/soc/mediatek/mt8173/mt8173-rt5650.c b/sound/soc/mediatek/mt8173/mt8173-rt5650.c
index 18cf84bb25c7..bcec1d9d790b 100644
--- a/sound/soc/mediatek/mt8173/mt8173-rt5650.c
+++ b/sound/soc/mediatek/mt8173/mt8173-rt5650.c
@@ -7,8 +7,6 @@
*/
#include <linux/module.h>
-#include <linux/gpio.h>
-#include <linux/of_gpio.h>
#include <sound/soc.h>
#include <sound/jack.h>
#include "../../codecs/rt5645.h"
--
2.34.1
This driver includes the legacy GPIO header <linux/gpio.h> and
<linux/of_gpio.h> but does not use any symbols from either of
them so drop the includes.
Signed-off-by: Linus Walleij <[email protected]>
---
sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c b/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c
index e502cd1670ba..0204b461e291 100644
--- a/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c
+++ b/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c
@@ -7,8 +7,6 @@
*/
#include <linux/module.h>
-#include <linux/gpio.h>
-#include <linux/of_gpio.h>
#include <sound/soc.h>
#include <sound/jack.h>
#include "../../codecs/rt5645.h"
--
2.34.1
This driver includes the legacy GPIO header <linux/gpio.h> but
is not using any symbols from it. AFE has a custom GPIO
implementation that is not using the kernel GPIO framework.
Signed-off-by: Linus Walleij <[email protected]>
---
sound/soc/mediatek/mt8192/mt8192-afe-gpio.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/sound/soc/mediatek/mt8192/mt8192-afe-gpio.c b/sound/soc/mediatek/mt8192/mt8192-afe-gpio.c
index 165663a78e36..de5e1deaa167 100644
--- a/sound/soc/mediatek/mt8192/mt8192-afe-gpio.c
+++ b/sound/soc/mediatek/mt8192/mt8192-afe-gpio.c
@@ -6,7 +6,6 @@
// Author: Shane Chien <[email protected]>
//
-#include <linux/gpio.h>
#include <linux/pinctrl/consumer.h>
#include "mt8192-afe-common.h"
--
2.34.1
This driver includes the legacy GPIO header <linux/gpio.h> and
<linux/of_gpio.h> but does not use any symbols from either of
them so drop the includes.
Signed-off-by: Linus Walleij <[email protected]>
---
sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c b/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c
index ffb094284bfb..351b586e01b0 100644
--- a/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c
+++ b/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c
@@ -7,8 +7,6 @@
*/
#include <linux/module.h>
-#include <linux/gpio.h>
-#include <linux/of_gpio.h>
#include <sound/soc.h>
#include <sound/jack.h>
#include "../../codecs/rt5645.h"
--
2.34.1
Il 06/10/23 15:46, Linus Walleij ha scritto:
> This driver includes the legacy GPIO header <linux/gpio.h> and
> <linux/of_gpio.h> but does not use any symbols from either of
> them so drop the includes.
>
> Signed-off-by: Linus Walleij <[email protected]>
Reviewed-by: AngeloGioacchino Del Regno <[email protected]>
Il 06/10/23 15:46, Linus Walleij ha scritto:
> This driver includes the legacy GPIO header <linux/gpio.h> and
> <linux/of_gpio.h> but does not use any symbols from either of
> them so drop the includes.
>
> Signed-off-by: Linus Walleij <[email protected]>
Reviewed-by: AngeloGioacchino Del Regno <[email protected]>
Tested-by: AngeloGioacchino Del Regno <[email protected]>
Il 06/10/23 15:46, Linus Walleij ha scritto:
> This driver includes the legacy GPIO header <linux/gpio.h> but
> is not using any symbols from it. AFE has a custom GPIO
> implementation that is not using the kernel GPIO framework,
> so it need not include it either.
>
> Signed-off-by: Linus Walleij <[email protected]>
Reviewed-by: AngeloGioacchino Del Regno <[email protected]>
Tested-by: AngeloGioacchino Del Regno <[email protected]>
Il 06/10/23 15:46, Linus Walleij ha scritto:
> This driver includes the legacy GPIO header <linux/gpio.h> and
> <linux/of_gpio.h> but does not use any symbols from either of
> them so drop the includes.
>
> Signed-off-by: Linus Walleij <[email protected]>
Reviewed-by: AngeloGioacchino Del Regno <[email protected]>
Il 06/10/23 15:46, Linus Walleij ha scritto:
> This driver includes the legacy GPIO header <linux/gpio.h> but
> is not using any symbols from it. AFE has a custom GPIO
> implementation that is not using the kernel GPIO framework.
>
> Signed-off-by: Linus Walleij <[email protected]>
Reviewed-by: AngeloGioacchino Del Regno <[email protected]>
Tested-by: AngeloGioacchino Del Regno <[email protected]>
On Fri, 06 Oct 2023 15:46:23 +0200, Linus Walleij wrote:
> Convert over the Mediatek codecs to use GPIO descriptors.
>
> One few-liner affects gpiolib-of.h, I don't think there
> will be conflicts so I suggest that all of this can be
> merged through ASoC after review.
>
>
> [...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/8] gpiolib: of: Add quirk for mt2701-cs42448 ASoC sound
commit: 9e189e80dcb68528dea9e061d9704993f98cb84f
[2/8] ASoC: mediatek: mt2701-cs42448: Convert to GPIO descriptors
commit: 654a23724072f37c0d07b31395e1d9f45f5563ab
[3/8] ASoC: mt8173-max98090: Drop unused include
commit: b1306c3b6140f0c299f727edc9bb90ec79700614
[4/8] ASoC: mt8173-rt5650-rt5514: Drop unused includes
commit: 94a7f618211652235f3e4b88aca477391078dba6
[5/8] ASoC: mt8173-rt5650-rt5676: Drop unused includes
commit: cb1c18e8a7337c7f3ee461b613a52a45c3f723d5
[6/8] ASoC: mt8173-rt5650: Drop unused includes
commit: 6dffd1f38ad76660e7fff8e269889284e892603d
[7/8] ASoC: mt8186-mt6366-rt1019-rt5682s: Drop unused include
commit: 73e1f8a05bd8289ab5154c703a0592729267e979
[8/8] ASoC: mt8192-afe-gpio: Drop unused include
commit: 3b5d22bdf33c4e44016fdcfc8904a0b0bf218e75
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