* [PATCH] mfd: wm5110: Give new AIF2 registers defaults and mark as readable
@ 2013-11-27 12:51 Charles Keepax
2013-11-27 13:24 ` Lee Jones
2013-11-28 10:35 ` Mark Brown
0 siblings, 2 replies; 10+ messages in thread
From: Charles Keepax @ 2013-11-27 12:51 UTC (permalink / raw)
To: broonie, lee.jones; +Cc: sameo, patches, linux-kernel
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.
Thanks,
Charles
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:
--
1.7.2.5
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH] mfd: wm5110: Give new AIF2 registers defaults and mark as readable
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
2013-11-27 14:19 ` Charles Keepax
2013-11-27 15:16 ` Mark Brown
2013-11-28 10:35 ` Mark Brown
1 sibling, 2 replies; 10+ messages in thread
From: Lee Jones @ 2013-11-27 13:24 UTC (permalink / raw)
To: Charles Keepax; +Cc: broonie, sameo, patches, linux-kernel
> 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
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH] mfd: wm5110: Give new AIF2 registers defaults and mark as readable
2013-11-27 13:24 ` Lee Jones
@ 2013-11-27 14:19 ` Charles Keepax
2013-11-27 15:16 ` Mark Brown
1 sibling, 0 replies; 10+ messages in thread
From: Charles Keepax @ 2013-11-27 14:19 UTC (permalink / raw)
To: Lee Jones; +Cc: broonie, sameo, patches, linux-kernel
On Wed, Nov 27, 2013 at 01:24:42PM +0000, Lee Jones wrote:
> > 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...
To be honest there is no urgent rush to get this in so it can
wait until the next cycle, I will just have to make sure I
remember to resend.
Thanks,
Charles
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] mfd: wm5110: Give new AIF2 registers defaults and mark as readable
2013-11-27 13:24 ` Lee Jones
2013-11-27 14:19 ` Charles Keepax
@ 2013-11-27 15:16 ` Mark Brown
2013-11-27 15:27 ` Lee Jones
1 sibling, 1 reply; 10+ messages in thread
From: Mark Brown @ 2013-11-27 15:16 UTC (permalink / raw)
To: Lee Jones; +Cc: Charles Keepax, sameo, patches, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 531 bytes --]
On Wed, Nov 27, 2013 at 01:24:42PM +0000, Lee Jones wrote:
> 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...
That seems excessive and it probably ought to go in as a bug fix
afterwards. Given that it's just an addition of data to the table I'd
expect we could cope, we've routinely done that with similar updates in
the past without incident.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] mfd: wm5110: Give new AIF2 registers defaults and mark as readable
2013-11-27 15:16 ` Mark Brown
@ 2013-11-27 15:27 ` Lee Jones
2013-11-27 16:07 ` Mark Brown
0 siblings, 1 reply; 10+ messages in thread
From: Lee Jones @ 2013-11-27 15:27 UTC (permalink / raw)
To: Mark Brown; +Cc: Charles Keepax, sameo, patches, linux-kernel
On Wed, 27 Nov 2013, Mark Brown wrote:
> On Wed, Nov 27, 2013 at 01:24:42PM +0000, Lee Jones wrote:
>
> > 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...
>
> That seems excessive and it probably ought to go in as a bug fix
> afterwards. Given that it's just an addition of data to the table I'd
> expect we could cope, we've routinely done that with similar updates in
> the past without incident.
Ah, is the depends patch in Mainline already? I assumed it was due to
go in during the v3.14 merge window? If it's already in Mainline, then
sure I don't mind if it goes in -fixes via ASoC, no problem.
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] mfd: wm5110: Give new AIF2 registers defaults and mark as readable
2013-11-27 15:27 ` Lee Jones
@ 2013-11-27 16:07 ` Mark Brown
2013-11-27 16:42 ` Lee Jones
0 siblings, 1 reply; 10+ messages in thread
From: Mark Brown @ 2013-11-27 16:07 UTC (permalink / raw)
To: Lee Jones; +Cc: Charles Keepax, sameo, patches, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 694 bytes --]
On Wed, Nov 27, 2013 at 03:27:01PM +0000, Lee Jones wrote:
> On Wed, 27 Nov 2013, Mark Brown wrote:
> > That seems excessive and it probably ought to go in as a bug fix
> > afterwards. Given that it's just an addition of data to the table I'd
> > expect we could cope, we've routinely done that with similar updates in
> > the past without incident.
> Ah, is the depends patch in Mainline already? I assumed it was due to
> go in during the v3.14 merge window? If it's already in Mainline, then
> sure I don't mind if it goes in -fixes via ASoC, no problem.
No, it's for v3.14 - it just seemed like for the size/impact of the
change we should be able to handle the situation more smoothly.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] mfd: wm5110: Give new AIF2 registers defaults and mark as readable
2013-11-27 16:07 ` Mark Brown
@ 2013-11-27 16:42 ` Lee Jones
2013-11-27 18:28 ` Mark Brown
0 siblings, 1 reply; 10+ messages in thread
From: Lee Jones @ 2013-11-27 16:42 UTC (permalink / raw)
To: Mark Brown; +Cc: Charles Keepax, sameo, patches, linux-kernel
On Wed, 27 Nov 2013, Mark Brown wrote:
> On Wed, Nov 27, 2013 at 03:27:01PM +0000, Lee Jones wrote:
> > On Wed, 27 Nov 2013, Mark Brown wrote:
>
> > > That seems excessive and it probably ought to go in as a bug fix
> > > afterwards. Given that it's just an addition of data to the table I'd
> > > expect we could cope, we've routinely done that with similar updates in
> > > the past without incident.
>
> > Ah, is the depends patch in Mainline already? I assumed it was due to
> > go in during the v3.14 merge window? If it's already in Mainline, then
> > sure I don't mind if it goes in -fixes via ASoC, no problem.
>
> No, it's for v3.14 - it just seemed like for the size/impact of the
> change we should be able to handle the situation more smoothly.
I see. Well I'm not sure how. If we apply it to either ASoC or MFD and
other patches pertaining to that file subsequently appear, then
conflict is likely. As you know, the commonly used mitigation
technique we usually employ is immutable branches, but this was not
employed in this case for one reason or another. So if we apply it now
to either one of the trees we will be hedging our bets.
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] mfd: wm5110: Give new AIF2 registers defaults and mark as readable
2013-11-27 16:42 ` Lee Jones
@ 2013-11-27 18:28 ` Mark Brown
2013-11-28 8:48 ` Lee Jones
0 siblings, 1 reply; 10+ messages in thread
From: Mark Brown @ 2013-11-27 18:28 UTC (permalink / raw)
To: Lee Jones; +Cc: Charles Keepax, sameo, patches, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 801 bytes --]
On Wed, Nov 27, 2013 at 04:42:02PM +0000, Lee Jones wrote:
> I see. Well I'm not sure how. If we apply it to either ASoC or MFD and
> other patches pertaining to that file subsequently appear, then
> conflict is likely. As you know, the commonly used mitigation
It shouldn't be that likely, we're adding entries to the middle of big,
ordered tables - conflicts would be caused by something like changing
or adding adjacent entries and they're pretty trivial to resolve. It's
not like a restructring of the code or anything.
> technique we usually employ is immutable branches, but this was not
> employed in this case for one reason or another. So if we apply it now
> to either one of the trees we will be hedging our bets.
Hedging our bets would be applying it to both trees!
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] mfd: wm5110: Give new AIF2 registers defaults and mark as readable
2013-11-27 18:28 ` Mark Brown
@ 2013-11-28 8:48 ` Lee Jones
0 siblings, 0 replies; 10+ messages in thread
From: Lee Jones @ 2013-11-28 8:48 UTC (permalink / raw)
To: Mark Brown; +Cc: Charles Keepax, sameo, patches, linux-kernel
> > I see. Well I'm not sure how. If we apply it to either ASoC or MFD and
> > other patches pertaining to that file subsequently appear, then
> > conflict is likely. As you know, the commonly used mitigation
>
> It shouldn't be that likely, we're adding entries to the middle of big,
> ordered tables - conflicts would be caused by something like changing
> or adding adjacent entries and they're pretty trivial to resolve. It's
> not like a restructring of the code or anything.
>
> > technique we usually employ is immutable branches, but this was not
> > employed in this case for one reason or another. So if we apply it now
> > to either one of the trees we will be hedging our bets.
>
> Hedging our bets would be applying it to both trees!
Well I'm sure we'd sort out any conflicts.
Go ahead and apply it to your tree with my Ack then.
In future, let's do the immutable branch thing, it's worked well thus
far.
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] mfd: wm5110: Give new AIF2 registers defaults and mark as readable
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
@ 2013-11-28 10:35 ` Mark Brown
1 sibling, 0 replies; 10+ messages in thread
From: Mark Brown @ 2013-11-28 10:35 UTC (permalink / raw)
To: Charles Keepax; +Cc: lee.jones, sameo, patches, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 226 bytes --]
On Wed, Nov 27, 2013 at 12:51:17PM +0000, Charles Keepax wrote:
> The registers associated with the new channels on AIF2 were accidentally
> missing defaults and not marked as readable this patch fixes this.
Applied, thanks.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2013-11-28 10:36 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
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
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.