From: Lee Jones <lee.jones@linaro.org>
To: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Cc: broonie@kernel.org, sameo@linux.intel.com,
patches@opensource.wolfsonmicro.com,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] mfd: wm5110: Give new AIF2 registers defaults and mark as readable
Date: Wed, 27 Nov 2013 13:24:42 +0000 [thread overview]
Message-ID: <20131127132442.GJ3296@lee--X1> (raw)
In-Reply-To: <1385556677-5244-1-git-send-email-ckeepax@opensource.wolfsonmicro.com>
> The registers associated with the new channels on AIF2 were accidentally
> missing defaults and not marked as readable this patch fixes this.
>
> Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
> ---
>
> This patch depends on the patch:
>
> "ASoC: wm5110: Add extra AIF2 channels"
>
> Which is going through the ASoC tree at the moment, so
> probably best to send this patch through the ASoC tree as
> well. As such I have generated it against Mark's for-next
> branch, let me know if it needs regenerating.
Hmm... this is awkward!
I'm not keen on this patch going through ASoC, as it might make things
equally as awkward later in the cycle. We should have created an
immutable branch for that really. I guess this will have to wait for
the next cycle now...
> drivers/mfd/wm5110-tables.c | 64 +++++++++++++++++++++++++++++++++++++++++++
> 1 files changed, 64 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/mfd/wm5110-tables.c b/drivers/mfd/wm5110-tables.c
> index d433e28..338cfbe 100644
> --- a/drivers/mfd/wm5110-tables.c
> +++ b/drivers/mfd/wm5110-tables.c
> @@ -885,6 +885,38 @@ static const struct reg_default wm5110_reg_default[] = {
> { 0x0000074D, 0x0080 }, /* R1869 - AIF2TX2MIX Input 3 Volume */
> { 0x0000074E, 0x0000 }, /* R1870 - AIF2TX2MIX Input 4 Source */
> { 0x0000074F, 0x0080 }, /* R1871 - AIF2TX2MIX Input 4 Volume */
> + { 0x00000750, 0x0000 }, /* R1872 - AIF2TX3MIX Input 1 Source */
> + { 0x00000751, 0x0080 }, /* R1873 - AIF2TX3MIX Input 1 Volume */
> + { 0x00000752, 0x0000 }, /* R1874 - AIF2TX3MIX Input 2 Source */
> + { 0x00000753, 0x0080 }, /* R1875 - AIF2TX3MIX Input 2 Volume */
> + { 0x00000754, 0x0000 }, /* R1876 - AIF2TX3MIX Input 3 Source */
> + { 0x00000755, 0x0080 }, /* R1877 - AIF2TX3MIX Input 3 Volume */
> + { 0x00000756, 0x0000 }, /* R1878 - AIF2TX3MIX Input 4 Source */
> + { 0x00000757, 0x0080 }, /* R1879 - AIF2TX3MIX Input 4 Volume */
> + { 0x00000758, 0x0000 }, /* R1880 - AIF2TX4MIX Input 1 Source */
> + { 0x00000759, 0x0080 }, /* R1881 - AIF2TX4MIX Input 1 Volume */
> + { 0x0000075A, 0x0000 }, /* R1882 - AIF2TX4MIX Input 2 Source */
> + { 0x0000075B, 0x0080 }, /* R1883 - AIF2TX4MIX Input 2 Volume */
> + { 0x0000075C, 0x0000 }, /* R1884 - AIF2TX4MIX Input 3 Source */
> + { 0x0000075D, 0x0080 }, /* R1885 - AIF2TX4MIX Input 3 Volume */
> + { 0x0000075E, 0x0000 }, /* R1886 - AIF2TX4MIX Input 4 Source */
> + { 0x0000075F, 0x0080 }, /* R1887 - AIF2TX4MIX Input 4 Volume */
> + { 0x00000760, 0x0000 }, /* R1888 - AIF2TX5MIX Input 1 Source */
> + { 0x00000761, 0x0080 }, /* R1889 - AIF2TX5MIX Input 1 Volume */
> + { 0x00000762, 0x0000 }, /* R1890 - AIF2TX5MIX Input 2 Source */
> + { 0x00000763, 0x0080 }, /* R1891 - AIF2TX5MIX Input 2 Volume */
> + { 0x00000764, 0x0000 }, /* R1892 - AIF2TX5MIX Input 3 Source */
> + { 0x00000765, 0x0080 }, /* R1893 - AIF2TX5MIX Input 3 Volume */
> + { 0x00000766, 0x0000 }, /* R1894 - AIF2TX5MIX Input 4 Source */
> + { 0x00000767, 0x0080 }, /* R1895 - AIF2TX5MIX Input 4 Volume */
> + { 0x00000768, 0x0000 }, /* R1896 - AIF2TX6MIX Input 1 Source */
> + { 0x00000769, 0x0080 }, /* R1897 - AIF2TX6MIX Input 1 Volume */
> + { 0x0000076A, 0x0000 }, /* R1898 - AIF2TX6MIX Input 2 Source */
> + { 0x0000076B, 0x0080 }, /* R1899 - AIF2TX6MIX Input 2 Volume */
> + { 0x0000076C, 0x0000 }, /* R1900 - AIF2TX6MIX Input 3 Source */
> + { 0x0000076D, 0x0080 }, /* R1901 - AIF2TX6MIX Input 3 Volume */
> + { 0x0000076E, 0x0000 }, /* R1902 - AIF2TX6MIX Input 4 Source */
> + { 0x0000076F, 0x0080 }, /* R1903 - AIF2TX6MIX Input 4 Volume */
> { 0x00000780, 0x0000 }, /* R1920 - AIF3TX1MIX Input 1 Source */
> { 0x00000781, 0x0080 }, /* R1921 - AIF3TX1MIX Input 1 Volume */
> { 0x00000782, 0x0000 }, /* R1922 - AIF3TX1MIX Input 2 Source */
> @@ -1883,6 +1915,38 @@ static bool wm5110_readable_register(struct device *dev, unsigned int reg)
> case ARIZONA_AIF2TX2MIX_INPUT_3_VOLUME:
> case ARIZONA_AIF2TX2MIX_INPUT_4_SOURCE:
> case ARIZONA_AIF2TX2MIX_INPUT_4_VOLUME:
> + case ARIZONA_AIF2TX3MIX_INPUT_1_SOURCE:
> + case ARIZONA_AIF2TX3MIX_INPUT_1_VOLUME:
> + case ARIZONA_AIF2TX3MIX_INPUT_2_SOURCE:
> + case ARIZONA_AIF2TX3MIX_INPUT_2_VOLUME:
> + case ARIZONA_AIF2TX3MIX_INPUT_3_SOURCE:
> + case ARIZONA_AIF2TX3MIX_INPUT_3_VOLUME:
> + case ARIZONA_AIF2TX3MIX_INPUT_4_SOURCE:
> + case ARIZONA_AIF2TX3MIX_INPUT_4_VOLUME:
> + case ARIZONA_AIF2TX4MIX_INPUT_1_SOURCE:
> + case ARIZONA_AIF2TX4MIX_INPUT_1_VOLUME:
> + case ARIZONA_AIF2TX4MIX_INPUT_2_SOURCE:
> + case ARIZONA_AIF2TX4MIX_INPUT_2_VOLUME:
> + case ARIZONA_AIF2TX4MIX_INPUT_3_SOURCE:
> + case ARIZONA_AIF2TX4MIX_INPUT_3_VOLUME:
> + case ARIZONA_AIF2TX4MIX_INPUT_4_SOURCE:
> + case ARIZONA_AIF2TX4MIX_INPUT_4_VOLUME:
> + case ARIZONA_AIF2TX5MIX_INPUT_1_SOURCE:
> + case ARIZONA_AIF2TX5MIX_INPUT_1_VOLUME:
> + case ARIZONA_AIF2TX5MIX_INPUT_2_SOURCE:
> + case ARIZONA_AIF2TX5MIX_INPUT_2_VOLUME:
> + case ARIZONA_AIF2TX5MIX_INPUT_3_SOURCE:
> + case ARIZONA_AIF2TX5MIX_INPUT_3_VOLUME:
> + case ARIZONA_AIF2TX5MIX_INPUT_4_SOURCE:
> + case ARIZONA_AIF2TX5MIX_INPUT_4_VOLUME:
> + case ARIZONA_AIF2TX6MIX_INPUT_1_SOURCE:
> + case ARIZONA_AIF2TX6MIX_INPUT_1_VOLUME:
> + case ARIZONA_AIF2TX6MIX_INPUT_2_SOURCE:
> + case ARIZONA_AIF2TX6MIX_INPUT_2_VOLUME:
> + case ARIZONA_AIF2TX6MIX_INPUT_3_SOURCE:
> + case ARIZONA_AIF2TX6MIX_INPUT_3_VOLUME:
> + case ARIZONA_AIF2TX6MIX_INPUT_4_SOURCE:
> + case ARIZONA_AIF2TX6MIX_INPUT_4_VOLUME:
> case ARIZONA_AIF3TX1MIX_INPUT_1_SOURCE:
> case ARIZONA_AIF3TX1MIX_INPUT_1_VOLUME:
> case ARIZONA_AIF3TX1MIX_INPUT_2_SOURCE:
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
next prev parent reply other threads:[~2013-11-27 13:24 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-27 12:51 [PATCH] mfd: wm5110: Give new AIF2 registers defaults and mark as readable Charles Keepax
2013-11-27 13:24 ` Lee Jones [this message]
2013-11-27 14:19 ` Charles Keepax
2013-11-27 15:16 ` Mark Brown
2013-11-27 15:27 ` Lee Jones
2013-11-27 16:07 ` Mark Brown
2013-11-27 16:42 ` Lee Jones
2013-11-27 18:28 ` Mark Brown
2013-11-28 8:48 ` Lee Jones
2013-11-28 10:35 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20131127132442.GJ3296@lee--X1 \
--to=lee.jones@linaro.org \
--cc=broonie@kernel.org \
--cc=ckeepax@opensource.wolfsonmicro.com \
--cc=linux-kernel@vger.kernel.org \
--cc=patches@opensource.wolfsonmicro.com \
--cc=sameo@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox