From patchwork Mon Aug 26 18:20:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 825 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ot1-f69.google.com (mail-ot1-f69.google.com [209.85.210.69]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 3EB6C3F9FB for ; Mon, 26 Aug 2019 20:21:22 +0200 (CEST) Received: by mail-ot1-f69.google.com with SMTP id a26sf10594396otl.1 for ; Mon, 26 Aug 2019 11:21:22 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1566843681; cv=pass; d=google.com; s=arc-20160816; b=gjsekyLmg6DV3COLHXZGsBOEW8kE/7cBeA9tIANUCakbHd7tbfI6B7lxAwhbB5yCbF Z+SW0kcUyM9rtOj+m0DcqQYu7sgGZDsH/CpwBU6WbKHoZiXh0l20mk2ln13RcewPpX1T v5g47LIIu6ZoqTN6WsqFqL2O2G76Oap4NoLh/4nt7Nem2dpM/80Zob0+gNrwLIE7zr4q Uo4mFsfmbH6XHAG+bCGS5qmi9nYNlExjzGrrSJ2R5hHJ+FAW34MAyacFmbuPcEfyv3Q0 WaRFypf83LS+3sHPLWKZrU84N98vtI1XYXL8oDqUAt9jxPg6zNChuqBHrJgYThqquSQa Ho1A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=kO1olT6hiSHZyHV8eKVKpO6kcCH47DXLbAtrv3WMFPs=; b=CF20SMXsM/RG95v0Y4E+aWhoA/p7PDfeYkPVMLCthLDjSfgXaop1+cnnCWy1UdDWhE OW+Drpz5B3tmT8GA/G4GR5ltolaux8EUMslAtccNVwE6OLDvBlLfgBFKML+iFGsJYLLU bdDTUq7XtAEjGSduwg4L6ZRIOwqFzLkgTTuQl6Sao+0H+gu+oWnVq2fCKRM2AJDM936d +CorgmPCOTgPlaytebwY0rnn4hyaN5ucj7ZuhB3jUaN63mMc49Hrjrlg3JEPb8s8+IF9 9VxzaoNCUBzZleX7o4XDXn9PUhK0PKWQCWTO/D6nVcMAAqcgcUhqBDu5NVgD9oDNHNLM OUnA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=Njd9rnY4; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=kO1olT6hiSHZyHV8eKVKpO6kcCH47DXLbAtrv3WMFPs=; b=D/VGN03VnD92ekUNj5osn7opjfeKM4/AqydB2etqRfDbmjJTTjyAeqT9b3Rh3m9Yvd x5Db0gBcOUOvebpHX3JE8ZN4O+mkJIijjS4e5h+lo4IHAPFtc7+ewVxnJ4rseZHPSVCM VkGlJ1q4WRqy94ANFvoyqehJYzU4Wug9JB4ho= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=kO1olT6hiSHZyHV8eKVKpO6kcCH47DXLbAtrv3WMFPs=; b=XmNuMcOxqtZOqoFEHebTzCVmma5dwvcqLc2hGlZWtBjVdj65oOfqHknUGxQY9+MNe5 vRDKrvpy87Bq6UHJH74Q2S2IApcd9hN33lR/Q5FhTTikf0Ao/6O3ygyR169HIKIwLSaS /ZMQwsAMWgaOB35H7oMPjq9L8zl1ZVUARc7ga6tdp7pQeJVpY17lQD3R4fl8S0i9Pw1z zGCuEkWOfCihXuajL/FJG2V9Cn/Pher0VrZiPtwUMb0uXVRNGWtXnI3uCleyeKRT10jn s/VObNiquYX0STyVOXGXSzvXQ2YoYFFSbsuOOXNuKRhPkRmvJtCw47ur9VS2BamW5AAx z+ug== X-Gm-Message-State: APjAAAWoLfiFmE+PtA9ui1u2vNkOZDoFpl2wXrGTEfvc92EjuXcNE4ji 7w9m/8zY528RRg2p6p25ylLUMPGD X-Google-Smtp-Source: APXvYqxcKR4SpEDpDYTG9AFoVTOrwBIQnO1H7jtSr2PCFwP++sygAUiMeET7ER3L59yp1bmSkm9HcA== X-Received: by 2002:aca:38c2:: with SMTP id f185mr13701372oia.80.1566843680962; Mon, 26 Aug 2019 11:21:20 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a54:448b:: with SMTP id v11ls406559oiv.3.gmail; Mon, 26 Aug 2019 11:21:20 -0700 (PDT) X-Received: by 2002:aca:c644:: with SMTP id w65mr9061935oif.41.1566843680643; Mon, 26 Aug 2019 11:21:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566843680; cv=none; d=google.com; s=arc-20160816; b=dd+vTHU5tWTETdEvvQEQUfNVeQQZQAljYqKE4bUUEFO5gZt8f25sOvzGzxco0ebmum WSxfMCPFTWbNmyj8JLhKMMrG2oYInaGhcuFYQvPONcQ+Dz1/AqjWafx437KX5tYCJZWc K8w4aAggXIL5ZUSM4Op2DokPZt7FZVWeBT4Pvo8abiP02SBp1ycViu8GEkbF7qovgHhX 43mN5z5LDbaGiBeAo+N/gqdOskRrHghq+PsLn2gdQI7UL4G3lFaCDn/ABNQmr4pSJRND wDGxdDrU/UkeEiJWmWfJ77bzgQEKn9AwddGJhkTk9UCTl3AHiIPCntFAzd7dA7AN66NI 4j1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=xRu0x2zdsAS9SouCZDw1havsmdJYtE07rAHvq61BChY=; b=rh41kaeo6lUwBqgcBcQNzwCHS+NmNWqyvuCJx54hsN8Gk8Era3bIVbAZhovT//6SrU Iq/Ckt92WAXxPLcmhzz44WQNIjEJm8NoAwAUOSGOmCxKXWg704GpBuxMF6MMS8ks6NGr OSnOIHJT+Qkm7GG2BpalBCG+O2U/KM1bqXL6po61me2HntCye0LeQGCXgcbhYMaFZR5V Ioc3XC6kCrv8fw2wfzoyHgy6VNRSzvduBB7rk/j1crjY1mU0L66RkJtZkmFw6n5F1WRT LHpOwEI6FHQgff4DQqOCxPTy2AKcy69Spa0bwXlTaC6fZ4wEnpg3Q7Quy2qEbZLLv51y odKA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=Njd9rnY4; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id j7sor5054910oia.175.2019.08.26.11.21.20 for (Google Transport Security); Mon, 26 Aug 2019 11:21:20 -0700 (PDT) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; X-Received: by 2002:a05:6808:198:: with SMTP id w24mr13261346oic.53.1566843679641; Mon, 26 Aug 2019 11:21:19 -0700 (PDT) Received: from jagan-XPS-13-9350.attlocal.net ([2600:1700:7430:38e0:d5b0:4823:33c8:5e46]) by smtp.gmail.com with ESMTPSA id c11sm4401461otr.54.2019.08.26.11.21.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Aug 2019 11:21:19 -0700 (PDT) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Cc: Akash Gajjar , u-boot@lists.denx.de, linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, Jagan Teki Subject: [PATCH v2 01/16] rockchip: Add cpu-info Date: Mon, 26 Aug 2019 23:50:56 +0530 Message-Id: <20190826182111.30999-2-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190826182111.30999-1-jagan@amarulasolutions.com> References: <20190826182111.30999-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=Njd9rnY4; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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 Reviewed-by: Kever Yang --- arch/arm/mach-rockchip/Makefile | 1 + arch/arm/mach-rockchip/cpu-info.c | 16 ++++++++++++++++ 2 files changed, 17 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 207f900011..76fc4942ee 100644 --- a/arch/arm/mach-rockchip/Makefile +++ b/arch/arm/mach-rockchip/Makefile @@ -20,6 +20,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_COMMON_BOARD) += board.o endif diff --git a/arch/arm/mach-rockchip/cpu-info.c b/arch/arm/mach-rockchip/cpu-info.c new file mode 100644 index 0000000000..90ce65d9ff --- /dev/null +++ b/arch/arm/mach-rockchip/cpu-info.c @@ -0,0 +1,16 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * (C) Copyright 2019 Amarula Solutions. + * Author: Jagan Teki + */ + +#include + +int print_cpuinfo(void) +{ + printf("SoC: Rockchip %s\n", CONFIG_SYS_SOC); + + /* TODO print operating temparature and clock */ + + return 0; +} From patchwork Mon Aug 26 18:20: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: 827 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-oi1-f198.google.com (mail-oi1-f198.google.com [209.85.167.198]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 05E5B3FA00 for ; Mon, 26 Aug 2019 20:21:23 +0200 (CEST) Received: by mail-oi1-f198.google.com with SMTP id v135sf2235117oie.9 for ; Mon, 26 Aug 2019 11:21:23 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1566843682; cv=pass; d=google.com; s=arc-20160816; b=SIJ8VDl2ec8ObIjtQLhcyB7pbqJdhBUJd+00sZDC6YHzRRNn4DQmih/G2PeNICfZFq iAgm7c+XyWFsznefrhS2M8bQSd1vg4dRDx4sA7102TPQqtpWmovWrSZsmO5gx2l+3eHM 6CRiFvCJy7diXGnPuLKW3HSwmMzukE6U48yGSB2vWmk0GlMzwK8YlCguxpzDvyuIdTJh xc3pE+3ZqGRDM9nYOvmLYAYHeM1Pa5ZCCP0h3f0RDh9FjhoouPBOCIyELYeNH8B3nQ+h W3Oso8DSVMUrtBsTbhGdhhs9SFv7e9BUoA8dclbfMyR91qyshwYbASDnw7tkd7ujqdVX kQnQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=L1JjkVWHHZQTn7BFCIGuoTUwQ2ES0LsQ7CfrodfUh2c=; b=YiGjIfSs0BW+9ic/HxYnVXQ6dIiMyInduPKaamjQHIy+MbVlgsKGFJdBawHqbGmU25 h+ZjCI1A13dd+QdxIbL7VPrRA9Wo4kGE9fcXKqBswoNYDHp5CauC7DVGw7cIPvwSnmSi 1jt6J6payiHyf7nim0oXnfKycRoIOtCoJmsIqi7jfDthFk6TJbMuUS7zibOfwZMMwi4Z Jo7amsiCV9hZnDFduS9vgrghc8mwrlwaVxYw5Yz6ELVZKyG/iFaPGT2By6kpiMzJRuKh Rx2aWuqI78FqZKmadHuopSqo97vxqpXQAGYbE3SFsWRf7b7UCHEULHkGDCLaygQD3Z/V xiPQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=DcWaZINn; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=L1JjkVWHHZQTn7BFCIGuoTUwQ2ES0LsQ7CfrodfUh2c=; b=dR8YnmjRbXlQl39QLM+rVmN7egGA3qKdlC3QKf+IQHyZZDkhwIO88pAieaPEhzHP2y iM9yvd4YiGznGKW7edXoGfaMKwvBZvKoR9Wcj3W/98108gm/YpMH8CwWQ6T28bUz8wcD SjMe2WN2gfHS7jmVLgzybhSxKyKdnpR6nQDeI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=L1JjkVWHHZQTn7BFCIGuoTUwQ2ES0LsQ7CfrodfUh2c=; b=opCDJ76zb5htsY7TF8pcIMlumH7sY6cZSIGVPfwwm6NECTX887SPPv3dguTheghnPr TSqFWOTZOgZB/lffTi1Le9T9YCglv2IOdmOQw9U0J+tvDVp9pxC+8EZH+A8fGfpAx+rW y0dPXxpblr93njU952kjbs6XOS0CMtopnbVHoq4JzH3Ll6BcUqrsVLswN9gT/gDxKQJR j+Esmwewzrux3ui2PQ28fmrjoeITQEs2DWTBugGlMRGeBKY+5TxVWSZEOyc2cSwXiL8X DnOQE2OAJmLdgDwgKOOLIw/vYogVv4F5ffmbisEuZOEMJ8hlJLN5DBNe0PzH/V5uHK43 XNQw== X-Gm-Message-State: APjAAAXdlC37+q7i4/i5jO862lKnOf1oFerRkSocmNHHem2VVd+s93DP O5fhtPXHcOOJatRgyGqvgJKP4K8f X-Google-Smtp-Source: APXvYqzyQ9osx6ptoUMNSyv4fMfY2cCNvytrp58XfV/+QNmewZ5obawoHbGblADWYFJhYYdinAYolA== X-Received: by 2002:aca:e055:: with SMTP id x82mr12756236oig.90.1566843682258; Mon, 26 Aug 2019 11:21:22 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a54:4717:: with SMTP id k23ls408954oik.9.gmail; Mon, 26 Aug 2019 11:21:22 -0700 (PDT) X-Received: by 2002:aca:190e:: with SMTP id l14mr12539569oii.20.1566843681829; Mon, 26 Aug 2019 11:21:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566843681; cv=none; d=google.com; s=arc-20160816; b=Ypn6IB+hvrBxsJRBhdD1BBp3V7OGsAfGwgBb3g8CsxyRabyKUcrDiKCSdlLXCkGsuP RO3Vq5BWMe/P6LirvvXbxXrAunhFiRugr9heGKcTBhetPkmgazSI7Y7dRmX6jI/9+0kY rvAnErXh1WXwdA815e6RKmSQWcFBrc7CZ5G+yaR1MNt431DUSq9V8L99ItGqR9E9uvcq g2Xigs+J2xNG27BiyOMiJEygtUEEid/ekeWssRsSTl/XoR7Ufomb6sZNBjC/oXtfNxYX /AlkNzN8UbAaYfbhCR0uT5mX1dePLGLfnK24ObYiMsRoKp3LfvQhqS76anDuLAT6m3DA G5QA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=DI6U6w8IvWI4vnO9bSLBH4qlamzGPmsKfkq0Jp23uaM=; b=LztezT+2mLOPwC0vbrHVwG+6BfoC4y0azX5i76a4L0xFizAw9dfo7axKgNPFC1m2zN 4ZeE1lSHFuQDsnOq8Y40ngIUcr0uTEcKhOpBe5IpBeE9dvZHJnvteX8at1VsGFDV/dHI 0TZnEz3m5/JbgjFi0FtkoN9CDejSoDsVVwqEw6iDduQiLOn5sj/Jwe+VGYxpFZY2TOAk 3L/R8JxGg28FVsrtk7syy+H9/Gz3/tHAdri5FPyUeNPmzsb3402BL6TKzYNgDJTUZ4U1 rfaH1zwnD0cLJX8kLAVG52hrTxlREYqUPpBHImFCzAMACJy6KMyGT9TMJNOI4Uwpugm0 UCtg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=DcWaZINn; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id n13sor5405409oij.33.2019.08.26.11.21.21 for (Google Transport Security); Mon, 26 Aug 2019 11:21:21 -0700 (PDT) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; X-Received: by 2002:aca:518a:: with SMTP id f132mr13040418oib.114.1566843681424; Mon, 26 Aug 2019 11:21:21 -0700 (PDT) Received: from jagan-XPS-13-9350.attlocal.net ([2600:1700:7430:38e0:d5b0:4823:33c8:5e46]) by smtp.gmail.com with ESMTPSA id c11sm4401461otr.54.2019.08.26.11.21.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Aug 2019 11:21:21 -0700 (PDT) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Cc: Akash Gajjar , u-boot@lists.denx.de, linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, Jagan Teki Subject: [PATCH v2 02/16] rockchip: rk3288/rk3399: Enable DISPLAY_CPUINFO Date: Mon, 26 Aug 2019 23:50:57 +0530 Message-Id: <20190826182111.30999-3-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190826182111.30999-1-jagan@amarulasolutions.com> References: <20190826182111.30999-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=DcWaZINn; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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/ficus-rk3399_defconfig | 1 - configs/firefly-rk3288_defconfig | 1 - configs/firefly-rk3399_defconfig | 1 - configs/khadas-edge-captain-rk3399_defconfig | 1 - configs/khadas-edge-rk3399_defconfig | 1 - configs/khadas-edge-v-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 - 21 files changed, 21 deletions(-) diff --git a/configs/evb-rk3288_defconfig b/configs/evb-rk3288_defconfig index 405fde0c80..68791cb417 100644 --- a/configs/evb-rk3288_defconfig +++ b/configs/evb-rk3288_defconfig @@ -12,7 +12,6 @@ CONFIG_DEBUG_UART=y CONFIG_USE_PREBOOT=y 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 a0d215a5f1..2dae9e86b7 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_RAW_IMAGE_SUPPORT is not set CONFIG_SPL_STACK_R=y diff --git a/configs/ficus-rk3399_defconfig b/configs/ficus-rk3399_defconfig index 8b3692cdf0..4d05e0eb31 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_RAW_IMAGE_SUPPORT is not set diff --git a/configs/firefly-rk3288_defconfig b/configs/firefly-rk3288_defconfig index 7ca522b479..1ebaf0dd72 100644 --- a/configs/firefly-rk3288_defconfig +++ b/configs/firefly-rk3288_defconfig @@ -13,7 +13,6 @@ CONFIG_DEBUG_UART=y CONFIG_USE_PREBOOT=y 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 d022631465..6b5a43219e 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_RAW_IMAGE_SUPPORT is not set CONFIG_SPL_STACK_R=y diff --git a/configs/khadas-edge-captain-rk3399_defconfig b/configs/khadas-edge-captain-rk3399_defconfig index acfd91dbe7..b2bdc7c032 100644 --- a/configs/khadas-edge-captain-rk3399_defconfig +++ b/configs/khadas-edge-captain-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-khadas-edge-captain.dtbi" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set CONFIG_SPL_STACK_R=y diff --git a/configs/khadas-edge-rk3399_defconfig b/configs/khadas-edge-rk3399_defconfig index b71fd3a286..c3e3933d12 100644 --- a/configs/khadas-edge-rk3399_defconfig +++ b/configs/khadas-edge-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-khadas-edge.dtb" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set CONFIG_SPL_STACK_R=y diff --git a/configs/khadas-edge-v-rk3399_defconfig b/configs/khadas-edge-v-rk3399_defconfig index 0a789872dc..394c60f076 100644 --- a/configs/khadas-edge-v-rk3399_defconfig +++ b/configs/khadas-edge-v-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-khadas-edge-v.dtbi" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set CONFIG_SPL_STACK_R=y diff --git a/configs/miqi-rk3288_defconfig b/configs/miqi-rk3288_defconfig index 1fee1be58a..2424711f6d 100644 --- a/configs/miqi-rk3288_defconfig +++ b/configs/miqi-rk3288_defconfig @@ -13,7 +13,6 @@ CONFIG_DEBUG_UART=y CONFIG_USE_PREBOOT=y 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 1d4c8f8a02..3571a7bccc 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_RAW_IMAGE_SUPPORT is not set CONFIG_SPL_STACK_R=y diff --git a/configs/nanopi-m4-rk3399_defconfig b/configs/nanopi-m4-rk3399_defconfig index 7375b758a2..69bf290a66 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_RAW_IMAGE_SUPPORT is not set CONFIG_SPL_STACK_R=y diff --git a/configs/nanopi-neo4-rk3399_defconfig b/configs/nanopi-neo4-rk3399_defconfig index 874ee5efb6..f51b908dd9 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_RAW_IMAGE_SUPPORT is not set CONFIG_SPL_STACK_R=y diff --git a/configs/orangepi-rk3399_defconfig b/configs/orangepi-rk3399_defconfig index 7b02c59f08..4896bb3070 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_RAW_IMAGE_SUPPORT is not set CONFIG_SPL_STACK_R=y diff --git a/configs/phycore-rk3288_defconfig b/configs/phycore-rk3288_defconfig index 7cfbd50c1e..8d49677e60 100644 --- a/configs/phycore-rk3288_defconfig +++ b/configs/phycore-rk3288_defconfig @@ -14,7 +14,6 @@ CONFIG_USE_PREBOOT=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 efa20d0800..34f6eb139d 100644 --- a/configs/popmetal-rk3288_defconfig +++ b/configs/popmetal-rk3288_defconfig @@ -14,7 +14,6 @@ CONFIG_USE_PREBOOT=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 5d2a28a72d..1065d2d8fd 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 91e60da803..e0a35d8539 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_RAW_IMAGE_SUPPORT is not set CONFIG_SPL_STACK_R=y diff --git a/configs/rock960-rk3399_defconfig b/configs/rock960-rk3399_defconfig index abcc53fc8e..99b18cf8f2 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_RAW_IMAGE_SUPPORT is not set diff --git a/configs/rockpro64-rk3399_defconfig b/configs/rockpro64-rk3399_defconfig index 40ebad5abb..e05ea3e186 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_RAW_IMAGE_SUPPORT is not set CONFIG_SPL_STACK_R=y diff --git a/configs/tinker-rk3288_defconfig b/configs/tinker-rk3288_defconfig index 443f4d88b9..88e43c6d62 100644 --- a/configs/tinker-rk3288_defconfig +++ b/configs/tinker-rk3288_defconfig @@ -13,7 +13,6 @@ CONFIG_USE_PREBOOT=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 c74c1457a7..68b680a417 100644 --- a/configs/vyasa-rk3288_defconfig +++ b/configs/vyasa-rk3288_defconfig @@ -13,7 +13,6 @@ CONFIG_DEBUG_UART=y CONFIG_USE_PREBOOT=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 Aug 26 18:20: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: 828 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ot1-f70.google.com (mail-ot1-f70.google.com [209.85.210.70]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 85C8C3F0E1 for ; Mon, 26 Aug 2019 20:21:24 +0200 (CEST) Received: by mail-ot1-f70.google.com with SMTP id o21sf10597607otj.7 for ; Mon, 26 Aug 2019 11:21:24 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1566843683; cv=pass; d=google.com; s=arc-20160816; b=iYsvEnCDu5rJsb0c0k6kHtZaid+H8A2XyETamvGjj/MknAb2vmNeEMS+kisPIRlcns 3KyM+f4lEIvow634CIkCeesLlGdACJG56lYynKD/xuaXv62zAyyw+mH3AbM+T/XiHa99 Z6zkazbxCfoGl/P3ndwKCrn/S8N8Fmn57p4ipeFkDCvUp99TKRygtZi0vLV1kP/aHvhs JGO1ez5qycwh389AsE1xoS2F6pddsRhLEDAKKtTtuUzAjy+9IqcqUzKDbGOYnJDNMCkX IjCQLiOdPvn4oI0q0I3YCY5cnjMJ5f//LCxJIQpfLkoe4m9xzkqlkj2G3jy7Byd+0yhM AKHw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=wyTYB5AwGY5Z4DBLOyOoRzcbdyLID7HicgyEXMCRKG8=; b=1GwVkz5zwy2HSrK49WnTl9U4bqJY+bwobhPb+Y+JCqBD5+I+QmLbVCk2lTOp30PaKS F9rS3o8oPgjXQ6nQWtSDFVF1GUW/ywAgc1SXXv0OwwrhlSUN5EegaClPjsjFCHdZtMDY yhFwmAcIxF/iLsRSemhdrgN2zo3oeSmNHvQFCxBG6AX/nx8bHx2JcEczJMlRAyk+wpCk puEelogpiAViyozHmaolPd/n3r/lyJNjjn103SqHDx+iOiqf8kp8d0qAVhL/J1aJ/tRN yiWJavfTXIVobLTfmob+/l1hjVK87d1kFsfVMcP5cGp3FsXrsgBrchftbJU2RDcusNiS AQnQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=fsGb8TnH; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=wyTYB5AwGY5Z4DBLOyOoRzcbdyLID7HicgyEXMCRKG8=; b=Xm59iuHmaiP8x7n0HI8mQkvEURLnovp8BV+i5VHpaXXiMBh0EyP/+ZBzH36QgRaA3I rAExhVIy/Jlz9Xa50GPgI2TuCC63+UDcsaKgdrH8GovIlkVqHYKtIkvkeSyy6FH3+KLK 0j17jN8tXtuHQNc9h2lFC2MYIA+q4oGUa4jII= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=wyTYB5AwGY5Z4DBLOyOoRzcbdyLID7HicgyEXMCRKG8=; b=ofKZ8NxOFB1OmzZOCe44VPIcKy+xex4rpkwpUFwgYcsgcCFhl0zRQRiuzOLxTfN1SP 2DGcyunmXBBugZC1IDm8Xk8KYkOtenR0IQk3V2hRfQu4EGj3fMACwFTlDmMhGd/WTS8K y8FFOfTWA3Hq6jPi/M4/JYeVagD8h5LOOxw/wyj+DtRUlDJlVHKKSxZTx58SfA7xCOyQ H6NGcX1ni/Nb4HhXrsUSglfbvu3dKJtef7l08ol48oNVMi4OaYhLv3tvz3P9u3WnUJEU WBaLoPTZ2g5CvPolgGtXNBPK//BkbQVP9HCwrjUbftl89cEtQ7h0cDkD0TCtjbsOehcl 68GA== X-Gm-Message-State: APjAAAXSnv8uQmEtHVq91IGFwWeJzIXZDL7x2RBmeWLHXcOX/JUcp5Jh MvsflgD0W/lyZKSJ5ryk6mynC3ct X-Google-Smtp-Source: APXvYqz3AQ0VdMBinYzg+DeP3ri8TDjaTzIKk0DMK1S3zxztppxCJ4jURo0mqdjU/IdYFU+oVGMeZw== X-Received: by 2002:a05:6830:17da:: with SMTP id p26mr16741665ota.3.1566843683468; Mon, 26 Aug 2019 11:21:23 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:aca:c615:: with SMTP id w21ls412780oif.15.gmail; Mon, 26 Aug 2019 11:21:23 -0700 (PDT) X-Received: by 2002:a05:6808:1d2:: with SMTP id x18mr13521465oic.74.1566843683057; Mon, 26 Aug 2019 11:21:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566843683; cv=none; d=google.com; s=arc-20160816; b=aWM0YdGVOODTbkIxNgqWupTDeNVHMaFJoVPc/Rw4KPwvMqHVj5gfBokaI3IuP/Hvlq SWA5yDaGvkbIDYa4hdWMjXfJJ38/WYhVaHYNKE/IP6g/3cFa7nCF1SCwdezMugsVR7Zi 1Ctk+qglxSXfZVe0qnMDV7G99ogtzUFCkBvuRvoMxNZafOOT5M77smHPZauz2DrXzhQY oY9tWxujhFfr8Wa2e4icmaKMsp+TCB/2qsPi/ad4kzaCvdrQ0D9GZ+5N0zAukZzFZAb/ avy4ih8edoZWQJp8pSm1NrqV4d1KDG8hX0M8kKLWEKnekBdtw6+/nuFyNKHGaOklhJ1w sRNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=nd4boDn9znc312hG3U3AYZUoyMAL39X9bOCQWlb7btE=; b=UiKXQqv/CPWFq5Ao1544Vks+cwR5cQGwIGtgAFl3aBlJg8zvSGC6MQsUeCf/dJuxYP yR0cHAo1DsmxdK43deKyKsNX9L0yrq//I8+hnCufTAvBW8iDzz+rpDbVFi60Kx51mLBX VYDUu4HhIzXx818Rwqc7AF3cY4a6nu9wewZ7I1FKKgQ6y9Mpf3RAwRReFK+qoQiNO93b EUsqFSJApEk+8jxkB9vV2cASb1hjcwNSI47GJt46Uued96ezqBpuwxdI11GZjUM6ol0q hBW2l9h0tlMkAeALGchO+xiQQNd65OeCX5pUUe8ecn4ntMQpCqKva2Xxha5iLm7P/DZi NbaA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=fsGb8TnH; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id u64sor5379466oif.94.2019.08.26.11.21.23 for (Google Transport Security); Mon, 26 Aug 2019 11:21:23 -0700 (PDT) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; X-Received: by 2002:a05:6808:8e2:: with SMTP id d2mr13830258oic.47.1566843682620; Mon, 26 Aug 2019 11:21:22 -0700 (PDT) Received: from jagan-XPS-13-9350.attlocal.net ([2600:1700:7430:38e0:d5b0:4823:33c8:5e46]) by smtp.gmail.com with ESMTPSA id c11sm4401461otr.54.2019.08.26.11.21.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Aug 2019 11:21:22 -0700 (PDT) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Cc: Akash Gajjar , u-boot@lists.denx.de, linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, Jagan Teki Subject: [PATCH v2 03/16] arm: rockchip: Add common cru.h Date: Mon, 26 Aug 2019 23:50:58 +0530 Message-Id: <20190826182111.30999-4-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190826182111.30999-1-jagan@amarulasolutions.com> References: <20190826182111.30999-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=fsGb8TnH; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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 rk3399 arch cru include file and move the common cru register bit definitions into it. The rest of rockchip cru files will add it in future. Signed-off-by: Jagan Teki --- arch/arm/include/asm/arch-rockchip/cru.h | 14 ++++++++ .../include/asm/arch-rockchip/cru_rk3399.h | 10 +++--- arch/arm/mach-rockchip/rk3399/clk_rk3399.c | 2 +- arch/arm/mach-rockchip/rk3399/rk3399.c | 2 +- drivers/clk/rockchip/clk_rk3399.c | 36 +++++++++---------- drivers/ram/rockchip/sdram_rk3399.c | 10 +++--- drivers/video/rockchip/rk3399_mipi.c | 2 +- drivers/video/rockchip/rk_mipi.c | 2 +- 8 files changed, 46 insertions(+), 32 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..3d1927580f --- /dev/null +++ b/arch/arm/include/asm/arch-rockchip/cru.h @@ -0,0 +1,14 @@ +/* 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_RK3399) +# include +#endif + +#endif /* _ROCKCHIP_CLOCK_H */ diff --git a/arch/arm/include/asm/arch-rockchip/cru_rk3399.h b/arch/arm/include/asm/arch-rockchip/cru_rk3399.h index 15eeb9c440..33ce190434 100644 --- a/arch/arm/include/asm/arch-rockchip/cru_rk3399.h +++ b/arch/arm/include/asm/arch-rockchip/cru_rk3399.h @@ -10,7 +10,7 @@ /* Private data for the clock driver - used by rockchip_get_cru() */ struct rk3399_clk_priv { - struct rk3399_cru *cru; + struct rockchip_cru *cru; }; struct rk3399_pmuclk_priv { @@ -33,7 +33,7 @@ struct rk3399_pmucru { }; check_member(rk3399_pmucru, pmucru_gatedis_con[1], 0x134); -struct rk3399_cru { +struct rockchip_cru { u32 apll_l_con[6]; u32 reserved[2]; u32 apll_b_con[6]; @@ -65,7 +65,7 @@ struct rk3399_cru { u32 sdio0_con[2]; u32 sdio1_con[2]; }; -check_member(rk3399_cru, sdio1_con[1], 0x594); +check_member(rockchip_cru, sdio1_con[1], 0x594); #define MHz 1000000 #define KHz 1000 #define OSC_HZ (24*MHz) @@ -107,9 +107,9 @@ enum apll_b_frequencies { APLL_B_600_MHZ, }; -void rk3399_configure_cpu_l(struct rk3399_cru *cru, +void rk3399_configure_cpu_l(struct rockchip_cru *cru, enum apll_l_frequencies apll_l_freq); -void rk3399_configure_cpu_b(struct rk3399_cru *cru, +void rk3399_configure_cpu_b(struct rockchip_cru *cru, enum apll_b_frequencies apll_b_freq); #endif /* __ASM_ARCH_CRU_RK3399_H_ */ 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/arch/arm/mach-rockchip/rk3399/rk3399.c b/arch/arm/mach-rockchip/rk3399/rk3399.c index 863024d071..dafa142824 100644 --- a/arch/arm/mach-rockchip/rk3399/rk3399.c +++ b/arch/arm/mach-rockchip/rk3399/rk3399.c @@ -240,7 +240,7 @@ static void rk3399_force_power_on_reset(void) void spl_board_init(void) { #if defined(SPL_GPIO_SUPPORT) - struct rk3399_cru *cru = rockchip_get_cru(); + struct rockchip_cru *cru = rockchip_get_cru(); /* * The RK3399 resets only 'almost all logic' (see also in the TRM diff --git a/drivers/clk/rockchip/clk_rk3399.c b/drivers/clk/rockchip/clk_rk3399.c index d9950c159b..b79935c774 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 @@ -418,7 +418,7 @@ static int pll_para_config(u32 freq_hz, struct pll_div *div) return 0; } -void rk3399_configure_cpu_l(struct rk3399_cru *cru, +void rk3399_configure_cpu_l(struct rockchip_cru *cru, enum apll_l_frequencies apll_l_freq) { u32 aclkm_div; @@ -453,7 +453,7 @@ void rk3399_configure_cpu_l(struct rk3399_cru *cru, atclk_div << ATCLK_CORE_L_DIV_SHIFT); } -void rk3399_configure_cpu_b(struct rk3399_cru *cru, +void rk3399_configure_cpu_b(struct rockchip_cru *cru, enum apll_b_frequencies apll_b_freq) { u32 aclkm_div; @@ -505,7 +505,7 @@ void rk3399_configure_cpu_b(struct rk3399_cru *cru, #define I2C_PMUCLK_REG_VALUE(bus, clk_div) \ ((clk_div - 1) << CLK_I2C ##bus## _DIV_CON_SHIFT) -static ulong rk3399_i2c_get_clk(struct rk3399_cru *cru, ulong clk_id) +static ulong rk3399_i2c_get_clk(struct rockchip_cru *cru, ulong clk_id) { u32 div, con; @@ -542,7 +542,7 @@ static ulong rk3399_i2c_get_clk(struct rk3399_cru *cru, ulong clk_id) return DIV_TO_RATE(GPLL_HZ, div); } -static ulong rk3399_i2c_set_clk(struct rk3399_cru *cru, ulong clk_id, uint hz) +static ulong rk3399_i2c_set_clk(struct rockchip_cru *cru, ulong clk_id, uint hz) { int src_clk_div; @@ -619,7 +619,7 @@ static const struct spi_clkreg spi_clkregs[] = { .sel_shift = CLK_SPI5_PLL_SEL_SHIFT, }, }; -static ulong rk3399_spi_get_clk(struct rk3399_cru *cru, ulong clk_id) +static ulong rk3399_spi_get_clk(struct rockchip_cru *cru, ulong clk_id) { const struct spi_clkreg *spiclk = NULL; u32 div, val; @@ -641,7 +641,7 @@ static ulong rk3399_spi_get_clk(struct rk3399_cru *cru, ulong clk_id) return DIV_TO_RATE(GPLL_HZ, div); } -static ulong rk3399_spi_set_clk(struct rk3399_cru *cru, ulong clk_id, uint hz) +static ulong rk3399_spi_set_clk(struct rockchip_cru *cru, ulong clk_id, uint hz) { const struct spi_clkreg *spiclk = NULL; int src_clk_div; @@ -668,7 +668,7 @@ static ulong rk3399_spi_set_clk(struct rk3399_cru *cru, ulong clk_id, uint hz) return rk3399_spi_get_clk(cru, clk_id); } -static ulong rk3399_vop_set_clk(struct rk3399_cru *cru, ulong clk_id, u32 hz) +static ulong rk3399_vop_set_clk(struct rockchip_cru *cru, ulong clk_id, u32 hz) { struct pll_div vpll_config = {0}; int aclk_vop = 198 * MHz; @@ -712,7 +712,7 @@ static ulong rk3399_vop_set_clk(struct rk3399_cru *cru, ulong clk_id, u32 hz) return hz; } -static ulong rk3399_mmc_get_clk(struct rk3399_cru *cru, uint clk_id) +static ulong rk3399_mmc_get_clk(struct rockchip_cru *cru, uint clk_id) { u32 div, con; @@ -739,7 +739,7 @@ static ulong rk3399_mmc_get_clk(struct rk3399_cru *cru, uint clk_id) return DIV_TO_RATE(GPLL_HZ, div); } -static ulong rk3399_mmc_set_clk(struct rk3399_cru *cru, +static ulong rk3399_mmc_set_clk(struct rockchip_cru *cru, ulong clk_id, ulong set_rate) { int src_clk_div; @@ -792,7 +792,7 @@ static ulong rk3399_mmc_set_clk(struct rk3399_cru *cru, return rk3399_mmc_get_clk(cru, clk_id); } -static ulong rk3399_gmac_set_clk(struct rk3399_cru *cru, ulong rate) +static ulong rk3399_gmac_set_clk(struct rockchip_cru *cru, ulong rate) { ulong ret; @@ -817,7 +817,7 @@ static ulong rk3399_gmac_set_clk(struct rk3399_cru *cru, ulong rate) } #define PMUSGRF_DDR_RGN_CON16 0xff330040 -static ulong rk3399_ddr_set_clk(struct rk3399_cru *cru, +static ulong rk3399_ddr_set_clk(struct rockchip_cru *cru, ulong set_rate) { struct pll_div dpll_cfg; @@ -863,7 +863,7 @@ static ulong rk3399_ddr_set_clk(struct rk3399_cru *cru, return set_rate; } -static ulong rk3399_saradc_get_clk(struct rk3399_cru *cru) +static ulong rk3399_saradc_get_clk(struct rockchip_cru *cru) { u32 div, val; @@ -874,7 +874,7 @@ static ulong rk3399_saradc_get_clk(struct rk3399_cru *cru) return DIV_TO_RATE(OSC_HZ, div); } -static ulong rk3399_saradc_set_clk(struct rk3399_cru *cru, uint hz) +static ulong rk3399_saradc_set_clk(struct rockchip_cru *cru, uint hz) { int src_clk_div; @@ -1108,7 +1108,7 @@ static struct clk_ops rk3399_clk_ops = { }; #ifdef CONFIG_SPL_BUILD -static void rkclk_init(struct rk3399_cru *cru) +static void rkclk_init(struct rockchip_cru *cru) { u32 aclk_div; u32 hclk_div; @@ -1225,15 +1225,15 @@ static int rk3399_clk_bind(struct udevice *dev) debug("Warning: No sysreset driver: ret=%d\n", ret); } else { priv = malloc(sizeof(struct sysreset_reg)); - priv->glb_srst_fst_value = offsetof(struct rk3399_cru, + priv->glb_srst_fst_value = offsetof(struct rockchip_cru, glb_srst_fst_value); - priv->glb_srst_snd_value = offsetof(struct rk3399_cru, + priv->glb_srst_snd_value = offsetof(struct rockchip_cru, glb_srst_snd_value); sys_child->priv = priv; } #if CONFIG_IS_ENABLED(CONFIG_RESET_ROCKCHIP) - ret = offsetof(struct rk3399_cru, softrst_con[0]); + ret = offsetof(struct rockchip_cru, softrst_con[0]); ret = rockchip_reset_bind(dev, ret, 21); if (ret) debug("Warning: software reset driver bind faile\n"); diff --git a/drivers/ram/rockchip/sdram_rk3399.c b/drivers/ram/rockchip/sdram_rk3399.c index ed70137ce7..2b5d51feb8 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 @@ -61,7 +61,7 @@ struct dram_info { u32 pwrup_srefresh_exit[2]; struct chan_info chan[2]; struct clk ddr_clk; - struct rk3399_cru *cru; + struct rockchip_cru *cru; struct rk3399_grf_regs *grf; struct rk3399_pmu_regs *pmu; struct rk3399_pmucru *pmucru; @@ -251,7 +251,7 @@ static void copy_to_reg(u32 *dest, const u32 *src, u32 n) } } -static void rkclk_ddr_reset(struct rk3399_cru *cru, u32 channel, u32 ctl, +static void rkclk_ddr_reset(struct rockchip_cru *cru, u32 channel, u32 ctl, u32 phy) { channel &= 0x1; @@ -262,7 +262,7 @@ static void rkclk_ddr_reset(struct rk3399_cru *cru, u32 channel, u32 ctl, &cru->softrst_con[4]); } -static void phy_pctrl_reset(struct rk3399_cru *cru, u32 channel) +static void phy_pctrl_reset(struct rockchip_cru *cru, u32 channel) { rkclk_ddr_reset(cru, channel, 1, 1); udelay(10); @@ -2498,7 +2498,7 @@ static int pctl_init(struct dram_info *dram, struct rk3399_sdram_params *params) for (channel = 0; channel < 2; channel++) { const struct chan_info *chan = &dram->chan[channel]; - struct rk3399_cru *cru = dram->cru; + struct rockchip_cru *cru = dram->cru; struct rk3399_ddr_publ_regs *publ = chan->publ; phy_pctrl_reset(cru, channel); 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 Aug 26 18:20: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: 829 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-oi1-f198.google.com (mail-oi1-f198.google.com [209.85.167.198]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id E6FF33F0E1 for ; Mon, 26 Aug 2019 20:21:26 +0200 (CEST) Received: by mail-oi1-f198.google.com with SMTP id s3sf5949781oia.19 for ; Mon, 26 Aug 2019 11:21:26 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1566843686; cv=pass; d=google.com; s=arc-20160816; b=dbhfUUN5p6PEk12YVRcwkVcelUifK88i4+PIwm6g+48gyJCIjb5MkEUcn3HaeJRRgQ dnxVYWCJFmIEv/2hUoyH6RWqho8hfaEDhIBDeyOlt9kwE21XwW2P2rUZ6HQYjOl/FV5w xODm6GDbvy13mvSxhAKoia8mqmPa/kr9WXccWvkNZyRiOV/Ah+nqG38PLr1V6P6FEugf 118SLiFgVTlpVMbE5lx+bOZ9E4jJCuOJE+rFdoORJMn3MEaifNYjfWLj3jo0le8+z3Dc 6YZlQ+/yFv/bq0EINenhwZS10/c5VCZjK0wJfKU5kS5WZcaO+4gFwQvg27QriXAuEGdY WMMw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=KswccmZeTy0pDg+XoKH5COiQatRD++DC7RKhsfm5umg=; b=hWkHyN2gc9xv1Pe36Si7me1iC6b+ZDDCxSmnvZvTT1mVc6LFq8QLcZk7gUmQXBHsLM huQxMbFI13GZeKvojBOuxTO40bSJSYpdXSAJIyJwN69k/wX8MJOPVUA0DYo9WGDa/AYm yTVT95/HnA9RVE5D/p5YAfSyJmifrLBzL2wGletWzeDV/JE7/OqhUDS7IslCknHF7UCJ a4/GuGHDw4hc6fG85raDkE1ZcFsXrecpBIke0sge1QqwBqFsKb/Ye3x5Wkgo04rd79o5 vG9Pd2LvG/snO3uZovfgWJREdPW8jFdDyBm7MGLRydzo+FefzzbxYltJcxyKzLlAYyUm qfHQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=JD+kGEMh; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=KswccmZeTy0pDg+XoKH5COiQatRD++DC7RKhsfm5umg=; b=LZ1xQREOouroL36Vp+WHw80BbJKBCFCyBCixgP2Ouf+3201OTApZWkagBY/LvTWo3U Ic0sbSclI2FruYp6X1EZPxJbzhFoNb/e9uGiLicjV+GZPUt9SqzkgOcgbe5N+xGg4I7A ekwPbZkwiy2XxM7wBQrZqwZK1q16TyMpjXd0c= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=KswccmZeTy0pDg+XoKH5COiQatRD++DC7RKhsfm5umg=; b=PlqXys7dNmzH+HOe+rtIc0kyNnqiUyYVuWwZLrAdtnwaIodJI9jOSBOq5r3GjE4SNj MhowUeHSSs+DQCI0/75yHCpXhrsAZPaZUfmFaMj89jBj8TuTWd/1qCpn4h+WJkT2gp/k KjSqPnj6J62Lq89DOodIWuot46hsTzf/04FUtVEk3rJaClkpYvBAXcFNDk3vjo+XW7ny JnR/xqr3QtHGw6ZIL9r7ik3Y0/EnPRFBTXXbabYwVXFERLW/oiGQF6fM20uC2jLu7yCF Y3AHjvE34b1JrPknjxyj+NOjjUJ17QTy4uLSdMb6V2PtMYschJy3rnm8SNxdszYHIK7v pJHg== X-Gm-Message-State: APjAAAW4QmTykC5rb+F2HXmd9U6uHpeAtH+TFEvBYyzaBvzP0VXQ4CoM A70Kd4eOXwNSot4/jWUBfeH1qGBp X-Google-Smtp-Source: APXvYqyLqf4fNpCJBP5MWiUbmK4M/p9YLUJZp8K4Vpiou6+Nuxt2dA49YEp1F4QT8qc+yBCRcjjlKw== X-Received: by 2002:aca:5106:: with SMTP id f6mr13667623oib.69.1566843685852; Mon, 26 Aug 2019 11:21:25 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a9d:12ee:: with SMTP id g101ls508548otg.16.gmail; Mon, 26 Aug 2019 11:21:25 -0700 (PDT) X-Received: by 2002:a9d:4e97:: with SMTP id v23mr16166854otk.112.1566843685486; Mon, 26 Aug 2019 11:21:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566843685; cv=none; d=google.com; s=arc-20160816; b=Tm4IZRwBEuWDKcsNYqv1R0rkkBoJbMREGDTZ5m7Ft06vOiWYAoo6+7TkpfH3U3aual 2UxZQVlVx4gGT9pXf2gXY+EvN5gMcER3KtlILA6LsirUzfn1ElQnxnDajKSCri7Dnpy1 lgHvc6Dn6PxKPsniTHR8T1+ek94n5aJMqsuSz8bR6IkUOphhZPucczcyYJGB2rHm+7x7 u6ViMsuo1aC5U++ecTpEFk8DmEJH3LMfoqmrwDVMF6RuYyFCPvQBExGeaZhwgIwuitq4 KtxuGIczGOmQ9B1LYZbQ3QEEanQ5Hqb/X/3UCIE3fLKB8gKBOEcYctPh4vyRBAV0h99J O7FQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=V7KXtS4UY6UlB13Z0yXdsQzffMPbipOXSFmQnsy4Ilw=; b=f7+zD4SQlfmUnKOP8x/LoKLXzPAVGQISSt1il8h4aaWd/cn0k+OnguxJQRO5FV1nrH dWkiz2UEyAQPaHrMN7ZKQeTjyA8nLtlyJmPMkrE2nXLnHaegqkrfZYKaeF+k/hgAqfrV 5PYiffAVUMYhUCRJjs6lrQVHBsxVbJpF9tKEzQnIi0EU9xbRv/I3IdYkOBhodGz2JGgs 2No5AWDIa5YZFb/c4hVJE1VkjNGShygQV7UY6neKsIvOsrcE1nHLrezuCIL+HWcdwLwf UTU9LvC38MU7/rGj4wa0mjRCGbcKa44NTDJEyw2eoGqwHjdhplDHgWNHH2TGhE6YkU2r qHag== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=JD+kGEMh; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id h21sor6114209otr.132.2019.08.26.11.21.25 for (Google Transport Security); Mon, 26 Aug 2019 11:21:25 -0700 (PDT) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; X-Received: by 2002:a9d:2cc:: with SMTP id 70mr13662029otl.145.1566843685166; Mon, 26 Aug 2019 11:21:25 -0700 (PDT) Received: from jagan-XPS-13-9350.attlocal.net ([2600:1700:7430:38e0:d5b0:4823:33c8:5e46]) by smtp.gmail.com with ESMTPSA id c11sm4401461otr.54.2019.08.26.11.21.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Aug 2019 11:21:24 -0700 (PDT) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Cc: Akash Gajjar , u-boot@lists.denx.de, linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, Jagan Teki Subject: [PATCH v2 04/16] rockchip: Add rk3399 reset cause Date: Mon, 26 Aug 2019 23:50:59 +0530 Message-Id: <20190826182111.30999-5-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190826182111.30999-1-jagan@amarulasolutions.com> References: <20190826182111.30999-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=JD+kGEMh; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Add reset cause for rk3399 in common cpu-info file. This would help to print the reset cause for various resets. Common code for various rockchip reset cause will add it in future. Signed-off-by: Jagan Teki --- arch/arm/include/asm/arch-rockchip/cru.h | 12 +++++++ arch/arm/mach-rockchip/cpu-info.c | 43 ++++++++++++++++++++++++ 2 files changed, 55 insertions(+) diff --git a/arch/arm/include/asm/arch-rockchip/cru.h b/arch/arm/include/asm/arch-rockchip/cru.h index 3d1927580f..e267a71ca6 100644 --- a/arch/arm/include/asm/arch-rockchip/cru.h +++ b/arch/arm/include/asm/arch-rockchip/cru.h @@ -11,4 +11,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/mach-rockchip/cpu-info.c b/arch/arm/mach-rockchip/cpu-info.c index 90ce65d9ff..63d867fe78 100644 --- a/arch/arm/mach-rockchip/cpu-info.c +++ b/arch/arm/mach-rockchip/cpu-info.c @@ -5,10 +5,53 @@ */ #include +#include +#include +#include +#include +#include + +static char *get_reset_cause(void) +{ + struct rockchip_cru *cru = rockchip_get_cru(); + char *cause = NULL; + + if (IS_ERR(cru)) + return cause; + + switch (cru->glb_rst_st) { + case GLB_POR_RST: + cause = "POR"; + break; + case FST_GLB_RST_ST: + case SND_GLB_RST_ST: + cause = "RST"; + break; + case FST_GLB_TSADC_RST_ST: + case SND_GLB_TSADC_RST_ST: + cause = "THERMAL"; + break; + case FST_GLB_WDT_RST_ST: + case SND_GLB_WDT_RST_ST: + cause = "WDOG"; + break; + default: + cause = "unknown reset"; + } + + /* + * Clear glb_rst_st, so we can determine the last reset cause + * for following resets. + */ + rk_clrreg(&cru->glb_rst_st, GLB_RST_ST_MASK); + + return cause; +} int print_cpuinfo(void) { printf("SoC: Rockchip %s\n", CONFIG_SYS_SOC); + printf("Reset cause: %s\n", get_reset_cause()); /* TODO print operating temparature and clock */ From patchwork Mon Aug 26 18:21: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: 830 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ot1-f71.google.com (mail-ot1-f71.google.com [209.85.210.71]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 0F6963F0E1 for ; Mon, 26 Aug 2019 20:21:28 +0200 (CEST) Received: by mail-ot1-f71.google.com with SMTP id 71sf10582150otl.5 for ; Mon, 26 Aug 2019 11:21:27 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1566843687; cv=pass; d=google.com; s=arc-20160816; b=QczieYynHsS+afcThhoc+IMivbl8mXTuATzw6zB3jwomYSmtoksKhgUBnZoI41Y65u 0NRtOoDWabl2YtXbvKac5zdO0A0O/KVaPop6mt2gFz4ccLrfEiY5hXE64ULo3UwGCgXG lJ04AGZR7XDMr2ertjBx2dNNjn+nYTOhg73xD7v02EFcosjUrE57Cd98RPyue/LNHtHJ uXv+V3Gy/AiIgiBWyCk9mx8i7AupdL6n4XGUNaPTnCJUGtjEQnwF2KzwwZ/urWG5e45O 05ORmTivWI0OJpw1No+HJVuSU/7AkjuWVdtr0yTEMSI2szlKfS++XsNsmFIX5grJOnYc wV5w== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=BwSMowhkOcHUvkKD3km5AkrSTcx7c+Ou7k7Jj1uGJiw=; b=RNJgNOEdepzdrI/DY0Knt1GwqIIlplFHebgmthfDgrZ16bVLRWhpyYmcN6JRbeqpcb dl7LXMD87IcknuJORiVdoFVTvaXzYcXro1FbJV6yaAsoR2EfnbniW9gTlyWmHlCKMxic FeDdES+fkIP6gXWMV8CYiz08Ggx0g2vqa1nIrqly9HLXUi8SRMc50cpMk/1F90h7dtBD tR+GxcvsW/VkJ7CtIZctFO8Fdgtw/Nxg8KhZ0O+eANybjI+nGVSiGoRXBQwKlZ/rEURx qtWyK1Sk1LAT7yCeLRz7hBlHH5WlarxbcC20QqbIReHKIEk9W2QDEVn6DvG6EvQjL/rm jWAw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=Tk2a6UaE; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=BwSMowhkOcHUvkKD3km5AkrSTcx7c+Ou7k7Jj1uGJiw=; b=S7doqCnLr125H2L5H5JcbnKnlWewp0KCvl4Gzyg2asCcCmAI2YcHTK29I1o1VS7yby NO7nCSMc5WAEloS5/sY2ePEpuRyiCeiGPB1Zbv0Ovg2Kg4lf7LcDeO3Uye+6XI1D2l1i eAqVT/bRJ0DsvWhBdXFQFviLNynkYB68IViTQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=BwSMowhkOcHUvkKD3km5AkrSTcx7c+Ou7k7Jj1uGJiw=; b=MOX2wjH7gtUVhxHOYRSkXd3gznA/B0ImRp/H6GkqJuywLhu83Cu19jaP+sSyAI4TxJ yfJ4LmPgWF7XNgB/h86NGJLYxWN9CWcWPnur2SuRr504Nlxu6wIEVCwt7Z21lCqHkDTN FKKndvhkR3fFm3Z3RTtCmkcCuc8Rzl5wQzaXeyaEHVDJKMwLs9NXnJtdufSRzu+ZimkC /2eZ30gmJohuKq4jv6MgyfOIv1jJDq4681X9gyxBtS6cLsLwT6s8tZ8MpAfbB2Q4mgj3 aYeVMn3c/TbZZui6Ob8iCr7Q0wbBywfFjzQp8oKbebK6kchHczKdAdQII3tRszSNUV4V MC9g== X-Gm-Message-State: APjAAAWchlLAjY3TInP6K9m3h71TqUytpECtnCso801aS7aV2pFt8+NQ evtYoBcbYhPFXQ+F7n8XZAj+euHv X-Google-Smtp-Source: APXvYqwhBUvV3dCgf87qwN61oyCFcDR+c7sL2PEC1kwcCVvCqqvzjiTsVk21HY9sYPzX+RlBJcwN2A== X-Received: by 2002:a9d:20c3:: with SMTP id x61mr16347052ota.289.1566843687012; Mon, 26 Aug 2019 11:21:27 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a9d:70d2:: with SMTP id w18ls506296otj.11.gmail; Mon, 26 Aug 2019 11:21:26 -0700 (PDT) X-Received: by 2002:a9d:7516:: with SMTP id r22mr17440032otk.151.1566843686689; Mon, 26 Aug 2019 11:21:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566843686; cv=none; d=google.com; s=arc-20160816; b=tr7kEIUQgcY/P6PvzDVLyNLZmCGyJ3MwYTSTwnWwubilpDehgfkLyuqKo3b3BvFKNI R+EwavacAqYQmABkyZBHhxzrqxnJuSp+mWeIFVnRoseRA6UBgWpcWJ4amQkVGjxC0cF9 iD0PScSyugjQg5zWp6fGyo1vgQn6fqzTaMuenL8RnWViDtTViOMT0ipcQ9bEAic1WgJI mHmA/Ye/4XrDRp7IKlzWHl010W7XsHSm96dT0XX0TQ1p/DSwTlpBN69ffcu3I5qYv8Yj i+Wa/3jh0CIODzg4UvYzR8BaT8RR+3wiuUCN+p6F0LnecD39DRu6hL0vkFTJNi/T3sT/ DqLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=Wq6GJCz6OpwvPx36T+BmHN2obhM+vzYcJ0vK8rO0YF0=; b=x//9dmONevcmmpUW4/DAXwjySY0RgTrtx9nC1eLkTEWiiTju+pFF4lO+ajdC/hqKlv 7/3LjOAczZYWof7qwQLe+2bcYMczJs5uPhD4eTGvzPcI7yQvj3wYH0KiimBMehbsQogW Jcfkw7bNL+1dtb90pPLfjIDHVSnpk5jvF1yxeUYssHb7ITid8nHYyOvpFn4F6eHv6ghF 1GA51ciFfe2VVFgywpxlYN7IRBnhuFZ6/N51CycYJ+NFrnbf4TrMfD5G0cI7Wubd5UAP ZNrvC03ngMYeceFS+kJ3zy8kv6hASZburR/THsH3wFN4RZfORbTr+WGDpfNjwPXc2Xfj Y/QA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=Tk2a6UaE; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id h81sor5075188oia.128.2019.08.26.11.21.26 for (Google Transport Security); Mon, 26 Aug 2019 11:21:26 -0700 (PDT) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; X-Received: by 2002:aca:4e0a:: with SMTP id c10mr12953762oib.61.1566843686355; Mon, 26 Aug 2019 11:21:26 -0700 (PDT) Received: from jagan-XPS-13-9350.attlocal.net ([2600:1700:7430:38e0:d5b0:4823:33c8:5e46]) by smtp.gmail.com with ESMTPSA id c11sm4401461otr.54.2019.08.26.11.21.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Aug 2019 11:21:25 -0700 (PDT) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Cc: Akash Gajjar , u-boot@lists.denx.de, linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, Jagan Teki , Chin Liang See , Andy Shevchenko Subject: [PATCH v2 05/16] wdt: designware: Simplify is_enabled function Date: Mon, 26 Aug 2019 23:51:00 +0530 Message-Id: <20190826182111.30999-6-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190826182111.30999-1-jagan@amarulasolutions.com> References: <20190826182111.30999-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=Tk2a6UaE; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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 Aug 26 18:21: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: 831 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-oi1-f197.google.com (mail-oi1-f197.google.com [209.85.167.197]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 19E9E3F0E1 for ; Mon, 26 Aug 2019 20:21:29 +0200 (CEST) Received: by mail-oi1-f197.google.com with SMTP id z9sf5958575oid.11 for ; Mon, 26 Aug 2019 11:21:29 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1566843688; cv=pass; d=google.com; s=arc-20160816; b=x99SjNiXrh/GukRW/pwPCEff5LRKHWNTXPj7kQG8S0DYl6CI56JF8pUuTLwJpVcOf+ CagqCdLEXpvlnRk97PiHwTDVxrBAfm7BNgbGLIM3fwADihzv9lKe80Qg6g3Avu2/vhH1 kb6xAU/xxI0EUK/78ZHVNPL1H9Bz5jKHV56+eLnli4z7+aHIDt5pn0laBwOG84DhdOTa LdzzXMQqINk4iwRIs6KV2yG+LP1kWpxswqK0/YOf6nNSd2GQartHN1GHJQRqzQ9htvqH /K+SZ8D8hH0oOD8kWBfxjA3GH/X4obeRXN0MFr/RVn6AvUhRIK0w0ANTHhQ4QIH/gqyH qizA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=hS07LSoaVYHzagSIsAxrHdE+uAw5fkE95CpiT+3OrU0=; b=sMqtTcamLzeAGIH+jx2VMF6HemtGtg+tg5VRmD3iXlstCDH0vUVz0pFxy5Wjqymg44 B5mgGxiRQGGJtATejTyMAQRhrAz+zn6riGFmMVabTAWqiuYeYpQ3huxGIUntJtZlhvI1 rjJxPtJ1+v1YbLbMCjepYRkk2VzI1OJgGjog8BjSwy7Suv2JMGf/m62aYVg6/FUgJQ8j gpYVn3bbBRy1lbw+b42WSrUjjYe6XVLpfusBqLZ4KrXzVJw9k78/dmGnds3ZHzQ4UZKK FXjBNWPX23YbTEnmW3bU+bWF2UYpISyk31NK1PAYpGuNXgpQTlphsyZdLgtrU0+X6sNn siyw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=ft4AtN5x; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=hS07LSoaVYHzagSIsAxrHdE+uAw5fkE95CpiT+3OrU0=; b=qqJkvfjftRINqapwLDNjca/qwRn/h9GPmim9O8KAiY3rvOhJ83/i+acHMJ3853ZeW2 RSdCd9XYvHDbJb/ETOVvEJPPsvzgb9TkrQtCSexx71vgz1YDEd0OZrrasFECZsFPl5cV 17aNdvonohqC0+Vlcx6zZYfvu+nYMGBnNrAC4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=hS07LSoaVYHzagSIsAxrHdE+uAw5fkE95CpiT+3OrU0=; b=dLN50lWerRss8WZrpzfAIHq3dKDoMX+obG8c/OB8JWw8nzs/pQrWA4F+hY3eq8iiav +BLG3OMIxtfuf7SebgE6HXvbc5r9svny8F3u5378LeqgGZTV7Wuh3nMHPriErXHZhI67 OEFN239V6X5mBSx69znT3E7oAv9eu9HiybzIIkWdB9DZBDlyS7yo6N2/E8MlBzUN0DeY Ai9sjLsOXTPtiysFLRWSrUBCtvloqVw7ur5KWB+oyQEopfE5kyD3D3qKgeewBvaRi3X4 9Y8aKMneEqQeuULnHqiZjMgXhn1JGBLOAphij9lV96CLI8omtiK1fFiWQ+g3I+EjsUXb SAMg== X-Gm-Message-State: APjAAAUtIEVmFwZtK5He0GL5RBmGeU/8G9CoWnXaosOPZF4W0rleIpbA 3tkZb/0pREaE4VFvpDbFyaZsl8Pn X-Google-Smtp-Source: APXvYqzlYleBwWM0/VYhh++bKPcd0Dudhek/+P9PMSwdveSNI7QCdH7yTAVuEFy/qq4K9/rH8i7MiQ== X-Received: by 2002:aca:b20b:: with SMTP id b11mr13536014oif.16.1566843688067; Mon, 26 Aug 2019 11:21:28 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6808:103:: with SMTP id b3ls410452oie.2.gmail; Mon, 26 Aug 2019 11:21:27 -0700 (PDT) X-Received: by 2002:a05:6808:65a:: with SMTP id z26mr12769201oih.151.1566843687731; Mon, 26 Aug 2019 11:21:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566843687; cv=none; d=google.com; s=arc-20160816; b=YO3g5cJPEjmDAp0+FFox8oBNZa/esdkZkBWt6bllXKwhLwHAYOzKv9FFHNSc5ZiqVC bcdZUQVMib7MgAY9ysaLe3GnJCbtpH3RmFWXCsrGrj3W3/TGNKTKAmeLZuZeKRmrHf1N MzvcYzL/BWhYCwO00CaI+chY0ZRPGgUCgwTWh2Tp1IqOt8R6pfnJ+KqZXoLbPl0bFtHW l1Q1qwXxvSh2P9RMMwjYJZ1BoRWey4IZf0e8oFcvSCUlOXVFzweV0rhKVxlwlHX+XSsV JGB7h60tzo8n0RkygE1hUYwNL4Q0l/vxZafDU7GrgaRe5xqql+eFp3/s+JM/ZsdiL2PX K9LQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=8hP6rdkEvhhT0hEj14Sjz70+JpS0tBwbVOMye6DfvhQ=; b=uG7aDsuGaZUSsqjJ5KJTbzYGOLFDB+yUp6ayXNldMPF5Z+Ifmjbq08hxCVgBvQJkD5 zlA7dTrTi++QZitBmC48pX9c1kPWYfVKMiycrZ2ktkikg42Hpm7ZN9bALf6+ROPFCu7E cxQEoLdgpvnpu84ZKluHA8Bir4C6fmgf5jf5OYHwA4VMvYF8giWlOyHoEiaUlOWLneCf qdpfErforU5q9I47IF/aQtTAumv87Z/8S5+m5/PLt5Dfu+x0pYyWWSuwqGnH+Dcm7J5g NMH4tLirQk7Cgqt3Zo6HUtTb72Tar4II7nQhjXD5bvCxBPCGxV6dhsZL9qc5ClN2Cl55 hpdg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=ft4AtN5x; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id l14sor5960927otk.79.2019.08.26.11.21.27 for (Google Transport Security); Mon, 26 Aug 2019 11:21:27 -0700 (PDT) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; X-Received: by 2002:a9d:6852:: with SMTP id c18mr16870633oto.218.1566843687442; Mon, 26 Aug 2019 11:21:27 -0700 (PDT) Received: from jagan-XPS-13-9350.attlocal.net ([2600:1700:7430:38e0:d5b0:4823:33c8:5e46]) by smtp.gmail.com with ESMTPSA id c11sm4401461otr.54.2019.08.26.11.21.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Aug 2019 11:21:27 -0700 (PDT) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Cc: Akash Gajjar , u-boot@lists.denx.de, linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, Jagan Teki , Chin Liang See , Andy Shevchenko Subject: [PATCH v2 06/16] wdt: designware: Simplify enable function Date: Mon, 26 Aug 2019 23:51:01 +0530 Message-Id: <20190826182111.30999-7-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190826182111.30999-1-jagan@amarulasolutions.com> References: <20190826182111.30999-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=ft4AtN5x; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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 Aug 26 18:21: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: 832 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ot1-f72.google.com (mail-ot1-f72.google.com [209.85.210.72]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 3955A3F0E1 for ; Mon, 26 Aug 2019 20:21:30 +0200 (CEST) Received: by mail-ot1-f72.google.com with SMTP id k70sf10589528otk.6 for ; Mon, 26 Aug 2019 11:21:30 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1566843689; cv=pass; d=google.com; s=arc-20160816; b=zef44nLvsNf46ZkEB3YE7/SSvw+DDBVwXCpiN5FnFO1nTE3Oyc28cB9sG0HBL0wr3x Fu7GfesYdZr6uMEO0imkbvLpf7maarVdzxrGs7JvQ0I7Xm0hkLTi7wsyB8G1utWQssZ+ g2MTeF4sK6T8KYyqdiCVFreAswSB2MgpNs2GcYOVnrglG20Ha9T4RsQk0W3wNbgLFGk4 MEW/f0sm+4RPakA0N3sRE0PMI7P0bNgHE+rTynIiTAwurt296m9xDa9p4siobiu1++Dl Q5KilV+SvbI7uTs8rkKNFbxLF5kERQK38J20X0I35Le3tJgHqy20njcsFlh8DJfPGDEY HxHQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=ujqjDiSoWdhn0k0hZJWapxFTHaCSW+ZQXyCRlIvk7Us=; b=qMvwNuF2uDeRsoX32n0ILSbMIGhan6txkk2AegA8MTHtskUyQWbv3DCqkyivZ5qtNx 8+6Z6iICI07cSOXBYxiPs64QcGMsp4jMJVzPSSpvluv4nwD5yMk6rfru7gCBKnmU0zpT J1sD2Cw9zPKT/DU5exH06DJ2qbqDKPc1eKDa/utf+MDorIVD//f+vcOdrSgACbLe+CcL +y1WTSOaXi+6xeg1KyeWpbQT9i0QrtedwUjOTgj6P+a4o7MJ51JNqxNxPuns1DO6CLfE Leo9Oo4jLD1HExvYt5PfC3exvuHka3q0ERqf7jTRkySVqTiMzUnGLtg/z4WL4GZDWDTS 4oGg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=JTibY+rs; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=ujqjDiSoWdhn0k0hZJWapxFTHaCSW+ZQXyCRlIvk7Us=; b=lKuIvzBJHUiZhf2MqrNS1f9CC5dbbMcPowm/mYO1P5WXbDhZTn2coj5zpUFyPfN0zh cAiSfcrthrtQ4CsEOz4I77wrVqBraqIcwaMIjtZeJlOX/gF1keBuzFtt1MfxewBwWYY/ z/zHRFr/g7QNk5rwKiaVjrkXXPsChlYBjqyHo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=ujqjDiSoWdhn0k0hZJWapxFTHaCSW+ZQXyCRlIvk7Us=; b=afb5CWOXjFFcMlEIobBsfWr9nmP/kfizlnWEMbNITWHtzlBDu9gMsou4wilkwJ3Tj8 2B6N8aq897iVnG/wBk7oS78Pafyte9VoIrj0aIlJ+ZsX6XjbPGzmzgwHxkK/C1AHLgay uRWKgezH9sgHzj+JUlgegIB+1Nk3pTtL7nWElFZXnIsqAg6gOIGh3tgbnbxYxX1mHzz0 Pe6F/24dBCG8nCedCaWrUCDMG+T479wD4ox+X4OTaFJUeeUXAKCL6wAzFQARG9L44NjR zRwK7gEw5cBzFXHN02vRRl8U1y0IT3QgSkKBGbRBj/7BjxVhL0yhk8O9zvDowbRuPlkY PUWg== X-Gm-Message-State: APjAAAWKiO+KZgJdQsTOe1/F7X/CsTN4zOVHvdErPwZ11/huJ+QymGHN Ton4otg86vuxo2PF8qRhMWNtoHSm X-Google-Smtp-Source: APXvYqxY6uO0uMdavVCv3/M/Rh7iaBY88qNshLiytI3CjbfE7L151EDjLT+h2+WNz9+gDEtCfqdQ7g== X-Received: by 2002:a05:6830:1f10:: with SMTP id u16mr2382508otg.229.1566843689193; Mon, 26 Aug 2019 11:21:29 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6830:1e97:: with SMTP id n23ls507442otr.5.gmail; Mon, 26 Aug 2019 11:21:29 -0700 (PDT) X-Received: by 2002:a05:6830:4da:: with SMTP id s26mr15753785otd.223.1566843688831; Mon, 26 Aug 2019 11:21:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566843688; cv=none; d=google.com; s=arc-20160816; b=dYx+n4yJ6DScKEAHo9MC5GrkOh3wgBQn7/nd302FiqHCK3q6thjUnwljC3pFg+w0fV Ewhj87Q8+Ct6+SVITjn0W0g0ZPCPrqkBWMgwcwq2taXpccEki38q3y0rsPpk27KIOg2j rS5vk8sBG7zjse/J4ZFwGTPLujwK9n2Xibvd8eAC8uxeUDZfYhD0+VckWOYBFJFtf85L Ul0+eGHi0VO9SVFS3opJPsRWgVGWQJ03m0oKhvSIEle01PMtOkvF2W3ADzAQ8QWzi+RP ebMYvhWvWkA/OJqgWHiCKpxQLT9hyGt4/eaXdLrw4lnrubMI4iofaMcqdRFQmYHG1p0V AP3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=aNcJ9rEaaKnDjlWm6bI6hY9Nv7plN57nwYDZFCxbKmE=; b=yIHFZeNXDghPinUiTIuHc0KG3IqX4uYyS047Bsg2Ytq8dcrc+l7cessd6H0QEhFxvN 2i6MC2enmlzAbWgRkLjN0zOWxUnsMNL+AIsSBQzI/mbs51zLSPf9sv878/fpduz+tz/P VZx6URm2GAg2jJyQlEvjiKBVgZDjnJognSFLqy9OdJPqpBgz6+3Pgb82KvQhkzjRYRI7 xSqlodn31YJx+qdL3S8Y8YVY5+0PiO+Y6H/nIx3GRS5ThBWEGWQkcAxi9csQwjpxMN4s /bIo4+6IuTK/vV9yKP+prnpGyayO3F6v9+D0mckRtvqHW2f+WnBmyKqY9vhTGIX9xPwK 6x0A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=JTibY+rs; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id s3sor6274591otr.176.2019.08.26.11.21.28 for (Google Transport Security); Mon, 26 Aug 2019 11:21:28 -0700 (PDT) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; X-Received: by 2002:a05:6830:1615:: with SMTP id g21mr15633100otr.124.1566843688512; Mon, 26 Aug 2019 11:21:28 -0700 (PDT) Received: from jagan-XPS-13-9350.attlocal.net ([2600:1700:7430:38e0:d5b0:4823:33c8:5e46]) by smtp.gmail.com with ESMTPSA id c11sm4401461otr.54.2019.08.26.11.21.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Aug 2019 11:21:28 -0700 (PDT) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Cc: Akash Gajjar , u-boot@lists.denx.de, linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, Jagan Teki , Chin Liang See , Andy Shevchenko Subject: [PATCH v2 07/16] wdt: dw: Add driver-model support Date: Mon, 26 Aug 2019 23:51:02 +0530 Message-Id: <20190826182111.30999-8-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190826182111.30999-1-jagan@amarulasolutions.com> References: <20190826182111.30999-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=JTibY+rs; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Add driver-model code for designware watchdog. Cc: Chin Liang See Cc: Andy Shevchenko Signed-off-by: Jagan Teki --- drivers/watchdog/designware_wdt.c | 118 +++++++++++++++++++++++++++++- 1 file changed, 117 insertions(+), 1 deletion(-) diff --git a/drivers/watchdog/designware_wdt.c b/drivers/watchdog/designware_wdt.c index 2979fda44e..c822b1e36b 100644 --- a/drivers/watchdog/designware_wdt.c +++ b/drivers/watchdog/designware_wdt.c @@ -4,7 +4,6 @@ */ #include -#include #include #include @@ -16,6 +15,121 @@ #define DW_WDT_CR_RMOD_OFFSET 0x01 #define DW_WDT_CRR_RESTART_VAL 0x76 +#define DW_WDT_MIN_TOP 0 +#define DW_WDT_MAX_TOP 15 +#define DW_WDT_TOPINIT_SHIFT 4 + +#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) +{ + int i, top_val; + + /* calculate the timeout range value */ + i = log_2_n_round_up(timeout * dw->clk_rate) - 16; + top_val = clamp_t(int, i, DW_WDT_MIN_TOP, DW_WDT_MAX_TOP); + + writel((top_val | (top_val << DW_WDT_TOPINIT_SHIFT)), + 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) + return ret; + + dw->clk_rate = clk_get_rate(&clk); + if (!dw->clk_rate) + 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 +184,5 @@ void hw_watchdog_init(void) hw_watchdog_reset(); } #endif + +#endif /* CONFIG_WDT */ From patchwork Mon Aug 26 18:21:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 833 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-oi1-f198.google.com (mail-oi1-f198.google.com [209.85.167.198]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 693983F0E1 for ; Mon, 26 Aug 2019 20:21:31 +0200 (CEST) Received: by mail-oi1-f198.google.com with SMTP id l15sf5963013oic.13 for ; Mon, 26 Aug 2019 11:21:31 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1566843690; cv=pass; d=google.com; s=arc-20160816; b=mAj8GWsUU3Gd+fQBQc95b4I70aM03g3jznFsDlzW8VZHKHjnlBIaRIrwZzM3Xj5wCS KAAYkGDCFgLQEzue0cUw3q8I/SrvRBVyGN+GEkDqck59JuzTDvQOytl+sUPe+kVEvcZM Abeord6eNq1lNVV17J8TohLhOY4LCJ53VZE9OY1bm2dLK1GPR/uqGTcAGHLU1UY3yRAK LzumJ3+PCdyTpl1NmBP8EzKxU0vsJ3n/9bgLX6hvNm35k0PS5QnkUfaAtyUt79MgsPSR E18SiXcFxQTyBwlKFcjKK653UjXOgqDRWP/PAW5uvVK6EIJogaexj38XhzAQZZNw7xnG llew== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=jdoDzA1GaTj8zZ+K+wE6D22zVJjDV9aNmxjeuVGrtKQ=; b=FxErH1W5YxJx6ky7aK8rsZlK64H4cQfDSeECtSVdBZxBwCfK3NNFZQQCApxkml2Ixm ZmgafF1DaCbiOT9gfJtypsSI2tfke2LiYDkveR7C/p9uQ/5xQ1wfDpgAd8gGd0bPomSG 7VLkh6GsuB9DkHlyzyaSRnxBWkWEnhLQxzH1eGxkke/zhdKicuaJET5IdSCAzJwSx5qe u04q+PWOTTCCVXnefQWtTybxCvOefwiaTIAcJQKkYkLiZIg1RGOEHzAy0Xxh431SoKn6 fhO0FZz5Ef5UEabmddRmFWMkd+iuGz2WOZ2UKG2flqUjL5lXh2JGxAg6oQZg2NpfSKrp mbVA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b="RDu/HXwV"; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=jdoDzA1GaTj8zZ+K+wE6D22zVJjDV9aNmxjeuVGrtKQ=; b=dJ9WA/mTG+9CPkAusAcE1KBTbSkYEa0aDV5dyDWTPG1iUae30Y7yL0Bd2GxTOhogV9 7emN0LEILSFoALzK/eeZIDwuCsZvzm6WY8fHlbVsnbqTvV59VuI4aNHdBTnzUjr9CYt8 n7aYcX1JSFilFtn6+PPUpaNVCMb+snMl/Qbn8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=jdoDzA1GaTj8zZ+K+wE6D22zVJjDV9aNmxjeuVGrtKQ=; b=lHGPPx+815hb3amDwaOeGuMuouuNn8tBUzOdgeddePzmerT0N6bJ5lfGUJp1fdTpvt 7YaJemQFneOIKgvSmS9Ep8+l8W2wRbEcjAAa+D26oGqv2Mpt7Hlj/hPvYBrZJQMfJLs7 WICahdSk85VS2VZq2JaIdxEc8Srhq9K/Uj3DTM/R4VP6L8F7QSDDHyeO8edPU8ZTe62w Je/teo/B5VZwGJCEJotDWmBFEQYfFHdF1ZOuoTuaef57d4c9ogYpn8ETUPeEZfT20iae 0vhqbrOiy7PEBdlrFic/gVv5teCR4GPSgOr8ZU83PUQpvevF+vHNNVcX/AodclQ1BpfD oQyA== X-Gm-Message-State: APjAAAXQoarJWPI7NKG8l5wvdPDNzKzWL5Jb57Jv5bWKM5Ls8dwKKy4z FxmjFc53FtqF9C69qt5+lHdA8k/g X-Google-Smtp-Source: APXvYqxfwTToX725bNUHu3G7TSWgL8iy1E1h8oMdSOWsVc5GIKHvGwyqJcQNxPcc72hnJGnzGy4nRA== X-Received: by 2002:a05:6830:1311:: with SMTP id p17mr16105195otq.2.1566843690388; Mon, 26 Aug 2019 11:21:30 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:aca:754b:: with SMTP id q72ls410757oic.14.gmail; Mon, 26 Aug 2019 11:21:30 -0700 (PDT) X-Received: by 2002:a54:4016:: with SMTP id x22mr13636637oie.27.1566843690042; Mon, 26 Aug 2019 11:21:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566843690; cv=none; d=google.com; s=arc-20160816; b=AYbYdOEeFirOwIhkp/s3KDr66RL0eEXz2giauHNCG5XPv2rl/az7VXtU2m3tp/oTTq OTN2CxrOtwpu4dPEtqiKj1XpNZe7PC52ul9MYNi9+F2Ozcacb7H7tQlrzJA0wNjPz3kt YtfiANrB0eh0ccFOlDXoACIwYQ1wIzNu8OgBo0SdnN8MjDMDlj8MOUKwnl3JK59wYzxx ckd+xqjO5+P4nU3m/BIWlUD8SweBNOSD4VKwe5BGIy8WIEy8zVlFjKhBcjILWEjF3fNW cUkD30qEmhPM/w1zekznM2z8o6NtQx5puEcq8ouxmdPz0PypuouNEoqPqxuthy9Xwn7o 6XBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=qO2o3JiSSK7DhHkxgiIofrCT8NvSiNOXOxqZG/yKu8I=; b=RrzA3fMyKU/1zmDJ7lCHX4nlGAmOP6A6wABPZpnGTpra/duXp7Rcg+Nm4PZy2x95Ay J3XIfOxf6PE0qmYPA095sF6loi2olQI3dez8eYCKhboReF/nT2S3mf1W4UZk6nH+y8fU Kv+p2Cs8+VmztUBeE6WXqFuSa64463+0XhrdGZRiAEGfqS/m25IC487In8YZqYbksEuJ s+Zu9hJyvhHanEst80DIktaYZ4mIiHHoksoqqU3lRzYkV83Q7hGf1zTFu7qhz8Mtsu1B cxBi6UVPbVZMWvWHzV3icQr6kbJBSPq+vG/OX94yCAsSF2LbrKsDbdzrTr2xzgNhMXlV oQyg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b="RDu/HXwV"; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id h26sor5155204oih.80.2019.08.26.11.21.30 for (Google Transport Security); Mon, 26 Aug 2019 11:21:30 -0700 (PDT) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; X-Received: by 2002:aca:4ecd:: with SMTP id c196mr13866597oib.10.1566843689672; Mon, 26 Aug 2019 11:21:29 -0700 (PDT) Received: from jagan-XPS-13-9350.attlocal.net ([2600:1700:7430:38e0:d5b0:4823:33c8:5e46]) by smtp.gmail.com with ESMTPSA id c11sm4401461otr.54.2019.08.26.11.21.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Aug 2019 11:21:29 -0700 (PDT) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Cc: Akash Gajjar , u-boot@lists.denx.de, linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, Jagan Teki , Dinh Nguyen , Chin-Liang See Subject: [PATCH v2 08/16] wdt: dw: Rename to dw_wdt.c Date: Mon, 26 Aug 2019 23:51:03 +0530 Message-Id: <20190826182111.30999-9-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190826182111.30999-1-jagan@amarulasolutions.com> References: <20190826182111.30999-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b="RDu/HXwV"; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , - use dw instead of designware for driver file since Linux following the same. - add CONFIG macro start with CONFIG_WDT since the driver mode wdt drivers follow this. Cc: Dinh Nguyen Cc: Chin-Liang See Signed-off-by: Jagan Teki --- common/board_f.c | 2 +- drivers/watchdog/Makefile | 2 +- drivers/watchdog/{designware_wdt.c => dw_wdt.c} | 0 include/configs/socfpga_common.h | 2 +- include/configs/socfpga_stratix10_socdk.h | 2 +- scripts/config_whitelist.txt | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-) rename drivers/watchdog/{designware_wdt.c => dw_wdt.c} (100%) diff --git a/common/board_f.c b/common/board_f.c index 31181a9dc4..33e69c645a 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -97,7 +97,7 @@ static int init_func_watchdog_init(void) # if defined(CONFIG_HW_WATCHDOG) && \ (defined(CONFIG_M68K) || defined(CONFIG_MICROBLAZE) || \ defined(CONFIG_SH) || \ - defined(CONFIG_DESIGNWARE_WATCHDOG) || \ + defined(CONFIG_WDT_DW) || \ defined(CONFIG_IMX_WATCHDOG)) hw_watchdog_init(); puts(" Watchdog enabled\n"); diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile index 955caef815..ecdc1ce54f 100644 --- a/drivers/watchdog/Makefile +++ b/drivers/watchdog/Makefile @@ -13,7 +13,6 @@ endif obj-$(CONFIG_S5P) += s5p_wdt.o obj-$(CONFIG_XILINX_TB_WATCHDOG) += xilinx_tb_wdt.o obj-$(CONFIG_OMAP_WATCHDOG) += omap_wdt.o -obj-$(CONFIG_DESIGNWARE_WATCHDOG) += designware_wdt.o obj-$(CONFIG_ULP_WATCHDOG) += ulp_wdog.o obj-$(CONFIG_$(SPL_TPL_)WDT) += wdt-uclass.o obj-$(CONFIG_WDT_SANDBOX) += sandbox_wdt.o @@ -22,6 +21,7 @@ obj-$(CONFIG_WDT_ASPEED) += ast_wdt.o obj-$(CONFIG_WDT_BCM6345) += bcm6345_wdt.o obj-$(CONFIG_WDT_ORION) += orion_wdt.o obj-$(CONFIG_WDT_CDNS) += cdns_wdt.o +obj-$(CONFIG_WDT_DW) += dw_wdt.o obj-$(CONFIG_WDT_MPC8xx) += mpc8xx_wdt.o obj-$(CONFIG_WDT_MT7621) += mt7621_wdt.o obj-$(CONFIG_WDT_MTK) += mtk_wdt.o diff --git a/drivers/watchdog/designware_wdt.c b/drivers/watchdog/dw_wdt.c similarity index 100% rename from drivers/watchdog/designware_wdt.c rename to drivers/watchdog/dw_wdt.c diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 36b0ed5459..902909216d 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -105,7 +105,7 @@ * L4 Watchdog */ #ifdef CONFIG_HW_WATCHDOG -#define CONFIG_DESIGNWARE_WATCHDOG +#define CONFIG_WDT_DW #define CONFIG_DW_WDT_BASE SOCFPGA_L4WD0_ADDRESS #define CONFIG_DW_WDT_CLOCK_KHZ 25000 #define CONFIG_WATCHDOG_TIMEOUT_MSECS 30000 diff --git a/include/configs/socfpga_stratix10_socdk.h b/include/configs/socfpga_stratix10_socdk.h index 90ad8172e2..5d03bfd061 100644 --- a/include/configs/socfpga_stratix10_socdk.h +++ b/include/configs/socfpga_stratix10_socdk.h @@ -162,7 +162,7 @@ unsigned int cm_get_qspi_controller_clk_hz(void); */ #ifdef CONFIG_SPL_BUILD #define CONFIG_HW_WATCHDOG -#define CONFIG_DESIGNWARE_WATCHDOG +#define CONFIG_WDT_DW #define CONFIG_DW_WDT_BASE SOCFPGA_L4WD0_ADDRESS #ifndef __ASSEMBLY__ unsigned int cm_get_l4_sys_free_clk_hz(void); diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 661c8b6427..35c56262ed 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -321,7 +321,7 @@ CONFIG_DEFAULT_IMMR CONFIG_DEF_HWCONFIG CONFIG_DELAY_ENVIRONMENT CONFIG_DESIGNWARE_ETH -CONFIG_DESIGNWARE_WATCHDOG +CONFIG_WDT_DW CONFIG_DEVELOP CONFIG_DEVICE_TREE_LIST CONFIG_DFU_ALT From patchwork Mon Aug 26 18:21: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: 834 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-oi1-f200.google.com (mail-oi1-f200.google.com [209.85.167.200]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 9B6953F0E1 for ; Mon, 26 Aug 2019 20:21:32 +0200 (CEST) Received: by mail-oi1-f200.google.com with SMTP id c18sf5947885oig.22 for ; Mon, 26 Aug 2019 11:21:32 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1566843691; cv=pass; d=google.com; s=arc-20160816; b=WMeHS2AxAa2nVc5GIWgXcjz1cb0H8KD4EAcnZrXvb6cDl0UwiiTdH9ainPeJeiM5HV egtu5HuazhprhCxurGY2kJ994SKehy8I31sWBxG/Y1/jZFptaiPUcigIQ3oZe9QeBy8J hwaROcqRSQFWrKlJrGQ3P7Vk1E7ob4Z7gKjk4KhWvD3tYXtgP/GyvD9i6KDdz5gn2PmZ bbrM2UZpc9vtrOiYdBa0AIOREvTHbj86cjo+9Dsx1bR4PTUCRLUYJO02HnydV8KeTlbd blDAlcnZGmrY5chOCJph/wvWPIhYbY3VNPCTMMANvDfkmobdRc0ihTOfKEiIMUa1Scl3 jC4Q== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=39dowU3E22K2DD9A1lT+lHmqdtun6IQ3wyw47+aAii4=; b=p7DTjmQZvGpn5Ac6iXHXJg4j8rttX57jPPsqHkuzc0Fj8vn3fE0DJHvWyo8JUayduS 5tEjw66RvB6O9pVjermKK71Ww8jo87IyrnDligDEAogEKuo3YR5GFNiDJod5U2GdIZ5K q5c3eVh1by2uAYcPkupSgK6+LgS0pMJJTWTzF4i2Fx3/sIxtNj6Hn3Noge6RwSm6zvlc eUWUjO2k5lu34ikJdDqLUX9EOM2Kl3Vl3zVxVsKBWjkQ/DqchXK4vz3cmeGFzlZgh3q6 05PC7TF/LL2SsqKcUzD25y1jINNQ9COKV+h5anMAaPVQvGLjyHL2GymZLEF9PFBAfSdW wYnA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=ffu893tP; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=39dowU3E22K2DD9A1lT+lHmqdtun6IQ3wyw47+aAii4=; b=B7XI4Gx3xc9Di/aUEFwCPet4taxomFsFEjFAWpyuhht3Dif9Umyix6u51xQg6OUFMC 7N3jUNNBNUvxk2U6a0LaNfKl6v8+L8pO7RS9O+cxDSywI0n38THuSGNm9ytdJn5FodBo nWs/v2FyQe87HPY3JLZCQ3Vi2btS3Xi5/Ihmw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=39dowU3E22K2DD9A1lT+lHmqdtun6IQ3wyw47+aAii4=; b=WVtOUpxbk1dM8JPa0xh93ztBqR6rD1qzBpeW1gnuvig2GHiCuzJ52mWbA6G47crq2N 9zL2y/31AQ9+CwjuCFcZPsEhNXTU7+M7Yj1LAzuJy3YV5vri+JSAf7ven0FSNagVAU3b bO1PWXB58vjeA5P3U2iT2IFGU8X43Nj5juFg662/vUqMlq7gnR2QVNasAvMiIc3fdKsp Vv2em+QVRsTXidGpQejNLkZM+Uz9iILjUb3LFEc5Y5Sv3bgKM4Ew2HTLAKXRBxp96dU8 jI54MCLCAQzWkF5D//kNE66YeT8HDIPMhNFojHNyw73UceVDfmaTT+QC+IWmtzu0uLLu qNVw== X-Gm-Message-State: APjAAAX9+t0X/hqrRRMvkQIf4aUsKMmxCj74216HaNoWPYk/mpidVZpI t11ZHSlrocvkj0xf/NKRk5KEIWHO X-Google-Smtp-Source: APXvYqw+GDrj4CUpuAg015xEwRcl+dL8WblPgsVhc+9YfMSaXIR9QJwVUnMvDhpviyG4BzgTPSQ94g== X-Received: by 2002:a05:6830:1e38:: with SMTP id t24mr1889978otr.134.1566843691569; Mon, 26 Aug 2019 11:21:31 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a9d:6343:: with SMTP id y3ls507032otk.7.gmail; Mon, 26 Aug 2019 11:21:31 -0700 (PDT) X-Received: by 2002:a9d:6955:: with SMTP id p21mr1695335oto.204.1566843691031; Mon, 26 Aug 2019 11:21:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566843691; cv=none; d=google.com; s=arc-20160816; b=QnsnieQoJDfba+e/TvdPl/7U+3C0AOTPdRBwfpeZt3PEMmwgACXifeDvkomcisXJN4 Y1DFkDdWl1lI72ok9a50Ikxdl9hrYz6pE6CCUKeHjy6d7PklyWMTxuAS4uKCJbqUPCrq WxIUDG2J6CJZKYkyXcW29Msw/n3PszRR9NDnf9mQaQ5lmjYoJqPlXjpNjH7BLZ+JqFxy +8Z5y9e4/5d7sBDySAg2jIXskpfll3Y7RiFmK3VsaN8Wq82sWYaKHasRh31RZGxWoUrw r41RGMfc2OjeetipLu7QEmQeYiQ4cv9aVZGpn2Rq3+QGhbPN2FYrpnkK+G1cKiabmU0Z EPvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=lMkAjW3GPc3JRQvbVP13XvU/Mvzd6g4b+EvCVNCUb6c=; b=Rst6QN3Y8ermPqHPHbFYg4zq1Mtqe+C5s4iCSEmuK4G2sdQbBOzh3r+LyUTiOzdwCr tE2Fj+zAJh4aj34ELJEtqxAzwXJb/wYGnMgGjPp4QdaISQN7UQcg1gY8QoowR4alPm5s jD/OtVi4GojrXmhzBrJP8jYv7eHds/UQYPALtr7mmBzRFrbmdeM/Y3Z4yXkiaqXTPi2F SpDKeAtR13EaLTWkBnqYJgri7s77zd3FEbtKIURhUHaaSZf4YRwQltOVUWI7dNekj9K+ 4vujzabY4MzCS9tIWmrvN+GeNihIYw+y2hY8JseNEzgKCsJ5+40HJUjmM04UQGmPngMX 4r7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=ffu893tP; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id e7sor6227619otl.58.2019.08.26.11.21.31 for (Google Transport Security); Mon, 26 Aug 2019 11:21:31 -0700 (PDT) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; X-Received: by 2002:a9d:7c93:: with SMTP id q19mr15805419otn.343.1566843690728; Mon, 26 Aug 2019 11:21:30 -0700 (PDT) Received: from jagan-XPS-13-9350.attlocal.net ([2600:1700:7430:38e0:d5b0:4823:33c8:5e46]) by smtp.gmail.com with ESMTPSA id c11sm4401461otr.54.2019.08.26.11.21.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Aug 2019 11:21:30 -0700 (PDT) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Cc: Akash Gajjar , u-boot@lists.denx.de, linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, Jagan Teki Subject: [PATCH v2 09/16] rockchip: dts: rk3399: Add u-boot, dm-pre-reloc for watchdog Date: Mon, 26 Aug 2019 23:51:04 +0530 Message-Id: <20190826182111.30999-10-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190826182111.30999-1-jagan@amarulasolutions.com> References: <20190826182111.30999-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=ffu893tP; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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 Aug 26 18:21: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: 835 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-oi1-f197.google.com (mail-oi1-f197.google.com [209.85.167.197]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id BA61C3F0E1 for ; Mon, 26 Aug 2019 20:21:33 +0200 (CEST) Received: by mail-oi1-f197.google.com with SMTP id p9sf4173134oic.6 for ; Mon, 26 Aug 2019 11:21:33 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1566843692; cv=pass; d=google.com; s=arc-20160816; b=vPZhgnm9NgwKHKDYivoj40LkECwMTv/Uvb0sM/nLBZAeSexqvnTJgSpKYlSfViNRRC seHmC8/r7mY+mFqpo1TwFUnqzkUUyDGC71eJ+Yb3oWvBhoUGF0vWsUlYiC4GTbT07mmE i5l7IgahvwXX/Kp0TaOrTsw06QPQ6nf2k58KVsP5GTVYfX+hqhGwjwj29qOYVz/4lw7b 0mvKPpPEsCoi6O1L52hm/VFwsKoFh8ClH890eKCfFTo1dh0jnGMSxOzOF/7txF+FPOdY CHaw37AAq8pXmbkAam+4FFZ2Y7egxU0O1m0RUgz+W5C9s5orcmsd9qzUgzzcu444pk15 1xGg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=vpxt8Z5WdSH6RIoyKgwLTdBxLxSzrxSEKPVP0A61sB4=; b=LbiW3cV6/79e3tK2Fb6Qf+Tv2faOVy0dwTPykOVqXi4RML6EVUbJh4/EgbElxQiaRw K1Zmytgp+MsOBxpeZ9DqNKoit+dhNIxbVBnJihjB0D2b+myFb5o4E545yXeyZjlz+9VH mlCArQJL+K5TgvOeN16T88RKyU0W2shpDBaKva/llM43lCw+B6XnyFoXx8avd6hOGIWp F1/uj/LLy87ihe6A9KI7446Q+NPMkdLXc+FQoEnA4tIb7bTxfmND2m158NIJOkhiqTV0 Ge96NGkUg/LIKLJgrmbQwnfe45f5Q2RqOcQYGhKi2yBwHXxBIeMIi8XW2N/oDREkg0k3 YKdA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=GvsaNMab; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=vpxt8Z5WdSH6RIoyKgwLTdBxLxSzrxSEKPVP0A61sB4=; b=m12z2ZR6cT5xVNzLRWBWpJIqbVVWjcupIn8Q8a3s3vCIbe4Nt780Gpq4Srl5EaLjr2 7aXPDx5Bx4hgRKf+ZfSWXp7EZTlglHNRaTrNjndB0eM+D+SsENS+JpPXEXbga83JEeus k9Ju87P9bfAVO4Al+qnN7YvVA3bgTtIrzrJJ8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=vpxt8Z5WdSH6RIoyKgwLTdBxLxSzrxSEKPVP0A61sB4=; b=a3i2GWUfJQ8CyWDxpIUORSD0CCTWiIAXhaNTxflx6NNWeDEcmKUEUTFgW63VtFlovM M6YbISV3inhiG3BajuBjd9T+xDb+soW7S/zxRZnLgmNHwkao2qkTfpf0hzc8IjsmxvWi RezDTx5olFi00Hl3aY5rU5bBlksRXy+foN0xAsDme9fMVPlvE/WNhu4s+xLSPXdIrOIO TLQ1ooGRXhSn625Q8S2ErFdZNKOqAjpl8cahaZ7fVT/ktZtGEfSMPJ6bymUjHKhMivZn 2ux+ljKpA9qwnhVzHhbW7dlgydVHVUZ9RTyQAxw6wdPuiTzocQfTvGoPwHQVSY2ql7r5 HsXQ== X-Gm-Message-State: APjAAAWZkRAl2Gk0KmnPJEuQZf5MHhOZkmm0UYfw3rrB5xSK5dud54eP F+861rUt/S1syvtLjw+5FMDrgqep X-Google-Smtp-Source: APXvYqy2a4Ch/xRwBGeABvi/RsSOT1VlY0lFptQUB/kLHY9eexl405yyz++8yBdOMvNbizNkMP9IhA== X-Received: by 2002:a9d:7308:: with SMTP id e8mr17075436otk.285.1566843692710; Mon, 26 Aug 2019 11:21:32 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6808:5c2:: with SMTP id d2ls410584oij.16.gmail; Mon, 26 Aug 2019 11:21:32 -0700 (PDT) X-Received: by 2002:aca:5c3:: with SMTP id 186mr12813035oif.37.1566843692353; Mon, 26 Aug 2019 11:21:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566843692; cv=none; d=google.com; s=arc-20160816; b=x9kjr26pFZCwZjv2Ce2WXa9wl9rV/BhvHUcWdzmXEUKjzsIB/2nzn8SxVRCv40WQ05 +afKx58o8QdniXbj2yNm6BeN7j0ctm6Tz3pGaN42iuGAqvxHPR3V0gPRjEaYUl+dkBH3 ZpcDo+HHdGcEPrTziIoOtjbvuSpKmIvOl+u83R9gS5aggMfXCOvGDGbh7g3bg6WB/zHc iNNQex6Skt8iJTkITKOZpi0Ut3Qu12ZtPKj4Bk6JMwK+U2UgJYRc4c8bGrHAU4m9b6Ld mD986S90wOy4evSA3/PQYmv92iWV8+HzkobWmWv6nX7g+josQnwCGoNjSdvXAbdH8ZRb sxOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=48tbCTA8i+mDb23wmOG8QXjh+G13bWj85edFBbAfgJQ=; b=msRayvgObGLdp4eF8k6VXd6vUi9vbFze4khjsLXT+TV0iKimFbH5vxF4s82+aeW2U7 UbZhANBVp9601peRy2ePnpEqXeRG+785gJWvSIHJm3fZ9icJqqahusoaodOKbcRdDz0M q66nAwoNpAEpsiURxw9d1bBO/ulduJE49cfkVxxzjy1ikbiR9oQ9lbAjBDcw35wL9LJb FSCksvcgCcOBYHlU7+OF3MDHLQwOJmi6lmAP8DRhSMh0nkbfIOuzYYuXB5Gaxd+L0ZB/ 7q7L9USRjtQwmmyYXKd+3uPdqmYScKzFC4m6VGtltcYQ1fZDjzg1PUWfee3rhsdQ7Z1d bkBg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=GvsaNMab; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id b25sor4084658oie.67.2019.08.26.11.21.32 for (Google Transport Security); Mon, 26 Aug 2019 11:21:32 -0700 (PDT) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; X-Received: by 2002:aca:4dd8:: with SMTP id a207mr12806037oib.115.1566843691996; Mon, 26 Aug 2019 11:21:31 -0700 (PDT) Received: from jagan-XPS-13-9350.attlocal.net ([2600:1700:7430:38e0:d5b0:4823:33c8:5e46]) by smtp.gmail.com with ESMTPSA id c11sm4401461otr.54.2019.08.26.11.21.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Aug 2019 11:21:31 -0700 (PDT) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Cc: Akash Gajjar , u-boot@lists.denx.de, linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, Jagan Teki Subject: [PATCH v2 10/16] wdt: Kconfig: Add WDT_DW entry Date: Mon, 26 Aug 2019 23:51:05 +0530 Message-Id: <20190826182111.30999-11-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190826182111.30999-1-jagan@amarulasolutions.com> References: <20190826182111.30999-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=GvsaNMab; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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 | 8 ++++++++ scripts/config_whitelist.txt | 1 - 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index a66a9bcbe2..8674633b90 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -90,6 +90,14 @@ 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 + 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 35c56262ed..0618cb9047 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -321,7 +321,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 Aug 26 18:21: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: 836 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ot1-f72.google.com (mail-ot1-f72.google.com [209.85.210.72]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id E4DD23F0E1 for ; Mon, 26 Aug 2019 20:21:34 +0200 (CEST) Received: by mail-ot1-f72.google.com with SMTP id t10sf10594020otb.3 for ; Mon, 26 Aug 2019 11:21:34 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1566843694; cv=pass; d=google.com; s=arc-20160816; b=eSUPkPMMEwJ2VZl095ea6rkMm4SJsoXuE7sWzVjfpLN6yhNGUZWJxlmqH38MzORjOf 13UnVDpHszx7KkoQ9MCUWcveTWCoCJOpiTdMZ2Hjp6XQMdbfTGflbYA9SbGSFZoCjSM6 ky8vIaNFyxOfYd/yj2mbLMTYmpsl258F03p0NHgY2f9HrU97Gvf3ZGhkkIUZtpabK6+B XcK9uWn4EVWzSsUNcdkOaeOfdHJpsETnVwGTtzSlaA801gWaFfBlq8iMs0Fznfy50i4e UTeLjheC9JOJg9QMLto3w51ckXob9sa6OnkV4XHKntANvZBUWm949Dbmhc5o1bboBLaS ikXA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=FNbfnUaPVnTGLqKAdfakjfJZ7ISe+dRsnccJSr1KX+E=; b=eAvZsaJ6E/TuUndvdrgrurlR6KUwId+PGMbjOHOlhD6XpV52f/Xti/qNoPbo+bNnsz ktaOCNgKwk5yVQyy7f/YTshHNgra2VB7OLTsKw5vhLxqk5Q318iUUFxnhE/46835Vc+N rW7GJBLDtMIodwRoGiJB8unoZd/P7xc0xVohmqb5J0VWODZZ542r5wVXn3gAX0PwqtDR LBSW8H53ROk5AJj75Q+x4Dcmr+JTLIQhZutj4ekwejm8zSr59UmmEi5QBBz52EcwrqKS CCNll2HNK7kDk1kGL8RxY+5kCR4y2OscC/KI6gUXHawgjLclcMLr4fuRAGlVQ3WytRkp PwRQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=ZZ8umxsn; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=FNbfnUaPVnTGLqKAdfakjfJZ7ISe+dRsnccJSr1KX+E=; b=ll1h3wRZdWnKClv1TY5Fqz6Vlkfj20i2xTRsiAxx4UsBHBhsdAftS/vHLa4xrrKba3 vwrkGYvvGwuVUT6oxMIQcij9mQ2aQ0VKYP+1SVqa8ChEcVp2CS8brGHLlBNm7ISdicvo 1++7XS6Iq0pw4m079+cyiax+xn+ORJrba35JQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=FNbfnUaPVnTGLqKAdfakjfJZ7ISe+dRsnccJSr1KX+E=; b=jOVpqhjtgUWPu5ST9bi2Ur1DyCC/JaHqjKiIC0pZGMEw3i/Z9f8KY0d5jfeyzuN4r1 fnzKkZ/9qlPirWMQhSWL4JxMRzoC2WY2VW1lxB31LSjySel3x5TVY1s24GzSQKiANOKU VFSgSZ6WeZx7wV76kOfroA8P8PEeLZvxbey4unG1CQcynM58fnAnPbR921k/b37gSvWa qFkBik7QXSzK6a3a8bajYo67LVzBSWj+Fbd+iMTQxeuLqwMX9WLbLA5uwh4VHGlE2ieS BLX/AFtJQ3aXCuvJ/ONnjhoPJXpmMb8V+/ypU1RNjqewJ0F9BLzGHNqGZDeYgA05SOxG LD7A== X-Gm-Message-State: APjAAAWgElpYpzQM8Vi5aUe58q8/KcK6xBcsIMeZcKMwGKXxapEG27VZ KAdXVICwEy70NMst/eHZ4PRqnDuw X-Google-Smtp-Source: APXvYqxtrtUYGWdn2JjQ3iAaF1U7bWf9pmtMs2v7/dOXEMudmzYjAIasf3nrelQblD4nKZCzVDpMtQ== X-Received: by 2002:a05:6830:108e:: with SMTP id y14mr17557639oto.283.1566843693973; Mon, 26 Aug 2019 11:21:33 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:aca:aa94:: with SMTP id t142ls407055oie.6.gmail; Mon, 26 Aug 2019 11:21:33 -0700 (PDT) X-Received: by 2002:a05:6808:986:: with SMTP id a6mr12811104oic.133.1566843693532; Mon, 26 Aug 2019 11:21:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566843693; cv=none; d=google.com; s=arc-20160816; b=dXqjsj8xKdPeI+hHUH7TtLZnwNIdOdvyn7tiz2cPlpPuQV2vbtkWFtQasWeOAJgx3o HqfLrR+UM8FpupqpouK8XpL8Pq+KFV8waFzPgtVDPb7qZwaKrlCtLlHPNHBo3wX6kWi5 7z6LppbGkoxVm64nThJg9IRgm4gSBeBaNT+C+KNmLZ3Ieu34Nw4HtfL4D8ek2iq95qoT +WxzsyHkCtXzXzZ+rgkv15xWRfQduSDKwlmb0s9217chy1jSUzXsfe2AVB+vpsCQ0VXf GE3S7ruRLJ3vOurxCCw6kTd3bDiZAIgKx6FlAnptCdnUA8tmZINa3TNdurWKHVSGZoof WBOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=PqCk+P53M9OIrwfNEuUlXsc3KULixKlD69TP8gb4FyY=; b=z5o1HDQwvMHJOv0fJ9feKY0Ir5mIvtbSp2hkXRnDCrOrULDAC4UBOm0eiuXMppVp1h reD2aLRPE3b6F54YfSd2VnujSSe3oxCTcF9qi3K9EyaL9Oo0wo48q7VvB1kMrW9Ie4k1 n+mXWg15Li7UfNkFrZ68Yc1ENU49XE/x6KjmSguMh15CHM2RhnDRQ9lwDDBvHcZ5SiTv 74hVK3mtZbAkAM0U2JI/5U7JHrvWoPIijcvh7Ul+zqtJgn3wQIbElTU7d5GMwdLWH1KF B4j6Ka+6N4kuvSDwpXzccPg6yghI8qs7IdqpTWMH7gbIiMjig/+QjbXSCU8wBlk/697S 3PZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=ZZ8umxsn; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id y4sor5134828oig.173.2019.08.26.11.21.33 for (Google Transport Security); Mon, 26 Aug 2019 11:21:33 -0700 (PDT) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; X-Received: by 2002:aca:b20b:: with SMTP id b11mr13536237oif.16.1566843693149; Mon, 26 Aug 2019 11:21:33 -0700 (PDT) Received: from jagan-XPS-13-9350.attlocal.net ([2600:1700:7430:38e0:d5b0:4823:33c8:5e46]) by smtp.gmail.com with ESMTPSA id c11sm4401461otr.54.2019.08.26.11.21.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Aug 2019 11:21:32 -0700 (PDT) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Cc: Akash Gajjar , u-boot@lists.denx.de, linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, Jagan Teki Subject: [PATCH v2 11/16] wdt: Kconfig: Add TPL_WDT entry Date: Mon, 26 Aug 2019 23:51:06 +0530 Message-Id: <20190826182111.30999-12-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190826182111.30999-1-jagan@amarulasolutions.com> References: <20190826182111.30999-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=ZZ8umxsn; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Add missing Kconfig entry for TPL_WDT. Signed-off-by: Jagan Teki --- drivers/watchdog/Kconfig | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 8674633b90..7c7f0c67a0 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -182,4 +182,11 @@ config SPL_WDT Enable driver model for watchdog timer in SPL. This is similar to CONFIG_WDT in U-Boot. +config TPL_WDT + bool "Enable driver model for watchdog timer drivers in TPL" + depends on TPL_DM + help + Enable driver model for watchdog timer in TPL. + This is similar to CONFIG_WDT in U-Boot. + endmenu From patchwork Mon Aug 26 18:21: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: 837 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-oi1-f198.google.com (mail-oi1-f198.google.com [209.85.167.198]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id E04DB3F0E1 for ; Mon, 26 Aug 2019 20:21:35 +0200 (CEST) Received: by mail-oi1-f198.google.com with SMTP id d63sf5966754oib.5 for ; Mon, 26 Aug 2019 11:21:35 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1566843695; cv=pass; d=google.com; s=arc-20160816; b=M1kUaZsYo7YIv4hQ5e9D4FqHYlkeuXxs3KHqm2Ddabbk9HBbDmD2ieAEscKGgUuhtd FJFpR7kKKOXmQBiP4OjAjahcptl32uDFZ+WuLQUiGB2pyxm3cqGvZsjIl9Hj++uiVANY QnYDQINRwJpPwqjO4Lo7BSPpDJF0bb1HKeB1UVGXVU+1jsPeHatjRmzbtwlkQhVrkbaY enSgkp/HiN+GsUnsyBzsRrloY8//aYyI2Q3+FYs7PVEi6CNvJTqEHL9bpAA9APbkrOCO DplXbYlJKxMS7cJkLu+58pM04Mpar4mPe1UPR8XXjqByqNw69zJ3bsBvawhWZO4tfFhs BXqQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=nQmJJLbcr69LOhdB9fo+YYq3FKpODdgPncK9MfShm0Y=; b=IDbr9IfG2CIk4D71Sn0ItWJQoadzxWC8ka1mUSuZ/j9Yg7xZM778hJMM/NH3lfh1J6 fMaLaYWfMEPLyr+U4TFE3WlJG5x1jf1yvtNXGcyeIr/haBXWDZ7HqYveJdGJgguePtSa Ge9sexC/+5wOpGZxDM+DNjm4DsKftbq/GpYfEA++flw1vt9AqcnLokW0hCI3zL0oQasP 82GJKgZxf7wmykXsjJN4+v09AhSSon5qEE/kkheIhfguDJJYmHZN9kVMoBopK2gcoPHk K7irCLi8RMoaOtB4EvJEetiL9KK8q8OIxXzcunCCFUoEAcdWtBrqLEQ6vgMnMWMLf2vD LrFA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=US81vCc5; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=nQmJJLbcr69LOhdB9fo+YYq3FKpODdgPncK9MfShm0Y=; b=GTfCRn+2CnX/oypZs+eaUEyy2wHcyrLgHUJBzvxllKjZcRYvtzMDGPiGKKJM2r7uVp ljRC5gi7lpf/X1HhPBGcojtZYEueytnKcp5H+/gkxIyIzJyMUn6H0LDgTLeFahECLTWZ 2ExlzY9RtqdevshAJlofWzNvYFBkkd1CtpyYU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=nQmJJLbcr69LOhdB9fo+YYq3FKpODdgPncK9MfShm0Y=; b=BVgOxgEBafrwPWqz+fRFpZNnpluYHaWhjxvo08iNIOhqLLw7P4xtrwL78wrqVO9m7T eSVrr9/tki9dzq8vIG6zyhIYdTtMOzI+JS6se6lJVbnrBtoBlrVKbaAyTGjBhja47+1+ MC+0OOfCxMkAvOYjd42dgTGeSLgTPlhDGh87XW0bJJUpuB+HObU/I94IHjzQQngo0uc6 uDAof7A78eVhDPvRyvE59seN5ZzbxLuxPbbZNy4335wY8oFCQgeFGHhmlz3YUC5/jmAa q1eq16kdPyL2yPhT520KkuSK+JCVeGFaWJooEdjpyi6bbBSrZPFPff3IIfN/3+4+isJU 7LoA== X-Gm-Message-State: APjAAAVIdXAHV/l32w7DDFQTUAOB0JuSSHVXQfilBS2Vi9DQ1Un80agP CLjDFkhbBEjClRjFKJXXScadofW2 X-Google-Smtp-Source: APXvYqzjH3gkHSbOFmfdXbNtntd04agUK1GC73ymV7r992NBvDnTLDLUwBh1b1Kksl40YwkiF9NlNA== X-Received: by 2002:a9d:7092:: with SMTP id l18mr2832195otj.217.1566843694913; Mon, 26 Aug 2019 11:21:34 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a9d:b8b:: with SMTP id 11ls510989oth.6.gmail; Mon, 26 Aug 2019 11:21:34 -0700 (PDT) X-Received: by 2002:a9d:774d:: with SMTP id t13mr10517998otl.277.1566843694492; Mon, 26 Aug 2019 11:21:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566843694; cv=none; d=google.com; s=arc-20160816; b=pdzDhWswRyWScokteV2508fCjg4MfOrahjwj5HemxdinhAx/ekjOi7jtPJdPzRibhn HylEjzmNLH38vZ00U1tIwjUDISyw2xHC6RwvH7RdhIZkUU8rcoVTX/4AikihRib6nDTI 6aNseAQ+hXEooMsK1GNurBbyZcyXFMV7FTJKfsTdRdHio+Vs3rlhJnmRAuE/H1/zclBL WTlX/VhqkWf+xgm/rpk9B6qHSTSTH7V7wEz3X/PCedivtGEMyxonu+alzOXgCly9pLrv Dg9NR/mMhUB3pqrTmGie0G4toe7GQalWSYqglk3m9pVeF05tEikpTMcWvqd6qUL9s7Bj b2Ag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=x7hpSiGKoa+pKinmnYoEJnOjDHqswnX4hTwS5+hoHIQ=; b=rT5mrZVJAaIMhgIbKCxEVfmNDq8wAdOgxB7u0iMx42X9Sx3zbd3qGjZ7nnhm5OHrZb G+hGyQjnjA0Mg5+0EwNdyEIYhzDMKdKxKIVnoTVD9cT0ritxwY3HqLU/Vmmm86oMjmEC b4NRLkcY1352/VR3ll8dI1nvgSlf2yB2KxsCFyCrWTBBLKyJQGZIJBvD1T1q1fSftN8J rGKt3gAKEHcibs6BS6hsSXlXKs80OOskDAv2eAICOdGZ9yIr6zQ9Oq8cQhX2gtCHZIzI 4Comqek506r3/ADJf+zWtDUMGRqSYK2r9ND/WDgAaXvC4ufNeC25UM60z7lrt3spfvC7 PzkA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=US81vCc5; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id 16sor5039109oiy.119.2019.08.26.11.21.34 for (Google Transport Security); Mon, 26 Aug 2019 11:21:34 -0700 (PDT) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; X-Received: by 2002:a54:4117:: with SMTP id l23mr9138452oic.37.1566843694137; Mon, 26 Aug 2019 11:21:34 -0700 (PDT) Received: from jagan-XPS-13-9350.attlocal.net ([2600:1700:7430:38e0:d5b0:4823:33c8:5e46]) by smtp.gmail.com with ESMTPSA id c11sm4401461otr.54.2019.08.26.11.21.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Aug 2019 11:21:33 -0700 (PDT) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Cc: Akash Gajjar , u-boot@lists.denx.de, linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, Jagan Teki Subject: [PATCH v2 12/16] spl: Add watchdog support fot TPL Date: Mon, 26 Aug 2019 23:51:07 +0530 Message-Id: <20190826182111.30999-13-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190826182111.30999-1-jagan@amarulasolutions.com> References: <20190826182111.30999-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=US81vCc5; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Add support to build watchdog for TPL. Signed-off-by: Jagan Teki --- common/spl/Kconfig | 9 +++++++++ drivers/Makefile | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 660aa66d84..d4c5956b18 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -1370,6 +1370,15 @@ config TPL_YMODEM_SUPPORT means of transmitting U-Boot over a serial line for using in TPL, with a checksum to ensure correctness. +config TPL_WATCHDOG_SUPPORT + bool "Support watchdog drivers" + imply TPL_WDT if !HW_WATCHDOG + help + Enable support for watchdog drivers in TPL. A watchdog is + typically a hardware peripheral which can reset the system when it + detects no activity for a while (such as a software crash). This + enables the drivers in drivers/watchdog as part of an TPL build. + endif # TPL config SPL_AT91_MCK_BYPASS diff --git a/drivers/Makefile b/drivers/Makefile index a4bb5e4975..82f9ac4445 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -23,6 +23,7 @@ obj-$(CONFIG_$(SPL_TPL_)SPI_FLASH_SUPPORT) += mtd/spi/ obj-$(CONFIG_$(SPL_TPL_)SPI_SUPPORT) += spi/ obj-$(CONFIG_$(SPL_TPL_)TIMER) += timer/ obj-$(CONFIG_$(SPL_TPL_)VIRTIO) += virtio/ +obj-$(CONFIG_$(SPL_TPL_)WATCHDOG_SUPPORT) += watchdog/ obj-$(CONFIG_$(SPL_)DM_MAILBOX) += mailbox/ obj-$(CONFIG_$(SPL_)REMOTEPROC) += remoteproc/ obj-$(CONFIG_$(SPL_TPL_)TPM) += tpm/ @@ -53,7 +54,6 @@ obj-$(CONFIG_SPL_MUSB_NEW_SUPPORT) += usb/musb-new/ obj-$(CONFIG_SPL_USB_GADGET) += usb/gadget/ obj-$(CONFIG_SPL_USB_GADGET) += usb/common/ obj-$(CONFIG_SPL_USB_GADGET) += usb/gadget/udc/ -obj-$(CONFIG_SPL_WATCHDOG_SUPPORT) += watchdog/ obj-$(CONFIG_SPL_USB_HOST_SUPPORT) += usb/host/ obj-$(CONFIG_OMAP_USB_PHY) += usb/phy/ obj-$(CONFIG_SPL_SATA_SUPPORT) += ata/ scsi/ From patchwork Mon Aug 26 18:21: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: 838 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ot1-f72.google.com (mail-ot1-f72.google.com [209.85.210.72]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 0D7373F0E1 for ; Mon, 26 Aug 2019 20:21:37 +0200 (CEST) Received: by mail-ot1-f72.google.com with SMTP id x31sf10585596ota.4 for ; Mon, 26 Aug 2019 11:21:36 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1566843696; cv=pass; d=google.com; s=arc-20160816; b=ZknkY8LDqFjOqalTTSQvFtEIsaMZFfgh5Pvj3SVcSphI2C7XAz5OA26Aejfy9cfLLh 12uOGpBx/0iFsEsqVQragyrC9FnYp6uudADmwWypFhOZk2EGHAnanscAbzCiH0Q+2wgz HXRleumQr7+5TJ5G+gZarHQqU0TJJ6B/+fYp62EPAhcoEL4962Nv9EmsA6e1RHiPxs5n /R0Mz4g1mRUYPS83dLCouucyVVGNoh8wdbOaBDOQ+s8UMBlnsu6e9JYWXJgP2AcK2a+8 E3gY/H+z36/+oDgQoGkvStdNQXsqwUeQhqa6cPjPd7/IuDN5hWlmv769zaJQJuZBJCyq LzWQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=T5q1qw8y0q0b53p+gI4bcc/j0+wG3zw+jtK0GGS+STc=; b=Bkf+gmmTmgZCxVGhYP9+204RuZJPFkwPClNbcLXyGteNVaYtS/JMBGq638S6Q6hXh2 ggptM6AdD83moQKrqRqvCN2gwzsjU9LHg9uZduKmtbbZ2ifUjELOalSpB8s7w2bvBwHN ph+4Qhf96wfR3Xk8mAFT4EBkeYQd9XuL2xwki06EC42DP7QJ27rOrsQGsZzyKn5LAgHA V9A9/BoJwsMNcWV3DsXdv4dbvUiFKCG/KefFMI6q9aGpXfb3h91v+CUxBmrjjw9oIi4e k/YP0gW4wLWdZPbAmFMtnqNbPBNg++OpC4vyXKhmaDnPMT02cxJJ8kgTnkDi95ppLYWZ ryIg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=d001+P+0; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=T5q1qw8y0q0b53p+gI4bcc/j0+wG3zw+jtK0GGS+STc=; b=TF0d6rz7ijFkMrFRiLace/TVlT0KhNTFpIL6VFGd5QfiTBtEDhAh+44NGYy6qJTvJz VhCYHmAp2idHNYQ2P9JNxtcet8ktJskbm0xi9dhN3D5umBu9SeT3f/hWq13kVhqbo6oA fBjWkOmJOJuQ/iqBUkyxh2ZM7PVDAGrFWEuxw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=T5q1qw8y0q0b53p+gI4bcc/j0+wG3zw+jtK0GGS+STc=; b=KjjO6C8v2rWBTezrNdm2EsDoMlQpWABRp/FuI0w6u+pdzkGb4aU5cYT83eelJr5Emh OZpO1GlOvJOAcVA0oE4bm2iH23ruPMqE5bx1ajbxK57DTPJzZ6yIrui1l60qbKS0OWGC hVHH9EIAOD5Ilv6hH7c4W2xbfuSc+9un+rDAlk+Wq7gmBjAHcrjyywr9UYvfVf+ZIod4 kU37L8YBgk2ESO9S8Nn0fJrUCWoLBcClSJ4OANbHIoo5h5hc/ijvI8dCOeYX17RvgYum cNnEV45V5ZNRCksszl/JlE9jlFfxWoYRuRtCDMB3/3064qwnsodkpSr1MNoUFS3gqfo8 kP2g== X-Gm-Message-State: APjAAAXH0dIowlxQ3pV8/Tl2B1FWG6zFuKX8iz2ywTyAGV2Jl/67uWCy LlIeGG1AqeKV60X/1qhMnQAugOJd X-Google-Smtp-Source: APXvYqzRRJ7w3VXTj1ghcBLqOan/qxpIEhrDZUksTGX/+U5P4MalpYzwQAz7+EKdQPRrUIAFOOrSgA== X-Received: by 2002:aca:f4ca:: with SMTP id s193mr12856733oih.131.1566843696008; Mon, 26 Aug 2019 11:21:36 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a54:4717:: with SMTP id k23ls409159oik.9.gmail; Mon, 26 Aug 2019 11:21:35 -0700 (PDT) X-Received: by 2002:aca:4797:: with SMTP id u145mr13789388oia.19.1566843695728; Mon, 26 Aug 2019 11:21:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566843695; cv=none; d=google.com; s=arc-20160816; b=UVXIvKWphPkYqQidyAH8kA0x2iIVJZ/H9T2AIa9DIyaj8Pq/BU16ZGDE15ywnTuTl3 VY0wCKNHty8Z6h3GkKcRHh2d6rWec1HPEXrgwRkWPghgRCvi7IL6QEI+SKDmK69t+o3v JkyVIkjUWWfHwX+CC/UJmus/moCpY9QNmCDpa9W+rdNSNoi6dMD46SgJbaKr16HafDwA qKd4arI1B7oxqKk/6g9W/1KaG+WckE3D1zsyMvb/uYEbYFehxI/hvWfyoPU0QhtHcJX2 qGJSzJ7x4ILR3N4csiMVkM3LzX9kGe4w6hz37JijBjBetGZSLpCEQHspB05CM9yiFPP+ UOoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=jZTZrBBeRsgIagLVhnCtIjXbWsyubZYVGeJG3Ec4F8E=; b=vk+Ur/ST/2vG0Kh2JSj97XTQBkarEU+fghGT4tMjZgluO5LH7VwyWIK2kKhR9D/H5e Ur3sVlsJlHa3d1zmj/DSAija+fL5DE4DlHt+VReerNzre9Mhm6C9Oib+5ez9TsZ/Fei9 RiJZLRjaEfzq9U/idpLP8Ff4P4Q4MwOoLfYxaJwoQGgVfYIuErEle8eqOPyT3YmD7S8S KcRR9ySNM+5XgFk7tMMp+CWVmWHlHv/ldKqYx2JQuXVR8gJJfkT4cIPaDtnSom+7VEf5 GIpbO/u6/aO7iJSTSu/+L3Kehel+0Ympm1m5q/Bhptzn3tOGnellJc4OfiyH48+oBLmh 7bGQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=d001+P+0; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id x13sor5117889oie.112.2019.08.26.11.21.35 for (Google Transport Security); Mon, 26 Aug 2019 11:21:35 -0700 (PDT) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; X-Received: by 2002:aca:2b08:: with SMTP id i8mr12835817oik.31.1566843695319; Mon, 26 Aug 2019 11:21:35 -0700 (PDT) Received: from jagan-XPS-13-9350.attlocal.net ([2600:1700:7430:38e0:d5b0:4823:33c8:5e46]) by smtp.gmail.com with ESMTPSA id c11sm4401461otr.54.2019.08.26.11.21.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Aug 2019 11:21:34 -0700 (PDT) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Cc: Akash Gajjar , u-boot@lists.denx.de, linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, Jagan Teki Subject: [PATCH v2 13/16] watchdog: Handle TPL build with watchdog disabled Date: Mon, 26 Aug 2019 23:51:08 +0530 Message-Id: <20190826182111.30999-14-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190826182111.30999-1-jagan@amarulasolutions.com> References: <20190826182111.30999-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=d001+P+0; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This patch handle a checks to not enable watchdog in TPL, if TPL won't require to enable that. This is useful, in rockchip platforms where watchdog would require in SPL and U-Boot proper and optional to have it in TPL. So, without this check, the TPL build failed to get the watchdog_reset function even though the watchdog is not enable for it. Signed-off-by: Jagan Teki --- include/watchdog.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/include/watchdog.h b/include/watchdog.h index a4a4e8e614..f04e3e7c4d 100644 --- a/include/watchdog.h +++ b/include/watchdog.h @@ -51,9 +51,10 @@ int init_func_watchdog_reset(void); #if defined(__ASSEMBLY__) #define WATCHDOG_RESET bl watchdog_reset #else - /* Don't require the watchdog to be enabled in SPL */ - #if defined(CONFIG_SPL_BUILD) && \ - !defined(CONFIG_SPL_WATCHDOG_SUPPORT) + /* Don't require the watchdog to be enabled in TPL/SPL */ + #if ((defined(CONFIG_TPL_BUILD) || defined(CONFIG_TPL_BUILD)) && \ + (!defined(CONFIG_TPL_WATCHDOG_SUPPORT) || \ + !defined(CONFIG_SPL_WATCHDOG_SUPPORT))) #define WATCHDOG_RESET() {} #else extern void watchdog_reset(void); From patchwork Mon Aug 26 18:21: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: 839 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ot1-f72.google.com (mail-ot1-f72.google.com [209.85.210.72]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 229D93F0E1 for ; Mon, 26 Aug 2019 20:21:38 +0200 (CEST) Received: by mail-ot1-f72.google.com with SMTP id g1sf10601955otr.10 for ; Mon, 26 Aug 2019 11:21:38 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1566843697; cv=pass; d=google.com; s=arc-20160816; b=wRe9u1w1Chdlp4AHfOn9AiQAWPf1BOp8wiiZkHGRjEy/iGt8IILZ6OvB06XQFp1sYC jIrO2tmm8/rILSYEhB3KA/8l/i5REjKatdZHWXx+LwlORLDTN51Zmpsx2fvlOk+sSLsi VC1Ikbw5Oc1d1tkGqxBOuMBZK6LhPvD9mpz4VRTiXNO9NlgpSlmQDnjiHsj13E1o4aCi 1TUmt64O5H6HjEH0LBHfY5FW7rm8lgtNfWvcvc0Tis0VES53W4T98gG7PfZCIzSktbmW ncYf3J2qEmO1BM5wT+ZfrvLylWME8LL807IQLHGJGXGm4GMPecHcM4Ua8CDl2HDT5T4N 1Oyg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=y+VlA6XzPaA8JD7MusCJjLChY9S3FmpIrcVK8zRinv0=; b=BugXbB0l9KyGFyiI2HxsjTJdpdQWQK/tChp9kHw41OZknEVu1OrlZqP17kC503DUMe YOBdQ7gc7WuOCVfCxcyynk2Fx9GQ+dIQKHmwj6YHe3yzVNJnyyWo6kJjjXYVCotLQstY VQ+MXv72Hr0bLTQFRWeGTlfG52EIVIHhLymQlIOUY9YDAdX1ZU7ecV6NCwmbt9Hr8GM5 kJ2xojv6OPFYf/eYupjG5GeY6XDvtI8G01gMyByKfbjzwYHiFPz9bC63zQLl+aumh4TF yp4yhHA9ckXVcPnCSRO2Adyf72aHysKuA7vlVD+KosuYoWq9UxrLuQbc+R59zHJ/EzIe nzKQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=llqXD9Et; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=y+VlA6XzPaA8JD7MusCJjLChY9S3FmpIrcVK8zRinv0=; b=RIP4fpVmNYs/VxahSLgooo+GfPj4dVeLj5UAZ85YDiK+z3vGdW9VOTslTthvIsHKRD YId1mXLLmh9ATDDIQ2JY7lhnx2DAaVkZzk5gyvgtE+HWgI9PuO1Vl69WFaP1M5msoYHd 51CYoQq3uZc+mVJGGfe0ITHXclXrb1dMQmsn4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=y+VlA6XzPaA8JD7MusCJjLChY9S3FmpIrcVK8zRinv0=; b=JT7RjYgnBRoapRyoH/BJ0RSwZFb89Hh9fhlWfxSLwaLS6KTdbXA9F6q+qc79DrCu0u c4lLtd2mWqr6e0Tuszr5ZyL+/TE8OFajkxxf9144OKSG+d2YTJyxJA+5mEr/8lPBQocl +DA96a3R4YQR55qC8O8UUkQK2bH3KugPppvn+HuHCwcFuNXPjZjlVPjCP/Zghftk+RRW qZn2qRYR4+SiVd9fk4Lh6TtFvpZT2zZxhESo00ee+vOA0LjpAt6irig06hG9P1noiLMK E9+7xAYbXP98CUUiulcspjJc4Oa69y00wTF6P3JgM9SlX4EgtilZVDi9LhWlFHwVgJxP Cbaw== X-Gm-Message-State: APjAAAW/xf2nYJrfnKvKb6YK2Opdc4fNW3g82xaFKLUOpNIntmQf42QK wxm0D34JLPWXqbzbNXnCYeaesN1J X-Google-Smtp-Source: APXvYqwV+B8LvDvvJnJIsw8I2ggWXHAyneooOps15uTWyqaJ3b5eqdevcYarQyxloJ21aoTlCOOWDw== X-Received: by 2002:a54:4893:: with SMTP id r19mr13594692oic.91.1566843697058; Mon, 26 Aug 2019 11:21:37 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6808:5c2:: with SMTP id d2ls410634oij.16.gmail; Mon, 26 Aug 2019 11:21:36 -0700 (PDT) X-Received: by 2002:a05:6808:903:: with SMTP id w3mr12344175oih.119.1566843696792; Mon, 26 Aug 2019 11:21:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566843696; cv=none; d=google.com; s=arc-20160816; b=XmEbqgZ4GEKHZJczV1ofpKTVwhQvTMRFdgIDgsYxrRvgpr6s2F/d4M/ue3r6w9q+tK GJsOTqUDesxIA60aOqCWsj4+AV5AVNhTjVLLbd2nDjuMCBUthfW3tz0vRJGlRoSuKgOf IF8EEiPxjFm0gd5vv/hlXU2lhUVPKNvmWx1pzvW++ZYH89AGluisnQPlULUlw0qC9ge0 UCIriZ5H4KehUTF81o2Z1FmyFwBudYvoT8I+fZMxddCuzJG4Z06tconTmcN9ZOdMkFKU tc6VBKz5XhfwpZMlisZjFhiN51xeofqMJjnm4lN7bER/nwhjSu3+XD/QEKwX/3qBy8uR ytXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=PTRnUv8J7zEq+X2sNjg1iCIdKlVO2Xf4T9bpXqnekG8=; b=zK0/RsqWCs0l23OPLvvVBy8/pC1eTz4iZUun8Cr5nhUe2SnqDuzkvacAl0mm4Ogmj6 N7KC/0G74py1bJvGNjvVe9OyPFKoKjGW8WPCAtRxaRYjiTbnOrM3WiyyKUb+BO0uxNWC oeL1DHCPrhn4p+jl8gVdAKS6ON/pgaCkWP5FRwdYBfN9lFj6MbVd4HOtxhL5NWQWtqCQ lUDgjKDwEFhqXWF66NVGHzxTA80g+jRn0RATUwP9R8WHEXk7THNDVf1fJSj8KBrQn6Sq 4dN6Y147lkWAyEu1/cxlh22k8SsyrGNlmxL+Supsx9eJ75oa7YbfvUtCz59PradQ+JYQ lLmQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=llqXD9Et; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id n204sor5136554oig.54.2019.08.26.11.21.36 for (Google Transport Security); Mon, 26 Aug 2019 11:21:36 -0700 (PDT) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; X-Received: by 2002:aca:3c1:: with SMTP id 184mr11811619oid.113.1566843696436; Mon, 26 Aug 2019 11:21:36 -0700 (PDT) Received: from jagan-XPS-13-9350.attlocal.net ([2600:1700:7430:38e0:d5b0:4823:33c8:5e46]) by smtp.gmail.com with ESMTPSA id c11sm4401461otr.54.2019.08.26.11.21.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Aug 2019 11:21:36 -0700 (PDT) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Cc: Akash Gajjar , u-boot@lists.denx.de, linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, Jagan Teki Subject: [DO NOT MERGE] [PATCH v2 14/16] rk3399: rockpro64: Enable watchdog Date: Mon, 26 Aug 2019 23:51:09 +0530 Message-Id: <20190826182111.30999-15-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190826182111.30999-1-jagan@amarulasolutions.com> References: <20190826182111.30999-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=llqXD9Et; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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 e05ea3e186..5ff38efa53 100644 --- a/configs/rockpro64-rk3399_defconfig +++ b/configs/rockpro64-rk3399_defconfig @@ -55,3 +55,5 @@ CONFIG_USB_ETHER_RTL8152=y CONFIG_USB_ETHER_SMSC95XX=y CONFIG_SPL_TINY_MEMSET=y CONFIG_ERRNO_STR=y +CONFIG_WDT=y +CONFIG_SPL_WATCHDOG_SUPPORT=y From patchwork Mon Aug 26 18:21: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: 840 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-oi1-f199.google.com (mail-oi1-f199.google.com [209.85.167.199]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 7E4E23F0E1 for ; Mon, 26 Aug 2019 20:21:39 +0200 (CEST) Received: by mail-oi1-f199.google.com with SMTP id s3sf5950121oia.19 for ; Mon, 26 Aug 2019 11:21:39 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1566843698; cv=pass; d=google.com; s=arc-20160816; b=COblyJaiJ5b+ssXAtUQVnjduIMIzqaLCiMNRKdWEzyGXfTmQ5UzwHbOrgDi/vhob3V Zcd+NLMRZOFG6KJziJS+HXupLU36nOCtKfKMvV/aA3lSFuLBU3f2LK4ihAPCjcZfBU0Z 8YXdsLFPtzOMwHdPBMVF0AfEZAzK+K0d4e4yOeoBe8d8EdeuQLWYt+7VcclmrPDeR1/f QwsbgZdaWLGnw9m1vk+yxpH7VpPkqd0DQs5D/gp+1DXZNdRFc93pJAQuX4ar1BeG5dJ5 16sZFS6j2rNtKW2jLFdTZwBZMadfpdrLpW7Hr+4DZA1MdyoN5xWy1cLJJ4hx//zPjF85 jeTA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=ZQ4Oqo0DZo+9+vsMEeI6lXz3rp00qUNXSJiJsnDz3GA=; b=THIGGd1LVyZpT45eTqW12TIGgIi7ejtO7/y2Tr3BzIjdxJctFZX5nUQYKA1Kc8bJXY whG5yCGHuSGOTGnYUAsKyri93g641uiThv0OvDwOpJpdNcP4J9GVjf9uGiZCUdBJyZdN c5U/d4ERhx3tgory8La8FYacF89T/2es3pKuyYABZKBvjocHIeioQlxRC+1hoDJSL2mt An5GbOXusdRmQ1uvrLWXja40BTiRzLH+R5TujeMFycAT+Ywm51mWfqGniDNIOCktCY8Q YD+ZRKGl1ZwBY1KuzLJUK6GaT8PIZ3Mvsl9fRFb2WVlrWedyOQo7Q0sEQwhLGlVpFJVX VT9w== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=MOXXMFw6; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=ZQ4Oqo0DZo+9+vsMEeI6lXz3rp00qUNXSJiJsnDz3GA=; b=dCwlxaxmHU/BTpCAsn0y2UxCXXVpd5OJ9WhVlMbRNMlDex6Vnl2j8Ulfst6ZBztUcu JCB895v0ekHtymwBLAGeyyuDNjkDyHRwqfdT9nIrSB+2GvZy3Y53utuiy7Kn3dGVQbtm ikb4mLhYHqXm2I6Q5flOeg1bBjtPoarTSttlc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=ZQ4Oqo0DZo+9+vsMEeI6lXz3rp00qUNXSJiJsnDz3GA=; b=KDRmzHIC0LfkTxxbJP26y5dTqioY+v+KW5mJhYo9AiW1KbJM0tNdWfG2ZZ6RdA0s2V APa36hVgYiOrTV0wntgP8YaqswZcgoZ/EZBMkfNa+eBFoHrMFkJ2vgwgFyuCjE9I+U3q QMu2/ckA/BXRN6pYmaz5319ZBLqIXMv84Vlsdb6dyZrhHWvLpSPmItlzPhvSGDWi2K62 2yDzaKaN1UjYmZ9YQ5ATnf7jG6beF5wlIn1YP180RPx8fZmCloGskdlw4WeC6Bh1ZA7s PtlTbLvaKtxLCAlrIwCY3qyiD80+brsFRwqqa1PgMkLAzI6ov6ArKQno0w8/5Y4cqRhf ZqVw== X-Gm-Message-State: APjAAAXs4AGWklNZoX+r2Pe6OL3wG4KKcHpQOEMHhd4tosmXNicvPq0O 6VxGJJvHPlUb+ev+P8MQpUM5RQAI X-Google-Smtp-Source: APXvYqy7M2QYDVj5USZnaV1lAzDnHymd5vMgPYgKuLyoa3rIDiSZQnXHOREip01i3CjpHJ0koMi9Bw== X-Received: by 2002:a9d:1b01:: with SMTP id l1mr13865651otl.249.1566843698483; Mon, 26 Aug 2019 11:21:38 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a9d:6395:: with SMTP id w21ls508653otk.10.gmail; Mon, 26 Aug 2019 11:21:38 -0700 (PDT) X-Received: by 2002:a9d:5f0b:: with SMTP id f11mr6534431oti.211.1566843698001; Mon, 26 Aug 2019 11:21:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566843697; cv=none; d=google.com; s=arc-20160816; b=EXX76z2yF4M3pN0DaEy0NU1kXKUCTYMxABulZwjrnmzxi1qIVQ6q6KCWcIurVyN5u5 aQ82uPNPxmpCHFg/n7hbK8ymZRZ+ldlxV2pabltW05cu0Oay/ASyZQK5xZBgE6/5yxH9 Ek1WzENsgxllfnWlcj3ykPKC8gra328p8ZIg6KeeVG8gibLuca4VZuSJFnYXQTqyZLeO LKWa92fkROLopCbEfqInftOHp0srK8vuz6O7oEI3e2020z74Gz7GmTN2ehraSyIytegE Gi0ixkbIog58zPeapiuRsRSJqIWeqBVa2Y/zvVsRk2YZLjC0l4BbwSpteskrk33LJD2I pxKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=E/qBc6mh0Js+GUAR+QXICXFI1nahJkV/JF00fmFnkqo=; b=H3/irHlf2W3SqgCGGaj60Fzoqk7I2cL1hGNuBavQ+JdtDkOYowZjwRfAVQVjoGcAVi J3trHTKK/kYz/pL4GNxGXg/vWn83AjzcGWNIYHYpaela1jbjj0r6rsuh0D+mc2h9XK1s +syPBGZ/sEGlVDyCCN7H6y0bMusc+yaWExd49FeSDDYjTQ6ruXFC3Na/n88TVaHyc+bR CeTtpKgBoT6m00wO8DQGMALlO2Lpso2Wmjy5FE8+ZqxBmxkKdGJzdiIBe9b4fN/8KQgt epD/7dv5Phz+ShImtA56mbt9B3lbEampsgqi8sQcGSEqhnhjUkWO0Cqia0OHZHTBXWhP vVvw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=MOXXMFw6; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id 16sor5349746oin.143.2019.08.26.11.21.37 for (Google Transport Security); Mon, 26 Aug 2019 11:21:37 -0700 (PDT) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; X-Received: by 2002:aca:1104:: with SMTP id 4mr8967503oir.65.1566843697673; Mon, 26 Aug 2019 11:21:37 -0700 (PDT) Received: from jagan-XPS-13-9350.attlocal.net ([2600:1700:7430:38e0:d5b0:4823:33c8:5e46]) by smtp.gmail.com with ESMTPSA id c11sm4401461otr.54.2019.08.26.11.21.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Aug 2019 11:21:37 -0700 (PDT) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Cc: Akash Gajjar , u-boot@lists.denx.de, linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, Jagan Teki Subject: [PATCH v2 15/16] rockchip: rk3399: Add bootcount support Date: Mon, 26 Aug 2019 23:51:10 +0530 Message-Id: <20190826182111.30999-16-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190826182111.30999-1-jagan@amarulasolutions.com> References: <20190826182111.30999-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=MOXXMFw6; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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 f5a80b4f0c..f3e4d72203 100644 --- a/arch/arm/mach-rockchip/Kconfig +++ b/arch/arm/mach-rockchip/Kconfig @@ -197,6 +197,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 a5e69b26ad..724ea4cbfc 100644 --- a/include/configs/rk3399_common.h +++ b/include/configs/rk3399_common.h @@ -64,7 +64,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 Aug 26 18:21: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: 841 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ot1-f70.google.com (mail-ot1-f70.google.com [209.85.210.70]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 507323F9FB for ; Mon, 26 Aug 2019 20:21:40 +0200 (CEST) Received: by mail-ot1-f70.google.com with SMTP id c1sf10579258otb.22 for ; Mon, 26 Aug 2019 11:21:40 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1566843699; cv=pass; d=google.com; s=arc-20160816; b=NuntNh0BMReHmlNOsYaVDr0rOJvHUIks3JUTZFtQuEe+JnsuWgx0ACun4+hBEJmmVF DKdMtIMR/0BENUi75KnV+T5JgkVGT619nTWWqSy1uAVQw9lm16VlIWOg06R8cH4/56Qb TiTPeZaOjpajYBovkBVzIZmBJNTnUPwTI9zKZSQeJ9Uc+e0cxJOu90c+s51DJbal5wgC 9gJ5ACTidp5kLWLdZr+3KMpuA9oqax/eeE1sQ8jFEzYM+RQ87fR4osfjbodNcYzfZl/g INiKC6YgBfvB5GR40C4dG8flNO/iWJ0H1NNGv2y+g+NmSc6Iwq3vJtoRh0/q4NXtvJvz 0uoA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=w9qBGp5yx/S/Lbcx3cn1DOIiCx3aVWhBpo+PYVVq4/0=; b=VErlsSGuCRjht0E2w+1z0Gp8+b8cOl70hsS2Wx+Slf/WWat61ov5dN+Et0YPUuZfkg cgQaEJQ9XK6/e7S8qVd4w8eWDhfW5C5XSkd6QzAkoKgWOgB3HyJCwxdq6UbR//bO8dGz cVXkBRMYUw1Wjy3PLAPZCJQHHGELlsXqR+eLNsMCX71FR4Yb9AmXUatRJRmxcJqGqJln VY+Mf3PKj2zinnAiO8lhQ1k5gCHNMF8AGaU0fI3usaHY79xtYRlWdlI+ZlxkFSRaiugg bTOjbfzLEyejmdAqYn/+OwO4PrxmPyCWU277hwMo68rDvi0HinzKm8ul3cXUsi1zuE83 wMjQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=b63E40ug; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=w9qBGp5yx/S/Lbcx3cn1DOIiCx3aVWhBpo+PYVVq4/0=; b=jK/CYT2UuPL0IlfDa+Gka0kcRpfokCgC0OGbC7K7MDduoB0wkb0aQj3V4iMo5luHfK lw6wM3hMImK1nCn9YzA3FhcHf+huTUV0oNaoGzPcF67Vx5/JTakOM6gVRc2XGBCA17Rh znUbIIcZw7BY7xZkvDYXNQ7VzdNL/rZV5kPNA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=w9qBGp5yx/S/Lbcx3cn1DOIiCx3aVWhBpo+PYVVq4/0=; b=IdItLpnT2BrIagYnnoQM/WGbChNDCtFtdGfmPz4YDk2g7fLWng3An0jHyBsTaq2LR3 OM/2rPqehMqx5MF4dhMUtkW8M8y51pSQPAtdPs+faQgkD8QO/UlMzRxdBqJGOJEfKjPr 4eRC59pIs1zhaI7/WmRbTpALs4kc9Atlf75E0kR6nEueZ8BQ+19mSxBSfx7nsdoxwvMc MgytFUS9FQU9q4nDVDYRW+AVOIJqo8NPSPAtBY8DVcXk66qz9uZyOYpzemJJwjushYnI KBs+undMMrRlVMwEQqrTTtX+EoPtkAOq0cxjckfLX2vXT8GA10JGRI9C/vO5+lSEjdrN sRgw== X-Gm-Message-State: APjAAAW6cetgfP83So1ynrGyXwNDC1LsvSHfd2uEQAnQQtg0KtyRFVop I+o1V5sVG5eAgcj8JP3tbTv7cyfz X-Google-Smtp-Source: APXvYqyMkgsiQB66OyJ2faUaG3JPNR+UTjcI9Pn+bZL1J132wq4bshYQLA6Og6+EitD7g+u/SVOnIQ== X-Received: by 2002:a05:6830:15d9:: with SMTP id j25mr16207670otr.76.1566843699342; Mon, 26 Aug 2019 11:21:39 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a9d:70d2:: with SMTP id w18ls506531otj.11.gmail; Mon, 26 Aug 2019 11:21:39 -0700 (PDT) X-Received: by 2002:a9d:7dc2:: with SMTP id k2mr15802738otn.122.1566843699079; Mon, 26 Aug 2019 11:21:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566843699; cv=none; d=google.com; s=arc-20160816; b=dqqxuEQZQMxSytiBo72ZZ1BXngq74gDR0Aqln8XuuHw/OMAAGnNZQumcdFTTMs+xOM kFiqEL584R3uIjZIkzYsWlbDStnhXVnS2TD3zaW1nJIwvcUMWvJI8A0w0p+d/19Rq7/b NKtmL1sGT4iNyT+DUHNeWYGTwHkgIIBkcYn7MbKsJmwZ4j16RnBpcNkmRYu9hj9bVzEc 7H2o7GDjqEAv6TW0CUs1v9r+YdbiAW8iAJq+F+eS9y9FDvZz+ncsasJzmnbt+CbGQsKQ 8xp1QTtZBb6ngh5AiGESp8t/CV+XC4BYFEG9EKbAePGe0njZhXs6VzlPhDpFCcS/o18c 8DRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=aXcTM8Gfv2hGExnUDQ8bArc/TvpKmsOye+qMcasriMw=; b=S+PwSKdSG+Z5QOjNP30F5s5D73lCXU57vR3+OoRUsn+euNwCuYUqzQetJcxBitbfKF 5nMGtKL6MwMU3lx8CRQjymNVQsrpyqcWcGraMRPRD1I4dJLd2wE5WL587ro3aBwnXDK7 HR1RyqKLcw4Jmx/R/KtMoKz7K/GxmrZ2JhFoLMcQLu571uS6S2WytNrErFTtrUKdF9yp dcddx5ItXuVx6mfvMOHwde21U0S1Sfc01nwNcyyah21QVl79vcOIg+ZvJZoerO3byASI 3bXt3gSu5MRxwPVGQQDGWwosQqXiMC0xv7txkzCAsyvA1Ziv+CeY8pzzzdo5ULqk8t/d sHDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=b63E40ug; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id i21sor6068706otr.190.2019.08.26.11.21.39 for (Google Transport Security); Mon, 26 Aug 2019 11:21:39 -0700 (PDT) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; X-Received: by 2002:a9d:5502:: with SMTP id l2mr10774106oth.309.1566843698784; Mon, 26 Aug 2019 11:21:38 -0700 (PDT) Received: from jagan-XPS-13-9350.attlocal.net ([2600:1700:7430:38e0:d5b0:4823:33c8:5e46]) by smtp.gmail.com with ESMTPSA id c11sm4401461otr.54.2019.08.26.11.21.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Aug 2019 11:21:38 -0700 (PDT) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Cc: Akash Gajjar , u-boot@lists.denx.de, linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, Jagan Teki Subject: [DO NOT MERGE] [PATCH v2 16/16] rk3399: rockpro64: Enable bootcount Date: Mon, 26 Aug 2019 23:51:11 +0530 Message-Id: <20190826182111.30999-17-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190826182111.30999-1-jagan@amarulasolutions.com> References: <20190826182111.30999-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=b63E40ug; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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 5ff38efa53..84d050d743 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