From patchwork Fri Mar 4 10:03:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zong Li X-Patchwork-Id: 12768882 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1AD44C433EF for ; Fri, 4 Mar 2022 10:03:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=JJa0yedwnR0M2DAruXsMc8mFeBnTBQg/k/oPjQIAjlM=; b=AeHiRKvGVgFJrT 7lw0YegXcHB6Bz8mb7ZrVQ03ygpHIBb5qfS6AtVC1QzsR1yBkONuXNbiiiLhLFfuA3mThbyBFNPnp 3k1E8W06O9P8w97A/oIVzwxkSme+7/kEeYabn2V/293jz/Z6ZUPm17WsQ2isB90g1XZNFYlJG1SGs FmuKOHB+i3AOlZ/QsiMAtCDB8flytBAq298zjjz8qR2CQJrBDcPbUBc9vM3/NRr0Ls9JtGzJDW7QY muQvl31vMDT4ZID5Gm3jkYnXcOL9DW9dSSvl8ZGNOc0pPaxFSPcvDo/HC60tA8ue7UpAPt1leSEjD 4gRcP5xWOZYUdA7eMTdQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nQ4me-009TI8-74; Fri, 04 Mar 2022 10:03:36 +0000 Received: from mail-pg1-x530.google.com ([2607:f8b0:4864:20::530]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nQ4mY-009TFT-Ai for linux-riscv@lists.infradead.org; Fri, 04 Mar 2022 10:03:31 +0000 Received: by mail-pg1-x530.google.com with SMTP id 195so7109923pgc.6 for ; Fri, 04 Mar 2022 02:03:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/wivmtaq/SOM50t59wI6fLzJlaXtHmkBr6jDahJcOY4=; b=bGsRhcabvtlSfwd8B3Hc862NImw4ysYnY4vIXQXnY8c0yLMXuW0PWOkCVaYH0JddgX 7XaSpfnyNR176s48aOfJYFXy71qH1fJ3EKDwd49Xj3F5Y3iKd0WHgQkui2hDyZDse7VV HEq/JvcnB7tT50djw2mSzJSMbXst7GcASnJQwJe0mVpIA3Z6Ze0q1LfCirUuWD/0wUR0 B2ngyyebL8s4qkERUEDqCqZ7Go8vt76ElCnjnfNliAbA6d175ipCZTEec27TjBdsgtxB 1blU1E5FrL/PqUUV+WIHLFHThitCK4qGoqsxjnFgwJfsw1vMs+rpYR5QGKQJjZNGY8YF y+og== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/wivmtaq/SOM50t59wI6fLzJlaXtHmkBr6jDahJcOY4=; b=P6l7zeK/QxkIQrJ6UAbQF7dkwPcCgA+HZoStoeCgcrNlslvylIwFiWYfmvw78BxvH/ LFVvL0Z8CQ3XytS8Pgo5/txQYB3dB8pneUNQ73BxxdAEqHIZPzyfWp13FvXdoqOUbj9N 17t74wzcvPtUR7evA/beqoGgixQvTbtGYXEaACBGrCmcACaErkfSCM6SIMRU8aMhqaHE z+aBJ/etvyhvKdv+XqPIvZxMrHKaV1d34Ul/CrVXDtAoSKuylip0Lwa72rVlc8oTEsLm SYaFwdC3acVWXbGn0zZxCo0pYyAbFJN5UXtxLrWTqgE8wCX3ZxVnuN4XKFh2+GoNzh5t dfFw== X-Gm-Message-State: AOAM531gZanbxNSKcj21xHkHpe6O08nU32/tpjAB3DGDUZAtBbWx7yFo wm4A2rYhO4bLlijzCpwK2DrGpA== X-Google-Smtp-Source: ABdhPJyn7J5CnDAcxUu7niaATceQ6lk+NyKYqye5kYn0ltG7hPXizvd7T07ZbTlOO9WCND1NeREjGA== X-Received: by 2002:a63:c61:0:b0:370:592b:3ad1 with SMTP id 33-20020a630c61000000b00370592b3ad1mr33584816pgm.240.1646388209553; Fri, 04 Mar 2022 02:03:29 -0800 (PST) Received: from hsinchu16.internal.sifive.com (59-124-168-89.hinet-ip.hinet.net. [59.124.168.89]) by smtp.gmail.com with ESMTPSA id j8-20020a056a00174800b004f26d3f5b03sm5461605pfc.39.2022.03.04.02.03.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Mar 2022 02:03:29 -0800 (PST) From: Zong Li To: mturquette@baylibre.com, sboyd@kernel.org, palmer@dabbelt.com, paul.walmsley@sifive.com, lee.jones@linaro.org, robh+dt@kernel.org, devicetree@vger.kernel.org, linux-riscv@lists.infradead.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Zong Li Subject: [PATCH v2 1/5] clk: sifive: duplicate the macro definitions for the time being Date: Fri, 4 Mar 2022 18:03:17 +0800 Message-Id: <8cfd57f01cfb59adb716eb13ca0c8250c246dcb2.1646388139.git.zong.li@sifive.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220304_020330_440265_BF99DCE8 X-CRM114-Status: GOOD ( 11.51 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org This is a temporary patch in whole patch set. We are going to change the macro name in dt-binding, in order to avoid breaking the driver build and git bisect, add these macro definitions for the time being, and we will remove them later. Signed-off-by: Zong Li --- drivers/clk/sifive/fu540-prci.c | 6 +++++- drivers/clk/sifive/fu740-prci.c | 11 ++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/drivers/clk/sifive/fu540-prci.c b/drivers/clk/sifive/fu540-prci.c index 29bab915003c..9e13119066eb 100644 --- a/drivers/clk/sifive/fu540-prci.c +++ b/drivers/clk/sifive/fu540-prci.c @@ -20,9 +20,13 @@ #include -#include "fu540-prci.h" #include "sifive-prci.h" +#define PRCI_CLK_COREPLL 0 +#define PRCI_CLK_DDRPLL 1 +#define PRCI_CLK_GEMGXLPLL 2 +#define PRCI_CLK_TLCLK 3 + /* PRCI integration data for each WRPLL instance */ static struct __prci_wrpll_data __prci_corepll_data = { diff --git a/drivers/clk/sifive/fu740-prci.c b/drivers/clk/sifive/fu740-prci.c index 53f6e00a03b9..7141a22d90e3 100644 --- a/drivers/clk/sifive/fu740-prci.c +++ b/drivers/clk/sifive/fu740-prci.c @@ -8,9 +8,18 @@ #include -#include "fu540-prci.h" #include "sifive-prci.h" +#define PRCI_CLK_COREPLL 0 +#define PRCI_CLK_DDRPLL 1 +#define PRCI_CLK_GEMGXLPLL 2 +#define PRCI_CLK_DVFSCOREPLL 3 +#define PRCI_CLK_HFPCLKPLL 4 +#define PRCI_CLK_CLTXPLL 5 +#define PRCI_CLK_TLCLK 6 +#define PRCI_CLK_PCLK 7 +#define PRCI_CLK_PCIE_AUX 8 + /* PRCI integration data for each WRPLL instance */ static struct __prci_wrpll_data __prci_corepll_data = {