From nobody Wed Oct 18 14:34:20 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9YJX70x9z4x6JR; Wed, 18 Oct 2023 14:34:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S9YJX6Gzbz3TTh; Wed, 18 Oct 2023 14:34:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639660; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i1qrHWi6HHah0Yry6stdIDFaMibFncCenFGCbFf6BKg=; b=TSvz4cHVDjUn3pgZ+dhwVP8jqH6iT686Kktatq5Vs/CM2xQIOKqfkgdNnejMV4eksGyX9a uswtYQ96xq8aEtA/J/MX8Kzb8iomelX5uD2ktYRzL7Ya+rGoO7H8G4DK0RT/tUFYeQZALa gGG0ZX8S5vyZGkxS4TY1MtjPalAuLuElfKJaPX2og0tO+RhqtxmfFz06WlIrq/jeqisF1o u/1mwUIRlgSpvFQBWGqGYvJ9wBYApc7hnIwG2xZIgF0Dc1OxnRShWJmv1vi5a9+nG+VQ2B GKHJmhCjhtiiRj2IOqompauwg1YUGEeU2rqCcrEAtLIvmBeKFXFhcgJ77v54kQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697639660; a=rsa-sha256; cv=none; b=MdCnqVFZSMFCFqSXNQvEUlyG4310LMLvtUzNwpO1gRYbNP22AELWE+k2EUFkxtnCY4vIzg 1PpNkmqtQt0b2Jasn7LlsO6ulzGZmSouktX1R89+wINxeN+igfngjuM4LDYMdq0mf1x6wK Djd6rkDUej3qgE9PGfszBNTaR1weAeXhJTYor9nPRp1mp4SdiwJO7BOvVfDZh/AyEodJiW 4qAnI0S26Ctd67dhrAijkNnL/5m/EiqVk2L65cw0vDaNSaLlPE3Ok1qIU2q91YEOIi8q3g wffD2usXBVy/HlDIutnUvb1oo1io4Kxi7LBY6XAAdnS4eaLHylqRbrf8nbg78A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639660; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i1qrHWi6HHah0Yry6stdIDFaMibFncCenFGCbFf6BKg=; b=CXvCDEBVIq8QjifxAnyrLKhpvvtcHuDoAzjjnVW3L2yvT5s5bwLV4uaMeGHKD/+H7KERFL nwjq2i5vyhok0P0RxOgWFaV5T8gjPmQuOrjlD7VosbnEcbkDNBCB/PvAm0JdagoU2OAcoF Qvi5gflMYbrbw7oDd7//pq18f4q/N1hky7MZ8BXGuXRpzdV0xvJNL8OU7PAQns9IY1GgjM sGzQHqA9Z1ffpytpN63yVyJCssimEIVfXlsFyoHVX6YMxZWoHDnOPH/q3QFKPaYjFQUpsx Wsz9lDf3YXI0Jj9j+ztpaeN+Zu6dClTv2SvB+M6B4R1bntQdtf092vsgFSXHpg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9YJX5M2Kz18rw; Wed, 18 Oct 2023 14:34:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39IEYKQW092385; Wed, 18 Oct 2023 14:34:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IEYKMV092382; Wed, 18 Oct 2023 14:34:20 GMT (envelope-from git) Date: Wed, 18 Oct 2023 14:34:20 GMT Message-Id: <202310181434.39IEYKMV092382@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: dda809fb31a7 - stable/14 - arm64: rockchip: clk: Define PLIST macro in rk_cru.h List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: dda809fb31a7d4049aa5b1bc8adc1743a5ac92fb Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=dda809fb31a7d4049aa5b1bc8adc1743a5ac92fb commit dda809fb31a7d4049aa5b1bc8adc1743a5ac92fb Author: Emmanuel Vadot AuthorDate: 2023-09-19 15:59:34 +0000 Commit: Emmanuel Vadot CommitDate: 2023-10-18 14:33:25 +0000 arm64: rockchip: clk: Define PLIST macro in rk_cru.h We use it in all clock drivers so no need to define it everywhere (cherry picked from commit 8ae54db63970e9370d3d88f6eb57c102e085a128) --- sys/arm64/rockchip/clk/rk3288_cru.c | 1 - sys/arm64/rockchip/clk/rk3328_cru.c | 2 -- sys/arm64/rockchip/clk/rk3399_cru.c | 1 - sys/arm64/rockchip/clk/rk_cru.h | 4 ++++ 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/arm64/rockchip/clk/rk3288_cru.c b/sys/arm64/rockchip/clk/rk3288_cru.c index cadb1f586a1a..e35481e94c13 100644 --- a/sys/arm64/rockchip/clk/rk3288_cru.c +++ b/sys/arm64/rockchip/clk/rk3288_cru.c @@ -525,7 +525,6 @@ static struct rk_clk_armclk_rates rk3288_armclk_rates[] = { }, \ } -#define PLIST(_name) static const char *_name[] PLIST(pll_src_p) = {"xin24m", "xin24m", "xin32k"}; PLIST(armclk_p)= {"apll_core", "gpll_core"}; PLIST(ddrphy_p) = {"dpll_ddr", "gpll_ddr"}; diff --git a/sys/arm64/rockchip/clk/rk3328_cru.c b/sys/arm64/rockchip/clk/rk3328_cru.c index f969c8d758a5..1f48ce6c23a2 100644 --- a/sys/arm64/rockchip/clk/rk3328_cru.c +++ b/sys/arm64/rockchip/clk/rk3328_cru.c @@ -636,8 +636,6 @@ static struct rk_clk_pll_rate rk3328_pll_frac_rates[] = { }; /* Clock parents */ -#define PLIST(_name) static const char *_name[] - PLIST(pll_src_p) = {"xin24m"}; PLIST(xin24m_rtc32k_p) = {"xin24m", "clk_rtc32k"}; diff --git a/sys/arm64/rockchip/clk/rk3399_cru.c b/sys/arm64/rockchip/clk/rk3399_cru.c index 3d43d832792f..3bff0e64ea34 100644 --- a/sys/arm64/rockchip/clk/rk3399_cru.c +++ b/sys/arm64/rockchip/clk/rk3399_cru.c @@ -695,7 +695,6 @@ static struct rk_clk_armclk_rates rk3399_cpu_b_rates[] = { }, \ } -#define PLIST(_name) static const char *_name[] PLIST(pll_src_p) = {"xin24m", "xin32k"}; PLIST(armclkl_p) = {"clk_core_l_lpll_src", "clk_core_l_bpll_src", diff --git a/sys/arm64/rockchip/clk/rk_cru.h b/sys/arm64/rockchip/clk/rk_cru.h index b00e987abcfa..55f230036199 100644 --- a/sys/arm64/rockchip/clk/rk_cru.h +++ b/sys/arm64/rockchip/clk/rk_cru.h @@ -42,6 +42,10 @@ #include /* Macro for defining various types of clocks. */ + +/* Parent list */ +#define PLIST(_name) static const char *_name[] + /* Pure gate */ #define GATE(_idx, _clkname, _pname, _o, _s) \ { \