From patchwork Mon Jul 29 07:47:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 11063385 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A1F5D13A4 for ; Mon, 29 Jul 2019 07:47:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 95279286AD for ; Mon, 29 Jul 2019 07:47:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 89BC5286E0; Mon, 29 Jul 2019 07:47:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3D0FC286AD for ; Mon, 29 Jul 2019 07:47:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=MA/v+L3UN1pOpBkll083A7bgOQ1YrzqY1SKInzWzL7g=; b=FtQEBKecdwOFfh Xspa2ByCSZ3pXtXXhl4NgschPQykg4UL5UzNJsHGoeYmwqcFnTEa9KOtnydludeLr/+BVp82tCR8q qMVdc+11rvQnJZltIJGMfJrY8rzpawJerqjPviz5TeK3CyIbosbqN7E6/RAJoQLN7wLk+OiZ/rYmu UaHYRzxSFIUtshlTDhb2pBFcdGxj+UsjWsKR0fKh5EfTOFvN5Tmg13/e6AFagzmcJNvtyZF0c4kr8 HWqsafKV3JL7NvfJdcSkbnsVm3vqofv1dGlPuZwP5hfGvabK6KL2H4V61lQV7rfrxuufFW3sQiPuA CVucfUXB2BqxmOdOZayQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hs0Nu-00024d-1E; Mon, 29 Jul 2019 07:47:54 +0000 Received: from mail-pg1-x544.google.com ([2607:f8b0:4864:20::544]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hs0Nq-00022k-Pm for linux-rockchip@lists.infradead.org; Mon, 29 Jul 2019 07:47:52 +0000 Received: by mail-pg1-x544.google.com with SMTP id l21so27804976pgm.3 for ; Mon, 29 Jul 2019 00:47:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8hP6rdkEvhhT0hEj14Sjz70+JpS0tBwbVOMye6DfvhQ=; b=Zw8yjHY7mHBX03i5BrKP7ZPH48R8qQyU8zs4fxsP6usxxN0gAdHYdHjaSce9sHnze7 UgOHcGxUjMhFYYpXeEfhxbWLnUB/dJuFGTb88pDalkgDgXv+zGromRF2VmR7mU0asgiz vxIDk9ntQw62/x0RBqfxiEisL2MIt7Qg8elpc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8hP6rdkEvhhT0hEj14Sjz70+JpS0tBwbVOMye6DfvhQ=; b=tjhtXDDrsX4J3vIFCf8+T8ItMfBxC2YfjsJHy8yKWZgJBEAjo8KbeJ5iInB9530p4h xjJ+9mCq9NCjkGRqoqE1anKAiqhN/Y11lYb8bF4tgoE9XaezXMnaate6kFjocQTAG1XJ 2uE1zYi4MmJroPo0uOISoqE8eESMJlMWDAqp/K3IfFOZATOg4cSPqKeZBt0BX+fuo354 oz5Ibd4lmEjKdFCZ5OOo4/NCSRG102V+Uq1rqtBobkCOwPzsC4HWjplMD0s99RH6X7im cCzQ5dyTIJ7g0wCHO9JJUlKShrUsWqptx+qSHT48+vbZz60bngKV+YnVCyQSZskp3lLI 8wZg== X-Gm-Message-State: APjAAAV+5Qy1EA1nZdhREb4mGhz0OE0VtVW7f+Su7lhgFwEp2OaOpRke Kjuoo8MSKBG5mDpCBFeXuE9eTA== X-Google-Smtp-Source: APXvYqx0+A8nmjzgHgyduAQfOs8A09ga/PRWHRqYcXWhr/YktN63Jiz7gtCnvmATDBfcuaShkhS2Tg== X-Received: by 2002:a17:90b:8cd:: with SMTP id ds13mr105023725pjb.141.1564386470284; Mon, 29 Jul 2019 00:47:50 -0700 (PDT) Received: from localhost.localdomain ([49.206.203.41]) by smtp.gmail.com with ESMTPSA id h14sm75723348pfq.22.2019.07.29.00.47.46 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 29 Jul 2019 00:47:49 -0700 (PDT) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Subject: [PATCH 07/15] wdt: designware: Simplify enable function Date: Mon, 29 Jul 2019 13:17:03 +0530 Message-Id: <20190729074711.16988-8-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190729074711.16988-1-jagan@amarulasolutions.com> References: <20190729074711.16988-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190729_004750_928864_E68344AE X-CRM114-Status: UNSURE ( 9.03 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-rockchip@lists.infradead.org, Chin Liang See , u-boot@lists.denx.de, Jagan Teki , Andy Shevchenko , linux-amarula@amarulasolutions.com, Akash Gajjar Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Simplify dw watchdog enable function by using proper macro and drop unwanted macros. Cc: Chin Liang See Cc: Andy Shevchenko Signed-off-by: Jagan Teki --- drivers/watchdog/designware_wdt.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/watchdog/designware_wdt.c b/drivers/watchdog/designware_wdt.c index bd858f0608..2979fda44e 100644 --- a/drivers/watchdog/designware_wdt.c +++ b/drivers/watchdog/designware_wdt.c @@ -14,7 +14,6 @@ #define DW_WDT_CR_EN_OFFSET 0x00 #define DW_WDT_CR_RMOD_OFFSET 0x01 -#define DW_WDT_CR_RMOD_VAL 0x00 #define DW_WDT_CRR_RESTART_VAL 0x76 /* @@ -38,9 +37,11 @@ static int designware_wdt_settimeout(unsigned int timeout) static void designware_wdt_enable(void) { - writel(((DW_WDT_CR_RMOD_VAL << DW_WDT_CR_RMOD_OFFSET) | - (0x1 << DW_WDT_CR_EN_OFFSET)), - (CONFIG_DW_WDT_BASE + DW_WDT_CR)); + u32 val = readl(CONFIG_DW_WDT_BASE + DW_WDT_CR); + + /* Enable watchdog */ + val |= DW_WDT_CR_RMOD_OFFSET; + writel(val, CONFIG_DW_WDT_BASE + DW_WDT_CR); } static unsigned int designware_wdt_is_enabled(void)