From patchwork Tue Jul 14 06:29:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sai Krishna Potthuri X-Patchwork-Id: 11661487 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4EBC56C1 for ; Tue, 14 Jul 2020 06:24:09 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 27169221E7 for ; Tue, 14 Jul 2020 06:24:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="GMXwVNKL"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=xilinx.onmicrosoft.com header.i=@xilinx.onmicrosoft.com header.b="MwozJUyt" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 27169221E7 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=xilinx.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Qkm/rNnBs6NRUP4wEpq3Cm0+UimK7/SqJlJxamcxt2E=; b=GMXwVNKLDMObdp57TmRXZYrTY Vg9D5dSQ2gL2KxYSLDpfYjIBKsS4e+wcO2jTh0P3HEDgkBYSkM1OWqpZrVT8BHUMrVNjtGiUgojXc 695buLC9Qsm8nsEFcyg1phnNM/iEoMWkkO67sYrcGgrPlDcaOmmhoQW602V185WCUBqaBFUusTGOp 4nLhsrk/wkFjp1OemSxw3Bk+X1yaTMGM2IuhlNxLPzdJOYBpIzBSbufKTO24kNl5Ek+m9Fwo0EWir fBIh9OOuTTDC623Mrviy+auCT2m+tsC8/vAjFX2o7BTg8dpHxw5wEk/ueXzyIOI0uSNzbZpDS74vc paKnFi74w==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jvEKx-0004oS-6d; Tue, 14 Jul 2020 06:22:43 +0000 Received: from mail-mw2nam10on2074.outbound.protection.outlook.com ([40.107.94.74] helo=NAM10-MW2-obe.outbound.protection.outlook.com) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jvEKs-0004mD-BF for linux-arm-kernel@lists.infradead.org; Tue, 14 Jul 2020 06:22:39 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CsRaI+jYsYWVBuAtx6Dg3Q6GMP+82x1IsMqhEQCW1sOcvPOk6B18SUiKvBxMcVFMSF5jWaqdGgULo1r2UTze47oNmxfhGQGVE4nmU3E6eRpH9fTjRv9+ySAX78RJkB4LSNn7hIw7sIYLCHvjqB0TLqZmgpIkbxr+tz7zPQC4Nynd/2T25gNFuLx7F3prMZ8efFZFJ4cWRsfy/oAcWCk65NLhzzbI2fBcVZIOxJ6CchBxYmLuoZOer3bbgX38uGDzcBWPS8KErwbFKq5wUWmomo9/FufR3+O1tWWzDpPK86s0OVcL+nKPyRJEZpcorge6a8TUC4cimbmzoeqscZ0F9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=LQVpxY9/TFCjIlq2ZXDNOjZ121+4YVrQlaJhBZjfwls=; b=NWXQSYh66NjA7A9+TD0BN8Oa7TZyTKDH0SopS+tk+AeI7FqQrJv6VrQx4EyXMaxxtiSZQHBnomiZOrofFIry6YRxfwGSYVUjmZwVWdmdgq+vkBd+aewriEuMGbpkWPfId1Se9weQEma/QJcmnFgEmvqIAbD4NUjUYp5c1lWnkGa3rdlkJn2aV6r/tKNizAJR6iWxZjCVfNzVHB5UHS9ESLqUHaM2THRdm2fHko5PgxdYqLo9cDDkmgvaB5PPm0M8yULfqCxNeGnkGe8vUSOhCPMVsMNvfl4N9RAx0m0t1xr6q5Lo90McY5/b1rc2PCOZ246Ax+TUcMZgsYnxoCw4Xg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 149.199.60.83) smtp.rcpttodomain=avnet.com smtp.mailfrom=xilinx.com; dmarc=bestguesspass action=none header.from=xilinx.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xilinx.onmicrosoft.com; s=selector2-xilinx-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=LQVpxY9/TFCjIlq2ZXDNOjZ121+4YVrQlaJhBZjfwls=; b=MwozJUytGZXoxztso/7XxyHtrXzpJWJYA1qiSYPJTYfsK9Eo3FyAgGjpfLsixSmaFn+5JLvJWAxKMJhvxU5MHiubFYD65et8ZZN+y/n5eOB3R08vKxmUnV+ee1ZW30Lv7+MHi8NPGeu9/J7aKiR9wD47NEqMqq7UA9weyVzGGME= Received: from SN4PR0701CA0010.namprd07.prod.outlook.com (2603:10b6:803:28::20) by DM6PR02MB5306.namprd02.prod.outlook.com (2603:10b6:5:41::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3174.21; Tue, 14 Jul 2020 06:22:35 +0000 Received: from SN1NAM02FT013.eop-nam02.prod.protection.outlook.com (2603:10b6:803:28:cafe::a3) by SN4PR0701CA0010.outlook.office365.com (2603:10b6:803:28::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3174.22 via Frontend Transport; Tue, 14 Jul 2020 06:22:35 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 149.199.60.83) smtp.mailfrom=xilinx.com; avnet.com; dkim=none (message not signed) header.d=none;avnet.com; dmarc=bestguesspass action=none header.from=xilinx.com; Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates 149.199.60.83 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.83; helo=xsj-pvapsmtpgw01; Received: from xsj-pvapsmtpgw01 (149.199.60.83) by SN1NAM02FT013.mail.protection.outlook.com (10.152.72.98) with Microsoft SMTP Server id 15.20.3174.21 via Frontend Transport; Tue, 14 Jul 2020 06:22:34 +0000 Received: from [149.199.38.66] (port=48880 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw01 with esmtp (Exim 4.90) (envelope-from ) id 1jvEJB-00033w-J7; Mon, 13 Jul 2020 23:20:53 -0700 Received: from localhost ([127.0.0.1] helo=xsj-pvapsmtp01) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1jvEKn-00046D-Vz; Mon, 13 Jul 2020 23:22:34 -0700 Received: from [10.140.6.35] (helo=xhdsaipava40.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1jvEKn-000467-9O; Mon, 13 Jul 2020 23:22:33 -0700 Received: by xhdsaipava40.xilinx.com (Postfix, from userid 14964) id 6237213C05CF; Tue, 14 Jul 2020 11:59:11 +0530 (IST) From: Sai Krishna Potthuri To: Philipp Zabel , Rob Herring , Michal Simek Subject: [PATCH 2/2] reset: reset-zynqmp: Added support for Versal platform Date: Tue, 14 Jul 2020 11:59:09 +0530 Message-Id: <1594708149-29944-3-git-send-email-lakshmi.sai.krishna.potthuri@xilinx.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1594708149-29944-1-git-send-email-lakshmi.sai.krishna.potthuri@xilinx.com> References: <1594708149-29944-1-git-send-email-lakshmi.sai.krishna.potthuri@xilinx.com> X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.2.0.1013-23620.005 X-TM-AS-User-Approved-Sender: Yes;Yes X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:149.199.60.83; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:xsj-pvapsmtpgw01; PTR:unknown-60-83.xilinx.com; CAT:NONE; SFTY:; SFS:(39860400002)(376002)(396003)(136003)(346002)(46966005)(81166007)(110136005)(82310400002)(2616005)(356005)(336012)(426003)(186003)(70586007)(26005)(83380400001)(70206006)(47076004)(8676002)(6266002)(107886003)(36756003)(82740400003)(316002)(42186006)(6636002)(2906002)(478600001)(8936002)(5660300002)(4326008); DIR:OUT; SFP:1101; X-MS-PublicTrafficType: Email MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: baa13902-8122-4216-6e4f-08d827be4c3a X-MS-TrafficTypeDiagnostic: DM6PR02MB5306: X-LD-Processed: 657af505-d5df-48d0-8300-c31994686c5c,ExtAddr X-Microsoft-Antispam-PRVS: X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-MS-Oob-TLC-OOBClassifiers: OLM:3631; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DIp/ytC/rIKSF1LQlx2U9eWVrcE2nKgJwvBveTYXG3vczxjwkMMbtFFSH9CywbnzKebx4UEg8InCbn4b/5gYHNW9L9+pf/Cm33k6imTNzHeDUpAPZbWgLbZ6ryZA5F1zbj9UIusGHfcwSOej4A4Qz3L6/c5oO8GASI0jmZ0lKJTitqYkMIfsRH6pm89jX6851Ko3ZUwp2pHEw1YC9rvSz779qPlbuhB2SPiG6z/iJySgzebtV9L1kDmoWwHnpKqfF7iF3MJv6huReBhlMUWqE7OVDavdmGESZSx5B0KDH8oCQOdJsLGqpf3EP/PHYEKOoK2rzggbgDUn5lJQoIfAYx/O0CBYjF+i8b7pxFJudcNRo2BBHe0FdgXWQHJGJlbYYfDs8RLdqlCgUrAcu1P6lA== X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jul 2020 06:22:34.8982 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: baa13902-8122-4216-6e4f-08d827be4c3a X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.60.83]; Helo=[xsj-pvapsmtpgw01] X-MS-Exchange-CrossTenant-AuthSource: SN1NAM02FT013.eop-nam02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR02MB5306 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200714_022238_421323_82D8655A X-CRM114-Status: GOOD ( 15.21 ) X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [40.107.94.74 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [40.107.94.74 listed in wl.mailspike.net] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: saikrishna12468@gmail.com, devicetree@vger.kernel.org, Sai Krishna Potthuri , linux-kernel@vger.kernel.org, git@xilinx.com, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Updated the reset driver to support Versal platform. As part of adding Versal support - Added Versal specific compatible string. - Reset Id and number of resets are different for Versal and ZynqMP, hence taken care of these two based on compatible string. Signed-off-by: Sai Krishna Potthuri --- drivers/reset/reset-zynqmp.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/drivers/reset/reset-zynqmp.c b/drivers/reset/reset-zynqmp.c index 373ea8d4f7a1..17aa4532ec5e 100644 --- a/drivers/reset/reset-zynqmp.c +++ b/drivers/reset/reset-zynqmp.c @@ -12,9 +12,11 @@ #define ZYNQMP_NR_RESETS (ZYNQMP_PM_RESET_END - ZYNQMP_PM_RESET_START) #define ZYNQMP_RESET_ID ZYNQMP_PM_RESET_START +#define VERSAL_NR_RESETS 95 struct zynqmp_reset_data { struct reset_controller_dev rcdev; + u32 reset_id; }; static inline struct zynqmp_reset_data * @@ -26,23 +28,28 @@ to_zynqmp_reset_data(struct reset_controller_dev *rcdev) static int zynqmp_reset_assert(struct reset_controller_dev *rcdev, unsigned long id) { - return zynqmp_pm_reset_assert(ZYNQMP_RESET_ID + id, + struct zynqmp_reset_data *priv = to_zynqmp_reset_data(rcdev); + + return zynqmp_pm_reset_assert(priv->reset_id + id, PM_RESET_ACTION_ASSERT); } static int zynqmp_reset_deassert(struct reset_controller_dev *rcdev, unsigned long id) { - return zynqmp_pm_reset_assert(ZYNQMP_RESET_ID + id, + struct zynqmp_reset_data *priv = to_zynqmp_reset_data(rcdev); + + return zynqmp_pm_reset_assert(priv->reset_id + id, PM_RESET_ACTION_RELEASE); } static int zynqmp_reset_status(struct reset_controller_dev *rcdev, unsigned long id) { + struct zynqmp_reset_data *priv = to_zynqmp_reset_data(rcdev); int val, err; - err = zynqmp_pm_reset_get_status(ZYNQMP_RESET_ID + id, &val); + err = zynqmp_pm_reset_get_status(priv->reset_id + id, &val); if (err) return err; @@ -52,7 +59,9 @@ static int zynqmp_reset_status(struct reset_controller_dev *rcdev, static int zynqmp_reset_reset(struct reset_controller_dev *rcdev, unsigned long id) { - return zynqmp_pm_reset_assert(ZYNQMP_RESET_ID + id, + struct zynqmp_reset_data *priv = to_zynqmp_reset_data(rcdev); + + return zynqmp_pm_reset_assert(priv->reset_id + id, PM_RESET_ACTION_PULSE); } @@ -76,13 +85,20 @@ static int zynqmp_reset_probe(struct platform_device *pdev) priv->rcdev.ops = &zynqmp_reset_ops; priv->rcdev.owner = THIS_MODULE; priv->rcdev.of_node = pdev->dev.of_node; + priv->reset_id = ZYNQMP_RESET_ID; priv->rcdev.nr_resets = ZYNQMP_NR_RESETS; + if (of_device_is_compatible(pdev->dev.of_node, + "xlnx,versal-reset")) { + priv->reset_id = 0; + priv->rcdev.nr_resets = VERSAL_NR_RESETS; + } return devm_reset_controller_register(&pdev->dev, &priv->rcdev); } static const struct of_device_id zynqmp_reset_dt_ids[] = { { .compatible = "xlnx,zynqmp-reset", }, + { .compatible = "xlnx,versal-reset", }, { /* sentinel */ }, };