From patchwork Mon Aug 26 18:21: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: 833 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-oi1-f198.google.com (mail-oi1-f198.google.com [209.85.167.198]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 693983F0E1 for ; Mon, 26 Aug 2019 20:21:31 +0200 (CEST) Received: by mail-oi1-f198.google.com with SMTP id l15sf5963013oic.13 for ; Mon, 26 Aug 2019 11:21:31 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1566843690; cv=pass; d=google.com; s=arc-20160816; b=mAj8GWsUU3Gd+fQBQc95b4I70aM03g3jznFsDlzW8VZHKHjnlBIaRIrwZzM3Xj5wCS KAAYkGDCFgLQEzue0cUw3q8I/SrvRBVyGN+GEkDqck59JuzTDvQOytl+sUPe+kVEvcZM Abeord6eNq1lNVV17J8TohLhOY4LCJ53VZE9OY1bm2dLK1GPR/uqGTcAGHLU1UY3yRAK LzumJ3+PCdyTpl1NmBP8EzKxU0vsJ3n/9bgLX6hvNm35k0PS5QnkUfaAtyUt79MgsPSR E18SiXcFxQTyBwlKFcjKK653UjXOgqDRWP/PAW5uvVK6EIJogaexj38XhzAQZZNw7xnG llew== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=jdoDzA1GaTj8zZ+K+wE6D22zVJjDV9aNmxjeuVGrtKQ=; b=FxErH1W5YxJx6ky7aK8rsZlK64H4cQfDSeECtSVdBZxBwCfK3NNFZQQCApxkml2Ixm ZmgafF1DaCbiOT9gfJtypsSI2tfke2LiYDkveR7C/p9uQ/5xQ1wfDpgAd8gGd0bPomSG 7VLkh6GsuB9DkHlyzyaSRnxBWkWEnhLQxzH1eGxkke/zhdKicuaJET5IdSCAzJwSx5qe u04q+PWOTTCCVXnefQWtTybxCvOefwiaTIAcJQKkYkLiZIg1RGOEHzAy0Xxh431SoKn6 fhO0FZz5Ef5UEabmddRmFWMkd+iuGz2WOZ2UKG2flqUjL5lXh2JGxAg6oQZg2NpfSKrp mbVA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b="RDu/HXwV"; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com 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:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=jdoDzA1GaTj8zZ+K+wE6D22zVJjDV9aNmxjeuVGrtKQ=; b=dJ9WA/mTG+9CPkAusAcE1KBTbSkYEa0aDV5dyDWTPG1iUae30Y7yL0Bd2GxTOhogV9 7emN0LEILSFoALzK/eeZIDwuCsZvzm6WY8fHlbVsnbqTvV59VuI4aNHdBTnzUjr9CYt8 n7aYcX1JSFilFtn6+PPUpaNVCMb+snMl/Qbn8= 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:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=jdoDzA1GaTj8zZ+K+wE6D22zVJjDV9aNmxjeuVGrtKQ=; b=lHGPPx+815hb3amDwaOeGuMuouuNn8tBUzOdgeddePzmerT0N6bJ5lfGUJp1fdTpvt 7YaJemQFneOIKgvSmS9Ep8+l8W2wRbEcjAAa+D26oGqv2Mpt7Hlj/hPvYBrZJQMfJLs7 WICahdSk85VS2VZq2JaIdxEc8Srhq9K/Uj3DTM/R4VP6L8F7QSDDHyeO8edPU8ZTe62w Je/teo/B5VZwGJCEJotDWmBFEQYfFHdF1ZOuoTuaef57d4c9ogYpn8ETUPeEZfT20iae 0vhqbrOiy7PEBdlrFic/gVv5teCR4GPSgOr8ZU83PUQpvevF+vHNNVcX/AodclQ1BpfD oQyA== X-Gm-Message-State: APjAAAXQoarJWPI7NKG8l5wvdPDNzKzWL5Jb57Jv5bWKM5Ls8dwKKy4z FxmjFc53FtqF9C69qt5+lHdA8k/g X-Google-Smtp-Source: APXvYqxfwTToX725bNUHu3G7TSWgL8iy1E1h8oMdSOWsVc5GIKHvGwyqJcQNxPcc72hnJGnzGy4nRA== X-Received: by 2002:a05:6830:1311:: with SMTP id p17mr16105195otq.2.1566843690388; Mon, 26 Aug 2019 11:21:30 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:aca:754b:: with SMTP id q72ls410757oic.14.gmail; Mon, 26 Aug 2019 11:21:30 -0700 (PDT) X-Received: by 2002:a54:4016:: with SMTP id x22mr13636637oie.27.1566843690042; Mon, 26 Aug 2019 11:21:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566843690; cv=none; d=google.com; s=arc-20160816; b=AYbYdOEeFirOwIhkp/s3KDr66RL0eEXz2giauHNCG5XPv2rl/az7VXtU2m3tp/oTTq OTN2CxrOtwpu4dPEtqiKj1XpNZe7PC52ul9MYNi9+F2Ozcacb7H7tQlrzJA0wNjPz3kt YtfiANrB0eh0ccFOlDXoACIwYQ1wIzNu8OgBo0SdnN8MjDMDlj8MOUKwnl3JK59wYzxx ckd+xqjO5+P4nU3m/BIWlUD8SweBNOSD4VKwe5BGIy8WIEy8zVlFjKhBcjILWEjF3fNW cUkD30qEmhPM/w1zekznM2z8o6NtQx5puEcq8ouxmdPz0PypuouNEoqPqxuthy9Xwn7o 6XBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=qO2o3JiSSK7DhHkxgiIofrCT8NvSiNOXOxqZG/yKu8I=; b=RrzA3fMyKU/1zmDJ7lCHX4nlGAmOP6A6wABPZpnGTpra/duXp7Rcg+Nm4PZy2x95Ay J3XIfOxf6PE0qmYPA095sF6loi2olQI3dez8eYCKhboReF/nT2S3mf1W4UZk6nH+y8fU Kv+p2Cs8+VmztUBeE6WXqFuSa64463+0XhrdGZRiAEGfqS/m25IC487In8YZqYbksEuJ s+Zu9hJyvhHanEst80DIktaYZ4mIiHHoksoqqU3lRzYkV83Q7hGf1zTFu7qhz8Mtsu1B cxBi6UVPbVZMWvWHzV3icQr6kbJBSPq+vG/OX94yCAsSF2LbrKsDbdzrTr2xzgNhMXlV oQyg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b="RDu/HXwV"; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id h26sor5155204oih.80.2019.08.26.11.21.30 for (Google Transport Security); Mon, 26 Aug 2019 11:21:30 -0700 (PDT) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; X-Received: by 2002:aca:4ecd:: with SMTP id c196mr13866597oib.10.1566843689672; Mon, 26 Aug 2019 11:21:29 -0700 (PDT) Received: from jagan-XPS-13-9350.attlocal.net ([2600:1700:7430:38e0:d5b0:4823:33c8:5e46]) by smtp.gmail.com with ESMTPSA id c11sm4401461otr.54.2019.08.26.11.21.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Aug 2019 11:21:29 -0700 (PDT) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Cc: Akash Gajjar , u-boot@lists.denx.de, linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, Jagan Teki , Dinh Nguyen , Chin-Liang See Subject: [PATCH v2 08/16] wdt: dw: Rename to dw_wdt.c Date: Mon, 26 Aug 2019 23:51:03 +0530 Message-Id: <20190826182111.30999-9-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190826182111.30999-1-jagan@amarulasolutions.com> References: <20190826182111.30999-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b="RDu/HXwV"; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , - use dw instead of designware for driver file since Linux following the same. - add CONFIG macro start with CONFIG_WDT since the driver mode wdt drivers follow this. Cc: Dinh Nguyen Cc: Chin-Liang See Signed-off-by: Jagan Teki --- common/board_f.c | 2 +- drivers/watchdog/Makefile | 2 +- drivers/watchdog/{designware_wdt.c => dw_wdt.c} | 0 include/configs/socfpga_common.h | 2 +- include/configs/socfpga_stratix10_socdk.h | 2 +- scripts/config_whitelist.txt | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-) rename drivers/watchdog/{designware_wdt.c => dw_wdt.c} (100%) diff --git a/common/board_f.c b/common/board_f.c index 31181a9dc4..33e69c645a 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -97,7 +97,7 @@ static int init_func_watchdog_init(void) # if defined(CONFIG_HW_WATCHDOG) && \ (defined(CONFIG_M68K) || defined(CONFIG_MICROBLAZE) || \ defined(CONFIG_SH) || \ - defined(CONFIG_DESIGNWARE_WATCHDOG) || \ + defined(CONFIG_WDT_DW) || \ defined(CONFIG_IMX_WATCHDOG)) hw_watchdog_init(); puts(" Watchdog enabled\n"); diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile index 955caef815..ecdc1ce54f 100644 --- a/drivers/watchdog/Makefile +++ b/drivers/watchdog/Makefile @@ -13,7 +13,6 @@ endif obj-$(CONFIG_S5P) += s5p_wdt.o obj-$(CONFIG_XILINX_TB_WATCHDOG) += xilinx_tb_wdt.o obj-$(CONFIG_OMAP_WATCHDOG) += omap_wdt.o -obj-$(CONFIG_DESIGNWARE_WATCHDOG) += designware_wdt.o obj-$(CONFIG_ULP_WATCHDOG) += ulp_wdog.o obj-$(CONFIG_$(SPL_TPL_)WDT) += wdt-uclass.o obj-$(CONFIG_WDT_SANDBOX) += sandbox_wdt.o @@ -22,6 +21,7 @@ obj-$(CONFIG_WDT_ASPEED) += ast_wdt.o obj-$(CONFIG_WDT_BCM6345) += bcm6345_wdt.o obj-$(CONFIG_WDT_ORION) += orion_wdt.o obj-$(CONFIG_WDT_CDNS) += cdns_wdt.o +obj-$(CONFIG_WDT_DW) += dw_wdt.o obj-$(CONFIG_WDT_MPC8xx) += mpc8xx_wdt.o obj-$(CONFIG_WDT_MT7621) += mt7621_wdt.o obj-$(CONFIG_WDT_MTK) += mtk_wdt.o diff --git a/drivers/watchdog/designware_wdt.c b/drivers/watchdog/dw_wdt.c similarity index 100% rename from drivers/watchdog/designware_wdt.c rename to drivers/watchdog/dw_wdt.c diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 36b0ed5459..902909216d 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -105,7 +105,7 @@ * L4 Watchdog */ #ifdef CONFIG_HW_WATCHDOG -#define CONFIG_DESIGNWARE_WATCHDOG +#define CONFIG_WDT_DW #define CONFIG_DW_WDT_BASE SOCFPGA_L4WD0_ADDRESS #define CONFIG_DW_WDT_CLOCK_KHZ 25000 #define CONFIG_WATCHDOG_TIMEOUT_MSECS 30000 diff --git a/include/configs/socfpga_stratix10_socdk.h b/include/configs/socfpga_stratix10_socdk.h index 90ad8172e2..5d03bfd061 100644 --- a/include/configs/socfpga_stratix10_socdk.h +++ b/include/configs/socfpga_stratix10_socdk.h @@ -162,7 +162,7 @@ unsigned int cm_get_qspi_controller_clk_hz(void); */ #ifdef CONFIG_SPL_BUILD #define CONFIG_HW_WATCHDOG -#define CONFIG_DESIGNWARE_WATCHDOG +#define CONFIG_WDT_DW #define CONFIG_DW_WDT_BASE SOCFPGA_L4WD0_ADDRESS #ifndef __ASSEMBLY__ unsigned int cm_get_l4_sys_free_clk_hz(void); diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 661c8b6427..35c56262ed 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -321,7 +321,7 @@ CONFIG_DEFAULT_IMMR CONFIG_DEF_HWCONFIG CONFIG_DELAY_ENVIRONMENT CONFIG_DESIGNWARE_ETH -CONFIG_DESIGNWARE_WATCHDOG +CONFIG_WDT_DW CONFIG_DEVELOP CONFIG_DEVICE_TREE_LIST CONFIG_DFU_ALT