From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Linus Walleij <linus.walleij@linaro.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Mugunthan V N <mugunthanvnm@ti.com>,
Sebastian Siewior <bigeasy@linutronix.de>,
David Miller <davem@davemloft.net>,
netdev@vger.kernel.org
Subject: linux-next: manual merge of the pinctrl tree with Linus' tree
Date: Mon, 17 Jun 2013 16:11:27 +1000 [thread overview]
Message-ID: <20130617161127.f202c6abe603c9ff8b30fc7c@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1635 bytes --]
Hi Linus,
Today's linux-next merge of the pinctrl tree got a conflict in
drivers/net/ethernet/ti/davinci_mdio.c between commit 2786aae7fc93
("net/ti davinci_mdio: don't hold a spin lock while calling pm_runtime")
from Linus' tree and commit 5c0e3580cb98 ("drivers: net: davinci_mdio:
use pinctrl PM helpers") from the pinctrl tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/net/ethernet/ti/davinci_mdio.c
index c47f0db,5e361f4..0000000
--- a/drivers/net/ethernet/ti/davinci_mdio.c
+++ b/drivers/net/ethernet/ti/davinci_mdio.c
@@@ -449,22 -453,32 +453,28 @@@ static int davinci_mdio_suspend(struct
__raw_writel(ctrl, &data->regs->control);
wait_for_idle(data);
- pm_runtime_put_sync(data->dev);
-
data->suspended = true;
spin_unlock(&data->lock);
+ pm_runtime_put_sync(data->dev);
+ /* Select sleep pin state */
+ pinctrl_pm_select_sleep_state(dev);
+
return 0;
}
static int davinci_mdio_resume(struct device *dev)
{
struct davinci_mdio_data *data = dev_get_drvdata(dev);
- u32 ctrl;
+ /* Select default pin state */
+ pinctrl_pm_select_default_state(dev);
+
- spin_lock(&data->lock);
pm_runtime_get_sync(data->dev);
+ spin_lock(&data->lock);
/* restart the scan state machine */
- ctrl = __raw_readl(&data->regs->control);
- ctrl |= CONTROL_ENABLE;
- __raw_writel(ctrl, &data->regs->control);
+ __davinci_mdio_reset(data);
data->suspended = false;
spin_unlock(&data->lock);
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2013-06-17 6:11 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-17 6:11 Stephen Rothwell [this message]
2013-06-17 7:09 ` linux-next: manual merge of the pinctrl tree with Linus' tree Sebastian Andrzej Siewior
-- strict thread matches above, loose matches on Subject: below --
2013-12-13 4:02 linux-next: manual merge of the pinctrl tree with Linus'tree Stephen Rothwell
2013-12-13 4:01 linux-next: manual merge of the pinctrl tree with Linus' tree Stephen Rothwell
2013-08-29 7:17 Stephen Rothwell
2013-08-29 7:34 ` Linus Walleij
2013-08-29 7:45 ` Linus Walleij
2013-08-29 15:24 ` Sherman Yin
2013-08-29 17:20 ` Linus Walleij
2013-08-29 17:21 ` Linus Walleij
2012-10-12 3:30 Stephen Rothwell
2012-10-12 3:08 Stephen Rothwell
2012-10-12 3:01 Stephen Rothwell
2012-10-12 2:56 Stephen Rothwell
2012-05-28 3:08 Stephen Rothwell
2012-05-28 15:24 ` Linus Walleij
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=20130617161127.f202c6abe603c9ff8b30fc7c@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=bigeasy@linutronix.de \
--cc=davem@davemloft.net \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mugunthanvnm@ti.com \
--cc=netdev@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).