From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3EFD0C433EB for ; Mon, 20 Jul 2020 16:05:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 106D02065E for ; Mon, 20 Jul 2020 16:05:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595261120; bh=skdvEiz7c1Tv5JbxH89mctTRqiNTBfFs1t1/vJk7+Ds=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Xdv4ly8PgWGiUdB5v+kCis05QUlP5nc9CLGlGCqFGVYVxvZxjV+fM+v3r6wwGiXYd d51QJRH/Uk1yy2vAMe65xbjOvKGvGvDczqYkERSD8pPzl/C4ZDWbDTP4x/kkHQqeDv ek9BQq1yMu/TasTLvGi+0vYICiQupsOF3rjTk2jc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732110AbgGTQFG (ORCPT ); Mon, 20 Jul 2020 12:05:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:40306 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732921AbgGTQFE (ORCPT ); Mon, 20 Jul 2020 12:05:04 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A1DB62064B; Mon, 20 Jul 2020 16:05:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595261104; bh=skdvEiz7c1Tv5JbxH89mctTRqiNTBfFs1t1/vJk7+Ds=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ejaCOhViYwvtqHKD/cK1iBH+t+VVyC+aAzyhmym0OSDeQnXCvdG0RfHqbxbpnJ5mm i8rM/abN2Rms/VryZqG/gegWYBf+RriCcGpMVtVqxp6fVigW2VOZP44DCNsUKl5pIw zRsH6rAg+3xvyVt2SwDzpBjeTOPfS9E/70JsuBaE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lingling Xu , Chunyan Zhang , Mark Brown Subject: [PATCH 5.4 211/215] spi: sprd: switch the sequence of setting WDG_LOAD_LOW and _HIGH Date: Mon, 20 Jul 2020 17:38:13 +0200 Message-Id: <20200720152830.185982858@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200720152820.122442056@linuxfoundation.org> References: <20200720152820.122442056@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Lingling Xu commit 8bdd79dae1ff5397351b95e249abcae126572617 upstream. The watchdog counter consists of WDG_LOAD_LOW and WDG_LOAD_HIGH, which would be loaded to watchdog counter once writing WDG_LOAD_LOW. Fixes: ac1775012058 ("spi: sprd: Add the support of restarting the system") Signed-off-by: Lingling Xu Signed-off-by: Chunyan Zhang Link: https://lore.kernel.org/r/20200602082415.5848-1-zhang.lyra@gmail.com Signed-off-by: Mark Brown Signed-off-by: Greg Kroah-Hartman --- drivers/spi/spi-sprd-adi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/spi/spi-sprd-adi.c +++ b/drivers/spi/spi-sprd-adi.c @@ -384,9 +384,9 @@ static int sprd_adi_restart_handler(stru sprd_adi_write(sadi, sadi->slave_pbase + REG_WDG_LOCK, WDG_UNLOCK_KEY); /* Load the watchdog timeout value, 50ms is always enough. */ + sprd_adi_write(sadi, sadi->slave_pbase + REG_WDG_LOAD_HIGH, 0); sprd_adi_write(sadi, sadi->slave_pbase + REG_WDG_LOAD_LOW, WDG_LOAD_VAL & WDG_LOAD_MASK); - sprd_adi_write(sadi, sadi->slave_pbase + REG_WDG_LOAD_HIGH, 0); /* Start the watchdog to reset system */ sprd_adi_read(sadi, sadi->slave_pbase + REG_WDG_CTRL, &val);