Skip to contentSkip to conversation

ASoC: Rename WM8915 to WM8996

PATCH Kukjin Kim 2 participants 2 messages Jun 29, 2011 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): 1309317832-24241-1-git-send-email-broonie@opensource.wolfsonmicro.com

Kukjin Kim

author Acked-by
#1 lore raw
Quoted 4 lines · Mark Brown

For marketing reasons the part will be called WM8996. In order to avoid user confusion rename the driver to reflect this.

Quoted 8 lines

---

The cross tree issues make this difficult to merge as there's dependencies in both ASoC and Samsung trees - Kukjin, would you be OK with merging this via ALSA late on in the merge window after both Samsung and ASoC trees have merged?

Yes, it's ok to me :)

As a note, basically my tree will be sent to upstream via rmk during merge window so I'm not sure when it is merged.

Quoted 6 lines

I will have a go at constructing some branches which do the right thing and can be merged now (so a base rename patch then a merge of that into ASoC which deals with all the work that has been done in the driver this release cycle) but I wanted to get this first option out there now.

 arch/arm/mach-s3c64xx/mach-crag6410.c |   18 +-

If required,

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.

Acked-by
#2 lore raw
Quoted 23 lines · Kukjin Kim
Quoted 4 lines · Mark Brown

For marketing reasons the part will be called WM8996. In order to avoid user confusion rename the driver to reflect this.

Quoted 8 lines

---

The cross tree issues make this difficult to merge as there's dependencies in both ASoC and Samsung trees - Kukjin, would you be OK with merging this via ALSA late on in the merge window after both Samsung and ASoC trees have merged?

Yes, it's ok to me :)

As a note, basically my tree will be sent to upstream via rmk during merge window so I'm not sure when it is merged.

Quoted 5 lines

I will have a go at constructing some branches which do the right thing and can be merged now (so a base rename patch then a merge of that into ASoC which deals with all the work that has been done in the driver this release cycle) but I wanted to get this first option out there now.

Quoted 5 lines
Quoted 1 line
 arch/arm/mach-s3c64xx/mach-crag6410.c |   18 +-

If required,