Skip to contentSkip to conversation

ASoC: mediatek: mt8183: support machine driver for rt1015

PATCH In review Tzung-Bi Shih 2 participants 7 messages Jul 8, 2020 – Jul 9, 2020

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

cover ASoC: mediatek: mt8183: support machine driver for rt1015

This series tries to reuse mt8183-mt6358-ts3a227-max98357.c for supporting machine driver with rt1015 speaker amplifier.

The 1st patch is straightforward: re-order the header inclusions.

The 2nd patch adds document for the new proposed compatible string.

The 3rd patch changes the machine driver to support either "MAX98357A" or "RT1015" codecs.

Tzung-Bi Shih (3):
ASoC: mediatek: mt8183: sort header inclusions in alphabetical
dt-bindings: mt8183: add compatible string for using rt1015
ASoC: mediatek: mt8183: support machine driver with rt1015

 .../sound/mt8183-mt6358-ts3a227-max98357.txt  |   5 +-
 sound/soc/mediatek/Kconfig                    |   5 +-
 .../mt8183/mt8183-mt6358-ts3a227-max98357.c   | 171 +++++++++++++++---
 3 files changed, 153 insertions(+), 28 deletions(-)
Signature · 1 line
2.27.0.383.g050319c2ae-goog
#1 lore raw

PATCH 1/3 ASoC: mediatek: mt8183: sort header inclusions in alphabetical

Sorts header inclusions in alphabetical.

---
 sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c +3 -3
index 1fca8df109b4..8cd53403a080 100644
@@ -7,13 +7,13 @@
 // Author: Shunli Wang <[email protected]>
 
 #include <linux/module.h>
+#include <linux/pinctrl/consumer.h>
+#include <sound/jack.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
-#include <sound/jack.h>
-#include <linux/pinctrl/consumer.h>
 
-#include "mt8183-afe-common.h"
 #include "../../codecs/ts3a227e.h"
+#include "mt8183-afe-common.h"
 
 enum PINCTRL_PIN_STATE {
 	PIN_STATE_DEFAULT = 0,
Signature · 1 line
2.27.0.383.g050319c2ae-goog
#2 lore raw

PATCH 2/3 dt-bindings: mt8183: add compatible string for using rt1015

In reply to Tzung-Bi Shih

Machines with rt1015 should use the compatible string "mt8183-mt6358-ts3a227-rt1015".

---
 .../bindings/sound/mt8183-mt6358-ts3a227-max98357.txt        | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
Documentation/devicetree/bindings/sound/mt8183-mt6358-ts3a227-max98357.txt +3 -2
index decaa013a07e..5afd3d8dab84 100644
@@ -1,7 +1,8 @@
-MT8183 with MT6358, TS3A227 and MAX98357 CODECS
+MT8183 with MT6358, TS3A227, MAX98357, and RT1015 CODECS
 
 Required properties:
-- compatible : "mediatek,mt8183_mt6358_ts3a227_max98357"
+- compatible : "mediatek,mt8183_mt6358_ts3a227_max98357" for MAX98357A codec
+               "mediatek,mt8183_mt6358_ts3a227_rt1015" for RT1015 codec
 - mediatek,platform: the phandle of MT8183 ASoC platform
 
 Optional properties:
Signature · 1 line
2.27.0.383.g050319c2ae-goog
#3 lore raw

PATCH 3/3 ASoC: mediatek: mt8183: support machine driver with rt1015

In reply to Tzung-Bi Shih

Supports machine driver with rt1015 ("mt8183-mt6358-ts3a227-rt1015"). Embeds in existing mt8183-mt6358-ts3a227-max98357.c because they share most of the code.

---
 sound/soc/mediatek/Kconfig                    |   5 +-
 .../mt8183/mt8183-mt6358-ts3a227-max98357.c   | 165 +++++++++++++++---
 2 files changed, 147 insertions(+), 23 deletions(-)
sound/soc/mediatek/Kconfig +3 -2
index a656d2014127..238e4871678a 100644
@@ -118,17 +118,18 @@ config SND_SOC_MT8183
 	  If unsure select "N".
 
 config SND_SOC_MT8183_MT6358_TS3A227E_MAX98357A
-	tristate "ASoC Audio driver for MT8183 with MT6358 TS3A227E MAX98357A codec"
+	tristate "ASoC Audio driver for MT8183 with MT6358 TS3A227E MAX98357A RT1015 codec"
 	depends on I2C
 	depends on SND_SOC_MT8183
 	select SND_SOC_MT6358
 	select SND_SOC_MAX98357A
+	select SND_SOC_RT1015
 	select SND_SOC_BT_SCO
 	select SND_SOC_TS3A227E
 	select SND_SOC_CROS_EC_CODEC if CROS_EC
 	help
 	  This adds ASoC driver for Mediatek MT8183 boards
-	  with the MT6358 TS3A227E MAX98357A audio codec.
+	  with the MT6358 TS3A227E MAX98357A RT1015 audio codec.
 	  Select Y if you have such device.
 	  If unsure select "N".
 
sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c +144 -21

262 lines not on this page · raw message

Signature · 1 line
2.27.0.383.g050319c2ae-goog
maintainer
#4 lore raw
In reply to Tzung-Bi Shih
Quoted 8 lines · Tzung-Bi Shih

This series tries to reuse mt8183-mt6358-ts3a227-max98357.c for supporting machine driver with rt1015 speaker amplifier.

The 1st patch is straightforward: re-order the header inclusions.

The 2nd patch adds document for the new proposed compatible string.

[...]

Applied to

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

Thanks!

[1/3] ASoC: mediatek: mt8183: sort header inclusions in alphabetical

      commit: 4dae01c2e5df7beb8dfd5deb9560e42f19d3cfb7
[2/3] ASoC: mt8183: add compatible string for using rt1015
      commit: ab1ba5252f611c0efabca5fca81f5717445da47b
[3/3] ASoC: mediatek: mt8183: support machine driver with rt1015
      commit: f4fb4fef49664e64f4f40e9e8db11f785fbc79a4

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

#5 lore raw
Quoted 5 lines · Mark Brown

[1/3] ASoC: mediatek: mt8183: sort header inclusions in alphabetical

      commit: 4dae01c2e5df7beb8dfd5deb9560e42f19d3cfb7
[2/3] ASoC: mt8183: add compatible string for using rt1015
      commit: ab1ba5252f611c0efabca5fca81f5717445da47b

I am curious about the 2nd patch's title. Did you change it from "dt-bindings" to "ASoC" intentionally?

I am trying to avoid using the wrong title prefix next time.

maintainer
#6 lore raw
Quoted 7 lines · Tzung-Bi Shih
Quoted 2 lines · Mark Brown

[2/3] ASoC: mt8183: add compatible string for using rt1015

      commit: ab1ba5252f611c0efabca5fca81f5717445da47b

I am curious about the 2nd patch's title. Did you change it from "dt-bindings" to "ASoC" intentionally?

Yes.