From patchwork Mon Jul 29 07:46:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 11063375 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 457A8174A for ; Mon, 29 Jul 2019 07:47:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 37AF7286BF for ; Mon, 29 Jul 2019 07:47:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2B44028703; Mon, 29 Jul 2019 07:47:37 +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 8C2C3286BF for ; Mon, 29 Jul 2019 07:47:36 +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=PoDp/LQKN5c8VKs3DaqzeM19jRKiGXwWdydGbgnrKi0=; b=CPsizJ3QMB+DSu i4YtR5gZre1QKubxN5ndBzaWPt4zdkWWNga/BqrseBRoRil/Af35b6sPDHVi9uzAkiS68OgU/XBrs IhuYHzggRASS3huGpqT5IZ8eQJh7/0ZZPvgIeZKU6j2X2PKxEVoiWZgqf6GWCnLrO46G2IDgxzBgV IY8/ZFeg/dlVOFJXhYAKYY2sCZpe+zCvQAq8nAyh1eT1YeOcky4dOP7vtokNAR2KaxEgeigIiBbTt wIKG6kBLIyWggkI+7HxfSd5svSb+DzUr+YmGCrL3xmPOt+ZrokAnWAUQEKlMK5UqFTDRb7gmKOruF Wr2X9kwdrkEo+PycGZ5w==; 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 1hs0NW-0001oe-Dx; Mon, 29 Jul 2019 07:47:30 +0000 Received: from mail-pf1-x443.google.com ([2607:f8b0:4864:20::443]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hs0NS-0001nP-Hi for linux-rockchip@lists.infradead.org; Mon, 29 Jul 2019 07:47:28 +0000 Received: by mail-pf1-x443.google.com with SMTP id p184so27570976pfp.7 for ; Mon, 29 Jul 2019 00:47:26 -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=8OIOV+UE8ZbIkjguEi4aoCp9GMNHCgAZTjnew6eqK2M=; b=Cf3TC4YQPkizGBSyao/hqd9J0Qpb7S2Y9Vm70mFQvJ1RVkLUe039HMVmZujGoi+2LW 9zxq7pBfIwVmauVfpxh3eZ0yiT62xCUE1C4ISWfrYbO84E3KJuos2eSbKJcFHuOVXE1A 5UGBL6MB39kxVKKyU6+C8p9Nvnum/CyeOnIK0= 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=8OIOV+UE8ZbIkjguEi4aoCp9GMNHCgAZTjnew6eqK2M=; b=mI14w2T3Ymw4VykNrrbPQoq+ZNlmXVOl75XllBKmDb2W/y67ZwmxTUie288tcJ1thh 0N1eqH5V9ID0KmoC6pYlpBoWjCzecFBrnbjihy2B1WTNc1ZcokeUzui7VWj82b8Xz8nw 9EdYc9InM0t1QUzXD2JlVDoHarEYXiZHVm6TurUX/GgUzhv78pUvdJRh5Vz8fjwLUYiK EO1FYJCVZLuolnhjV4FyfcvIbH38Z5JOX2qGIrdK4ylHwWDbg5aqo4F0TdKmjCl2I2+T wA2pq1d4jr7aPoK+aT5oDrhccbIgthHnUkKtnCUWBS0hq3FeOlJ5LFRfF2x5/FNyttRx Bkfw== X-Gm-Message-State: APjAAAUiEQOBZKzpJQ4AIosciyeizyLbmy+mlpp5C0TwESH2cSGKdn1c V77URufqtYltDBTXGao/3seq0w== X-Google-Smtp-Source: APXvYqwe5BRqCXtAllzes0eKWa6WmJqLG0Pp/cy/uIAzpAuiZ17NNS1YE5aHtkyibSQzH0jD7ft6Sg== X-Received: by 2002:a17:90a:a404:: with SMTP id y4mr114436155pjp.58.1564386445900; Mon, 29 Jul 2019 00:47:25 -0700 (PDT) Received: from localhost.localdomain ([49.206.203.41]) by smtp.gmail.com with ESMTPSA id h14sm75723348pfq.22.2019.07.29.00.47.22 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 29 Jul 2019 00:47:25 -0700 (PDT) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Subject: [PATCH 01/15] arm: rockchip: Add common cru.h Date: Mon, 29 Jul 2019 13:16:57 +0530 Message-Id: <20190729074711.16988-2-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_004726_584297_7B7C7C70 X-CRM114-Status: GOOD ( 12.15 ) 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: Jagan Teki , u-boot@lists.denx.de, linux-amarula@amarulasolutions.com, Akash Gajjar , linux-rockchip@lists.infradead.org Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Few of the rockchip family SoC atleast rk3288, rk3399 are sharing some cru register bits so adding common code between these SoC families would require to include both cru include files that indeed resulting function declarations error. So, create a common cru include as cru.h then include the arch cru include file and move the common cru register bit definitions into it. Signed-off-by: Jagan Teki --- arch/arm/include/asm/arch-rockchip/cru.h | 16 ++++++++++++++++ arch/arm/mach-rockchip/rk3288-board.c | 2 +- arch/arm/mach-rockchip/rk3288/clk_rk3288.c | 2 +- arch/arm/mach-rockchip/rk3399-board-spl.c | 2 +- arch/arm/mach-rockchip/rk3399/clk_rk3399.c | 2 +- drivers/clk/rockchip/clk_rk3288.c | 2 +- drivers/clk/rockchip/clk_rk3399.c | 2 +- drivers/ram/rockchip/sdram_rk3288.c | 2 +- drivers/ram/rockchip/sdram_rk3399.c | 2 +- drivers/video/rockchip/rk3288_mipi.c | 2 +- drivers/video/rockchip/rk3399_mipi.c | 2 +- drivers/video/rockchip/rk_mipi.c | 2 +- 12 files changed, 27 insertions(+), 11 deletions(-) create mode 100644 arch/arm/include/asm/arch-rockchip/cru.h diff --git a/arch/arm/include/asm/arch-rockchip/cru.h b/arch/arm/include/asm/arch-rockchip/cru.h new file mode 100644 index 0000000000..3b1a3bae71 --- /dev/null +++ b/arch/arm/include/asm/arch-rockchip/cru.h @@ -0,0 +1,16 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * (C) Copyright 2019 Amarula Solutions. + * Author: Jagan Teki + */ + +#ifndef _ROCKCHIP_CLOCK_H +#define _ROCKCHIP_CLOCK_H + +#if defined(CONFIG_ROCKCHIP_RK3288) +# include +#elif defined(CONFIG_ROCKCHIP_RK3399) +# include +#endif + +#endif /* _ROCKCHIP_CLOCK_H */ diff --git a/arch/arm/mach-rockchip/rk3288-board.c b/arch/arm/mach-rockchip/rk3288-board.c index a250d50387..d3ec141fea 100644 --- a/arch/arm/mach-rockchip/rk3288-board.c +++ b/arch/arm/mach-rockchip/rk3288-board.c @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/arm/mach-rockchip/rk3288/clk_rk3288.c b/arch/arm/mach-rockchip/rk3288/clk_rk3288.c index e64ee86f08..1730f12443 100644 --- a/arch/arm/mach-rockchip/rk3288/clk_rk3288.c +++ b/arch/arm/mach-rockchip/rk3288/clk_rk3288.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include int rockchip_get_clk(struct udevice **devp) { diff --git a/arch/arm/mach-rockchip/rk3399-board-spl.c b/arch/arm/mach-rockchip/rk3399-board-spl.c index 7154d8e5d0..5642c7f523 100644 --- a/arch/arm/mach-rockchip/rk3399-board-spl.c +++ b/arch/arm/mach-rockchip/rk3399-board-spl.c @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/arm/mach-rockchip/rk3399/clk_rk3399.c b/arch/arm/mach-rockchip/rk3399/clk_rk3399.c index f0411c0a21..a80a46f1db 100644 --- a/arch/arm/mach-rockchip/rk3399/clk_rk3399.c +++ b/arch/arm/mach-rockchip/rk3399/clk_rk3399.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include static int rockchip_get_cruclk(struct udevice **devp) { diff --git a/drivers/clk/rockchip/clk_rk3288.c b/drivers/clk/rockchip/clk_rk3288.c index 375d7f8acb..b05becd3d0 100644 --- a/drivers/clk/rockchip/clk_rk3288.c +++ b/drivers/clk/rockchip/clk_rk3288.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/clk/rockchip/clk_rk3399.c b/drivers/clk/rockchip/clk_rk3399.c index d9950c159b..37a82788c6 100644 --- a/drivers/clk/rockchip/clk_rk3399.c +++ b/drivers/clk/rockchip/clk_rk3399.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/ram/rockchip/sdram_rk3288.c b/drivers/ram/rockchip/sdram_rk3288.c index 6bb025a851..48b479d82b 100644 --- a/drivers/ram/rockchip/sdram_rk3288.c +++ b/drivers/ram/rockchip/sdram_rk3288.c @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/ram/rockchip/sdram_rk3399.c b/drivers/ram/rockchip/sdram_rk3399.c index 81fc71c051..0801faf7a1 100644 --- a/drivers/ram/rockchip/sdram_rk3399.c +++ b/drivers/ram/rockchip/sdram_rk3399.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/video/rockchip/rk3288_mipi.c b/drivers/video/rockchip/rk3288_mipi.c index 7c4a4cc53b..65891ce45c 100644 --- a/drivers/video/rockchip/rk3288_mipi.c +++ b/drivers/video/rockchip/rk3288_mipi.c @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/video/rockchip/rk3399_mipi.c b/drivers/video/rockchip/rk3399_mipi.c index a93b73400b..a5b7ba69a8 100644 --- a/drivers/video/rockchip/rk3399_mipi.c +++ b/drivers/video/rockchip/rk3399_mipi.c @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/video/rockchip/rk_mipi.c b/drivers/video/rockchip/rk_mipi.c index bcd039b7bc..f9280e8607 100644 --- a/drivers/video/rockchip/rk_mipi.c +++ b/drivers/video/rockchip/rk_mipi.c @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include From patchwork Mon Jul 29 07:46:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 11063373 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 100B214DB for ; Mon, 29 Jul 2019 07:47:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 017D8286BF for ; Mon, 29 Jul 2019 07:47:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E9B0728703; Mon, 29 Jul 2019 07:47:35 +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 99BE7286BF for ; Mon, 29 Jul 2019 07:47:35 +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=OsHOiY1HqewrZNjE8h7p3whi2AAZtkvzeOWcwF56gg8=; b=Ln3jSQBQVD4i4V PNN5KLl2+rPws//i72kzOmVGBWmPYWsKErH3ANo8skNfotL5TMLoYPkEXLuEdBzsm/OsBaVr+fwF6 GXGBTdZb9V1pOWxRecvHNy37PtBjbJA9fQCtw78lQ1AlyocoCJqPSGaPeJ04PDkzir3FAiS2N2yZq dAzENXI/V1AlIgeWlHhkUXcwkJoIIC5/KFg+UYtGH/3e252naR/7q2CjGT94ooXkD0q6xdGtJmyIw TAUXgyLPxqn/njduu4WQABDLGlDGRDFSYhOq4sSBj8+YJoO5Y8+TcGH+qi0OOmbCCF2Pcx7SkTooF SUG2VMRMuAHoE4ltTCug==; 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 1hs0NZ-0001qs-Dh; Mon, 29 Jul 2019 07:47:33 +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 1hs0NW-0001of-LC for linux-rockchip@lists.infradead.org; Mon, 29 Jul 2019 07:47:32 +0000 Received: by mail-pg1-x544.google.com with SMTP id f5so18987884pgu.5 for ; Mon, 29 Jul 2019 00:47:30 -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=4JXnpx3l8P91jIfWnhDZlrMqLln7iecWOgFHUzA4zZs=; b=HkHPufJY/pf+GYK9W1OEZ4vs+M7705C2HMu2blRCvJgqmDxLAGCwX2CIzgit84eSQi /X6WeMIs6a191Tkn6UNSOy2tgVCIgG3akl4db87Bnt/3lkMlUsAXWVrtyZSVtU9fIL77 YERv+5pRmYyCIxl0RWczwVk4ywUJr38dpMA3o= 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=4JXnpx3l8P91jIfWnhDZlrMqLln7iecWOgFHUzA4zZs=; b=sp2rnPZd2bFwc4V6RVUocdPT43A/PDFS0pFxlWLFfEJ8rb3mLD32kJIFknfVhR86Jm Cs1S+z4ze9pUF/788l7mwPJccus4ZQ+qmSf02fgI8ZQrgY6LC498CMiIFAElIV4I07M/ hi5GIdhCui7MYqeZQz28KQXtMi7lmx+PXnTzoH28bRtKUncuiF+tXiptnyBKFe84dwHl KfkYgvySMwFj/Xs1fMTXKkiyA99As+S+SgnylxH3DsRgr912I3YqJ31O5mfMed0n+TYY qVMQKdQXYRpTjEFDoF5KIAbBzcRPPgk2Rn1651XBWwT/BoCQjJLPYjMBrv9x/pNA7pmB Epvg== X-Gm-Message-State: APjAAAWfrVCT02RXraS92OiD/l1vyhRCiFPGdpPsn8fqAbtsBIQsjuvU 1OLI0uUZcpDDByQL59NUGWPmfA== X-Google-Smtp-Source: APXvYqxO2r26UF1PaczY/WRjn7FsU95aieXeZOYgBJz0nSARiVlZYqrj/UKVWeV+efkpAxcmukaBmw== X-Received: by 2002:a17:90a:b883:: with SMTP id o3mr109551398pjr.50.1564386450038; Mon, 29 Jul 2019 00:47:30 -0700 (PDT) Received: from localhost.localdomain ([49.206.203.41]) by smtp.gmail.com with ESMTPSA id h14sm75723348pfq.22.2019.07.29.00.47.26 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 29 Jul 2019 00:47:29 -0700 (PDT) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Subject: [PATCH 02/15] rockchip: Add cpu-info Date: Mon, 29 Jul 2019 13:16:58 +0530 Message-Id: <20190729074711.16988-3-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_004730_779536_A3C978EA X-CRM114-Status: GOOD ( 11.25 ) 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: Jagan Teki , u-boot@lists.denx.de, linux-amarula@amarulasolutions.com, Akash Gajjar , linux-rockchip@lists.infradead.org Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Add cpu information for rockchip soc. This would help to print the SoC family number, with associated temparature, clock and reason for reset etc. Signed-off-by: Jagan Teki --- arch/arm/mach-rockchip/Makefile | 1 + arch/arm/mach-rockchip/cpu-info.c | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 arch/arm/mach-rockchip/cpu-info.c diff --git a/arch/arm/mach-rockchip/Makefile b/arch/arm/mach-rockchip/Makefile index a12b8d4434..655b3e3e1a 100644 --- a/arch/arm/mach-rockchip/Makefile +++ b/arch/arm/mach-rockchip/Makefile @@ -25,6 +25,7 @@ ifeq ($(CONFIG_SPL_BUILD)$(CONFIG_TPL_BUILD),) # we can have the preprocessor correctly recognise both 0x0 and 0 # meaning "turn it off". obj-y += boot_mode.o +obj-$(CONFIG_DISPLAY_CPUINFO) += cpu-info.o obj-$(CONFIG_ROCKCHIP_RK3188) += rk3188-board.o obj-$(CONFIG_ROCKCHIP_RK3128) += rk3128-board.o diff --git a/arch/arm/mach-rockchip/cpu-info.c b/arch/arm/mach-rockchip/cpu-info.c new file mode 100644 index 0000000000..088fc806a6 --- /dev/null +++ b/arch/arm/mach-rockchip/cpu-info.c @@ -0,0 +1,24 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * (C) Copyright 2019 Amarula Solutions. + * Author: Jagan Teki + */ + +#include + +int print_cpuinfo(void) +{ + puts("SoC: Rockchip "); + + /* TODO print operating temparature and clock */ +# ifdef CONFIG_ROCKCHIP_RK3288 + puts("RK3288\n"); +# elif CONFIG_ROCKCHIP_RK3399 + puts("RK3399\n"); +# else +# warning Please update cpu.c with correct CPU information + puts("Family\n"); +# endif + + return 0; +} From patchwork Mon Jul 29 07:46:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 11063377 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 C027B14DB for ; Mon, 29 Jul 2019 07:47:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B0C8D286AD for ; Mon, 29 Jul 2019 07:47:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A5260286E0; Mon, 29 Jul 2019 07:47:40 +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 3271B286BF for ; Mon, 29 Jul 2019 07:47:40 +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=LcVgn87Y/WEWdrXTHKszs6aCWPS+yH7BpPTr/v5F+SU=; b=CCRPTJGaFsPhcW V6ngmEIZEA6TefNVMsAoQFWMTnpSQMlsTF5PVxNGN6FC+VKoMc/aRzySsotVTsSGO7q04EGtdnwsx XFRSXdwPKGyJayN+JpqzTTs4BgAKlXq/hZrzR7t5d6CeXFpjvmNOasFv2HOUM8O58F0MBT5qXvlt4 fIZE/BYW46XRpwS7fH2Wh/N7egCKndn9NS3+/yanegItPWxRjSfjwgUECjnQth3AvN4fSwnd0T852 XOtuOnUP8VZPtEjTmki3bQXPppGPSLJNv4poXQ3tAPVoDdTpbwuuIL9Bs/Zz50DRetz2p/9Ds2Eyb tOgtOnrbugCb6kBanxBA==; 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 1hs0Nd-0001uA-R5; Mon, 29 Jul 2019 07:47:37 +0000 Received: from mail-pl1-x641.google.com ([2607:f8b0:4864:20::641]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hs0Na-0001rr-Vz for linux-rockchip@lists.infradead.org; Mon, 29 Jul 2019 07:47:36 +0000 Received: by mail-pl1-x641.google.com with SMTP id b3so27195668plr.4 for ; Mon, 29 Jul 2019 00:47:34 -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=mgFw3iYrH+nI0SVN4epuo/Jnv38uJqCeO59EyXMs1/M=; b=kJJcD6461D2S8TX1uuWNojPPz09bo0vsutkFYvMCUJlWXVTvDciTzVDxYTp50yXtl9 XxKY+7UZm5NTwZ2K8bj7AFe/S1ANT/A2z+Jvh155+Fmv46KOHxpbNig+6I6t8piexNWM yrNv3eo4woir2nk+25nPikNJsUyqKuymJYNZE= 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=mgFw3iYrH+nI0SVN4epuo/Jnv38uJqCeO59EyXMs1/M=; b=KZt+vtizt/jWSAf6YABDzqB4zjM99O7UqufAMLhQUAIE7hFdD0iaGQc4dkfl5pmufk BAfvEzVqplKvHFDbkGPHO67Hw30JMK7d9hmg3IK/x8JPxwvomaenp+4HA6qju/5yVNvd vtQ4gE1JeULjhVqpwRBKellsa7TXGVqVDZtH4uAf63TaRVSIpwOddMjP5Xuw/Fq3TF+i 3Q7FsaEXBnUy6N6BhNtE230dLeje8n64gPLenAqukjoYS62JwQOAzN00gEyrsjCt05AH hQVjupuaYsMhlyIpiCBQ9RQ3V3q79v7YALKRmN3+RaMPqin9GKq2woRqpe3JKXyuW6oB kdMg== X-Gm-Message-State: APjAAAWaLxbT7McYbhC3Q2D1Oz+ihoxTgAxGR780fk5cNHJ6WR81Ggsy liFtPZa2wb4YGHIRxmJ9eMGJhg== X-Google-Smtp-Source: APXvYqywKbVAJHnrKgzTOaNx4mNo1oZ/tTTQMIacAqARIfdzoTOC+VA3GqRON42hYFGcw8ibONL0sQ== X-Received: by 2002:a17:902:110b:: with SMTP id d11mr113400546pla.213.1564386453901; Mon, 29 Jul 2019 00:47:33 -0700 (PDT) Received: from localhost.localdomain ([49.206.203.41]) by smtp.gmail.com with ESMTPSA id h14sm75723348pfq.22.2019.07.29.00.47.30 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 29 Jul 2019 00:47:33 -0700 (PDT) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Subject: [PATCH 03/15] rockchip: rk3288: Print reset reason Date: Mon, 29 Jul 2019 13:16:59 +0530 Message-Id: <20190729074711.16988-4-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_004735_072070_60A13134 X-CRM114-Status: GOOD ( 10.84 ) 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, u-boot@lists.denx.de, Jagan Teki , Wadim Egorov , 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 Print the reason for reset instead of storing it into env variable in rk3288. This would help to find the reset reason directly on U-Boot proper logs. Cc: Wadim Egorov Signed-off-by: Jagan Teki --- arch/arm/mach-rockchip/rk3288-board.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-rockchip/rk3288-board.c b/arch/arm/mach-rockchip/rk3288-board.c index d3ec141fea..613264d7ee 100644 --- a/arch/arm/mach-rockchip/rk3288-board.c +++ b/arch/arm/mach-rockchip/rk3288-board.c @@ -72,7 +72,7 @@ static void rk3288_detect_reset_reason(void) reason = "unknown reset"; } - env_set("reset_reason", reason); + printf("Reset cause: %s\n", reason); /* * Clear cru_glb_rst_st, so we can determine the last reset cause From patchwork Mon Jul 29 07:47:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 11063379 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 035921398 for ; Mon, 29 Jul 2019 07:47:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E611C286AD for ; Mon, 29 Jul 2019 07:47:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D1DE1286E0; Mon, 29 Jul 2019 07:47:45 +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 5BE2E286AD for ; Mon, 29 Jul 2019 07:47:45 +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=cG9Jlpu2J48j8FS+YR7HKS8HqHG3mLwXLbslDR+gdqw=; b=hcINFNsZBTYdJJ k4MY/CNhf6y+ER9PDLmw0C63o+gIjQDV9aYzNA+kBIKVKt9c1A8OreplF3ndd3Ge95jawQB7ll5hV 5f+eK0pOEWaSFbesYO0PbkzKfLcg/X7YVsHc2tXsJh+5f3j+lYVgkmTzIPkhnD8QAbvb0WLDbNwNI N9m5G9ld/mFV40cadXjycMTIE5ESLeJSEtsK9pOWQ6O3Sqg1yA82qOVigJcl5BbxQZ2HCrD/WHSHS lsSLtKRH7suQeX1Ny7DO7dnr8sXN67rYNsCCrrhIUB9kFjj+V/XFRjw6BBEbjzPSwaqQViEJgAZ8O GvQIS0XGkckSmyLVDREQ==; 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 1hs0Ni-0001xN-UU; Mon, 29 Jul 2019 07:47:42 +0000 Received: from mail-pg1-x541.google.com ([2607:f8b0:4864:20::541]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hs0Nf-0001vN-Qz for linux-rockchip@lists.infradead.org; Mon, 29 Jul 2019 07:47:41 +0000 Received: by mail-pg1-x541.google.com with SMTP id t132so27798020pgb.9 for ; Mon, 29 Jul 2019 00:47:39 -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=PeStiX165xrcK3wOyhqM1gLga3q5yUQWbEfSl5LTn2Q=; b=afvLBT/WsLEWmDPO+JEsGl0IXjcIVlCPNrzpDJPY1zymg0m21xF/4pbQTzl0QQw3Dk Q12gMf1gpUMenf3m8BQIrl4s6ZB0Bx3qz08EG+sYxs4audFtM4QBSuvdIItmMzJGVbhB oj7rEDhUDgYGVIwZvwQrf4AWb/f9TVqhmV31M= 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=PeStiX165xrcK3wOyhqM1gLga3q5yUQWbEfSl5LTn2Q=; b=YimebXZbbIjAs8Lnwtr2LXsHdT7y1PP5BfHAS44I8Lp3N94Ug9uXO4feaGYcPNiXv6 GEPjrkqbn+TqKPmaPCpJd+GtHHIF/f8VBBOv53obOiKuU9Q5w/4RMCTB86W/K+PKwWEL n7cRoqw6moudjW/7R5OvZg+MofNqO/Pp6/q9TcKdkrOdUZmQqt40hkluUntHtHROEtf/ jmq/RWsvxJm03i37ukNkUZE2EXm2kcaH8JXHtpw7FCQ48p9lCMAgJhNymqdWiPNNJw+f uE7FXHZMMKHnkr5P95kDSlEPenYuTFJ8omWmzWO5cGq9ALS3ebFhu+dj2aVW+j2haaH+ nu/g== X-Gm-Message-State: APjAAAXDDAvQ5m7S1jpQrMj9yOsJJwcuc3cK/foZEsyTHss9b1K9/tUa 2rST1ndpR+dq353ZFCwsYba8mg== X-Google-Smtp-Source: APXvYqzWZamCx+szJEBAgCz/a4s1zervCOf0r/AmD3vNyRpmV0RLMcpeydC5aVJfiipO8hcp3q0nWg== X-Received: by 2002:a17:90b:f0f:: with SMTP id br15mr112231709pjb.101.1564386458628; Mon, 29 Jul 2019 00:47:38 -0700 (PDT) Received: from localhost.localdomain ([49.206.203.41]) by smtp.gmail.com with ESMTPSA id h14sm75723348pfq.22.2019.07.29.00.47.35 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 29 Jul 2019 00:47:38 -0700 (PDT) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Subject: [PATCH 04/15] rockchip: Add common reset reason Date: Mon, 29 Jul 2019 13:17:00 +0530 Message-Id: <20190729074711.16988-5-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_004739_883862_6B00317F X-CRM114-Status: GOOD ( 11.90 ) 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, u-boot@lists.denx.de, Jagan Teki , Wadim Egorov , 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 Right now the reset reason supported by rk3288 and which is printing on board late function. Support the same reset reason for rk3399 as well, since it is sharing same cru register mark the code into common area. Printing reset reason below SoC information would really help instead of printing in board late call, so support this as part of cpu_info. Cc: Wadim Egorov Signed-off-by: Jagan Teki --- arch/arm/include/asm/arch-rockchip/cru.h | 12 ++++++ .../include/asm/arch-rockchip/cru_rk3288.h | 14 +------ arch/arm/mach-rockchip/cpu-info.c | 41 +++++++++++++++++++ arch/arm/mach-rockchip/rk3288-board.c | 39 ------------------ 4 files changed, 54 insertions(+), 52 deletions(-) diff --git a/arch/arm/include/asm/arch-rockchip/cru.h b/arch/arm/include/asm/arch-rockchip/cru.h index 3b1a3bae71..b54e21d6f1 100644 --- a/arch/arm/include/asm/arch-rockchip/cru.h +++ b/arch/arm/include/asm/arch-rockchip/cru.h @@ -13,4 +13,16 @@ # include #endif +/* CRU_GLB_RST_ST */ +enum { + GLB_POR_RST, + FST_GLB_RST_ST = BIT(0), + SND_GLB_RST_ST = BIT(1), + FST_GLB_TSADC_RST_ST = BIT(2), + SND_GLB_TSADC_RST_ST = BIT(3), + FST_GLB_WDT_RST_ST = BIT(4), + SND_GLB_WDT_RST_ST = BIT(5), + GLB_RST_ST_MASK = GENMASK(5, 0), +}; + #endif /* _ROCKCHIP_CLOCK_H */ diff --git a/arch/arm/include/asm/arch-rockchip/cru_rk3288.h b/arch/arm/include/asm/arch-rockchip/cru_rk3288.h index e891f20b37..7acb1c7208 100644 --- a/arch/arm/include/asm/arch-rockchip/cru_rk3288.h +++ b/arch/arm/include/asm/arch-rockchip/cru_rk3288.h @@ -51,7 +51,7 @@ struct rk3288_cru { u32 cru_glb_cnt_th; u32 cru_glb_rst_con; u32 reserved3; - u32 cru_glb_rst_st; + u32 glb_rst_st; u32 reserved4; u32 cru_sdmmc_con[2]; u32 cru_sdio0_con[2]; @@ -227,16 +227,4 @@ enum { CLKF_MASK = 0x1fff << CLKF_SHIFT, }; -/* CRU_GLB_RST_ST */ -enum { - GLB_POR_RST, - FST_GLB_RST_ST = BIT(0), - SND_GLB_RST_ST = BIT(1), - FST_GLB_TSADC_RST_ST = BIT(2), - SND_GLB_TSADC_RST_ST = BIT(3), - FST_GLB_WDT_RST_ST = BIT(4), - SND_GLB_WDT_RST_ST = BIT(5), - GLB_RST_ST_MASK = GENMASK(5, 0), -}; - #endif diff --git a/arch/arm/mach-rockchip/cpu-info.c b/arch/arm/mach-rockchip/cpu-info.c index 088fc806a6..8e56999b05 100644 --- a/arch/arm/mach-rockchip/cpu-info.c +++ b/arch/arm/mach-rockchip/cpu-info.c @@ -5,6 +5,38 @@ */ #include +#include +#include +#include +#include +#include + +static char *rockchip_reset_reason(unsigned int glb_rst_st) +{ + char *reason; + + switch (glb_rst_st) { + case GLB_POR_RST: + reason = "POR"; + break; + case FST_GLB_RST_ST: + case SND_GLB_RST_ST: + reason = "RST"; + break; + case FST_GLB_TSADC_RST_ST: + case SND_GLB_TSADC_RST_ST: + reason = "THERMAL"; + break; + case FST_GLB_WDT_RST_ST: + case SND_GLB_WDT_RST_ST: + reason = "WDOG"; + break; + default: + reason = "unknown reset"; + } + + return reason; +} int print_cpuinfo(void) { @@ -13,12 +45,21 @@ int print_cpuinfo(void) /* TODO print operating temparature and clock */ # ifdef CONFIG_ROCKCHIP_RK3288 puts("RK3288\n"); + struct rk3288_cru *cru = rockchip_get_cru(); # elif CONFIG_ROCKCHIP_RK3399 puts("RK3399\n"); + struct rk3399_cru *cru = rockchip_get_cru(); # else # warning Please update cpu.c with correct CPU information puts("Family\n"); # endif + if (IS_ERR(cru)) + return -EINVAL; + + printf("Reset cause: %s\n", rockchip_reset_reason(cru->glb_rst_st)); + + rk_clrreg(&cru->glb_rst_st, GLB_RST_ST_MASK); + return 0; } diff --git a/arch/arm/mach-rockchip/rk3288-board.c b/arch/arm/mach-rockchip/rk3288-board.c index 613264d7ee..3e5cd9bad9 100644 --- a/arch/arm/mach-rockchip/rk3288-board.c +++ b/arch/arm/mach-rockchip/rk3288-board.c @@ -10,7 +10,6 @@ #include #include #include -#include #include #include #include @@ -44,48 +43,10 @@ int rk3288_qos_init(void) return 0; } -static void rk3288_detect_reset_reason(void) -{ - struct rk3288_cru *cru = rockchip_get_cru(); - const char *reason; - - if (IS_ERR(cru)) - return; - - switch (cru->cru_glb_rst_st) { - case GLB_POR_RST: - reason = "POR"; - break; - case FST_GLB_RST_ST: - case SND_GLB_RST_ST: - reason = "RST"; - break; - case FST_GLB_TSADC_RST_ST: - case SND_GLB_TSADC_RST_ST: - reason = "THERMAL"; - break; - case FST_GLB_WDT_RST_ST: - case SND_GLB_WDT_RST_ST: - reason = "WDOG"; - break; - default: - reason = "unknown reset"; - } - - printf("Reset cause: %s\n", reason); - - /* - * Clear cru_glb_rst_st, so we can determine the last reset cause - * for following resets. - */ - rk_clrreg(&cru->cru_glb_rst_st, GLB_RST_ST_MASK); -} - int board_late_init(void) { setup_boot_mode(); rk3288_qos_init(); - rk3288_detect_reset_reason(); return rk_board_late_init(); } From patchwork Mon Jul 29 07:47:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 11063381 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 1B3771398 for ; Mon, 29 Jul 2019 07:47:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0C3C7286AD for ; Mon, 29 Jul 2019 07:47:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 005EC286E0; Mon, 29 Jul 2019 07:47:48 +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 4C4CC286AD for ; Mon, 29 Jul 2019 07:47:48 +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=Hts7sw+85lQ1rXc7p+tIiOUJj7OEAWM1jV0eTwI4VuQ=; b=nrVHsbNIOxbZae Nvqb1TMk5RoI6ZSeJX3yNwjGnsUXFo7FUWr7AS0HkGLu1HbNWn2W4VPiWoYkAbr13gHK6sRfGSWZ/ NQbHiJppe/YesUmR+CzMzYLdYGtWU2f67vQEcwEQSSmDnzGfMUpKTGpNyuCwax6ae8Us2+1AlgSfn +uTWXjBsZyzQNhFFXeGMm2MrIb1TcBR5i5nuUZeqpl3wY8ZmxtvBIk+WgDpRa0pLmkm90b25kDsZe wwiNBnejBtJ3l4xxzmeTXsjo80ZXbOv8jm9fH85QEtHuc07H4si1hH0NgiT/boR9HmtiDviJvrioS AczBrIkyO0kcXp2TrKXQ==; 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 1hs0Nl-0001zG-T6; Mon, 29 Jul 2019 07:47:46 +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 1hs0Ni-0001x5-JT for linux-rockchip@lists.infradead.org; Mon, 29 Jul 2019 07:47:44 +0000 Received: by mail-pg1-x544.google.com with SMTP id o13so27790373pgp.12 for ; Mon, 29 Jul 2019 00:47:42 -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=3WatgTkSDx3CZrcTJhLzwhvz5OTEzJVZ8ujzC2nCq74=; b=dRi43XsUyk5M6Uzj5E+ZyW1ORsQVSxNagk5vsmA5l4ikk7MCJdNzZNGzYq8t7nxB0E f5obDi4yMOmJWXNnMfbyF02ewCIQKwk5zGP7WYPViWmacUn8ZhA50V6CJeE+39yW9p+V mBhWw+4xUIfE2RV9xMrLWGzeBajpjxCDmCx3Q= 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=3WatgTkSDx3CZrcTJhLzwhvz5OTEzJVZ8ujzC2nCq74=; b=KPv+wsVLnauep22/0oCx6zPDp2UO6+HWN/ltW+nB4LzcN7Acj2W36DwtCp2uQREiiY 7k6F1jyr5TnexmRSCDwycWm4cPa0Axngf/ozkMYkcnv+OKVvoNuv/xacr+SgmjI11uFw 7c2Y1m1Um42Nm6dmFoHmAR0OuOmuYoCWT9IpSdKGEvB3IqVaXvJRJEWYAZSYhJpfaqlO zg9hEvQJIr86pTyUYVAG5YnMvSGRz6XUYOs0ey0tp+T8Nt9BCGVy+kLzQ7+ehKPveWUq 8Ai+Aiwz/3l+Wvmxkrs3VrVcwETsE1hbCg8evuyfY0nkI1l4wN0B/2ZjgQ8oLWEN2sTM I+jg== X-Gm-Message-State: APjAAAWLhYl4tjgW0sNwYuyp/8pvtkCmXvte3AKjNg4SbHCCW/dm5vBu H2DkW6xzwLXa0aTVlSD68e8IgA== X-Google-Smtp-Source: APXvYqwc16HrvliouPj5PEyBwJrxw2rEalc4OXlZOE05UOnhi76qBsrpyoQwNIF5bmtjOXBXL+gLDQ== X-Received: by 2002:a63:4a51:: with SMTP id j17mr102712841pgl.284.1564386461978; Mon, 29 Jul 2019 00:47:41 -0700 (PDT) Received: from localhost.localdomain ([49.206.203.41]) by smtp.gmail.com with ESMTPSA id h14sm75723348pfq.22.2019.07.29.00.47.38 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 29 Jul 2019 00:47:41 -0700 (PDT) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Subject: [PATCH 05/15] rockchip: rk3288/rk3399: Enable DISPLAY_CPUINFO Date: Mon, 29 Jul 2019 13:17:01 +0530 Message-Id: <20190729074711.16988-6-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_004742_652866_59C727E2 X-CRM114-Status: UNSURE ( 7.95 ) 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: Jagan Teki , u-boot@lists.denx.de, linux-amarula@amarulasolutions.com, Akash Gajjar , linux-rockchip@lists.infradead.org Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP RK3288 and Rk3399 are now support cpu-info, so enable them by default. Signed-off-by: Jagan Teki --- configs/evb-rk3288_defconfig | 1 - configs/evb-rk3399_defconfig | 1 - configs/fennec-rk3288_defconfig | 1 - configs/ficus-rk3399_defconfig | 1 - configs/firefly-rk3288_defconfig | 1 - configs/firefly-rk3399_defconfig | 1 - configs/miqi-rk3288_defconfig | 1 - configs/nanopc-t4-rk3399_defconfig | 1 - configs/nanopi-m4-rk3399_defconfig | 1 - configs/nanopi-neo4-rk3399_defconfig | 1 - configs/orangepi-rk3399_defconfig | 1 - configs/phycore-rk3288_defconfig | 1 - configs/popmetal-rk3288_defconfig | 1 - configs/puma-rk3399_defconfig | 1 - configs/rock-pi-4-rk3399_defconfig | 1 - configs/rock960-rk3399_defconfig | 1 - configs/rockpro64-rk3399_defconfig | 1 - configs/tinker-rk3288_defconfig | 1 - configs/vyasa-rk3288_defconfig | 1 - 19 files changed, 19 deletions(-) diff --git a/configs/evb-rk3288_defconfig b/configs/evb-rk3288_defconfig index a6df143276..28b3e392ec 100644 --- a/configs/evb-rk3288_defconfig +++ b/configs/evb-rk3288_defconfig @@ -11,7 +11,6 @@ CONFIG_DEBUG_UART=y # CONFIG_ANDROID_BOOT_IMAGE is not set CONFIG_SILENT_CONSOLE=y CONFIG_DEFAULT_FDT_FILE="rk3288-evb-rk808.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_TEXT_BASE=0 CONFIG_CMD_GPIO=y diff --git a/configs/evb-rk3399_defconfig b/configs/evb-rk3399_defconfig index 764d32f259..3c48053480 100644 --- a/configs/evb-rk3399_defconfig +++ b/configs/evb-rk3399_defconfig @@ -9,7 +9,6 @@ CONFIG_DEBUG_UART_BASE=0xFF1A0000 CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_DEBUG_UART=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-evb.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000 diff --git a/configs/fennec-rk3288_defconfig b/configs/fennec-rk3288_defconfig index 16d8fb155c..21ff5a0efc 100644 --- a/configs/fennec-rk3288_defconfig +++ b/configs/fennec-rk3288_defconfig @@ -13,7 +13,6 @@ CONFIG_DEBUG_UART=y CONFIG_SILENT_CONSOLE=y CONFIG_CONSOLE_MUX=y CONFIG_DEFAULT_FDT_FILE="rk3288-fennec.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_TEXT_BASE=0xff704000 CONFIG_SPL_STACK_R=y diff --git a/configs/ficus-rk3399_defconfig b/configs/ficus-rk3399_defconfig index d1425dc3d0..a146b0ced0 100644 --- a/configs/ficus-rk3399_defconfig +++ b/configs/ficus-rk3399_defconfig @@ -8,7 +8,6 @@ CONFIG_SPL_STACK_R_ADDR=0x80000 CONFIG_DEBUG_UART_BASE=0xFF1A0000 CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_DEBUG_UART=y -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_TEXT_BASE=0xff8c2000 CONFIG_SPL_STACK_R=y diff --git a/configs/firefly-rk3288_defconfig b/configs/firefly-rk3288_defconfig index 8abe8a648a..081744dc39 100644 --- a/configs/firefly-rk3288_defconfig +++ b/configs/firefly-rk3288_defconfig @@ -12,7 +12,6 @@ CONFIG_DEBUG_UART=y # CONFIG_ANDROID_BOOT_IMAGE is not set CONFIG_SILENT_CONSOLE=y CONFIG_DEFAULT_FDT_FILE="rk3288-firefly.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_TEXT_BASE=0xff704000 CONFIG_SPL_STACK_R=y diff --git a/configs/firefly-rk3399_defconfig b/configs/firefly-rk3399_defconfig index 9f05f33ddd..71f8e56669 100644 --- a/configs/firefly-rk3399_defconfig +++ b/configs/firefly-rk3399_defconfig @@ -9,7 +9,6 @@ CONFIG_DEBUG_UART_BASE=0xFF1A0000 CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_DEBUG_UART=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-firefly.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000 diff --git a/configs/miqi-rk3288_defconfig b/configs/miqi-rk3288_defconfig index c9a35115fb..42f27b0ba8 100644 --- a/configs/miqi-rk3288_defconfig +++ b/configs/miqi-rk3288_defconfig @@ -12,7 +12,6 @@ CONFIG_DEBUG_UART=y # CONFIG_ANDROID_BOOT_IMAGE is not set CONFIG_SILENT_CONSOLE=y CONFIG_DEFAULT_FDT_FILE="rk3288-miqi.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_TEXT_BASE=0xff704000 CONFIG_SPL_STACK_R=y diff --git a/configs/nanopc-t4-rk3399_defconfig b/configs/nanopc-t4-rk3399_defconfig index bca4f08966..2d437f4d86 100644 --- a/configs/nanopc-t4-rk3399_defconfig +++ b/configs/nanopc-t4-rk3399_defconfig @@ -9,7 +9,6 @@ CONFIG_DEBUG_UART_BASE=0xFF1A0000 CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_DEBUG_UART=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-nanopc-t4.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000 diff --git a/configs/nanopi-m4-rk3399_defconfig b/configs/nanopi-m4-rk3399_defconfig index dd2065df5f..18cc9a4482 100644 --- a/configs/nanopi-m4-rk3399_defconfig +++ b/configs/nanopi-m4-rk3399_defconfig @@ -9,7 +9,6 @@ CONFIG_DEBUG_UART_BASE=0xFF1A0000 CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_DEBUG_UART=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-nanopi-m4.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000 diff --git a/configs/nanopi-neo4-rk3399_defconfig b/configs/nanopi-neo4-rk3399_defconfig index 46039d1d07..037f3f7c5a 100644 --- a/configs/nanopi-neo4-rk3399_defconfig +++ b/configs/nanopi-neo4-rk3399_defconfig @@ -9,7 +9,6 @@ CONFIG_DEBUG_UART_BASE=0xFF1A0000 CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_DEBUG_UART=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-nanopi-neo4.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000 diff --git a/configs/orangepi-rk3399_defconfig b/configs/orangepi-rk3399_defconfig index 16a0a17c74..f3e8b6686c 100644 --- a/configs/orangepi-rk3399_defconfig +++ b/configs/orangepi-rk3399_defconfig @@ -9,7 +9,6 @@ CONFIG_DEBUG_UART_BASE=0xFF1A0000 CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_DEBUG_UART=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-orangepi.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000 diff --git a/configs/phycore-rk3288_defconfig b/configs/phycore-rk3288_defconfig index dfddc4af5e..7766aa6d65 100644 --- a/configs/phycore-rk3288_defconfig +++ b/configs/phycore-rk3288_defconfig @@ -13,7 +13,6 @@ CONFIG_DEBUG_UART=y CONFIG_SILENT_CONSOLE=y CONFIG_CONSOLE_MUX=y CONFIG_DEFAULT_FDT_FILE="rk3288-phycore-rdk.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_TEXT_BASE=0xff704000 CONFIG_SPL_STACK_R=y diff --git a/configs/popmetal-rk3288_defconfig b/configs/popmetal-rk3288_defconfig index 4c9a7f0824..97e814d1e3 100644 --- a/configs/popmetal-rk3288_defconfig +++ b/configs/popmetal-rk3288_defconfig @@ -13,7 +13,6 @@ CONFIG_DEBUG_UART=y CONFIG_SILENT_CONSOLE=y CONFIG_CONSOLE_MUX=y CONFIG_DEFAULT_FDT_FILE="rk3288-popmetal.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_TEXT_BASE=0xff704000 CONFIG_SPL_STACK_R=y diff --git a/configs/puma-rk3399_defconfig b/configs/puma-rk3399_defconfig index 37f845cfb1..0e1ed3ec18 100644 --- a/configs/puma-rk3399_defconfig +++ b/configs/puma-rk3399_defconfig @@ -15,7 +15,6 @@ CONFIG_DEBUG_UART=y CONFIG_SPL_FIT_GENERATOR="board/theobroma-systems/puma_rk3399/fit_spl_atf.sh" CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-puma-haikou.dtb" CONFIG_MISC_INIT_R=y -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_TEXT_BASE=0xff8c2000 # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set diff --git a/configs/rock-pi-4-rk3399_defconfig b/configs/rock-pi-4-rk3399_defconfig index 14ae39a561..c4c05d0d62 100644 --- a/configs/rock-pi-4-rk3399_defconfig +++ b/configs/rock-pi-4-rk3399_defconfig @@ -9,7 +9,6 @@ CONFIG_DEBUG_UART_BASE=0xFF1A0000 CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_DEBUG_UART=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rock-pi-4.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000 diff --git a/configs/rock960-rk3399_defconfig b/configs/rock960-rk3399_defconfig index ed11fef7c2..8890b547ba 100644 --- a/configs/rock960-rk3399_defconfig +++ b/configs/rock960-rk3399_defconfig @@ -9,7 +9,6 @@ CONFIG_DEBUG_UART_BASE=0xFF1A0000 CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_DEBUG_UART=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rock960.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_TEXT_BASE=0xff8c2000 CONFIG_SPL_STACK_R=y diff --git a/configs/rockpro64-rk3399_defconfig b/configs/rockpro64-rk3399_defconfig index 72bfff289b..32d8415b23 100644 --- a/configs/rockpro64-rk3399_defconfig +++ b/configs/rockpro64-rk3399_defconfig @@ -9,7 +9,6 @@ CONFIG_DEBUG_UART_BASE=0xFF1A0000 CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_DEBUG_UART=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rockpro64.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000 diff --git a/configs/tinker-rk3288_defconfig b/configs/tinker-rk3288_defconfig index b234539a53..06527c4933 100644 --- a/configs/tinker-rk3288_defconfig +++ b/configs/tinker-rk3288_defconfig @@ -12,7 +12,6 @@ CONFIG_DEBUG_UART=y CONFIG_SILENT_CONSOLE=y CONFIG_CONSOLE_MUX=y CONFIG_DEFAULT_FDT_FILE="rk3288-tinker.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_TEXT_BASE=0 CONFIG_CMD_GPIO=y diff --git a/configs/vyasa-rk3288_defconfig b/configs/vyasa-rk3288_defconfig index eaea625007..29482a299e 100644 --- a/configs/vyasa-rk3288_defconfig +++ b/configs/vyasa-rk3288_defconfig @@ -12,7 +12,6 @@ CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_DEBUG_UART=y CONFIG_SILENT_CONSOLE=y CONFIG_DEFAULT_FDT_FILE="rk3288-vyasa.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_TEXT_BASE=0xff704000 CONFIG_SPL_STACK_R=y From patchwork Mon Jul 29 07:47:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 11063383 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 C813E13A4 for ; Mon, 29 Jul 2019 07:47:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BA8E0286AD for ; Mon, 29 Jul 2019 07:47:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AE6B3286E0; Mon, 29 Jul 2019 07:47:52 +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 562D2286AD for ; Mon, 29 Jul 2019 07:47:52 +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=nhv2gChpS+NVmxYYE/b1GCtTOsLCI1WG8VrU5gVSRyk=; b=KEJirmadDskpaE JWr//3nQ4j3BuiHA/5rvNMFsrtJt+PDuGLO56vdXynjRQ73sS4tqXS6jvcoZ3DGaEFljkIE0eJo36 qKLPv4eQbHNeXB+Fmb8DaWRksTD9PWPV/KndqPklleBhIV9MwSn8xWpyww1YZMtySq9Bx2+QBsqz+ pReUyQxq96rTA8GIjn1zv4oe2qPd+iWMkPb51NdtSVegR1fjYc06y0hyM6J2tt5oC7E0KcOUqQbp+ pJaAnpTfsHA9G8KNdGUMpYuvB6ZEuvxJoD6I7w7XX6DYalbiG03smVdTidCME1sCBuQoYm5sOysLi 4DQdBYAbUluWMvaQ58zg==; 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 1hs0Nq-000225-0Y; Mon, 29 Jul 2019 07:47:50 +0000 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hs0Nn-0001zl-64 for linux-rockchip@lists.infradead.org; Mon, 29 Jul 2019 07:47:48 +0000 Received: by mail-pf1-x444.google.com with SMTP id t16so27549452pfe.11 for ; Mon, 29 Jul 2019 00:47:46 -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=Wq6GJCz6OpwvPx36T+BmHN2obhM+vzYcJ0vK8rO0YF0=; b=fMgIoiW3ShlTeR49mIXtuaJOrS2+VvqAOtXphwDgXhjrczEtt3yomfLVy2IIfGHkeJ L5q2EZQ2xPSNZ6g1nTjLCME5LCBH7g+OA7JbsRNh2klcvFv3KewFW4DJ4paBFS0BCr88 MR9PIidsVH9QkmXSEHpq2N4detN75HSboL/fA= 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=Wq6GJCz6OpwvPx36T+BmHN2obhM+vzYcJ0vK8rO0YF0=; b=N6pS9DpwRWrIFAR6gec+l09XyuoSu/U6ge8bnsi3QPIMaP0pu4PtWySEC+KX0xfHOF sCkI3o5zRm3JmHXMG7Kst259+0DOIriPcth4H6ZVVIZcNv8IvuCsLl8Ef8jM8BbPV9Xb fx1thEtYWhNGYm2HOCQghSigW6Ccz451mqRYYiympT2v0J2OgWmACQBWD69tXvvu4VX1 dXmhmlfu98GTJj2g1YvOFPF2vFjfcXTW4NJfjwabcvTMegU7E9zaF2jGSCT0f+xsPOJ6 WdtFVGT8z3XxwDBrBKsbKre0+LT/ZJfj5gKOiJFyML3Ie64QyGz+iWBBqQ5/37EXXsZR 9y2Q== X-Gm-Message-State: APjAAAVQKyizNw38ffax6qcWlM4YFdP7chpNmsZuQmjlsdwb+uT/kZcR /S+MR8W6AWc3FNzi5MfyqXeypA== X-Google-Smtp-Source: APXvYqx6jowZR9X/srplpGIul5M/Ov0Bf5aMwlX8osvQf4Szvil62gsF4lfHtsOmQ83IkCLxZfTqTw== X-Received: by 2002:a65:6547:: with SMTP id a7mr81906381pgw.65.1564386465884; Mon, 29 Jul 2019 00:47:45 -0700 (PDT) Received: from localhost.localdomain ([49.206.203.41]) by smtp.gmail.com with ESMTPSA id h14sm75723348pfq.22.2019.07.29.00.47.42 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 29 Jul 2019 00:47:45 -0700 (PDT) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Subject: [PATCH 06/15] wdt: designware: Simplify is_enabled function Date: Mon, 29 Jul 2019 13:17:02 +0530 Message-Id: <20190729074711.16988-7-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_004747_277318_635768F5 X-CRM114-Status: UNSURE ( 9.74 ) 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 Right now the designware is_enabled function is using numeric number to check whether watchdog is enabled or not, so use register macro and check the same. Cc: Chin Liang See Cc: Andy Shevchenko Signed-off-by: Jagan Teki --- drivers/watchdog/designware_wdt.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/watchdog/designware_wdt.c b/drivers/watchdog/designware_wdt.c index c668567c66..bd858f0608 100644 --- a/drivers/watchdog/designware_wdt.c +++ b/drivers/watchdog/designware_wdt.c @@ -45,9 +45,7 @@ static void designware_wdt_enable(void) static unsigned int designware_wdt_is_enabled(void) { - unsigned long val; - val = readl((CONFIG_DW_WDT_BASE + DW_WDT_CR)); - return val & 0x1; + return readl(CONFIG_DW_WDT_BASE + DW_WDT_CR) & DW_WDT_CR_RMOD_OFFSET; } #if defined(CONFIG_HW_WATCHDOG) 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) From patchwork Mon Jul 29 07:47:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 11063387 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 C439B1398 for ; Mon, 29 Jul 2019 07:48:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B5AD7286AD for ; Mon, 29 Jul 2019 07:48:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A97D7286E0; Mon, 29 Jul 2019 07:48:01 +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 A446A286AD for ; Mon, 29 Jul 2019 07:48:00 +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=LExzNgrQeqHnaY/wiFyL0dA8pIP66d1Ef5N0rU2PCHY=; b=RMN/BOpNVwEyZo qOJ/8YXpV+c0TUMIfyoiooN5D9mHhCqRq2gNNt1a4GWB2MNtzOCHVfO/cAnICqmbQPayaMKbInyWP jupwPVavl2Qr0LCDYqGzcJ//iqJWguPTOOtNViL8VpJkPgX/d8fKAbL7f5pn7T1nSkbGDL6IwkMY3 qrD/jP8SRJkRtgg86JJKvREgbVjA9V6X0nNISmx96+Sy+cKh8WxxK/+yUpEzk1Uvy1zdribf5O2f9 iQGwhBmM8kPwt92mGmB9wayzlmvMFYvCfx3X52vyaGYqEyXuCqO0QRqrnCKeLazY2nS05Ot9q+efi 5cwMgx4XTBaZCI78+/MQ==; 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 1hs0Ny-00027T-B1; Mon, 29 Jul 2019 07:47:58 +0000 Received: from mail-pf1-x441.google.com ([2607:f8b0:4864:20::441]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hs0Nw-000266-2z for linux-rockchip@lists.infradead.org; Mon, 29 Jul 2019 07:47:57 +0000 Received: by mail-pf1-x441.google.com with SMTP id g2so27584667pfq.0 for ; Mon, 29 Jul 2019 00:47:55 -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=3hoUuQJVXo5vdHFLjFQWacOvMnFEqgMjS7FzAI1sCA8=; b=UPGJPNGssHHiAFdf5UvE2/TGDwEKPzovESALS2rUK3L7vhd6Lzi2wn33Kt/mhoFY01 OpyVGnhgEGfpjc/bH7TGcdQNTedVuvNH+8IVHMlv8g3AsyhIE52yeQL/c0pYZiGB/Du2 9SvWu1LRMlvHANz/H8UoX0GK3ICJkRjra2W2I= 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=3hoUuQJVXo5vdHFLjFQWacOvMnFEqgMjS7FzAI1sCA8=; b=kkx+ioPTRdtwO4PAo8xZzTh3MwSLG49c/JtlNwk0bouzUZo/KNJKNT+3x2eH83P4CH T6CXfWxcBt4KXG/S22f+mi1cD+b5ygiYUJ5h+T3ogC2Qi2JuxqpO0iBU5lxeQulIsySN bP3r0HWJqVUdkQl1FXWy2Ds/12iK8+8vKq4ONimkLP+O1wd/Gaut3YsCVbped7f0UaKM JgC6rY9Rgd0EsHuzfbjpObC4zIlgn9x2iYldYWyOOJWhVjnNeM7XA+Rg2MWeH/7HcItQ P3uXJQ7IUocY8PkVe1Vyc6g/VIrm6zqRBDKuPrJeLfWRswR8t97AZEytkjERDSCI7KWB J3LQ== X-Gm-Message-State: APjAAAXdDCD2r03DRFLiRhLxW2Rf8db1cDDWy1Zr4jt9v9u2kac0OLcC N9dEvn1PHvrzeUWtlUeYzms6vA== X-Google-Smtp-Source: APXvYqyxKkhW0HrUPY5NvqdOaqVjHyx344s0DTxq1DdV5v2O1HqpFR1L/zyyJoBHDSU73NpnrAewhA== X-Received: by 2002:a17:90a:b908:: with SMTP id p8mr23018965pjr.94.1564386474934; Mon, 29 Jul 2019 00:47:54 -0700 (PDT) Received: from localhost.localdomain ([49.206.203.41]) by smtp.gmail.com with ESMTPSA id h14sm75723348pfq.22.2019.07.29.00.47.50 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 29 Jul 2019 00:47:54 -0700 (PDT) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Subject: [PATCH 08/15] wdt: dw: Add driver-model support Date: Mon, 29 Jul 2019 13:17:04 +0530 Message-Id: <20190729074711.16988-9-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_004756_129885_2B72CE37 X-CRM114-Status: GOOD ( 12.76 ) 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 Add driver-model code for designware watchdog. Cc: Chin Liang See Cc: Andy Shevchenko Signed-off-by: Jagan Teki --- drivers/watchdog/designware_wdt.c | 114 +++++++++++++++++++++++++++++- 1 file changed, 113 insertions(+), 1 deletion(-) diff --git a/drivers/watchdog/designware_wdt.c b/drivers/watchdog/designware_wdt.c index 2979fda44e..4efbb25f86 100644 --- a/drivers/watchdog/designware_wdt.c +++ b/drivers/watchdog/designware_wdt.c @@ -4,7 +4,6 @@ */ #include -#include #include #include @@ -16,6 +15,117 @@ #define DW_WDT_CR_RMOD_OFFSET 0x01 #define DW_WDT_CRR_RESTART_VAL 0x76 +#ifdef CONFIG_WDT + +#include +#include +#include + +struct dw_wdt { + void __iomem *regs; + unsigned long clk_rate; +}; + +static inline int dw_wdt_is_enabled(struct dw_wdt *dw) +{ + return readl(dw->regs + DW_WDT_CR) & DW_WDT_CR_RMOD_OFFSET; +} + +/* + * Set the watchdog time interval. + * Counter is 32 bit. + */ +static int dw_wdt_set_timeout(struct dw_wdt *dw, unsigned int timeout) +{ + signed int i; + + /* calculate the timeout range value */ + i = (log_2_n_round_up(timeout * dw->clk_rate)) - 16; + if (i > 15) + i = 15; + if (i < 0) + i = 0; + + writel((i | (i << 4)), dw->regs + DW_WDT_TORR); + + return 0; +} + +static void dw_wdt_enable(struct dw_wdt *dw) +{ + u32 val = readl(dw->regs + DW_WDT_CR); + + /* Enable watchdog */ + val |= DW_WDT_CR_RMOD_OFFSET; + writel(val, dw->regs + DW_WDT_CR); +} + +static int dw_wdt_reset(struct udevice *dev) +{ + struct dw_wdt *dw = dev_get_priv(dev); + + if (dw_wdt_is_enabled(dw)) + writel(DW_WDT_CRR_RESTART_VAL, dw->regs + DW_WDT_CRR); + else + dw_wdt_enable(dw); + + return 0; +} + +static int dw_wdt_start(struct udevice *dev, u64 timeout, ulong flags) +{ + struct dw_wdt *dw = dev_get_priv(dev); + + dw_wdt_set_timeout(dw, timeout); + dw_wdt_enable(dw); + + return 0; +} + +static int dw_wdt_probe(struct udevice *dev) +{ + struct dw_wdt *dw = dev_get_priv(dev); + struct clk clk; + int ret; + + dw->regs = dev_remap_addr(dev); + if (!dw->regs) + return -EINVAL; + + ret = clk_get_by_index(dev, 0, &clk); + if (!ret) + dw->clk_rate = clk_get_rate(&clk); + else + return -EINVAL; + + dw_wdt_reset(dev); + + return 0; +} + +static const struct wdt_ops dw_wdt_ops = { + .reset = dw_wdt_reset, + .start = dw_wdt_start, +}; + +static const struct udevice_id dw_wdt_ids[] = { + { .compatible = "snps,dw-wdt" }, + { /* sentinel */ } +}; + +U_BOOT_DRIVER(dw_wdt) = { + .name = "dw_wdt", + .id = UCLASS_WDT, + .of_match = dw_wdt_ids, + .ops = &dw_wdt_ops, + .priv_auto_alloc_size = sizeof(struct dw_wdt), + .probe = dw_wdt_probe, +}; + +#else + +#include + /* * Set the watchdog time interval. * Counter is 32 bit. @@ -70,3 +180,5 @@ void hw_watchdog_init(void) hw_watchdog_reset(); } #endif + +#endif /* CONFIG_WDT */ 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: 11063389 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 6B12D1398 for ; Mon, 29 Jul 2019 07:48:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5C10E286AD for ; Mon, 29 Jul 2019 07:48:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4FF77286E0; Mon, 29 Jul 2019 07:48:04 +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 DD572286AD for ; Mon, 29 Jul 2019 07:48:03 +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=XTrp6b2n/TZ5NI/qdcgTPuUi1Rh2SF0xwKq3NRidi5E=; b=mqrIafdW88tfCe PrvxWaNFECGmpFY+lcZMAoKt60UkZnDXyoI/cjbh5UJ1IRm2Zxt3LUA9bHtqV6KlCClOhQCcv//AP LbPxVuJ7Ya2YpNrmGHbsenoka/DdSd3htcGnRmgwWnudNr92VexNZiI9n+sGEDxF/3z+NWbSSWDvH u3cp0NQIC4CVZt9woZdCQ/Y5gy005H7qHf660ilQHiwLz0Clp6vek1V/8W2h842h6WL/6As+srYfb HS8lHHWPShO6XOpe23GkUQOPQLgsjhrOTfCyBCmShCt2xdrUF35RRu6DKTmJnPy8jKqipmVZqyn+a 7yDjX1fwR7PQZQR39Qbw==; 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 1hs0O1-0002Ao-Cz; Mon, 29 Jul 2019 07:48:01 +0000 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hs0Nz-00028S-E3 for linux-rockchip@lists.infradead.org; Mon, 29 Jul 2019 07:48:00 +0000 Received: by mail-pf1-x444.google.com with SMTP id p184so27571778pfp.7 for ; Mon, 29 Jul 2019 00:47:59 -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=hh6Zq8q5k9JEDwSOsX0RjFgz0CKFycTyn3roDfu0XeM=; b=MBdweSrMjAeQ7pwHqDcOcGiTdyAR6+9bnT3k55MWhu4KIpcLLyA3caAnAvG5zJFUP/ Z81utBX78yqB4iw+n7555C/z/QlkjxIgmJGVCdgDz1Q9U8TjAlpAxhVEhpmz25aLY95M vkJBpNvle5Ad8o4aYE9/kxwApSJkhmgHnNxts= 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=hh6Zq8q5k9JEDwSOsX0RjFgz0CKFycTyn3roDfu0XeM=; b=eSl2hxc/UcRO8+7z7PixvgKOzVc2Nd2skQFHrV5gk68RoVmVOZfnuG/eO8CPserL+U NRAU7ZztG3XjuhxK8HwCha22ujlV4vSiJuLNX86xYMi/M52u3brrAoEvfRnQ9/9ordgD knLTS4y7hRfzCCeqwUYMs+nFbq7ep9fFn5AVgDpQ4VY7n8mVWjJwpbWNX1D1+mOojVKa 1pncthsgiEm7cbEVCJzibvRBbjMdpdXLww2fyCNcruewgMTJzvmqajVgtHntyPA3EdwO anLumg4UdtdQlkod166TfDGjK946tEl96E9GD4biJZHzaVsXkCrV8etUoBieUWo08b/V J0kg== X-Gm-Message-State: APjAAAVC2bI9CWwxAUzKLr92IPeJM1uxCED32KarcLOyiTYk1dY1QQrw 0V5giLBfNBQp+7mRIiN8iwJwSA== X-Google-Smtp-Source: APXvYqxrXhqR0zqd76kAsaqdohX7a86AfMZi8ZCDFKzzFrqztpakFzptTmS5G7t76gZHwwZJSbqeiQ== 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 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190729_004759_476997_0E78AA56 X-CRM114-Status: UNSURE ( 9.50 ) 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: Dinh Nguyen , Chin-Liang See , u-boot@lists.denx.de, Jagan Teki , linux-rockchip@lists.infradead.org, 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 - 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 From patchwork Mon Jul 29 07:47:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 11063391 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 88E98174A for ; Mon, 29 Jul 2019 07:48:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7B4F2286AD for ; Mon, 29 Jul 2019 07:48:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6FA5F286E0; Mon, 29 Jul 2019 07:48:08 +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 233D7286AD for ; Mon, 29 Jul 2019 07:48:08 +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=fIxJDFw/eIf9mmoVLLKcOW2NdGMA7GmbYGuO4nm9Vdo=; b=K1hGfGa0RzQHuQ qtLI/ku2ikVgwQ2VF3ssj5DP8lzj8M0bFrKf+Hw4vRH4wxsW4whgntfwfYJf3VbuxBmo4jfUZhb/6 74RVzRKzO8U0UpPI+LrEeuInTJLW2FmI3JzGIUrvJkLKAeCcv+NqxzUo2/UZpnaw+b5vtwka6araS waPd8motFREpli+5fv2cK4u/Pd9wyfFb1sYa9C6RTKXpcysHu5/lm3UBgAzP+ox0WNwqbUE/tOqBX ZbMx5jEc4maqKwc4GsErFXfjr4KJV6KbVBGLjZnVK5Fxhr2PItUVp+bRrit4viGwTYRP2sfCu6hw9 foDM+I+TmNpzR8J3aK+g==; 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 1hs0O5-0002NE-Qj; Mon, 29 Jul 2019 07:48:05 +0000 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hs0O3-0002Gy-AC for linux-rockchip@lists.infradead.org; Mon, 29 Jul 2019 07:48:04 +0000 Received: by mail-pf1-x444.google.com with SMTP id f17so23586183pfn.6 for ; Mon, 29 Jul 2019 00:48:03 -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=lMkAjW3GPc3JRQvbVP13XvU/Mvzd6g4b+EvCVNCUb6c=; b=K4BETp5cfQBTIxgNhBbjmqewPrt6c84L0iwP2e3gWoI2FezIibQcTe7zmOGmOKdcTG KRsoTTK9uXdU7ukl2YVVrrhi0BP5oLm+mKBUxs9r/WMzJ628MsU3L//M+PrRoJIrr2MD wWrHJdszYUS6qnLZT+/DdLV+K7ZAQIAh+xcjE= 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=lMkAjW3GPc3JRQvbVP13XvU/Mvzd6g4b+EvCVNCUb6c=; b=qHMDQHmvOqeTzZUauAi2wWzh3MtMp1ZhWrrG05+2z42TqblZ1ZcANKehotKwpPuO0/ bc9tvzHT4IwBS/aYF8UCjHgRr7r7eH9uuPlu3301WfMoUxp0e4z40vyz30mpdxVuwxku z5QJ+uUDsb7dOfEg10eA3ghPBmzO45SPnd5phy9Zux/1tVBKEqv/ArGCphT71Vlc16I9 6iU/v1HRbTjeAOPy8RDeEDJtENGBDP2AWdUWGwKDEJD+3a8Gh6Yw+HZCYbK3deKndZSh Nr6Ss2FoXqC0bCMm4fBbH+Q2b9mfVasSIYA+Av8TUWg1YGyAZ9pjsnvmcFX8nXZ3qrfF VlSg== X-Gm-Message-State: APjAAAVsY/jGSGen7Mu+71CB7DjsBRduReWafLxpCB7HFhZ1ylk+mad3 J0c0T89M9gwgzObUjgm9c/kzjQ== X-Google-Smtp-Source: APXvYqwOXQxo+NIm8u8hg/lQpG05a3iNuDpn/HimbMFXFVkTTj2Y2v3oY1QnThZkDSdpWbrr2A3rew== X-Received: by 2002:a63:544d:: with SMTP id e13mr13856042pgm.143.1564386482744; Mon, 29 Jul 2019 00:48:02 -0700 (PDT) Received: from localhost.localdomain ([49.206.203.41]) by smtp.gmail.com with ESMTPSA id h14sm75723348pfq.22.2019.07.29.00.47.59 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 29 Jul 2019 00:48:02 -0700 (PDT) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Subject: [PATCH 10/15] rockchip: dts: rk3399: Add u-boot, dm-pre-reloc for watchdog Date: Mon, 29 Jul 2019 13:17:06 +0530 Message-Id: <20190729074711.16988-11-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_004803_376606_85FCECB4 X-CRM114-Status: UNSURE ( 7.89 ) 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: Jagan Teki , u-boot@lists.denx.de, linux-amarula@amarulasolutions.com, Akash Gajjar , linux-rockchip@lists.infradead.org Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Add u-boot,dm-pre-reloc property for watchdog in rk3399-u-boot.dtsi so-that SPL can access watchdog. Signed-off-by: Jagan Teki --- arch/arm/dts/rk3399-u-boot.dtsi | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/arm/dts/rk3399-u-boot.dtsi b/arch/arm/dts/rk3399-u-boot.dtsi index 2738a3889e..54286b585b 100644 --- a/arch/arm/dts/rk3399-u-boot.dtsi +++ b/arch/arm/dts/rk3399-u-boot.dtsi @@ -3,6 +3,12 @@ * Copyright (C) 2019 Jagan Teki */ +/ { + watchdog@ff848000 { + u-boot,dm-pre-reloc; + }; +}; + &pmu { u-boot,dm-pre-reloc; }; From patchwork Mon Jul 29 07:47:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 11063397 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 88A0713A4 for ; Mon, 29 Jul 2019 07:48:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7B203286BF for ; Mon, 29 Jul 2019 07:48:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6F11E28703; Mon, 29 Jul 2019 07:48:12 +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 2229A286BF for ; Mon, 29 Jul 2019 07:48:12 +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=WsyByLcRrK/+lNnQeoUwJbn8lVtknzOvrDKZoAlzKVc=; b=eMgY2nGBc2MsMn C5aUlFBK9RdREIVRZYeQRJQvcncNG7BYPeffpi95gR+yLjaDadH5b3pbR5+RhFDdUb9/TQ4Hox9yN uKKr7BcXTIo6UciYB07EccrJ0a8oj4aBDixu5F/c5sbMfXmKLadQFBvfZfN36PtvZrrfwKHjmsB5O T26YSFrFoVDjiRM1AbXma/ADh959vTeZ9f+fMPBUs+u7UfXBGDyIxxr5zwa59uRhKrqQQLGDbj2va bvlraapqHDuGFuKzbHjH9aU/enSx33dYC5zSVZcsg5TYeV6wV4S3TAIal00AtuQnFLaq4x0su6rkP gfwuZUPbr7I4mDpsrdgw==; 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 1hs0OA-0002aa-0c; Mon, 29 Jul 2019 07:48:10 +0000 Received: from mail-pg1-x541.google.com ([2607:f8b0:4864:20::541]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hs0O6-0002PC-Qj for linux-rockchip@lists.infradead.org; Mon, 29 Jul 2019 07:48:08 +0000 Received: by mail-pg1-x541.google.com with SMTP id u17so27808207pgi.6 for ; Mon, 29 Jul 2019 00:48:06 -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=w/x1ZiOCvrLzZkcwYiaPJMQ1HnVFDjCbF32VbqVbBMU=; b=hNnQNwS+ajw9+D1H7wHZAtdfL5SMbBkU/Qgs28PaoSrgqRGfEu6Ax4g44UaOnP+5Xt k0al4FTF/WZUBqwUFz8X+D99vi+8u3O6/sSM9TV9uTMVrEatA0B7WxfxOWAzctWa7Ghh k4/rhQEF4ewYcmQqQM8ndtVjt+CbYu5ADrh0c= 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=w/x1ZiOCvrLzZkcwYiaPJMQ1HnVFDjCbF32VbqVbBMU=; b=HbOYoDcnWdxsyn8SEOkyFBU6uzY/ap9gwHkAYyk4ddZEu/aFr1HdWSgX3SjwQZL0/y faOjZVMBb74NSHmLvVSk9+0tM9KW/+66iy3+loUX6gVgOdZ3ewSgE+gT9PJYnbO0l9Dz au/YOpvxi+0ZbqtE7Bi866+2PXn0ojkWlkxrKMjW7tOZMxXg/9RoWejB7+SlYW1E4Cui ACD0aESBVZBmvLG3+T3arDvXb5RFHz69+5TQDehW0aAfwqpKNZbQjF7lclV7ylXOp42F TczVgCeQffUuA/TgQ1d8CKNW2IBjQIIlZxXIbhTJGMG8oWwQ8M3HPEEYIo7vWPNQqfi6 IP8Q== X-Gm-Message-State: APjAAAWj4CiUTJGRSxAYyUPkHKwirv6fgq9pZLfStMaVlQc8TvygO75g gNWv2yV0TSSmk429NvWRTd3nAg== X-Google-Smtp-Source: APXvYqxv7cFXQ1ZgceANlFkUet/grzfVRxMDJSC2bH5U7+FGvV1jqlql6Ub5rLS7VVcPZCwAqh0hPQ== X-Received: by 2002:a17:90a:ac14:: with SMTP id o20mr112030960pjq.114.1564386486303; Mon, 29 Jul 2019 00:48:06 -0700 (PDT) Received: from localhost.localdomain ([49.206.203.41]) by smtp.gmail.com with ESMTPSA id h14sm75723348pfq.22.2019.07.29.00.48.03 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 29 Jul 2019 00:48:05 -0700 (PDT) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Subject: [PATCH 11/15] wdt: Kconfig: Add WDT_DW entry Date: Mon, 29 Jul 2019 13:17:07 +0530 Message-Id: <20190729074711.16988-12-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_004806_893251_245AADE2 X-CRM114-Status: GOOD ( 10.37 ) 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: Jagan Teki , u-boot@lists.denx.de, linux-amarula@amarulasolutions.com, Akash Gajjar , linux-rockchip@lists.infradead.org Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Add Kconfig entry for CONFIG_WDT_DW, and it indeed depends on DM WDT. So, it can be avialable on particular board defconfig only if they switch to use DW driver model code. Signed-off-by: Jagan Teki --- drivers/watchdog/Kconfig | 9 +++++++++ scripts/config_whitelist.txt | 1 - 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index ee0ddffe73..0b64298016 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -100,6 +100,15 @@ config WDT_CDNS Select this to enable Cadence watchdog timer, which can be found on some Xilinx Microzed Platform. +config WDT_DW + bool "Synopsys DesignWare watchdog" + depends on WDT + default y if ROCKCHIP_RK3399 + imply WATCHDOG + help + Say Y here if to include support for the Synopsys DesignWare + watchdog timer found in many chips. + config WDT_MPC8xx bool "MPC8xx watchdog timer support" depends on WDT && MPC8xx diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index f2453728c6..47e42e680a 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -323,7 +323,6 @@ CONFIG_DEFAULT_IMMR CONFIG_DEF_HWCONFIG CONFIG_DELAY_ENVIRONMENT CONFIG_DESIGNWARE_ETH -CONFIG_WDT_DW CONFIG_DEVELOP CONFIG_DEVICE_TREE_LIST CONFIG_DFU_ALT From patchwork Mon Jul 29 07:47:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 11063399 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 504E113A4 for ; Mon, 29 Jul 2019 07:48:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 41ED5286BF for ; Mon, 29 Jul 2019 07:48:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 358AA28703; Mon, 29 Jul 2019 07:48:16 +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 D2568286BF for ; Mon, 29 Jul 2019 07:48:15 +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=5AjcyKscA5PWQr87q/NhgHEL+QcfuNXmQRs/iLHizoM=; b=TDElDSeS9F/uxQ WVpQEXPCSmg1xpU94rxOFcu0mzE1s3ZvVU6U8HVD3ASlsYXhIM3re13xxCYiFIpFjFncSKWI9ERqD YAh4nOX3KcWcBwA9Gm1HBBsNpnaE++hRtLpdQkByHI8Te/Mbt6RUT7wRrTL5A0Mbjvrh7iEWy2f/4 ZaeXqYnX/lJk2RoOmM/A1PVMKCX+EElEBhEQV3QN5IO81gO45H8Tof3KiyXOBEnSgQ55DBKFWJoEa RlcOMh8ADonsfz5SMfs7Cnx6ri1YcB1knNbQRyhyPxlahZHtWNfS49kg0/m16IbyM3L/2gVXtKoAC vLuTMNJ6/LtaSUdmJxJA==; 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 1hs0OD-0002lW-Ld; Mon, 29 Jul 2019 07:48:13 +0000 Received: from mail-pf1-x443.google.com ([2607:f8b0:4864:20::443]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hs0OA-0002bL-ON for linux-rockchip@lists.infradead.org; Mon, 29 Jul 2019 07:48:12 +0000 Received: by mail-pf1-x443.google.com with SMTP id m30so27589442pff.8 for ; Mon, 29 Jul 2019 00:48:10 -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=UnjYrJEzucsxijDaLJ3Qy03AYryDuOEPvq0xHZN5TzA=; b=JES5mUdcV1iSSnvIWXFbbBkOHnH36E2+gxp/3//Ja6teVRkPFF6d4uocPLSPv4xw/h 4OdX44e8CyVodKI3BLFuQzcHtbI6Pzg0Zx8IaSyUlc5a+BG8SrAZOIGlGoe7uO0fK9yr MrYNxYuyIbn4JDEBzNtCU3bV+t1scLokAQrZs= 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=UnjYrJEzucsxijDaLJ3Qy03AYryDuOEPvq0xHZN5TzA=; b=I4SD/EcRVUoUeFn0Stgre9CBNC3eBFCz9Xxy/IItzL7qbWosF6KIriZiT40Pc9PN8H dlcxmu14jnfYyyGkzoQ9gjY9jr4nMJX9bHdKQeLR51OkYh7osJ2PrY4Cta4+mmTWOggq /Pi87+n/lHENbxLmLP0Cn8dpSXDYVh1GoIzkJJfI/hG0tny4vNT0w/Xgf//7Z44TkSQk xBxGZfuDvH+2uGIM5en6xA1VMqnQoy+pnRlhH41cInmWtv+yuOayN728+7gB3i5WGYc/ rDc10HzbbW3RqOhHgQ2MIr0HNOsJouvy5qfIiNUxMXnnEcilqn5Hf1tSh1frIBqE7XKc 6TRw== X-Gm-Message-State: APjAAAUAOtl6gQMZKkhj4hCsMdK0N3YK8BYsRBhPr0NjMMKB6d2Qhyou d6bkHZEfaU3bsu1oEfiM6s6IAg== X-Google-Smtp-Source: APXvYqx9wJOPSxmbBnTdii0utj5EHqU4x3FgYMhi1bcqUqEyFkjxbo1rbtkZkS6Ql+rBmPcnNhAm2A== X-Received: by 2002:a17:90a:b903:: with SMTP id p3mr108891521pjr.79.1564386490275; Mon, 29 Jul 2019 00:48:10 -0700 (PDT) Received: from localhost.localdomain ([49.206.203.41]) by smtp.gmail.com with ESMTPSA id h14sm75723348pfq.22.2019.07.29.00.48.06 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 29 Jul 2019 00:48:09 -0700 (PDT) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Subject: [PATCH 12/15] include: rk3399: Disable watchdog in TPL Date: Mon, 29 Jul 2019 13:17:08 +0530 Message-Id: <20190729074711.16988-13-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_004810_915635_A0D3C413 X-CRM114-Status: UNSURE ( 7.66 ) 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: Jagan Teki , u-boot@lists.denx.de, linux-amarula@amarulasolutions.com, Akash Gajjar , linux-rockchip@lists.infradead.org Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Disable watchdog for TPL, since there is no support it. Signed-off-by: Jagan Teki --- include/configs/rk3399_common.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h index 8df0180284..67b48e03ba 100644 --- a/include/configs/rk3399_common.h +++ b/include/configs/rk3399_common.h @@ -46,6 +46,11 @@ #define CONFIG_SYS_SDRAM_BASE 0 #define SDRAM_MAX_SIZE 0xf8000000 +#ifdef CONFIG_TPL_BUILD +# undef CONFIG_WDT +# undef CONFIG_WATCHDOG +#endif + #ifndef CONFIG_SPL_BUILD #define ENV_MEM_LAYOUT_SETTINGS \ From patchwork Mon Jul 29 07:47:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 11063401 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 069281398 for ; Mon, 29 Jul 2019 07:48:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EB9F8286AD for ; Mon, 29 Jul 2019 07:48:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DE88F286E0; Mon, 29 Jul 2019 07:48:19 +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 8C3C7286AD for ; Mon, 29 Jul 2019 07:48:19 +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=dX2tnaGUDoTAVLinPlkir1B8VQPbPFHeQ0ty2eusUuk=; b=R8YcpeEYt9h6EH XTTdFGXKX7ahEFq8XZD718xennM6lrBIduTqYf89o3Mut3HFCj2RXA2OMxjMijAF5N5vR8xtf91pV lenbYSs+dcuvnM61VtVL3X58yCp0CVmgfBEiQc/mQ9szuK9ww+dDSdUVUJQWDbN0sQZAMvkqtIr+8 bTWOShtjXHtA4VIcwb6LXwIfctptmwQLNYCMd47VsokDzHUV6i7WaOoDJyLLpu9LQRzb96Wf7jek1 6WJK0CX/D7fr9SGsNut92aP1HSSZD5g0T5bZeNZHPqljEJDwO3GwBXUNGdtp9sbGg2C7MqgUxPsV1 JDwQVNo0lLncv4UQfpeA==; 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 1hs0OH-0002w1-7e; Mon, 29 Jul 2019 07:48:17 +0000 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hs0OE-0002nf-9p for linux-rockchip@lists.infradead.org; Mon, 29 Jul 2019 07:48:15 +0000 Received: by mail-pf1-x444.google.com with SMTP id u14so27601410pfn.2 for ; Mon, 29 Jul 2019 00:48:14 -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=o7CIWIRFdW751SnjnqsVlk5xcbVjSz3RZofqr0wVIcY=; b=gmrxZe8jotnJVIJnHJbVvHrTpbhM04oGl4ZyWqB3xuf4LNTrnzZCDyPcI8dLQjud2G cc+bDjRM3IGuJT1z+xYPyDp6G2tqenoYmpU+BLyiMoTfS85qu/SC6Eeg6Cj4vP8aEKV5 5cibkyJCWACwyfIlEbqvKxJqQdlYBVLfIWZlU= 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=o7CIWIRFdW751SnjnqsVlk5xcbVjSz3RZofqr0wVIcY=; b=NbDkjarpwjxXXWN9PAiOGHYA3yua8RB+mQ0K/bF1WGbLkC21xXt2drpkkzgGS/kvns fIGtq5ff6OC+UMjB6Y1W6sVCMl4b0o5qEpvroYT5K9cp/hs0ex8r/4pcUdtYv20SXLXj Z7JzhZgUcnrCSGYKmsG45jfoXwat5N0mfsNQm1Ge+Ot6qJhQ8/dsmeDjF5yHMqre37i4 awxAuNimJCct7sAG0iNyyx6AD/AB9her7lmtNncAuYfvRI7tknFnUcFrlHyfWPH4I5/E sCbDSdESEzwbeIFwEIX5SY5BPSuXGXDFTIJZRvbS/9qsUu0oZdy3AWnfkXj+25k2lHf5 YSWQ== X-Gm-Message-State: APjAAAVbAfXz46/WhiPfGUUYIQ2l+yM37jslcuuV41FGhCHLEME3u8So 4pxFu4qANrNhn1AZYi1CZZ3MqQ== X-Google-Smtp-Source: APXvYqw+t67A3+soEwfQa7CnwhZqhgfpcfBNXEJVKaR1hHQl3CsEaUzilc9zqidKcPYi4e+TuV/+8A== X-Received: by 2002:a17:90a:360c:: with SMTP id s12mr112293213pjb.30.1564386493822; Mon, 29 Jul 2019 00:48:13 -0700 (PDT) Received: from localhost.localdomain ([49.206.203.41]) by smtp.gmail.com with ESMTPSA id h14sm75723348pfq.22.2019.07.29.00.48.10 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 29 Jul 2019 00:48:13 -0700 (PDT) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Subject: [DO NOT MERGE] [PATCH 13/15] rk3399: rockpro64: Enable watchdog Date: Mon, 29 Jul 2019 13:17:09 +0530 Message-Id: <20190729074711.16988-14-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_004814_433871_AEDDCBF4 X-CRM114-Status: UNSURE ( 7.06 ) 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: Jagan Teki , u-boot@lists.denx.de, linux-amarula@amarulasolutions.com, Akash Gajjar , linux-rockchip@lists.infradead.org Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Enable watchdog in SPL and U-Boot proper for Rockpro64. Signed-off-by: Jagan Teki --- configs/rockpro64-rk3399_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/rockpro64-rk3399_defconfig b/configs/rockpro64-rk3399_defconfig index 32d8415b23..f604ccc1ec 100644 --- a/configs/rockpro64-rk3399_defconfig +++ b/configs/rockpro64-rk3399_defconfig @@ -55,3 +55,5 @@ CONFIG_USB_ETHER_SMSC95XX=y CONFIG_USE_TINY_PRINTF=y CONFIG_SPL_TINY_MEMSET=y CONFIG_ERRNO_STR=y +CONFIG_WDT=y +CONFIG_SPL_WATCHDOG_SUPPORT=y From patchwork Mon Jul 29 07:47:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 11063403 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 7D24113A4 for ; Mon, 29 Jul 2019 07:48:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6FD72286AD for ; Mon, 29 Jul 2019 07:48:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 61850286E0; Mon, 29 Jul 2019 07:48:23 +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 0B431286AD for ; Mon, 29 Jul 2019 07:48:23 +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=LfWEofBFJhIs1+ytpgKrIpQKdYkiZc2k6+jHDoAyrhM=; b=QFRZ2bSaTu0tiB CQmTLb91qvXOP7vaItso1lFyhSxwZzBNGASCg6VOCTwdMtzSmr/WdULYpjGQTF/qLgy+/SirZK+wP d2gGTZuptYCsE/3KFvKgfYs06dioTzZoG8XT+pr5hgXPFKT5FMAiezXVFxY/v9MQlyt5ZIXdCro0k +2whiyNDRX/4fnzITO+0TwGvRlrK5YRrWoq9azQLvsW8/AADuVbi8A7z/K2FPZ931hFZNRkEwAfz9 UvbBMUcxHKehFrpIDrndZ0BVW8RSu2TTU+119oSHQNN4dAkEo/c5aPAEYGbVFmNhEPWkTo4z2xHmi mTFaqWNNOdkId3cRNR6A==; 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 1hs0OK-00039V-IA; Mon, 29 Jul 2019 07:48:20 +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 1hs0OI-0002yY-3v for linux-rockchip@lists.infradead.org; Mon, 29 Jul 2019 07:48:19 +0000 Received: by mail-pg1-x544.google.com with SMTP id u17so27808424pgi.6 for ; Mon, 29 Jul 2019 00:48:18 -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=u7szBjNEXUp4OiSeFnl8aPhRsuIeh4Tl0P1JrlmGS+4=; b=c7WwARmCOMC1k9yY6B799HcEcsOa42QQyjFXyDCDvq+zZ3J9psjI3ti/tvw1qYvxu9 lnDGoCh4ONCjBZLb1ga8aUOjPN2EYJORN/iI5TlNAwIE17vqxefmcPO1UyIYWmzX8Fy5 fqbxnIrl/8vJqLFSsxJvcRJ+vJEFxZfA9WOrI= 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=u7szBjNEXUp4OiSeFnl8aPhRsuIeh4Tl0P1JrlmGS+4=; b=GLamWbLQoDtS0iD5vxUcHqbaT02PqhsqHBIvenbz2oM7QXlvFXWMm8gc/O+PAWxGk7 dzyyiVGMOA45GIwH6g1lcjVO6cCNsTrHUyhfcQ1r9IJO8uUxJE671s4rmANV0y30iWKt POH1cuG1cVe1ORr3Iyf+h/q+U++E3kGIYlQRqcPDh5bw1YHGr1TGasP9uJojGLgh55FK EmjvAzJhuhM2DZOqkjhiGwUb65+zwXa0MSv+Hg41Ar8wBZsAfvXqsrydGFgEnQKEnP19 nfLG/gTDpXOzjFblvmNLE73kbjZF6hnL6X/8HDzzY77I6gqs8L2EtBwwvdhLkrmRDrSf HK8w== X-Gm-Message-State: APjAAAWjMUsP0xw+J3R1sSSDa8UCw8PZt/pE3g6Eil65IVZsPJrmsbmH fLSlXt/wwfrWeeY/942t+Uxr+Q== X-Google-Smtp-Source: APXvYqxd7DW4FUjd7e0VL24ANUFtT0eZc4uXh1C9cfD0resPdzxTBUOgEAXqeodlU+HMvAA4q8TzVQ== X-Received: by 2002:a65:5a44:: with SMTP id z4mr103285588pgs.41.1564386497542; Mon, 29 Jul 2019 00:48:17 -0700 (PDT) Received: from localhost.localdomain ([49.206.203.41]) by smtp.gmail.com with ESMTPSA id h14sm75723348pfq.22.2019.07.29.00.48.14 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 29 Jul 2019 00:48:17 -0700 (PDT) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Subject: [PATCH 14/15] rockchip: rk3399: Add bootcount support Date: Mon, 29 Jul 2019 13:17:10 +0530 Message-Id: <20190729074711.16988-15-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_004818_184448_EAFD56DD X-CRM114-Status: GOOD ( 10.66 ) 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: Jagan Teki , u-boot@lists.denx.de, linux-amarula@amarulasolutions.com, Akash Gajjar , linux-rockchip@lists.infradead.org Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Add bootcount support for Rockchip rk3399. The bootcount value is preserved in PMU_SYS_REG0 register, this would help to support redundent boot. Once the redundant boot triggers, the altboot command will look for extlinux-rollback.conf on particular bootable partition which supposed to be a recovery partition where redundant boot required. Signed-off-by: Jagan Teki --- arch/arm/mach-rockchip/Kconfig | 2 ++ arch/arm/mach-rockchip/rk3399/Kconfig | 10 ++++++++++ include/configs/rk3399_common.h | 5 ++++- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig index 17f31e89f3..dd5055ed69 100644 --- a/arch/arm/mach-rockchip/Kconfig +++ b/arch/arm/mach-rockchip/Kconfig @@ -184,6 +184,8 @@ config ROCKCHIP_RK3399 imply TPL_CLK imply TPL_TINY_MEMSET imply TPL_ROCKCHIP_COMMON_BOARD + imply SYS_BOOTCOUNT_SINGLEWORD if BOOTCOUNT_LIMIT + imply CMD_BOOTCOUNT if BOOTCOUNT_LIMIT help The Rockchip RK3399 is a ARM-based SoC with a dual-core Cortex-A72 and quad-core Cortex-A53. diff --git a/arch/arm/mach-rockchip/rk3399/Kconfig b/arch/arm/mach-rockchip/rk3399/Kconfig index 6660d05349..68ac913bcb 100644 --- a/arch/arm/mach-rockchip/rk3399/Kconfig +++ b/arch/arm/mach-rockchip/rk3399/Kconfig @@ -91,6 +91,16 @@ config TPL_STACK config TPL_TEXT_BASE default 0xff8c2000 +if BOOTCOUNT_LIMIT + +config BOOTCOUNT_BOOTLIMIT + default 3 + +config SYS_BOOTCOUNT_ADDR + default 0xff3100f0 # PMU_SYS_REG0 + +endif # BOOTCOUNT_LIMIT + source "board/rockchip/evb_rk3399/Kconfig" source "board/theobroma-systems/puma_rk3399/Kconfig" source "board/vamrs/rock960_rk3399/Kconfig" diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h index 67b48e03ba..ace82928d1 100644 --- a/include/configs/rk3399_common.h +++ b/include/configs/rk3399_common.h @@ -70,7 +70,10 @@ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ "partitions=" PARTS_DEFAULT \ ROCKCHIP_DEVICE_SETTINGS \ - BOOTENV + BOOTENV \ + "altbootcmd=" \ + "setenv boot_syslinux_conf extlinux/extlinux-rollback.conf;" \ + "run distro_bootcmd\0" #endif From patchwork Mon Jul 29 07:47:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 11063405 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 BB94513A4 for ; Mon, 29 Jul 2019 07:48:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ADD75286AD for ; Mon, 29 Jul 2019 07:48:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A0B45286E0; Mon, 29 Jul 2019 07:48:27 +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 5F5D2286AD for ; Mon, 29 Jul 2019 07:48:27 +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=eUu8T/MR3uRxWWJBhxdWkqvCSForByR1nZ3GyTBZb9M=; b=Tk615paiFDGl5v IO04kUn36a5u09Tk0LqCqyXVATJHc3K8rylLK5EE9Dt0toGjsE9hmOxQ1xVYppoJHIZ2/hMeGanjT GySne6PsnGHz+BzBRK8GaR1LTb16aU6blcYPEvUVsMVFzk1W9j9MDu5oywLgDA1uTw1170/5j9Smp XkWFYh7FANGufDrtZkFUChhHpRDBxr2r05v3UAi9a5ibtyl6YLYAt+o3STJ7UANcuajZFw5a4xnUG SVCCPwbrPiovwpMunlpdmuLrxcPWCljtiCITIwo4oNWfl+A1edOWSBo89sUMGY20hXD5uybtX6rP9 JuHvtNCtorEGY8xm+4sw==; 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 1hs0OP-0003Ge-16; Mon, 29 Jul 2019 07:48:25 +0000 Received: from mail-pg1-x541.google.com ([2607:f8b0:4864:20::541]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hs0OL-0003DJ-N2 for linux-rockchip@lists.infradead.org; Mon, 29 Jul 2019 07:48:23 +0000 Received: by mail-pg1-x541.google.com with SMTP id t132so27798997pgb.9 for ; Mon, 29 Jul 2019 00:48:21 -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=f1CWAkaGxV+TJoP0QvAY8A3uWWMaAVYWVc4J6D/J154=; b=GhGoqUktGYlVuBCkKNoAkRaO0p2jQD+H9tJzm/TVT4nKOt3msrjRJeoBgF+GFjEPzq L3RCPdFhKPDq4iW7aEyotO2aZZ9UtVlyqb1/uhwFl7mDynda+Svvy9TG3q0dlo3EM88q Vekd+U24m1G7KnEVbX/ifrkxeBWwsUcr3QRS4= 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=f1CWAkaGxV+TJoP0QvAY8A3uWWMaAVYWVc4J6D/J154=; b=CCZKN9h0vKxJVLKRD3T/LrZgWTCIoKYNuF7m/5ZfNWNx4VOv9w085WE7oOdHT1G8ex MAwqZ1qy9QN1Aofqke8qrpH+8xe7ME508f16H3Y2fsVqQ/kXI0i30+vd9WPmhsuGGO+j lbAm3Dh009hBZQW6esYPGWG2MEqPAfX+xTIuWq1INXaUNNv6S7x4dKtlvM3Fk9KiNmsB kYkg5EjPeuQe++Mw40PnTvXAZAsX31FyJ8tL/VMYEMbfNvrzMAhYcwhLoieBYOoBKb0u OV2J7+lbhtS+0QY2OfTwVQIaJYXB2We0OK8Xu9wpeBStRvpOjzaVbuJIjghZPs0y+4gx DltA== X-Gm-Message-State: APjAAAVo8k7y8nDwplvVyGGitK+qPLvTIvYdM5PK4KoYCYXXD27VpDOz I3Y39q1nj8pPHHDGxXbykjmo3Q== X-Google-Smtp-Source: APXvYqyz4yrERS12TgcL68+nCZoAumWr7OnxoB0wbGlTJW/dhnDHcEIaFC2o1qDWRvnd4b6Hn2K0rQ== X-Received: by 2002:a63:e54:: with SMTP id 20mr100694932pgo.244.1564386501085; Mon, 29 Jul 2019 00:48:21 -0700 (PDT) Received: from localhost.localdomain ([49.206.203.41]) by smtp.gmail.com with ESMTPSA id h14sm75723348pfq.22.2019.07.29.00.48.17 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 29 Jul 2019 00:48:20 -0700 (PDT) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Subject: [DO NOT MERGE] [PATCH 15/15] rk3399: rockpro64: Enable bootcount Date: Mon, 29 Jul 2019 13:17:11 +0530 Message-Id: <20190729074711.16988-16-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_004822_002739_504E8B87 X-CRM114-Status: UNSURE ( 7.93 ) 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: Jagan Teki , u-boot@lists.denx.de, linux-amarula@amarulasolutions.com, Akash Gajjar , linux-rockchip@lists.infradead.org Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Enable bootcount support for Rockpro64 boards, this would help to use it for redundent boot. Signed-off-by: Jagan Teki --- configs/rockpro64-rk3399_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/rockpro64-rk3399_defconfig b/configs/rockpro64-rk3399_defconfig index f604ccc1ec..3f1cf21ca0 100644 --- a/configs/rockpro64-rk3399_defconfig +++ b/configs/rockpro64-rk3399_defconfig @@ -57,3 +57,4 @@ CONFIG_SPL_TINY_MEMSET=y CONFIG_ERRNO_STR=y CONFIG_WDT=y CONFIG_SPL_WATCHDOG_SUPPORT=y +CONFIG_BOOTCOUNT_LIMIT=y