From patchwork Fri Oct 4 14:27:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 1171872 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=xilinx.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=monstr-eu.20150623.gappssmtp.com header.i=@monstr-eu.20150623.gappssmtp.com header.b="wqekJ4yc"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46lC1t20Pbz9sNw for ; Sat, 5 Oct 2019 00:29:38 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 07F8EC21F0F; Fri, 4 Oct 2019 14:28:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 8DE70C21E96; Fri, 4 Oct 2019 14:28:43 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 98CB5C21F48; Fri, 4 Oct 2019 14:28:04 +0000 (UTC) Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by lists.denx.de (Postfix) with ESMTPS id DA1A2C21F29 for ; Fri, 4 Oct 2019 14:27:58 +0000 (UTC) Received: by mail-wm1-f68.google.com with SMTP id 5so6077584wmg.0 for ; Fri, 04 Oct 2019 07:27:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=gaIXCKGum5vZB3Bxgt3r0izZgM0GCn3XkXfV/6OpyGk=; b=wqekJ4ycgEgVAKaNABDLJ5wFIxCQTUNmYceVxOTzT8rpcvriF7ED4RjJM+JyBPjU9e fZHn1TL0vq4EN0qSNNlxjQn/FMV6WqyesOBFWMmAKD4yn46aWJ1WzWyHRsu4X2YJJjXn D5PYFPOv1j2wmX4btFhoI1oH5p40snIIopMB+zDvgyeSelg3L4zOva+1ugaeQwGtIBgD mV69Q7knV7XeFI3pwz78FhlURHJOlArslTeSRhTNpwvoP3SZIJczU7mg+jFMVPZ3lK1s YKDs4AR1u53OnZmmX2VY08q2YpZSUkXwyJAIREPjE16wZcYtVM5VwX/xU+e9XwFudoFc BfMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:in-reply-to:references; bh=gaIXCKGum5vZB3Bxgt3r0izZgM0GCn3XkXfV/6OpyGk=; b=mnXNVuCrdfvcJSQM5VoestaB7PKUXnuN8/dbSkqsiY8avY9b955RZMA0BdvErvJj6r dkjZexJzme0wTUow2nhvjP5tnOcsY8Jz+iY48wJTasCNRxiZXZZVLgOeA7vzFeZev5lj AwkMgAWAPgXbUmhKTMhi+qo6np3FWtLAdQMt+71XfaNg8vtSg2l5lBvLM9MqRNNb2EyF 4HRuxzOyVr2arJpopGKdQWzjTpLNuxpg6Cwg5hDm+Fp8pIhXiJltXMkfVWYOlpeUU5Oy TDtczxKl1+9VoKWuArxdI6MGfrOx22go7akR3bUSUZJeLBbkFG4ySsGGx+vzJqTbFaAm w2mQ== X-Gm-Message-State: APjAAAWuQCy21HnyJjNdFlZqB+9jqVrS5BW41DmhqUFrbDSLGe8ZRBbO rzaM2JUp7WpisUG1kL9Z1jXLEs7ooGl5Vg== X-Google-Smtp-Source: APXvYqxEiVvjCcLa0gHJhX7h3m63xnkgGL9dX7IN2VappqvHulAGMWkcl1sU6f+zxNpIDNQk2jN6RQ== X-Received: by 2002:a05:600c:230d:: with SMTP id 13mr11664935wmo.114.1570199278237; Fri, 04 Oct 2019 07:27:58 -0700 (PDT) Received: from localhost (nat-35.starnet.cz. [178.255.168.35]) by smtp.gmail.com with ESMTPSA id d193sm6426093wmd.0.2019.10.04.07.27.57 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 04 Oct 2019 07:27:57 -0700 (PDT) From: Michal Simek To: u-boot@lists.denx.de, git@xilinx.com Date: Fri, 4 Oct 2019 16:27:49 +0200 Message-Id: <8f2123c5157a172abce15e9ad91a927c1d96d221.1570199266.git.michal.simek@xilinx.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: In-Reply-To: References: Cc: Ibai Erkiaga , Luca Ceresoli , Rajan Vaja Subject: [U-Boot] [PATCH 3/4] arm64: versal: Rename versal_pm_request to xilinx_pm_request X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Use generic name instead of Versal specific because this should be also used on ZynqMP. Signed-off-by: Michal Simek --- drivers/clk/clk_versal.c | 14 +++++++------- drivers/firmware/firmware-zynqmp.c | 2 +- drivers/fpga/versalpl.c | 2 +- include/zynqmp_firmware.h | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/clk/clk_versal.c b/drivers/clk/clk_versal.c index e0fa661be9e0..7e97b0c4bf3a 100644 --- a/drivers/clk/clk_versal.c +++ b/drivers/clk/clk_versal.c @@ -363,7 +363,7 @@ static u32 versal_clock_get_div(u32 clk_id) u32 ret_payload[PAYLOAD_ARG_CNT]; u32 div; - versal_pm_request(PM_CLOCK_GETDIVIDER, clk_id, 0, 0, 0, ret_payload); + xilinx_pm_request(PM_CLOCK_GETDIVIDER, clk_id, 0, 0, 0, ret_payload); div = ret_payload[1]; return div; @@ -373,7 +373,7 @@ static u32 versal_clock_set_div(u32 clk_id, u32 div) { u32 ret_payload[PAYLOAD_ARG_CNT]; - versal_pm_request(PM_CLOCK_SETDIVIDER, clk_id, div, 0, 0, ret_payload); + xilinx_pm_request(PM_CLOCK_SETDIVIDER, clk_id, div, 0, 0, ret_payload); return div; } @@ -383,7 +383,7 @@ static u64 versal_clock_ref(u32 clk_id) u32 ret_payload[PAYLOAD_ARG_CNT]; int ref; - versal_pm_request(PM_CLOCK_GETPARENT, clk_id, 0, 0, 0, ret_payload); + xilinx_pm_request(PM_CLOCK_GETPARENT, clk_id, 0, 0, 0, ret_payload); ref = ret_payload[0]; if (!(ref & 1)) return ref_clk; @@ -402,7 +402,7 @@ static u64 versal_clock_get_pll_rate(u32 clk_id) u32 parent_rate, parent_id; u32 id = clk_id & 0xFFF; - versal_pm_request(PM_CLOCK_GETSTATE, clk_id, 0, 0, 0, ret_payload); + xilinx_pm_request(PM_CLOCK_GETSTATE, clk_id, 0, 0, 0, ret_payload); res = ret_payload[1]; if (!res) { printf("0%x PLL not enabled\n", clk_id); @@ -412,9 +412,9 @@ static u64 versal_clock_get_pll_rate(u32 clk_id) parent_id = clock[clock[id].parent[0].id].clk_id; parent_rate = versal_clock_ref(parent_id); - versal_pm_request(PM_CLOCK_GETDIVIDER, clk_id, 0, 0, 0, ret_payload); + xilinx_pm_request(PM_CLOCK_GETDIVIDER, clk_id, 0, 0, 0, ret_payload); fbdiv = ret_payload[1]; - versal_pm_request(PM_CLOCK_PLL_GETPARAM, clk_id, 2, 0, 0, ret_payload); + xilinx_pm_request(PM_CLOCK_PLL_GETPARAM, clk_id, 2, 0, 0, ret_payload); frac = ret_payload[1]; freq = (fbdiv * parent_rate) >> (1 << frac); @@ -441,7 +441,7 @@ static u32 versal_clock_get_parentid(u32 clk_id) u32 id = clk_id & 0xFFF; if (versal_clock_mux(clk_id)) { - versal_pm_request(PM_CLOCK_GETPARENT, clk_id, 0, 0, 0, + xilinx_pm_request(PM_CLOCK_GETPARENT, clk_id, 0, 0, 0, ret_payload); parent_id = ret_payload[1]; } diff --git a/drivers/firmware/firmware-zynqmp.c b/drivers/firmware/firmware-zynqmp.c index 11f5030e85c7..e8fbf1f5644d 100644 --- a/drivers/firmware/firmware-zynqmp.c +++ b/drivers/firmware/firmware-zynqmp.c @@ -176,7 +176,7 @@ int __maybe_unused invoke_smc(u32 pm_api_id, u32 arg0, u32 arg1, u32 arg2, return regs.regs[0]; } -int __maybe_unused versal_pm_request(u32 api_id, u32 arg0, u32 arg1, u32 arg2, +int __maybe_unused xilinx_pm_request(u32 api_id, u32 arg0, u32 arg1, u32 arg2, u32 arg3, u32 *ret_payload) { return invoke_smc(PM_SIP_SVC | api_id, arg0, arg1, arg2, arg3, diff --git a/drivers/fpga/versalpl.c b/drivers/fpga/versalpl.c index 8337b8306d76..4bcc2132432b 100644 --- a/drivers/fpga/versalpl.c +++ b/drivers/fpga/versalpl.c @@ -39,7 +39,7 @@ static int versal_load(xilinx_desc *desc, const void *buf, size_t bsize, buf_lo = lower_32_bits(bin_buf); buf_hi = upper_32_bits(bin_buf); - ret = versal_pm_request(VERSAL_PM_LOAD_PDI, VERSAL_PM_PDI_TYPE, buf_lo, + ret = xilinx_pm_request(VERSAL_PM_LOAD_PDI, VERSAL_PM_PDI_TYPE, buf_lo, buf_hi, 0, ret_payload); if (ret) puts("PL FPGA LOAD fail\n"); diff --git a/include/zynqmp_firmware.h b/include/zynqmp_firmware.h index 088ba30e0bb8..84090208e50c 100644 --- a/include/zynqmp_firmware.h +++ b/include/zynqmp_firmware.h @@ -83,7 +83,7 @@ unsigned int zynqmp_firmware_version(void); void zynqmp_pmufw_load_config_object(const void *cfg_obj, size_t size); int invoke_smc(u32 pm_api_id, u32 arg0, u32 arg1, u32 arg2, u32 arg3, u32 *ret_payload); -int versal_pm_request(u32 api_id, u32 arg0, u32 arg1, u32 arg2, +int xilinx_pm_request(u32 api_id, u32 arg0, u32 arg1, u32 arg2, u32 arg3, u32 *ret_payload); #endif /* _ZYNQMP_FIRMWARE_H_ */