From nobody Thu Sep 21 16:00:13 2023 X-Original-To: dev-commits-src-all@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 4Rs0V53HF0z4tcVN; Thu, 21 Sep 2023 16:00:13 +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 4Rs0V52pfpz4R9s; Thu, 21 Sep 2023 16:00:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695312013; 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=ukwP2P1RMmt46dlEuJW67xcF+p+evFiy3yt6TCIwJK0=; b=xCqXmlNxIrEjjCAtNdB68Iyi9d+BxvdtHceoEZloopYkNo0Ca8U/akkO1IcOjfiqQwI+aL khJrJzXb7CxlcI/eX9W4JeP9YMG4kEtBxEBHcZX55s2b6UZey5zAdXOqm/d4ADjIX1HJaH Xr36goJH5E5XgQBD8CePpIx9RVKL2xHOgMa8jUmYayxPVQza/Vcn4xIrdKJTE+8uvTTMlN IN46I/Z//RISSP4mcfo3ij1JXS9R+vzD9dRMZMa8SYpKDHWyTCmzIxmDTn2oJ5ZNSdSCFm iRfZEznQ7hQsDG9v5C/vY4/JS2qA4XgxlKGTRPYKuFGCNE6+GR2it1tQqWmdLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695312013; a=rsa-sha256; cv=none; b=xkYwdbruJEGdmJZ3LGp+HMsXtxsMnGpSEiEAe3YMLgTytXVVcU3eReVUxrnYuvsDD70Z5+ 0gkix1I93BBkPBKkOkNBx3k6FUqngFhoKXPDO+ZdjksnT0Vm6ulgRtmvOLcH4NQpnmHT6Z xOxbgdjufD+p8Z6nG9hs7NH/MPNqUUqcgGeaFuqwspuL6hNgEc4SRJ81Q9isWGF/TDsiJ6 aZ5WbPcmtp3B9L3tDH1NcyB/Tox7koqhYP5sENl8OMc9oG8vJvnmcpuHeM43g2qcLhXP9k GO92JxL7jMmBDj47GmKdnD03HDdnNLAlplcQD4k8pri71l1tEzn6bYl0N3IDAg== 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=1695312013; 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=ukwP2P1RMmt46dlEuJW67xcF+p+evFiy3yt6TCIwJK0=; b=J8YL95AslL+OdhdAZKfnwiFRSxd/sKE3KZKYcUbJT6G2ylm9aql3SSxMiwo7CI4Dy2OEIa IH7ap/ZsobDRNEFLZ7iE4zFL4SVIMsZ3S5SiNtWSkOZNQZfRwyFjJOth9TfL5nxy2JpszP oGplp6u1xCivi+UtDV20HpJqWcnnsPtpnc/2TnfberSJPwUUKp3GN+t6eHbXt3ESeQ7IlA P/cWOKr0wFDCfCczCgxhv3UK4bDSzCRacmylXvuKQR9rEHqvq83x0fuJuIO34XZZH92OVl h1rdjBdPwjEKacjXI6TD/IgqN/coUyy82c6i3BaXLj7E3KdAj1gboTr+XjXeuw== 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 4Rs0V51rtCzklM; Thu, 21 Sep 2023 16:00:13 +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 38LG0Den047621; Thu, 21 Sep 2023 16:00:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38LG0DQ8047610; Thu, 21 Sep 2023 16:00:13 GMT (envelope-from git) Date: Thu, 21 Sep 2023 16:00:13 GMT Message-Id: <202309211600.38LG0DQ8047610@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 8ae54db63970 - main - arm64: rockchip: clk: Define PLIST macro in rk_cru.h List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 8ae54db63970e9370d3d88f6eb57c102e085a128 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=8ae54db63970e9370d3d88f6eb57c102e085a128 commit 8ae54db63970e9370d3d88f6eb57c102e085a128 Author: Emmanuel Vadot AuthorDate: 2023-09-19 15:59:34 +0000 Commit: Emmanuel Vadot CommitDate: 2023-09-21 15:49:02 +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 --- 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) \ { \