| Message ID | 20231020083426.302925-1-wangweidong.a@awinic.com |
|---|---|
| Headers | show |
| Series | ASoC: codecs: Add aw88399 amplifier driver | expand |
On Fri, Oct 20, 2023 at 04:34:25PM +0800, wangweidong.a@awinic.com wrote: > From: Weidong Wang <wangweidong.a@awinic.com> > > Add aw88399 compatible code to the aw88395_lib.c file > so that it can parse aw88399's bin file. This doesn't apply against current code, please check and resend: Applying: ASoC: codecs: Add code for bin parsing compatible with aw88399 Using index info to reconstruct a base tree... M sound/soc/codecs/aw88395/aw88395_lib.c M sound/soc/codecs/aw88395/aw88395_reg.h Falling back to patching base and 3-way merge... Auto-merging sound/soc/codecs/aw88395/aw88395_reg.h Auto-merging sound/soc/codecs/aw88395/aw88395_lib.c
From: Weidong Wang <wangweidong.a@awinic.com>
Add the awinic,aw88399 property to the awinic,aw88395.yaml file.
Add i2c and amplifier registration for
aw88399 and their associated operation functions.
v1 -> v2: Modify the reset mode
Delete AW88399_DSP_I2C_WRITES macros
and related debugging statements
Change the value of max_register in aw88399
Change the value of max_register in aw88261
Delete the judgment of unnecessary pointers
Modify the judgment of the ret return value
Weidong Wang (4):
ASoC: dt-bindings: Add schema for "awinic,aw88399"
ASoC: codecs: Modify max_register usage error
ASoC: codecs: Add code for bin parsing compatible with aw88399
ASoC: codecs: Add aw88399 amplifier driver
.../bindings/sound/awinic,aw88395.yaml | 1 +
sound/soc/codecs/Kconfig | 14 +
sound/soc/codecs/Makefile | 2 +
sound/soc/codecs/aw88261.c | 2 +-
sound/soc/codecs/aw88395/aw88395_lib.c | 3 +
sound/soc/codecs/aw88395/aw88395_reg.h | 1 +
sound/soc/codecs/aw88399.c | 1911 +++++++++++++++++
sound/soc/codecs/aw88399.h | 599 ++++++
8 files changed, 2532 insertions(+), 1 deletion(-)
create mode 100644 sound/soc/codecs/aw88399.c
create mode 100644 sound/soc/codecs/aw88399.h
base-commit: ce55c22ec8b223a90ff3e084d842f73cfba35588
On Tue, Oct 24, 2023 at 03:14:15PM +0800, wangweidong.a@awinic.com wrote: > From: Weidong Wang <wangweidong.a@awinic.com> > > Add the awinic,aw88399 property to the awinic,aw88395.yaml file. > > Add i2c and amplifier registration for > aw88399 and their associated operation functions. This *still* doesn't apply against my current for-next (or for-6.7) branch, and you've resent it as another v2. Please send something based against for-6.7 of my sound tree.
On Tue, Oct 24, 2023 at 03:19:28PM +0800, wangweidong.a@awinic.com wrote: > I generated the patch based on the mainline branch, > Why would there be a conflict? I know that I made a change to > this file when I committed aw87390 and that > the change was in the Linux-next branch, but the two > changes are in different parts of the file. I don't know off hand, I didn't check in detail. It's possible someone else sent a fix that's been applied and is causing the issue - if you check out my branch and try to apply the patches hopefully you can figure out what the problem was.
On Fri, 20 Oct 2023 16:34:22 +0800, wangweidong.a@awinic.com wrote: > Add the awinic,aw88399 property to the awinic,aw88395.yaml file. > > Add i2c and amplifier registration for > aw88399 and their associated operation functions. > > v1 -> v2: Modify the reset mode > Delete AW88399_DSP_I2C_WRITES macros > and related debugging statements > Change the value of max_register in aw88399 > Change the value of max_register in aw88261 > Delete the judgment of unnecessary pointers > Modify the judgment of the ret return value > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/4] ASoC: dt-bindings: Add schema for "awinic,aw88399" (no commit info) [2/4] ASoC: codecs: Modify max_register usage error commit: f1c406866af5dacdd9601cfa3be4873ebd801b86 [3/4] ASoC: codecs: Add code for bin parsing compatible with aw88399 (no commit info) [4/4] ASoC: codecs: Add aw88399 amplifier driver (no commit info) 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
On Tue, Oct 24, 2023 at 01:42:13PM +0100, Mark Brown wrote: > On Tue, Oct 24, 2023 at 03:19:28PM +0800, wangweidong.a@awinic.com wrote: > > > I generated the patch based on the mainline branch, > > Why would there be a conflict? I know that I made a change to > > this file when I committed aw87390 and that > > the change was in the Linux-next branch, but the two > > changes are in different parts of the file. > > I don't know off hand, I didn't check in detail. It's possible someone > else sent a fix that's been applied and is causing the issue - if you > check out my branch and try to apply the patches hopefully you can > figure out what the problem was. diff --cc sound/soc/codecs/aw88395/aw88395_lib.c index a0a429ca9768,bc72a7487048..000000000000 --- a/sound/soc/codecs/aw88395/aw88395_lib.c +++ b/sound/soc/codecs/aw88395/aw88395_lib.c @@@ -705,7 -703,8 +705,12 @@@ static int aw_dev_load_cfg_by_hdr(struc switch (aw_dev->chip_id) { case AW88395_CHIP_ID: ++<<<<<<< HEAD + ret = aw88395_dev_cfg_get_valid_prof(aw_dev, all_prof_info); ++======= + case AW88399_CHIP_ID: + ret = aw88395_dev_cfg_get_valid_prof(aw_dev, *all_prof_info); ++>>>>>>> ASoC: codecs: Add code for bin parsing compatible with aw88399 if (ret < 0) goto exit; break;
Thank you very much for your help. On Tue, Oct 24, 2023 at 14:57:03 +0100, Mark Brown wrote: > On Tue, Oct 24, 2023 at 01:42:13PM +0100, Mark Brown wrote: >> On Tue, Oct 24, 2023 at 03:19:28PM +0800, wangweidong.a@awinic.com wrote: >> >> > I generated the patch based on the mainline branch, >> > Why would there be a conflict? I know that I made a change to >> > this file when I committed aw87390 and that >> > the change was in the Linux-next branch, but the two >> > changes are in different parts of the file. >> >> I don't know off hand, I didn't check in detail. It's possible someone >> else sent a fix that's been applied and is causing the issue - if you >> check out my branch and try to apply the patches hopefully you can >> figure out what the problem was. > diff --cc sound/soc/codecs/aw88395/aw88395_lib.c > index a0a429ca9768,bc72a7487048..000000000000 > --- a/sound/soc/codecs/aw88395/aw88395_lib.c > +++ b/sound/soc/codecs/aw88395/aw88395_lib.c > @@@ -705,7 -703,8 +705,12 @@@ static int aw_dev_load_cfg_by_hdr(struc > > switch (aw_dev->chip_id) { > case AW88395_CHIP_ID: > ++<<<<<<< HEAD > + ret = aw88395_dev_cfg_get_valid_prof(aw_dev, all_prof_info); > ++======= > + case AW88399_CHIP_ID: > + ret = aw88395_dev_cfg_get_valid_prof(aw_dev, *all_prof_info); > ++>>>>>>> ASoC: codecs: Add code for bin parsing compatible with aw88399 > if (ret < 0) > goto exit; > break; Again, thank you very much for your help. I'll resend the patch based against for-6.7 of sound tree. Best regards Weidong Wang
From: Weidong Wang <wangweidong.a@awinic.com> Add the awinic,aw88399 property to the awinic,aw88395.yaml file. Add i2c and amplifier registration for aw88399 and their associated operation functions. v1 -> v2: Modify the reset mode Delete AW88399_DSP_I2C_WRITES macros and related debugging statements Change the value of max_register in aw88399 Change the value of max_register in aw88261 Delete the judgment of unnecessary pointers Modify the judgment of the ret return value Weidong Wang (4): ASoC: dt-bindings: Add schema for "awinic,aw88399" ASoC: codecs: Modify max_register usage error ASoC: codecs: Add code for bin parsing compatible with aw88399 ASoC: codecs: Add aw88399 amplifier driver .../bindings/sound/awinic,aw88395.yaml | 1 + sound/soc/codecs/Kconfig | 14 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/aw88261.c | 2 +- sound/soc/codecs/aw88395/aw88395_lib.c | 3 + sound/soc/codecs/aw88395/aw88395_reg.h | 1 + sound/soc/codecs/aw88399.c | 1911 +++++++++++++++++ sound/soc/codecs/aw88399.h | 599 ++++++ 8 files changed, 2532 insertions(+), 1 deletion(-) create mode 100644 sound/soc/codecs/aw88399.c create mode 100644 sound/soc/codecs/aw88399.h base-commit: ce55c22ec8b223a90ff3e084d842f73cfba35588