Signed-off-by: Roel Kluin <[email protected]>
---
drivers/pinctrl/mvebu/pinctrl-dove.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/pinctrl/mvebu/pinctrl-dove.c b/drivers/pinctrl/mvebu/pinctrl-dove.c
index 29f7e4f..360b9b2 100644
--- a/drivers/pinctrl/mvebu/pinctrl-dove.c
+++ b/drivers/pinctrl/mvebu/pinctrl-dove.c
@@ -335,7 +335,7 @@ static int dove_twsi_ctrl_set(struct mvebu_mpp_ctrl *ctrl,
unsigned long gcfg2 = readl(DOVE_GLOBAL_CONFIG_2);
gcfg1 &= ~DOVE_TWSI_ENABLE_OPTION1;
- gcfg2 &= ~(DOVE_TWSI_ENABLE_OPTION2 | DOVE_TWSI_ENABLE_OPTION2);
+ gcfg2 &= ~(DOVE_TWSI_ENABLE_OPTION2 | DOVE_TWSI_ENABLE_OPTION3);
switch (config) {
case 1:
--
1.8.1.2
Please include Thomas & Sebastian on the To: line when posting
patches to this driver.
On Mon, Oct 14, 2013 at 1:27 AM, Roel Kluin <[email protected]> wrote:
> Signed-off-by: Roel Kluin <[email protected]>
When you don't write a commit message I have no chance to
classify this patch.
- Is this a serious regression?
- Is this something that does not affect anybody, just a cleanup?
Please consult the following document:
Documentation/SubmittingPatches
Yours,
Linus Walleij
Dear Linus Walleij,
On Mon, 14 Oct 2013 09:08:11 +0200, Linus Walleij wrote:
> Please include Thomas & Sebastian on the To: line when posting
> patches to this driver.
... and you should quote the entire e-mail so it's easier for us to see
what it is all about :-))
Sebastian, the original e-mail is at
http://www.spinics.net/lists/kernel/msg1618853.html.
Since this is a Dove-specific pinctrl issue, and Sebastian is the one
knowing about Dove, I'll let him answer.
Best regards,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
On 10/14/2013 09:12 AM, Thomas Petazzoni wrote:
> On Mon, 14 Oct 2013 09:08:11 +0200, Linus Walleij wrote:
>> Please include Thomas & Sebastian on the To: line when posting
>> patches to this driver.
>
> ... and you should quote the entire e-mail so it's easier for us to see
> what it is all about :-))
>
> Sebastian, the original e-mail is at
> http://www.spinics.net/lists/kernel/msg1618853.html.
>
> Since this is a Dove-specific pinctrl issue, and Sebastian is the one
> knowing about Dove, I'll let him answer.
Roel,
thanks for the typo catch! Next time please always describe what and
why your patches are doing. No matter how simple the fix is. Also,
try to narrow down Cc recipients, e.g. Grant, Rob, and devtree ML
love to not getting bugged with this.
(removed them from Cc, added LAKML)
@Linus:
I guess the typo is there from the beginning. You know a good way to
determine how far it should go back to -stable?
Please apply with following commit msg (or request a proper v2):
"""
This fixes a typo which left twsi config3 option enabled.
"""
and
Acked-by: Sebastian Hesselbarth <[email protected]>
Sebastian
On Mon, Oct 14, 2013 at 08:43:49PM +0200, Sebastian Hesselbarth wrote:
...
> You know a good way to determine how far it should go back to -stable?
$ git blame -L 338,338 drivers/pinctrl/mvebu/pinctrl-dove.c
c9f95ced drivers/pinctrl/pinctrl-dove.c (Sebastian Hesselbarth
2012-09-13 17:41:44 +0200 338) gcfg2 &= ~(DOVE_TWSI_ENABLE_OPTION2 |
DOVE_TWSI_ENABLE_OPTION2);
$ git tag --contains c9f95ced | grep '^v[23]\.[0-9][0-9]*' | sed -r -e
's/^(v[23]\.[0-9][0-9]*).*$/\1.x/' | sort -uV
v3.7.x
v3.8.x
v3.9.x
v3.10.x
v3.11.x
v3.12.x
so it should get flagged for v3.7 and newer.
Watch out for really old stuff, the regex above doesn't properly handle
v2.6.XX.x...
hth,
Jason.
On 10/14/2013 09:02 PM, Jason Cooper wrote:
> On Mon, Oct 14, 2013 at 08:43:49PM +0200, Sebastian Hesselbarth wrote:
> ...
>> You know a good way to determine how far it should go back to -stable?
>
> $ git blame -L 338,338 drivers/pinctrl/mvebu/pinctrl-dove.c
> c9f95ced drivers/pinctrl/pinctrl-dove.c (Sebastian Hesselbarth
> 2012-09-13 17:41:44 +0200 338) gcfg2 &= ~(DOVE_TWSI_ENABLE_OPTION2 |
> DOVE_TWSI_ENABLE_OPTION2);
>
> $ git tag --contains c9f95ced | grep '^v[23]\.[0-9][0-9]*' | sed -r -e
> 's/^(v[23]\.[0-9][0-9]*).*$/\1.x/' | sort -uV
> v3.7.x
> v3.8.x
> v3.9.x
> v3.10.x
> v3.11.x
> v3.12.x
>
> so it should get flagged for v3.7 and newer.
>
> Watch out for really old stuff, the regex above doesn't properly handle
> v2.6.XX.x...
Ok, it is not in pre-v3.0, so the regex is fine. Thanks for the above -
and I also see git magic to resolve the rename of pinctrl-dove.c :)
If it originates from before the rename, I guess we need two different
-stable patches, one for pre-rename, one for post-rename?
Sebastian
On Mon, Oct 14, 2013 at 09:09:14PM +0200, Sebastian Hesselbarth wrote:
> On 10/14/2013 09:02 PM, Jason Cooper wrote:
> >On Mon, Oct 14, 2013 at 08:43:49PM +0200, Sebastian Hesselbarth wrote:
> >...
> >>You know a good way to determine how far it should go back to -stable?
> >
> >$ git blame -L 338,338 drivers/pinctrl/mvebu/pinctrl-dove.c
> >c9f95ced drivers/pinctrl/pinctrl-dove.c (Sebastian Hesselbarth
> >2012-09-13 17:41:44 +0200 338) gcfg2 &= ~(DOVE_TWSI_ENABLE_OPTION2 |
> >DOVE_TWSI_ENABLE_OPTION2);
> >
> >$ git tag --contains c9f95ced | grep '^v[23]\.[0-9][0-9]*' | sed -r -e
> >'s/^(v[23]\.[0-9][0-9]*).*$/\1.x/' | sort -uV
> >v3.7.x
> >v3.8.x
> >v3.9.x
> >v3.10.x
> >v3.11.x
> >v3.12.x
> >
> >so it should get flagged for v3.7 and newer.
> >
> >Watch out for really old stuff, the regex above doesn't properly handle
> >v2.6.XX.x...
>
> Ok, it is not in pre-v3.0, so the regex is fine. Thanks for the above -
> and I also see git magic to resolve the rename of pinctrl-dove.c :)
rename occurred in
06763c7 pinctrl: mvebu: move to its own directory
which was added to v3.8
> If it originates from before the rename, I guess we need two different
> -stable patches, one for pre-rename, one for post-rename?
No, the -stable maintainers handle that. If the patch is so complicated
that you need separate patches for the different stable trees, that's a
good indicator that it's not stable material. :-P
thx,
Jason.
Dear Jason Cooper,
On Mon, 14 Oct 2013 15:02:47 -0400, Jason Cooper wrote:
> On Mon, Oct 14, 2013 at 08:43:49PM +0200, Sebastian Hesselbarth wrote:
> ...
> > You know a good way to determine how far it should go back to -stable?
>
> $ git blame -L 338,338 drivers/pinctrl/mvebu/pinctrl-dove.c
> c9f95ced drivers/pinctrl/pinctrl-dove.c (Sebastian Hesselbarth
> 2012-09-13 17:41:44 +0200 338) gcfg2 &= ~(DOVE_TWSI_ENABLE_OPTION2 |
> DOVE_TWSI_ENABLE_OPTION2);
>
> $ git tag --contains c9f95ced | grep '^v[23]\.[0-9][0-9]*' | sed -r -e
> 's/^(v[23]\.[0-9][0-9]*).*$/\1.x/' | sort -uV
> v3.7.x
> v3.8.x
> v3.9.x
> v3.10.x
> v3.11.x
> v3.12.x
>
> so it should get flagged for v3.7 and newer.
>
> Watch out for really old stuff, the regex above doesn't properly handle
> v2.6.XX.x...
The pinctrl driver for mvebu platforms was added in 3.7, if I remember
correctly.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
On Mon, Oct 14, 2013 at 8:43 PM, Sebastian Hesselbarth
<[email protected]> wrote:
> @Linus:
> I guess the typo is there from the beginning. You know a good way to
> determine how far it should go back to -stable?
I just add CC: stable and the stable maintainers tend to figure
this out.
> Please apply with following commit msg (or request a proper v2):
>
> """
> This fixes a typo which left twsi config3 option enabled.
> """
>
> and
>
> Acked-by: Sebastian Hesselbarth <[email protected]>
OK patch applied and marked for stable.
Yours,
Linus Walleij