From: Guenter Roeck <linux@roeck-us.net>
To: "Ji-Ze Hong (Peter Hong)" <hpeter@gmail.com>
Cc: peter_hong@fintek.com.tw, wim@linux-watchdog.org,
linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org,
"Ji-Ze Hong (Peter Hong)" <hpeter+linux_kernel@gmail.com>
Subject: Re: [PATCH V2 2/2] watchdog: f71808e_wdt: fix F81866 bit operation
Date: Wed, 27 Mar 2019 10:32:39 -0700 [thread overview]
Message-ID: <20190327173239.GC9951@roeck-us.net> (raw)
In-Reply-To: <1553668971-18801-2-git-send-email-hpeter+linux_kernel@gmail.com>
On Wed, Mar 27, 2019 at 02:42:51PM +0800, Ji-Ze Hong (Peter Hong) wrote:
> Fix error bit operation in watchdog_start()
>
> Fixes: 14b24a88a3660 ("watchdog: f71808e_wdt: Add F81866 support")
> Signed-off-by: Ji-Ze Hong (Peter Hong) <hpeter+linux_kernel@gmail.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> ---
> drivers/watchdog/f71808e_wdt.c | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/watchdog/f71808e_wdt.c b/drivers/watchdog/f71808e_wdt.c
> index bd2ced9f39f4..afd1446241b3 100644
> --- a/drivers/watchdog/f71808e_wdt.c
> +++ b/drivers/watchdog/f71808e_wdt.c
> @@ -339,6 +339,7 @@ static int f71862fg_pin_configure(unsigned short ioaddr)
> static int watchdog_start(void)
> {
> int err;
> + u8 tmp;
>
> /* Make sure we don't die as soon as the watchdog is enabled below */
> err = watchdog_keepalive();
> @@ -388,19 +389,18 @@ static int watchdog_start(void)
> break;
>
> case f81866:
> - /* Set pin 70 to WDTRST# */
> - superio_clear_bit(watchdog.sioaddr, SIO_F81866_REG_PORT_SEL,
> - BIT(3) | BIT(0));
> - superio_set_bit(watchdog.sioaddr, SIO_F81866_REG_PORT_SEL,
> - BIT(2));
> /*
> * GPIO1 Control Register when 27h BIT3:2 = 01 & BIT0 = 0.
> * The PIN 70(GPIO15/WDTRST) is controlled by 2Ch:
> * BIT5: 0 -> WDTRST#
> * 1 -> GPIO15
> */
> - superio_clear_bit(watchdog.sioaddr, SIO_F81866_REG_GPIO1,
> - BIT(5));
> + tmp = superio_inb(watchdog.sioaddr, SIO_F81866_REG_PORT_SEL);
> + tmp &= ~(BIT(3) | BIT(0));
> + tmp |= BIT(2);
> + superio_outb(watchdog.sioaddr, SIO_F81866_REG_PORT_SEL, tmp);
> +
> + superio_clear_bit(watchdog.sioaddr, SIO_F81866_REG_GPIO1, 5);
> break;
>
> default:
> --
> 2.7.4
>
next prev parent reply other threads:[~2019-03-27 17:32 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-27 6:42 [PATCH V2 1/2] watchdog: f71808e_wdt: separate declaration and assignment Ji-Ze Hong (Peter Hong)
2019-03-27 6:42 ` [PATCH V2 2/2] watchdog: f71808e_wdt: fix F81866 bit operation Ji-Ze Hong (Peter Hong)
2019-03-27 17:32 ` Guenter Roeck [this message]
2019-03-27 17:32 ` [PATCH V2 1/2] watchdog: f71808e_wdt: separate declaration and assignment Guenter Roeck
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=20190327173239.GC9951@roeck-us.net \
--to=linux@roeck-us.net \
--cc=hpeter+linux_kernel@gmail.com \
--cc=hpeter@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=peter_hong@fintek.com.tw \
--cc=wim@linux-watchdog.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).