From: Jean Delvare <jdelvare@suse.de>
To: Matt Fleming <matt@codeblueprint.co.uk>
Cc: Wim Van Sebroeck <wim@iguana.be>,
linux-kernel@vger.kernel.org, linux-watchdog@vger.kernel.org,
Mika Westerberg <mika.westerberg@linux.intel.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Wolfram Sang <wsa@the-dreams.de>,
Matt Fleming <matt.fleming@intel.com>
Subject: Re: [PATCH 3/5] iTCO_wdt: Add support for TCO on Intel Sunrisepoint
Date: Tue, 28 Jul 2015 19:03:41 +0200 [thread overview]
Message-ID: <1438103021.24962.46.camel@chaos.site> (raw)
In-Reply-To: <1438004292-16382-4-git-send-email-matt@codeblueprint.co.uk>
Hi Matt,
Le Monday 27 July 2015 à 14:38 +0100, Matt Fleming a écrit :
> From: Matt Fleming <matt.fleming@intel.com>
>
> The revision of the watchdog hardware in Sunrisepoint necessitates a new
> "version" inside the TCO watchdog driver because some of the register
> layouts have changed.
>
> Cc: Wim Van Sebroeck <wim@iguana.be>
> Signed-off-by: Matt Fleming <matt.fleming@intel.com>
> ---
> drivers/watchdog/iTCO_wdt.c | 58 ++++++++++++++++++++++++++-------------------
> 1 file changed, 34 insertions(+), 24 deletions(-)
>
> diff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c
> index 9a6e70976f64..17dfbc51b85a 100644
> --- a/drivers/watchdog/iTCO_wdt.c
> +++ b/drivers/watchdog/iTCO_wdt.c
> (...)
> @@ -503,7 +510,10 @@ static int iTCO_wdt_probe(struct platform_device *dev)
> pdata->name, pdata->iTCO_version, (u64)TCOBASE);
>
> /* Clear out the (probably old) status */
> - if (iTCO_wdt_private.iTCO_version == 3) {
> + if (iTCO_wdt_private.iTCO_version == 4) {
> + outw(0x0008, TCO1_STS); /* Clear the Time Out Status bit */
> + outw(0x0002, TCO2_STS); /* Clear SECOND_TO_STS bit */
> + } else if (iTCO_wdt_private.iTCO_version == 3) {
> outl(0x20008, TCO1_STS);
> } else {
> outw(0x0008, TCO1_STS); /* Clear the Time Out Status bit */
The "version == 4" branch is a subset of the "else" branch, so you could
merge both with a conditional. If you prefer not to, then it probably
makes sense to change the whole block to a switch/case construct.
--
Jean Delvare
SUSE L3 Support
next prev parent reply other threads:[~2015-07-29 6:44 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-27 13:38 [PATCH 0/5] iTCO_wdt: Add support for " Matt Fleming
2015-07-27 13:38 ` [PATCH 1/5] iTCO_wdt: Expose watchdog properties using platform data Matt Fleming
2015-07-27 13:49 ` Guenter Roeck
2015-07-27 14:19 ` Matt Fleming
2015-07-27 14:24 ` Guenter Roeck
2015-07-28 9:52 ` Matt Fleming
2015-07-27 15:33 ` Lee Jones
2015-07-27 15:45 ` Andy Shevchenko
2015-07-27 20:32 ` Matt Fleming
2015-07-27 21:32 ` Lee Jones
2015-07-28 9:16 ` Matt Fleming
2015-07-28 9:46 ` Lee Jones
2015-07-28 11:07 ` Matt Fleming
2015-07-28 11:37 ` Lee Jones
2015-07-28 12:43 ` Matt Fleming
2015-07-28 15:00 ` Lee Jones
2015-07-28 15:18 ` Guenter Roeck
2015-07-28 15:28 ` Lee Jones
2015-07-28 15:45 ` Matt Fleming
2015-07-28 15:56 ` Lee Jones
2015-07-28 17:08 ` Guenter Roeck
2015-07-28 17:32 ` Lee Jones
2015-07-28 18:51 ` Guenter Roeck
2015-07-29 7:30 ` Lee Jones
2015-07-29 9:04 ` Jean Delvare
2015-07-29 10:07 ` Lee Jones
2015-07-28 18:46 ` Aaron Sierra
2015-07-29 7:38 ` Lee Jones
2015-07-29 14:52 ` Aaron Sierra
2015-07-29 15:32 ` Lee Jones
2015-07-29 15:52 ` Guenter Roeck
2015-07-30 8:51 ` Lee Jones
2015-07-29 16:20 ` Aaron Sierra
2015-07-29 16:38 ` Guenter Roeck
2015-07-29 17:00 ` Aaron Sierra
2015-07-28 16:50 ` Jean Delvare
2015-07-29 7:27 ` Lee Jones
2015-07-29 7:29 ` Jean Delvare
2015-07-29 11:09 ` Matt Fleming
2015-07-27 13:38 ` [PATCH 2/5] i2c: i801: Create iTCO device on newer Intel PCHs Matt Fleming
2015-07-27 14:08 ` Guenter Roeck
2015-07-28 9:34 ` Matt Fleming
2015-07-27 13:38 ` [PATCH 3/5] iTCO_wdt: Add support for TCO on Intel Sunrisepoint Matt Fleming
2015-07-27 14:22 ` Guenter Roeck
2015-07-28 10:13 ` Matt Fleming
2015-07-28 17:03 ` Jean Delvare [this message]
2015-07-29 10:45 ` Matt Fleming
2015-07-27 13:38 ` [PATCH 4/5] iTCO_wdt: fixup for the header Matt Fleming
2015-07-27 14:13 ` Guenter Roeck
2015-07-28 9:17 ` Matt Fleming
2015-07-27 13:38 ` [PATCH 5/5] i2c-i801: fixup regarding watchdog timer Matt Fleming
2015-07-27 14:14 ` Guenter Roeck
2015-07-28 9:17 ` Matt Fleming
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=1438103021.24962.46.camel@chaos.site \
--to=jdelvare@suse.de \
--cc=andriy.shevchenko@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=matt.fleming@intel.com \
--cc=matt@codeblueprint.co.uk \
--cc=mika.westerberg@linux.intel.com \
--cc=wim@iguana.be \
--cc=wsa@the-dreams.de \
/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
all inboxes | Powered by JetHome®