From patchwork Mon Jul 29 07:47:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 818 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pg1-f198.google.com (mail-pg1-f198.google.com [209.85.215.198]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id E65303F0E1 for ; Mon, 29 Jul 2019 09:48:00 +0200 (CEST) Received: by mail-pg1-f198.google.com with SMTP id a21sf30820068pgv.0 for ; Mon, 29 Jul 2019 00:48:00 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1564386479; cv=pass; d=google.com; s=arc-20160816; b=N94+y0ZpTk1ne9FGBmMbnLzGDH3jCYvonzoC57XQHT0/iOhtDW4kKAddLtNiWywmSH 96M8z/vJdJxA5XJ54N08/FG6g0n09Lo0HvPDwgulcQr9Iire/FYAQuym0k7m8qoJF/hI y9kfuTxQqvmgLvzeeBxDyQuMabZK/BXFCrpwUPXc3AM1HGqC+Sr7CsSpbo32SL7e7i7E EL+MVWz1eUnbnsYyTmhlEHpXHe4/3W4fP5JQKp5Nkn9nPMU/cTNmETTODpp2y+Di6axr rmkWUOv8Owr+tPOsEJbBYIEWPo1EDjJnkcBMLZORVHdq0ECB0AL2gcs8aBHPdYsYqFeF egnw== 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=Ikiod1bAqfTMgm5RsSCbSbiZ1A6ZEV5mjCMW7p7jOvI=; b=CB85WBvBlIS+OmDHdO59MghjvO/QU2lEpCqqBe3+X3XxetMwps53goSx84jqMC+88a O/+qiYP5fZQ7k93u0BW0khtdSGuhpyDjEOartSXXI85aSFUogH8EecD+MjeqygM/QUu8 /R1hIwCwHD9eCb+VLYFVWnI29qwdWwfq7JPuKYK8SiNRVOmZFHFRQlrOV7OKG0bXYxQz UJl6ewwhH53ocLwfJoxgsRJAQ1mtKjzaSs7x5hmawE2lPedU2Y7jC32a3OHEBwA+9/jw 84Z0wGIy4kpn6X1jIqdvSdrrNvDKY/84VJYQ+c54uPYm5SLgwYTCCx07UR+PCGxRac8f 2hLw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=MBdweSrM; 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=Ikiod1bAqfTMgm5RsSCbSbiZ1A6ZEV5mjCMW7p7jOvI=; b=WJH8vkbLTZM388TbS0v8YroWIFkw0w+FVCZlmpNGdCbfRddzzQQESLfel65tj4k4WY tCEuKJO9itnkVGBEZT9wwdQ0kP6Gr5ZYYyJqI7Iu3K1629X4t0n+fuVfIY4Ib0TkxVe2 Ygaa1/BOJ6WxkQTLUfnSyzgHSDL0/zGRGWBCc= 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=Ikiod1bAqfTMgm5RsSCbSbiZ1A6ZEV5mjCMW7p7jOvI=; b=MzOkmb3EFtF1n5w/Z6ni29X+cTToLNaqJn/dWcBSt3pn+Qy//QgdC1sfRaRnQp1T5h xMyIikPvUD1YlpEW9GfO4xFeXWHUM9mLWLn/aVl8zlQti2kf+KU0LVU2jk2rq7EPp/CD ppmRZPifyf+uVHkdhfxzBb4Oa/67l/3z5Oa4oRibygftx4nbHyNhkl7eDxZG5Cl1N9xZ bcOr5sWwynQB+mb3ZWFCZtB9AKuhUYRYVF8jYqDZCsPQcRAfvcu3clnwr62luB+PbV2z hAAosRVljHaPoysLvZGBJKiwODvoOnwQtProWMRZjQ64m5j3ecNpoJ2ve0+IhvvZ8czm WLuQ== X-Gm-Message-State: APjAAAUaQFxbUyRwzVKlmVpeL/+Jt2iMptr0ql8RmwxTZg6qBmH70FVh ey8XqlQ5Lh3M4+k1fBluGxMsH39J X-Google-Smtp-Source: APXvYqxugTEOlLFne3atbVe93a1Wssgy6VYyCsrdNPSzTt/0+V5gXqyFr+yGNf0sJ5Ph4sDLWyDzcg== X-Received: by 2002:a17:902:2ac8:: with SMTP id j66mr103777693plb.273.1564386479732; Mon, 29 Jul 2019 00:47:59 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a62:75ce:: with SMTP id q197ls12391196pfc.3.gmail; Mon, 29 Jul 2019 00:47:59 -0700 (PDT) X-Received: by 2002:a65:49cc:: with SMTP id t12mr96252399pgs.83.1564386479260; Mon, 29 Jul 2019 00:47:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564386479; cv=none; d=google.com; s=arc-20160816; b=Yyzo+kChRk+uD5vTZeTvT6Z3xWhHof5RhHvLUqg2FPrKg0r1zYzVEc2sthJ7LBN61i PSD8+omd2E324GC8cllK12VpXswDPxl11gjB9yXq2cW3se5sRZrbV8dvtuqcGaqjFIVD RIc3gkoDpXgIg9vULrMLSuPDpWW4r6kmWoreYyzCuJnNbvIT5E/wTaYqThuJDvnfRra4 K6N22zr1kAN7fIfpqOnWTtlgMl1ksxHyZaNzBABiowPJUaIt7tYikmoab1C6VKdO1jcO FRbFfYFOKQh2an3i07SVqA7WcmF95Q/eJduFP25NX5MvWJkO/2SPJ/keYbYKp8FnALHy BpOw== 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=hh6Zq8q5k9JEDwSOsX0RjFgz0CKFycTyn3roDfu0XeM=; b=PKtRxhzgHJzZt+04g900kX/wl6hqc6GBo6hOf9NxEZ5rDDJgvRTVJdrQ8JoV9kfIY+ RNoz1relxJYeh4xXEaYc5+YMmxijizw35AnCh74tymeE5Epl77ZQukaTtY1RCUr9W5m5 jpP5gWNTLUZIdQT6P6ZNGkk9XbtNLbtY0YB1kuCarfUxhV72+n2P3KYbTbbMw696Vvai sXm1+IvGXmyhSNnBDyCce1MhgwIb3KptzaT41z1MLClRCkp5VPMY6iE+MRMyU0Ho2k+V x/mBClfASVnSC9ndbfAjRSz/m5eb7mdJ6zzBE0bLcwq5sRRmfu4CbsVuRvVt3llxf3Ok RbVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=MBdweSrM; 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 b84sor42116549pfb.57.2019.07.29.00.47.59 for (Google Transport Security); Mon, 29 Jul 2019 00:47:59 -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:aa7:8acb:: with SMTP id b11mr33967451pfd.109.1564386478973; Mon, 29 Jul 2019 00:47:58 -0700 (PDT) Received: from localhost.localdomain ([49.206.203.41]) by smtp.gmail.com with ESMTPSA id h14sm75723348pfq.22.2019.07.29.00.47.55 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 29 Jul 2019 00:47:58 -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 09/15] wdt: dw: Rename to dw_wdt.c Date: Mon, 29 Jul 2019 13:17:05 +0530 Message-Id: <20190729074711.16988-10-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-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=MBdweSrM; 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 4760d728f3..79efef0792 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -95,7 +95,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 68c989aa0b..a14fdabf8d 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_WDT) += wdt-uclass.o obj-$(CONFIG_WDT_SANDBOX) += sandbox_wdt.o @@ -23,6 +22,7 @@ obj-$(CONFIG_WDT_BCM6345) += bcm6345_wdt.o obj-$(CONFIG_BCM2835_WDT) += bcm2835_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 d1034ac280..65f02eca2e 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 8d2971c6e2..3582aec822 100644 --- a/include/configs/socfpga_stratix10_socdk.h +++ b/include/configs/socfpga_stratix10_socdk.h @@ -161,7 +161,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 e616f7229b..f2453728c6 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -323,7 +323,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