From: Neil Armstrong <neil.armstrong@linaro.org>
To: Jerome Brunet <jbrunet@baylibre.com>,
Michael Turquette <mturquette@baylibre.com>,
Stephen Boyd <sboyd@kernel.org>,
Kevin Hilman <khilman@baylibre.com>,
Martin Blumenstingl <martin.blumenstingl@googlemail.com>,
Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Conor Dooley <conor+dt@kernel.org>,
David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch>,
Philipp Zabel <p.zabel@pengutronix.de>,
Kishon Vijay Abraham I <kishon@kernel.org>,
Sam Ravnborg <sam@ravnborg.org>
Cc: "Lukas F. Hartmann" <lukas@mntre.com>,
Nicolas Belin <nbelin@baylibre.com>,
linux-amlogic@lists.infradead.org, linux-clk@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, devicetree@vger.kernel.org,
dri-devel@lists.freedesktop.org, linux-phy@lists.infradead.org,
Neil Armstrong <neil.armstrong@linaro.org>
Subject: [PATCH v5 04/17] clk: meson: g12: use VCLK2_SEL, CTS_ENCL & CTS_ENCL_SEL public CLK IDs
Date: Tue, 30 May 2023 09:38:05 +0200 [thread overview]
Message-ID: <20230512-amlogic-v6-4-upstream-dsi-ccf-vim3-v5-4-56eb7a4d5b8e@linaro.org> (raw)
In-Reply-To: <20230512-amlogic-v6-4-upstream-dsi-ccf-vim3-v5-0-56eb7a4d5b8e@linaro.org>
Now those CLK IDs were added to the public bindings header, switch
to use those defines and drop the PRIV defines.
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
---
drivers/clk/meson/g12a.c | 18 +++++++++---------
drivers/clk/meson/g12a.h | 3 ---
2 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/drivers/clk/meson/g12a.c b/drivers/clk/meson/g12a.c
index a132aad2aac9..461ebd79497c 100644
--- a/drivers/clk/meson/g12a.c
+++ b/drivers/clk/meson/g12a.c
@@ -4411,7 +4411,7 @@ static struct clk_hw_onecell_data g12a_hw_onecell_data = {
[CLKID_PRIV_VID_PLL_SEL] = &g12a_vid_pll_sel.hw,
[CLKID_PRIV_VID_PLL_DIV] = &g12a_vid_pll.hw,
[CLKID_PRIV_VCLK_SEL] = &g12a_vclk_sel.hw,
- [CLKID_PRIV_VCLK2_SEL] = &g12a_vclk2_sel.hw,
+ [CLKID_VCLK2_SEL] = &g12a_vclk2_sel.hw,
[CLKID_PRIV_VCLK_INPUT] = &g12a_vclk_input.hw,
[CLKID_PRIV_VCLK2_INPUT] = &g12a_vclk2_input.hw,
[CLKID_PRIV_VCLK_DIV] = &g12a_vclk_div.hw,
@@ -4438,12 +4438,12 @@ static struct clk_hw_onecell_data g12a_hw_onecell_data = {
[CLKID_VCLK2_DIV12] = &g12a_vclk2_div12.hw,
[CLKID_PRIV_CTS_ENCI_SEL] = &g12a_cts_enci_sel.hw,
[CLKID_PRIV_CTS_ENCP_SEL] = &g12a_cts_encp_sel.hw,
- [CLKID_PRIV_CTS_ENCL_SEL] = &g12a_cts_encl_sel.hw,
+ [CLKID_CTS_ENCL_SEL] = &g12a_cts_encl_sel.hw,
[CLKID_PRIV_CTS_VDAC_SEL] = &g12a_cts_vdac_sel.hw,
[CLKID_PRIV_HDMI_TX_SEL] = &g12a_hdmi_tx_sel.hw,
[CLKID_CTS_ENCI] = &g12a_cts_enci.hw,
[CLKID_CTS_ENCP] = &g12a_cts_encp.hw,
- [CLKID_PRIV_CTS_ENCL] = &g12a_cts_encl.hw,
+ [CLKID_CTS_ENCL] = &g12a_cts_encl.hw,
[CLKID_CTS_VDAC] = &g12a_cts_vdac.hw,
[CLKID_HDMI_TX] = &g12a_hdmi_tx.hw,
[CLKID_PRIV_HDMI_SEL] = &g12a_hdmi_sel.hw,
@@ -4642,7 +4642,7 @@ static struct clk_hw_onecell_data g12b_hw_onecell_data = {
[CLKID_PRIV_VID_PLL_SEL] = &g12a_vid_pll_sel.hw,
[CLKID_PRIV_VID_PLL_DIV] = &g12a_vid_pll.hw,
[CLKID_PRIV_VCLK_SEL] = &g12a_vclk_sel.hw,
- [CLKID_PRIV_VCLK2_SEL] = &g12a_vclk2_sel.hw,
+ [CLKID_VCLK2_SEL] = &g12a_vclk2_sel.hw,
[CLKID_PRIV_VCLK_INPUT] = &g12a_vclk_input.hw,
[CLKID_PRIV_VCLK2_INPUT] = &g12a_vclk2_input.hw,
[CLKID_PRIV_VCLK_DIV] = &g12a_vclk_div.hw,
@@ -4669,12 +4669,12 @@ static struct clk_hw_onecell_data g12b_hw_onecell_data = {
[CLKID_VCLK2_DIV12] = &g12a_vclk2_div12.hw,
[CLKID_PRIV_CTS_ENCI_SEL] = &g12a_cts_enci_sel.hw,
[CLKID_PRIV_CTS_ENCP_SEL] = &g12a_cts_encp_sel.hw,
- [CLKID_PRIV_CTS_ENCL_SEL] = &g12a_cts_encl_sel.hw,
+ [CLKID_CTS_ENCL_SEL] = &g12a_cts_encl_sel.hw,
[CLKID_PRIV_CTS_VDAC_SEL] = &g12a_cts_vdac_sel.hw,
[CLKID_PRIV_HDMI_TX_SEL] = &g12a_hdmi_tx_sel.hw,
[CLKID_CTS_ENCI] = &g12a_cts_enci.hw,
[CLKID_CTS_ENCP] = &g12a_cts_encp.hw,
- [CLKID_PRIV_CTS_ENCL] = &g12a_cts_encl.hw,
+ [CLKID_CTS_ENCL] = &g12a_cts_encl.hw,
[CLKID_CTS_VDAC] = &g12a_cts_vdac.hw,
[CLKID_HDMI_TX] = &g12a_hdmi_tx.hw,
[CLKID_PRIV_HDMI_SEL] = &g12a_hdmi_sel.hw,
@@ -4908,7 +4908,7 @@ static struct clk_hw_onecell_data sm1_hw_onecell_data = {
[CLKID_PRIV_VID_PLL_SEL] = &g12a_vid_pll_sel.hw,
[CLKID_PRIV_VID_PLL_DIV] = &g12a_vid_pll.hw,
[CLKID_PRIV_VCLK_SEL] = &g12a_vclk_sel.hw,
- [CLKID_PRIV_VCLK2_SEL] = &g12a_vclk2_sel.hw,
+ [CLKID_VCLK2_SEL] = &g12a_vclk2_sel.hw,
[CLKID_PRIV_VCLK_INPUT] = &g12a_vclk_input.hw,
[CLKID_PRIV_VCLK2_INPUT] = &g12a_vclk2_input.hw,
[CLKID_PRIV_VCLK_DIV] = &g12a_vclk_div.hw,
@@ -4935,12 +4935,12 @@ static struct clk_hw_onecell_data sm1_hw_onecell_data = {
[CLKID_VCLK2_DIV12] = &g12a_vclk2_div12.hw,
[CLKID_PRIV_CTS_ENCI_SEL] = &g12a_cts_enci_sel.hw,
[CLKID_PRIV_CTS_ENCP_SEL] = &g12a_cts_encp_sel.hw,
- [CLKID_PRIV_CTS_ENCL_SEL] = &g12a_cts_encl_sel.hw,
+ [CLKID_CTS_ENCL_SEL] = &g12a_cts_encl_sel.hw,
[CLKID_PRIV_CTS_VDAC_SEL] = &g12a_cts_vdac_sel.hw,
[CLKID_PRIV_HDMI_TX_SEL] = &g12a_hdmi_tx_sel.hw,
[CLKID_CTS_ENCI] = &g12a_cts_enci.hw,
[CLKID_CTS_ENCP] = &g12a_cts_encp.hw,
- [CLKID_PRIV_CTS_ENCL] = &g12a_cts_encl.hw,
+ [CLKID_CTS_ENCL] = &g12a_cts_encl.hw,
[CLKID_CTS_VDAC] = &g12a_cts_vdac.hw,
[CLKID_HDMI_TX] = &g12a_hdmi_tx.hw,
[CLKID_PRIV_HDMI_SEL] = &g12a_hdmi_sel.hw,
diff --git a/drivers/clk/meson/g12a.h b/drivers/clk/meson/g12a.h
index 9a3091fcaa41..8275413f2beb 100644
--- a/drivers/clk/meson/g12a.h
+++ b/drivers/clk/meson/g12a.h
@@ -168,7 +168,6 @@
#define CLKID_PRIV_VID_PLL_SEL 130
#define CLKID_PRIV_VID_PLL_DIV 131
#define CLKID_PRIV_VCLK_SEL 132
-#define CLKID_PRIV_VCLK2_SEL 133
#define CLKID_PRIV_VCLK_INPUT 134
#define CLKID_PRIV_VCLK2_INPUT 135
#define CLKID_PRIV_VCLK_DIV 136
@@ -265,8 +264,6 @@
#define CLKID_PRIV_NNA_CORE_CLK_SEL 265
#define CLKID_PRIV_NNA_CORE_CLK_DIV 266
#define CLKID_PRIV_MIPI_DSI_PXCLK_DIV 268
-#define CLKID_PRIV_CTS_ENCL 271
-#define CLKID_PRIV_CTS_ENCL_SEL 272
#define NR_CLKS 273
--
2.34.1
WARNING: multiple messages have this Message-ID (diff)
From: Neil Armstrong <neil.armstrong@linaro.org>
To: Jerome Brunet <jbrunet@baylibre.com>,
Michael Turquette <mturquette@baylibre.com>,
Stephen Boyd <sboyd@kernel.org>,
Kevin Hilman <khilman@baylibre.com>,
Martin Blumenstingl <martin.blumenstingl@googlemail.com>,
Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Conor Dooley <conor+dt@kernel.org>,
David Airlie <airlied@gmail.com>,
Daniel Vetter <daniel@ffwll.ch>,
Philipp Zabel <p.zabel@pengutronix.de>,
Kishon Vijay Abraham I <kishon@kernel.org>,
Sam Ravnborg <sam@ravnborg.org>
Cc: devicetree@vger.kernel.org,
Neil Armstrong <neil.armstrong@linaro.org>,
linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org,
Nicolas Belin <nbelin@baylibre.com>,
linux-phy@lists.infradead.org, linux-amlogic@lists.infradead.org,
"Lukas F. Hartmann" <lukas@mntre.com>,
linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Subject: [PATCH v5 04/17] clk: meson: g12: use VCLK2_SEL, CTS_ENCL & CTS_ENCL_SEL public CLK IDs
Date: Tue, 30 May 2023 09:38:05 +0200 [thread overview]
Message-ID: <20230512-amlogic-v6-4-upstream-dsi-ccf-vim3-v5-4-56eb7a4d5b8e@linaro.org> (raw)
In-Reply-To: <20230512-amlogic-v6-4-upstream-dsi-ccf-vim3-v5-0-56eb7a4d5b8e@linaro.org>
Now those CLK IDs were added to the public bindings header, switch
to use those defines and drop the PRIV defines.
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
---
drivers/clk/meson/g12a.c | 18 +++++++++---------
drivers/clk/meson/g12a.h | 3 ---
2 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/drivers/clk/meson/g12a.c b/drivers/clk/meson/g12a.c
index a132aad2aac9..461ebd79497c 100644
--- a/drivers/clk/meson/g12a.c
+++ b/drivers/clk/meson/g12a.c
@@ -4411,7 +4411,7 @@ static struct clk_hw_onecell_data g12a_hw_onecell_data = {
[CLKID_PRIV_VID_PLL_SEL] = &g12a_vid_pll_sel.hw,
[CLKID_PRIV_VID_PLL_DIV] = &g12a_vid_pll.hw,
[CLKID_PRIV_VCLK_SEL] = &g12a_vclk_sel.hw,
- [CLKID_PRIV_VCLK2_SEL] = &g12a_vclk2_sel.hw,
+ [CLKID_VCLK2_SEL] = &g12a_vclk2_sel.hw,
[CLKID_PRIV_VCLK_INPUT] = &g12a_vclk_input.hw,
[CLKID_PRIV_VCLK2_INPUT] = &g12a_vclk2_input.hw,
[CLKID_PRIV_VCLK_DIV] = &g12a_vclk_div.hw,
@@ -4438,12 +4438,12 @@ static struct clk_hw_onecell_data g12a_hw_onecell_data = {
[CLKID_VCLK2_DIV12] = &g12a_vclk2_div12.hw,
[CLKID_PRIV_CTS_ENCI_SEL] = &g12a_cts_enci_sel.hw,
[CLKID_PRIV_CTS_ENCP_SEL] = &g12a_cts_encp_sel.hw,
- [CLKID_PRIV_CTS_ENCL_SEL] = &g12a_cts_encl_sel.hw,
+ [CLKID_CTS_ENCL_SEL] = &g12a_cts_encl_sel.hw,
[CLKID_PRIV_CTS_VDAC_SEL] = &g12a_cts_vdac_sel.hw,
[CLKID_PRIV_HDMI_TX_SEL] = &g12a_hdmi_tx_sel.hw,
[CLKID_CTS_ENCI] = &g12a_cts_enci.hw,
[CLKID_CTS_ENCP] = &g12a_cts_encp.hw,
- [CLKID_PRIV_CTS_ENCL] = &g12a_cts_encl.hw,
+ [CLKID_CTS_ENCL] = &g12a_cts_encl.hw,
[CLKID_CTS_VDAC] = &g12a_cts_vdac.hw,
[CLKID_HDMI_TX] = &g12a_hdmi_tx.hw,
[CLKID_PRIV_HDMI_SEL] = &g12a_hdmi_sel.hw,
@@ -4642,7 +4642,7 @@ static struct clk_hw_onecell_data g12b_hw_onecell_data = {
[CLKID_PRIV_VID_PLL_SEL] = &g12a_vid_pll_sel.hw,
[CLKID_PRIV_VID_PLL_DIV] = &g12a_vid_pll.hw,
[CLKID_PRIV_VCLK_SEL] = &g12a_vclk_sel.hw,
- [CLKID_PRIV_VCLK2_SEL] = &g12a_vclk2_sel.hw,
+ [CLKID_VCLK2_SEL] = &g12a_vclk2_sel.hw,
[CLKID_PRIV_VCLK_INPUT] = &g12a_vclk_input.hw,
[CLKID_PRIV_VCLK2_INPUT] = &g12a_vclk2_input.hw,
[CLKID_PRIV_VCLK_DIV] = &g12a_vclk_div.hw,
@@ -4669,12 +4669,12 @@ static struct clk_hw_onecell_data g12b_hw_onecell_data = {
[CLKID_VCLK2_DIV12] = &g12a_vclk2_div12.hw,
[CLKID_PRIV_CTS_ENCI_SEL] = &g12a_cts_enci_sel.hw,
[CLKID_PRIV_CTS_ENCP_SEL] = &g12a_cts_encp_sel.hw,
- [CLKID_PRIV_CTS_ENCL_SEL] = &g12a_cts_encl_sel.hw,
+ [CLKID_CTS_ENCL_SEL] = &g12a_cts_encl_sel.hw,
[CLKID_PRIV_CTS_VDAC_SEL] = &g12a_cts_vdac_sel.hw,
[CLKID_PRIV_HDMI_TX_SEL] = &g12a_hdmi_tx_sel.hw,
[CLKID_CTS_ENCI] = &g12a_cts_enci.hw,
[CLKID_CTS_ENCP] = &g12a_cts_encp.hw,
- [CLKID_PRIV_CTS_ENCL] = &g12a_cts_encl.hw,
+ [CLKID_CTS_ENCL] = &g12a_cts_encl.hw,
[CLKID_CTS_VDAC] = &g12a_cts_vdac.hw,
[CLKID_HDMI_TX] = &g12a_hdmi_tx.hw,
[CLKID_PRIV_HDMI_SEL] = &g12a_hdmi_sel.hw,
@@ -4908,7 +4908,7 @@ static struct clk_hw_onecell_data sm1_hw_onecell_data = {
[CLKID_PRIV_VID_PLL_SEL] = &g12a_vid_pll_sel.hw,
[CLKID_PRIV_VID_PLL_DIV] = &g12a_vid_pll.hw,
[CLKID_PRIV_VCLK_SEL] = &g12a_vclk_sel.hw,
- [CLKID_PRIV_VCLK2_SEL] = &g12a_vclk2_sel.hw,
+ [CLKID_VCLK2_SEL] = &g12a_vclk2_sel.hw,
[CLKID_PRIV_VCLK_INPUT] = &g12a_vclk_input.hw,
[CLKID_PRIV_VCLK2_INPUT] = &g12a_vclk2_input.hw,
[CLKID_PRIV_VCLK_DIV] = &g12a_vclk_div.hw,
@@ -4935,12 +4935,12 @@ static struct clk_hw_onecell_data sm1_hw_onecell_data = {
[CLKID_VCLK2_DIV12] = &g12a_vclk2_div12.hw,
[CLKID_PRIV_CTS_ENCI_SEL] = &g12a_cts_enci_sel.hw,
[CLKID_PRIV_CTS_ENCP_SEL] = &g12a_cts_encp_sel.hw,
- [CLKID_PRIV_CTS_ENCL_SEL] = &g12a_cts_encl_sel.hw,
+ [CLKID_CTS_ENCL_SEL] = &g12a_cts_encl_sel.hw,
[CLKID_PRIV_CTS_VDAC_SEL] = &g12a_cts_vdac_sel.hw,
[CLKID_PRIV_HDMI_TX_SEL] = &g12a_hdmi_tx_sel.hw,
[CLKID_CTS_ENCI] = &g12a_cts_enci.hw,
[CLKID_CTS_ENCP] = &g12a_cts_encp.hw,
- [CLKID_PRIV_CTS_ENCL] = &g12a_cts_encl.hw,
+ [CLKID_CTS_ENCL] = &g12a_cts_encl.hw,
[CLKID_CTS_VDAC] = &g12a_cts_vdac.hw,
[CLKID_HDMI_TX] = &g12a_hdmi_tx.hw,
[CLKID_PRIV_HDMI_SEL] = &g12a_hdmi_sel.hw,
diff --git a/drivers/clk/meson/g12a.h b/drivers/clk/meson/g12a.h
index 9a3091fcaa41..8275413f2beb 100644
--- a/drivers/clk/meson/g12a.h
+++ b/drivers/clk/meson/g12a.h
@@ -168,7 +168,6 @@
#define CLKID_PRIV_VID_PLL_SEL 130
#define CLKID_PRIV_VID_PLL_DIV 131
#define CLKID_PRIV_VCLK_SEL 132
-#define CLKID_PRIV_VCLK2_SEL 133
#define CLKID_PRIV_VCLK_INPUT 134
#define CLKID_PRIV_VCLK2_INPUT 135
#define CLKID_PRIV_VCLK_DIV 136
@@ -265,8 +264,6 @@
#define CLKID_PRIV_NNA_CORE_CLK_SEL 265
#define CLKID_PRIV_NNA_CORE_CLK_DIV 266
#define CLKID_PRIV_MIPI_DSI_PXCLK_DIV 268
-#define CLKID_PRIV_CTS_ENCL 271
-#define CLKID_PRIV_CTS_ENCL_SEL 272
#define NR_CLKS 273
--
2.34.1
WARNING: multiple messages have this Message-ID (diff)
From: Neil Armstrong <neil.armstrong@linaro.org>
To: Jerome Brunet <jbrunet@baylibre.com>,
Michael Turquette <mturquette@baylibre.com>,
Stephen Boyd <sboyd@kernel.org>,
Kevin Hilman <khilman@baylibre.com>,
Martin Blumenstingl <martin.blumenstingl@googlemail.com>,
Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Conor Dooley <conor+dt@kernel.org>,
David Airlie <airlied@gmail.com>,
Daniel Vetter <daniel@ffwll.ch>,
Philipp Zabel <p.zabel@pengutronix.de>,
Kishon Vijay Abraham I <kishon@kernel.org>,
Sam Ravnborg <sam@ravnborg.org>
Cc: "Lukas F. Hartmann" <lukas@mntre.com>,
Nicolas Belin <nbelin@baylibre.com>,
linux-amlogic@lists.infradead.org, linux-clk@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, devicetree@vger.kernel.org,
dri-devel@lists.freedesktop.org, linux-phy@lists.infradead.org,
Neil Armstrong <neil.armstrong@linaro.org>
Subject: [PATCH v5 04/17] clk: meson: g12: use VCLK2_SEL, CTS_ENCL & CTS_ENCL_SEL public CLK IDs
Date: Tue, 30 May 2023 09:38:05 +0200 [thread overview]
Message-ID: <20230512-amlogic-v6-4-upstream-dsi-ccf-vim3-v5-4-56eb7a4d5b8e@linaro.org> (raw)
In-Reply-To: <20230512-amlogic-v6-4-upstream-dsi-ccf-vim3-v5-0-56eb7a4d5b8e@linaro.org>
Now those CLK IDs were added to the public bindings header, switch
to use those defines and drop the PRIV defines.
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
---
drivers/clk/meson/g12a.c | 18 +++++++++---------
drivers/clk/meson/g12a.h | 3 ---
2 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/drivers/clk/meson/g12a.c b/drivers/clk/meson/g12a.c
index a132aad2aac9..461ebd79497c 100644
--- a/drivers/clk/meson/g12a.c
+++ b/drivers/clk/meson/g12a.c
@@ -4411,7 +4411,7 @@ static struct clk_hw_onecell_data g12a_hw_onecell_data = {
[CLKID_PRIV_VID_PLL_SEL] = &g12a_vid_pll_sel.hw,
[CLKID_PRIV_VID_PLL_DIV] = &g12a_vid_pll.hw,
[CLKID_PRIV_VCLK_SEL] = &g12a_vclk_sel.hw,
- [CLKID_PRIV_VCLK2_SEL] = &g12a_vclk2_sel.hw,
+ [CLKID_VCLK2_SEL] = &g12a_vclk2_sel.hw,
[CLKID_PRIV_VCLK_INPUT] = &g12a_vclk_input.hw,
[CLKID_PRIV_VCLK2_INPUT] = &g12a_vclk2_input.hw,
[CLKID_PRIV_VCLK_DIV] = &g12a_vclk_div.hw,
@@ -4438,12 +4438,12 @@ static struct clk_hw_onecell_data g12a_hw_onecell_data = {
[CLKID_VCLK2_DIV12] = &g12a_vclk2_div12.hw,
[CLKID_PRIV_CTS_ENCI_SEL] = &g12a_cts_enci_sel.hw,
[CLKID_PRIV_CTS_ENCP_SEL] = &g12a_cts_encp_sel.hw,
- [CLKID_PRIV_CTS_ENCL_SEL] = &g12a_cts_encl_sel.hw,
+ [CLKID_CTS_ENCL_SEL] = &g12a_cts_encl_sel.hw,
[CLKID_PRIV_CTS_VDAC_SEL] = &g12a_cts_vdac_sel.hw,
[CLKID_PRIV_HDMI_TX_SEL] = &g12a_hdmi_tx_sel.hw,
[CLKID_CTS_ENCI] = &g12a_cts_enci.hw,
[CLKID_CTS_ENCP] = &g12a_cts_encp.hw,
- [CLKID_PRIV_CTS_ENCL] = &g12a_cts_encl.hw,
+ [CLKID_CTS_ENCL] = &g12a_cts_encl.hw,
[CLKID_CTS_VDAC] = &g12a_cts_vdac.hw,
[CLKID_HDMI_TX] = &g12a_hdmi_tx.hw,
[CLKID_PRIV_HDMI_SEL] = &g12a_hdmi_sel.hw,
@@ -4642,7 +4642,7 @@ static struct clk_hw_onecell_data g12b_hw_onecell_data = {
[CLKID_PRIV_VID_PLL_SEL] = &g12a_vid_pll_sel.hw,
[CLKID_PRIV_VID_PLL_DIV] = &g12a_vid_pll.hw,
[CLKID_PRIV_VCLK_SEL] = &g12a_vclk_sel.hw,
- [CLKID_PRIV_VCLK2_SEL] = &g12a_vclk2_sel.hw,
+ [CLKID_VCLK2_SEL] = &g12a_vclk2_sel.hw,
[CLKID_PRIV_VCLK_INPUT] = &g12a_vclk_input.hw,
[CLKID_PRIV_VCLK2_INPUT] = &g12a_vclk2_input.hw,
[CLKID_PRIV_VCLK_DIV] = &g12a_vclk_div.hw,
@@ -4669,12 +4669,12 @@ static struct clk_hw_onecell_data g12b_hw_onecell_data = {
[CLKID_VCLK2_DIV12] = &g12a_vclk2_div12.hw,
[CLKID_PRIV_CTS_ENCI_SEL] = &g12a_cts_enci_sel.hw,
[CLKID_PRIV_CTS_ENCP_SEL] = &g12a_cts_encp_sel.hw,
- [CLKID_PRIV_CTS_ENCL_SEL] = &g12a_cts_encl_sel.hw,
+ [CLKID_CTS_ENCL_SEL] = &g12a_cts_encl_sel.hw,
[CLKID_PRIV_CTS_VDAC_SEL] = &g12a_cts_vdac_sel.hw,
[CLKID_PRIV_HDMI_TX_SEL] = &g12a_hdmi_tx_sel.hw,
[CLKID_CTS_ENCI] = &g12a_cts_enci.hw,
[CLKID_CTS_ENCP] = &g12a_cts_encp.hw,
- [CLKID_PRIV_CTS_ENCL] = &g12a_cts_encl.hw,
+ [CLKID_CTS_ENCL] = &g12a_cts_encl.hw,
[CLKID_CTS_VDAC] = &g12a_cts_vdac.hw,
[CLKID_HDMI_TX] = &g12a_hdmi_tx.hw,
[CLKID_PRIV_HDMI_SEL] = &g12a_hdmi_sel.hw,
@@ -4908,7 +4908,7 @@ static struct clk_hw_onecell_data sm1_hw_onecell_data = {
[CLKID_PRIV_VID_PLL_SEL] = &g12a_vid_pll_sel.hw,
[CLKID_PRIV_VID_PLL_DIV] = &g12a_vid_pll.hw,
[CLKID_PRIV_VCLK_SEL] = &g12a_vclk_sel.hw,
- [CLKID_PRIV_VCLK2_SEL] = &g12a_vclk2_sel.hw,
+ [CLKID_VCLK2_SEL] = &g12a_vclk2_sel.hw,
[CLKID_PRIV_VCLK_INPUT] = &g12a_vclk_input.hw,
[CLKID_PRIV_VCLK2_INPUT] = &g12a_vclk2_input.hw,
[CLKID_PRIV_VCLK_DIV] = &g12a_vclk_div.hw,
@@ -4935,12 +4935,12 @@ static struct clk_hw_onecell_data sm1_hw_onecell_data = {
[CLKID_VCLK2_DIV12] = &g12a_vclk2_div12.hw,
[CLKID_PRIV_CTS_ENCI_SEL] = &g12a_cts_enci_sel.hw,
[CLKID_PRIV_CTS_ENCP_SEL] = &g12a_cts_encp_sel.hw,
- [CLKID_PRIV_CTS_ENCL_SEL] = &g12a_cts_encl_sel.hw,
+ [CLKID_CTS_ENCL_SEL] = &g12a_cts_encl_sel.hw,
[CLKID_PRIV_CTS_VDAC_SEL] = &g12a_cts_vdac_sel.hw,
[CLKID_PRIV_HDMI_TX_SEL] = &g12a_hdmi_tx_sel.hw,
[CLKID_CTS_ENCI] = &g12a_cts_enci.hw,
[CLKID_CTS_ENCP] = &g12a_cts_encp.hw,
- [CLKID_PRIV_CTS_ENCL] = &g12a_cts_encl.hw,
+ [CLKID_CTS_ENCL] = &g12a_cts_encl.hw,
[CLKID_CTS_VDAC] = &g12a_cts_vdac.hw,
[CLKID_HDMI_TX] = &g12a_hdmi_tx.hw,
[CLKID_PRIV_HDMI_SEL] = &g12a_hdmi_sel.hw,
diff --git a/drivers/clk/meson/g12a.h b/drivers/clk/meson/g12a.h
index 9a3091fcaa41..8275413f2beb 100644
--- a/drivers/clk/meson/g12a.h
+++ b/drivers/clk/meson/g12a.h
@@ -168,7 +168,6 @@
#define CLKID_PRIV_VID_PLL_SEL 130
#define CLKID_PRIV_VID_PLL_DIV 131
#define CLKID_PRIV_VCLK_SEL 132
-#define CLKID_PRIV_VCLK2_SEL 133
#define CLKID_PRIV_VCLK_INPUT 134
#define CLKID_PRIV_VCLK2_INPUT 135
#define CLKID_PRIV_VCLK_DIV 136
@@ -265,8 +264,6 @@
#define CLKID_PRIV_NNA_CORE_CLK_SEL 265
#define CLKID_PRIV_NNA_CORE_CLK_DIV 266
#define CLKID_PRIV_MIPI_DSI_PXCLK_DIV 268
-#define CLKID_PRIV_CTS_ENCL 271
-#define CLKID_PRIV_CTS_ENCL_SEL 272
#define NR_CLKS 273
--
2.34.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
WARNING: multiple messages have this Message-ID (diff)
From: Neil Armstrong <neil.armstrong@linaro.org>
To: Jerome Brunet <jbrunet@baylibre.com>,
Michael Turquette <mturquette@baylibre.com>,
Stephen Boyd <sboyd@kernel.org>,
Kevin Hilman <khilman@baylibre.com>,
Martin Blumenstingl <martin.blumenstingl@googlemail.com>,
Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Conor Dooley <conor+dt@kernel.org>,
David Airlie <airlied@gmail.com>,
Daniel Vetter <daniel@ffwll.ch>,
Philipp Zabel <p.zabel@pengutronix.de>,
Kishon Vijay Abraham I <kishon@kernel.org>,
Sam Ravnborg <sam@ravnborg.org>
Cc: "Lukas F. Hartmann" <lukas@mntre.com>,
Nicolas Belin <nbelin@baylibre.com>,
linux-amlogic@lists.infradead.org, linux-clk@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, devicetree@vger.kernel.org,
dri-devel@lists.freedesktop.org, linux-phy@lists.infradead.org,
Neil Armstrong <neil.armstrong@linaro.org>
Subject: [PATCH v5 04/17] clk: meson: g12: use VCLK2_SEL, CTS_ENCL & CTS_ENCL_SEL public CLK IDs
Date: Tue, 30 May 2023 09:38:05 +0200 [thread overview]
Message-ID: <20230512-amlogic-v6-4-upstream-dsi-ccf-vim3-v5-4-56eb7a4d5b8e@linaro.org> (raw)
In-Reply-To: <20230512-amlogic-v6-4-upstream-dsi-ccf-vim3-v5-0-56eb7a4d5b8e@linaro.org>
Now those CLK IDs were added to the public bindings header, switch
to use those defines and drop the PRIV defines.
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
---
drivers/clk/meson/g12a.c | 18 +++++++++---------
drivers/clk/meson/g12a.h | 3 ---
2 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/drivers/clk/meson/g12a.c b/drivers/clk/meson/g12a.c
index a132aad2aac9..461ebd79497c 100644
--- a/drivers/clk/meson/g12a.c
+++ b/drivers/clk/meson/g12a.c
@@ -4411,7 +4411,7 @@ static struct clk_hw_onecell_data g12a_hw_onecell_data = {
[CLKID_PRIV_VID_PLL_SEL] = &g12a_vid_pll_sel.hw,
[CLKID_PRIV_VID_PLL_DIV] = &g12a_vid_pll.hw,
[CLKID_PRIV_VCLK_SEL] = &g12a_vclk_sel.hw,
- [CLKID_PRIV_VCLK2_SEL] = &g12a_vclk2_sel.hw,
+ [CLKID_VCLK2_SEL] = &g12a_vclk2_sel.hw,
[CLKID_PRIV_VCLK_INPUT] = &g12a_vclk_input.hw,
[CLKID_PRIV_VCLK2_INPUT] = &g12a_vclk2_input.hw,
[CLKID_PRIV_VCLK_DIV] = &g12a_vclk_div.hw,
@@ -4438,12 +4438,12 @@ static struct clk_hw_onecell_data g12a_hw_onecell_data = {
[CLKID_VCLK2_DIV12] = &g12a_vclk2_div12.hw,
[CLKID_PRIV_CTS_ENCI_SEL] = &g12a_cts_enci_sel.hw,
[CLKID_PRIV_CTS_ENCP_SEL] = &g12a_cts_encp_sel.hw,
- [CLKID_PRIV_CTS_ENCL_SEL] = &g12a_cts_encl_sel.hw,
+ [CLKID_CTS_ENCL_SEL] = &g12a_cts_encl_sel.hw,
[CLKID_PRIV_CTS_VDAC_SEL] = &g12a_cts_vdac_sel.hw,
[CLKID_PRIV_HDMI_TX_SEL] = &g12a_hdmi_tx_sel.hw,
[CLKID_CTS_ENCI] = &g12a_cts_enci.hw,
[CLKID_CTS_ENCP] = &g12a_cts_encp.hw,
- [CLKID_PRIV_CTS_ENCL] = &g12a_cts_encl.hw,
+ [CLKID_CTS_ENCL] = &g12a_cts_encl.hw,
[CLKID_CTS_VDAC] = &g12a_cts_vdac.hw,
[CLKID_HDMI_TX] = &g12a_hdmi_tx.hw,
[CLKID_PRIV_HDMI_SEL] = &g12a_hdmi_sel.hw,
@@ -4642,7 +4642,7 @@ static struct clk_hw_onecell_data g12b_hw_onecell_data = {
[CLKID_PRIV_VID_PLL_SEL] = &g12a_vid_pll_sel.hw,
[CLKID_PRIV_VID_PLL_DIV] = &g12a_vid_pll.hw,
[CLKID_PRIV_VCLK_SEL] = &g12a_vclk_sel.hw,
- [CLKID_PRIV_VCLK2_SEL] = &g12a_vclk2_sel.hw,
+ [CLKID_VCLK2_SEL] = &g12a_vclk2_sel.hw,
[CLKID_PRIV_VCLK_INPUT] = &g12a_vclk_input.hw,
[CLKID_PRIV_VCLK2_INPUT] = &g12a_vclk2_input.hw,
[CLKID_PRIV_VCLK_DIV] = &g12a_vclk_div.hw,
@@ -4669,12 +4669,12 @@ static struct clk_hw_onecell_data g12b_hw_onecell_data = {
[CLKID_VCLK2_DIV12] = &g12a_vclk2_div12.hw,
[CLKID_PRIV_CTS_ENCI_SEL] = &g12a_cts_enci_sel.hw,
[CLKID_PRIV_CTS_ENCP_SEL] = &g12a_cts_encp_sel.hw,
- [CLKID_PRIV_CTS_ENCL_SEL] = &g12a_cts_encl_sel.hw,
+ [CLKID_CTS_ENCL_SEL] = &g12a_cts_encl_sel.hw,
[CLKID_PRIV_CTS_VDAC_SEL] = &g12a_cts_vdac_sel.hw,
[CLKID_PRIV_HDMI_TX_SEL] = &g12a_hdmi_tx_sel.hw,
[CLKID_CTS_ENCI] = &g12a_cts_enci.hw,
[CLKID_CTS_ENCP] = &g12a_cts_encp.hw,
- [CLKID_PRIV_CTS_ENCL] = &g12a_cts_encl.hw,
+ [CLKID_CTS_ENCL] = &g12a_cts_encl.hw,
[CLKID_CTS_VDAC] = &g12a_cts_vdac.hw,
[CLKID_HDMI_TX] = &g12a_hdmi_tx.hw,
[CLKID_PRIV_HDMI_SEL] = &g12a_hdmi_sel.hw,
@@ -4908,7 +4908,7 @@ static struct clk_hw_onecell_data sm1_hw_onecell_data = {
[CLKID_PRIV_VID_PLL_SEL] = &g12a_vid_pll_sel.hw,
[CLKID_PRIV_VID_PLL_DIV] = &g12a_vid_pll.hw,
[CLKID_PRIV_VCLK_SEL] = &g12a_vclk_sel.hw,
- [CLKID_PRIV_VCLK2_SEL] = &g12a_vclk2_sel.hw,
+ [CLKID_VCLK2_SEL] = &g12a_vclk2_sel.hw,
[CLKID_PRIV_VCLK_INPUT] = &g12a_vclk_input.hw,
[CLKID_PRIV_VCLK2_INPUT] = &g12a_vclk2_input.hw,
[CLKID_PRIV_VCLK_DIV] = &g12a_vclk_div.hw,
@@ -4935,12 +4935,12 @@ static struct clk_hw_onecell_data sm1_hw_onecell_data = {
[CLKID_VCLK2_DIV12] = &g12a_vclk2_div12.hw,
[CLKID_PRIV_CTS_ENCI_SEL] = &g12a_cts_enci_sel.hw,
[CLKID_PRIV_CTS_ENCP_SEL] = &g12a_cts_encp_sel.hw,
- [CLKID_PRIV_CTS_ENCL_SEL] = &g12a_cts_encl_sel.hw,
+ [CLKID_CTS_ENCL_SEL] = &g12a_cts_encl_sel.hw,
[CLKID_PRIV_CTS_VDAC_SEL] = &g12a_cts_vdac_sel.hw,
[CLKID_PRIV_HDMI_TX_SEL] = &g12a_hdmi_tx_sel.hw,
[CLKID_CTS_ENCI] = &g12a_cts_enci.hw,
[CLKID_CTS_ENCP] = &g12a_cts_encp.hw,
- [CLKID_PRIV_CTS_ENCL] = &g12a_cts_encl.hw,
+ [CLKID_CTS_ENCL] = &g12a_cts_encl.hw,
[CLKID_CTS_VDAC] = &g12a_cts_vdac.hw,
[CLKID_HDMI_TX] = &g12a_hdmi_tx.hw,
[CLKID_PRIV_HDMI_SEL] = &g12a_hdmi_sel.hw,
diff --git a/drivers/clk/meson/g12a.h b/drivers/clk/meson/g12a.h
index 9a3091fcaa41..8275413f2beb 100644
--- a/drivers/clk/meson/g12a.h
+++ b/drivers/clk/meson/g12a.h
@@ -168,7 +168,6 @@
#define CLKID_PRIV_VID_PLL_SEL 130
#define CLKID_PRIV_VID_PLL_DIV 131
#define CLKID_PRIV_VCLK_SEL 132
-#define CLKID_PRIV_VCLK2_SEL 133
#define CLKID_PRIV_VCLK_INPUT 134
#define CLKID_PRIV_VCLK2_INPUT 135
#define CLKID_PRIV_VCLK_DIV 136
@@ -265,8 +264,6 @@
#define CLKID_PRIV_NNA_CORE_CLK_SEL 265
#define CLKID_PRIV_NNA_CORE_CLK_DIV 266
#define CLKID_PRIV_MIPI_DSI_PXCLK_DIV 268
-#define CLKID_PRIV_CTS_ENCL 271
-#define CLKID_PRIV_CTS_ENCL_SEL 272
#define NR_CLKS 273
--
2.34.1
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
WARNING: multiple messages have this Message-ID (diff)
From: Neil Armstrong <neil.armstrong@linaro.org>
To: Jerome Brunet <jbrunet@baylibre.com>,
Michael Turquette <mturquette@baylibre.com>,
Stephen Boyd <sboyd@kernel.org>,
Kevin Hilman <khilman@baylibre.com>,
Martin Blumenstingl <martin.blumenstingl@googlemail.com>,
Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Conor Dooley <conor+dt@kernel.org>,
David Airlie <airlied@gmail.com>,
Daniel Vetter <daniel@ffwll.ch>,
Philipp Zabel <p.zabel@pengutronix.de>,
Kishon Vijay Abraham I <kishon@kernel.org>,
Sam Ravnborg <sam@ravnborg.org>
Cc: "Lukas F. Hartmann" <lukas@mntre.com>,
Nicolas Belin <nbelin@baylibre.com>,
linux-amlogic@lists.infradead.org, linux-clk@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, devicetree@vger.kernel.org,
dri-devel@lists.freedesktop.org, linux-phy@lists.infradead.org,
Neil Armstrong <neil.armstrong@linaro.org>
Subject: [PATCH v5 04/17] clk: meson: g12: use VCLK2_SEL, CTS_ENCL & CTS_ENCL_SEL public CLK IDs
Date: Tue, 30 May 2023 09:38:05 +0200 [thread overview]
Message-ID: <20230512-amlogic-v6-4-upstream-dsi-ccf-vim3-v5-4-56eb7a4d5b8e@linaro.org> (raw)
In-Reply-To: <20230512-amlogic-v6-4-upstream-dsi-ccf-vim3-v5-0-56eb7a4d5b8e@linaro.org>
Now those CLK IDs were added to the public bindings header, switch
to use those defines and drop the PRIV defines.
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
---
drivers/clk/meson/g12a.c | 18 +++++++++---------
drivers/clk/meson/g12a.h | 3 ---
2 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/drivers/clk/meson/g12a.c b/drivers/clk/meson/g12a.c
index a132aad2aac9..461ebd79497c 100644
--- a/drivers/clk/meson/g12a.c
+++ b/drivers/clk/meson/g12a.c
@@ -4411,7 +4411,7 @@ static struct clk_hw_onecell_data g12a_hw_onecell_data = {
[CLKID_PRIV_VID_PLL_SEL] = &g12a_vid_pll_sel.hw,
[CLKID_PRIV_VID_PLL_DIV] = &g12a_vid_pll.hw,
[CLKID_PRIV_VCLK_SEL] = &g12a_vclk_sel.hw,
- [CLKID_PRIV_VCLK2_SEL] = &g12a_vclk2_sel.hw,
+ [CLKID_VCLK2_SEL] = &g12a_vclk2_sel.hw,
[CLKID_PRIV_VCLK_INPUT] = &g12a_vclk_input.hw,
[CLKID_PRIV_VCLK2_INPUT] = &g12a_vclk2_input.hw,
[CLKID_PRIV_VCLK_DIV] = &g12a_vclk_div.hw,
@@ -4438,12 +4438,12 @@ static struct clk_hw_onecell_data g12a_hw_onecell_data = {
[CLKID_VCLK2_DIV12] = &g12a_vclk2_div12.hw,
[CLKID_PRIV_CTS_ENCI_SEL] = &g12a_cts_enci_sel.hw,
[CLKID_PRIV_CTS_ENCP_SEL] = &g12a_cts_encp_sel.hw,
- [CLKID_PRIV_CTS_ENCL_SEL] = &g12a_cts_encl_sel.hw,
+ [CLKID_CTS_ENCL_SEL] = &g12a_cts_encl_sel.hw,
[CLKID_PRIV_CTS_VDAC_SEL] = &g12a_cts_vdac_sel.hw,
[CLKID_PRIV_HDMI_TX_SEL] = &g12a_hdmi_tx_sel.hw,
[CLKID_CTS_ENCI] = &g12a_cts_enci.hw,
[CLKID_CTS_ENCP] = &g12a_cts_encp.hw,
- [CLKID_PRIV_CTS_ENCL] = &g12a_cts_encl.hw,
+ [CLKID_CTS_ENCL] = &g12a_cts_encl.hw,
[CLKID_CTS_VDAC] = &g12a_cts_vdac.hw,
[CLKID_HDMI_TX] = &g12a_hdmi_tx.hw,
[CLKID_PRIV_HDMI_SEL] = &g12a_hdmi_sel.hw,
@@ -4642,7 +4642,7 @@ static struct clk_hw_onecell_data g12b_hw_onecell_data = {
[CLKID_PRIV_VID_PLL_SEL] = &g12a_vid_pll_sel.hw,
[CLKID_PRIV_VID_PLL_DIV] = &g12a_vid_pll.hw,
[CLKID_PRIV_VCLK_SEL] = &g12a_vclk_sel.hw,
- [CLKID_PRIV_VCLK2_SEL] = &g12a_vclk2_sel.hw,
+ [CLKID_VCLK2_SEL] = &g12a_vclk2_sel.hw,
[CLKID_PRIV_VCLK_INPUT] = &g12a_vclk_input.hw,
[CLKID_PRIV_VCLK2_INPUT] = &g12a_vclk2_input.hw,
[CLKID_PRIV_VCLK_DIV] = &g12a_vclk_div.hw,
@@ -4669,12 +4669,12 @@ static struct clk_hw_onecell_data g12b_hw_onecell_data = {
[CLKID_VCLK2_DIV12] = &g12a_vclk2_div12.hw,
[CLKID_PRIV_CTS_ENCI_SEL] = &g12a_cts_enci_sel.hw,
[CLKID_PRIV_CTS_ENCP_SEL] = &g12a_cts_encp_sel.hw,
- [CLKID_PRIV_CTS_ENCL_SEL] = &g12a_cts_encl_sel.hw,
+ [CLKID_CTS_ENCL_SEL] = &g12a_cts_encl_sel.hw,
[CLKID_PRIV_CTS_VDAC_SEL] = &g12a_cts_vdac_sel.hw,
[CLKID_PRIV_HDMI_TX_SEL] = &g12a_hdmi_tx_sel.hw,
[CLKID_CTS_ENCI] = &g12a_cts_enci.hw,
[CLKID_CTS_ENCP] = &g12a_cts_encp.hw,
- [CLKID_PRIV_CTS_ENCL] = &g12a_cts_encl.hw,
+ [CLKID_CTS_ENCL] = &g12a_cts_encl.hw,
[CLKID_CTS_VDAC] = &g12a_cts_vdac.hw,
[CLKID_HDMI_TX] = &g12a_hdmi_tx.hw,
[CLKID_PRIV_HDMI_SEL] = &g12a_hdmi_sel.hw,
@@ -4908,7 +4908,7 @@ static struct clk_hw_onecell_data sm1_hw_onecell_data = {
[CLKID_PRIV_VID_PLL_SEL] = &g12a_vid_pll_sel.hw,
[CLKID_PRIV_VID_PLL_DIV] = &g12a_vid_pll.hw,
[CLKID_PRIV_VCLK_SEL] = &g12a_vclk_sel.hw,
- [CLKID_PRIV_VCLK2_SEL] = &g12a_vclk2_sel.hw,
+ [CLKID_VCLK2_SEL] = &g12a_vclk2_sel.hw,
[CLKID_PRIV_VCLK_INPUT] = &g12a_vclk_input.hw,
[CLKID_PRIV_VCLK2_INPUT] = &g12a_vclk2_input.hw,
[CLKID_PRIV_VCLK_DIV] = &g12a_vclk_div.hw,
@@ -4935,12 +4935,12 @@ static struct clk_hw_onecell_data sm1_hw_onecell_data = {
[CLKID_VCLK2_DIV12] = &g12a_vclk2_div12.hw,
[CLKID_PRIV_CTS_ENCI_SEL] = &g12a_cts_enci_sel.hw,
[CLKID_PRIV_CTS_ENCP_SEL] = &g12a_cts_encp_sel.hw,
- [CLKID_PRIV_CTS_ENCL_SEL] = &g12a_cts_encl_sel.hw,
+ [CLKID_CTS_ENCL_SEL] = &g12a_cts_encl_sel.hw,
[CLKID_PRIV_CTS_VDAC_SEL] = &g12a_cts_vdac_sel.hw,
[CLKID_PRIV_HDMI_TX_SEL] = &g12a_hdmi_tx_sel.hw,
[CLKID_CTS_ENCI] = &g12a_cts_enci.hw,
[CLKID_CTS_ENCP] = &g12a_cts_encp.hw,
- [CLKID_PRIV_CTS_ENCL] = &g12a_cts_encl.hw,
+ [CLKID_CTS_ENCL] = &g12a_cts_encl.hw,
[CLKID_CTS_VDAC] = &g12a_cts_vdac.hw,
[CLKID_HDMI_TX] = &g12a_hdmi_tx.hw,
[CLKID_PRIV_HDMI_SEL] = &g12a_hdmi_sel.hw,
diff --git a/drivers/clk/meson/g12a.h b/drivers/clk/meson/g12a.h
index 9a3091fcaa41..8275413f2beb 100644
--- a/drivers/clk/meson/g12a.h
+++ b/drivers/clk/meson/g12a.h
@@ -168,7 +168,6 @@
#define CLKID_PRIV_VID_PLL_SEL 130
#define CLKID_PRIV_VID_PLL_DIV 131
#define CLKID_PRIV_VCLK_SEL 132
-#define CLKID_PRIV_VCLK2_SEL 133
#define CLKID_PRIV_VCLK_INPUT 134
#define CLKID_PRIV_VCLK2_INPUT 135
#define CLKID_PRIV_VCLK_DIV 136
@@ -265,8 +264,6 @@
#define CLKID_PRIV_NNA_CORE_CLK_SEL 265
#define CLKID_PRIV_NNA_CORE_CLK_DIV 266
#define CLKID_PRIV_MIPI_DSI_PXCLK_DIV 268
-#define CLKID_PRIV_CTS_ENCL 271
-#define CLKID_PRIV_CTS_ENCL_SEL 272
#define NR_CLKS 273
--
2.34.1
--
linux-phy mailing list
linux-phy@lists.infradead.org
https://lists.infradead.org/mailman/listinfo/linux-phy
next prev parent reply other threads:[~2023-05-30 7:38 UTC|newest]
Thread overview: 170+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-30 7:38 [PATCH v5 00/17] drm/meson: add support for MIPI DSI Display Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 7:38 ` [PATCH v5 01/17] clk: meson: g12a: prefix private CLK IDs defines with PRIV Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 8:08 ` Jerome Brunet
2023-05-30 8:08 ` Jerome Brunet
2023-05-30 8:08 ` Jerome Brunet
2023-05-30 8:08 ` Jerome Brunet
2023-05-30 8:08 ` Jerome Brunet
2023-05-30 15:56 ` Neil Armstrong
2023-05-30 15:56 ` Neil Armstrong
2023-05-30 15:56 ` Neil Armstrong
2023-05-30 15:56 ` Neil Armstrong
2023-05-30 15:56 ` Neil Armstrong
2023-05-31 16:08 ` Jerome Brunet
2023-05-31 16:08 ` Jerome Brunet
2023-05-31 16:08 ` Jerome Brunet
2023-05-31 16:08 ` Jerome Brunet
2023-05-31 16:08 ` Jerome Brunet
2023-05-30 7:38 ` [PATCH v5 02/17] clk: meson: g12a: add CTS_ENCL & CTS_ENCL_SEL clocks Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 7:38 ` [PATCH v5 03/17] dt-bindings: clk: g12a-clkc: add VCLK2_SEL and CTS_ENCL clock ids Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 17:25 ` Conor Dooley
2023-05-30 17:25 ` Conor Dooley
2023-05-30 17:25 ` Conor Dooley
2023-05-30 17:25 ` Conor Dooley
2023-05-30 17:25 ` Conor Dooley
2023-05-30 7:38 ` Neil Armstrong [this message]
2023-05-30 7:38 ` [PATCH v5 04/17] clk: meson: g12: use VCLK2_SEL, CTS_ENCL & CTS_ENCL_SEL public CLK IDs Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 7:38 ` [PATCH v5 05/17] clk: meson: g12a: make VCLK2 and ENCL clock path configurable by CCF Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 8:14 ` Jerome Brunet
2023-05-30 8:14 ` Jerome Brunet
2023-05-30 8:14 ` Jerome Brunet
2023-05-30 8:14 ` Jerome Brunet
2023-05-30 8:14 ` Jerome Brunet
2023-05-30 15:57 ` Neil Armstrong
2023-05-30 15:57 ` Neil Armstrong
2023-05-30 15:57 ` Neil Armstrong
2023-05-30 15:57 ` Neil Armstrong
2023-05-30 15:57 ` Neil Armstrong
2023-05-30 19:36 ` Martin Blumenstingl
2023-05-30 19:36 ` Martin Blumenstingl
2023-05-30 19:36 ` Martin Blumenstingl
2023-05-30 19:36 ` Martin Blumenstingl
2023-05-30 19:36 ` Martin Blumenstingl
2023-05-30 7:38 ` [PATCH v5 06/17] dt-bindings: display: add Amlogic MIPI DSI Host Controller bindings Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 17:28 ` Conor Dooley
2023-05-30 17:28 ` Conor Dooley
2023-05-30 17:28 ` Conor Dooley
2023-05-30 17:28 ` Conor Dooley
2023-05-30 17:28 ` Conor Dooley
2023-05-30 7:38 ` [PATCH v5 07/17] dt-bindings: display: meson-vpu: add third DPI output port Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 7:38 ` [PATCH v5 08/17] drm/meson: fix unbind path if HDMI fails to bind Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-31 9:19 ` Nicolas Belin
2023-05-31 9:19 ` Nicolas Belin
2023-05-31 9:19 ` Nicolas Belin
2023-05-31 9:19 ` Nicolas Belin
2023-05-31 9:19 ` Nicolas Belin
2023-05-30 7:38 ` [PATCH v5 09/17] drm/meson: only use components with dw-hdmi Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-31 9:21 ` Nicolas Belin
2023-05-31 9:21 ` Nicolas Belin
2023-05-31 9:21 ` Nicolas Belin
2023-05-31 9:21 ` Nicolas Belin
2023-05-31 9:21 ` Nicolas Belin
2023-05-30 7:38 ` [PATCH v5 10/17] drm/meson: venc: add ENCL encoder setup for MIPI-DSI output Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-31 9:21 ` Nicolas Belin
2023-05-31 9:21 ` Nicolas Belin
2023-05-31 9:21 ` Nicolas Belin
2023-05-31 9:21 ` Nicolas Belin
2023-05-31 9:21 ` Nicolas Belin
2023-05-30 7:38 ` [PATCH v5 11/17] drm/meson: add DSI encoder Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-31 9:22 ` Nicolas Belin
2023-05-31 9:22 ` Nicolas Belin
2023-05-31 9:22 ` Nicolas Belin
2023-05-31 9:22 ` Nicolas Belin
2023-05-31 9:22 ` Nicolas Belin
2023-05-30 7:38 ` [PATCH v5 12/17] drm/meson: add support for MIPI-DSI transceiver Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-31 9:22 ` Nicolas Belin
2023-05-31 9:22 ` Nicolas Belin
2023-05-31 9:22 ` Nicolas Belin
2023-05-31 9:22 ` Nicolas Belin
2023-05-31 9:22 ` Nicolas Belin
2023-05-30 7:38 ` [PATCH v5 13/17] drm/panel: khadas-ts050: update timings to achieve 60Hz refresh rate Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-31 9:23 ` Nicolas Belin
2023-05-31 9:23 ` Nicolas Belin
2023-05-31 9:23 ` Nicolas Belin
2023-05-31 9:23 ` Nicolas Belin
2023-05-31 9:23 ` Nicolas Belin
2023-05-30 7:38 ` [PATCH v5 14/17] arm64: meson: g12-common: add the MIPI DSI nodes Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 7:38 ` [PATCH v5 15/17] DONOTMERGE: arm64: meson: khadas-vim3l: add DSI panel Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 7:38 ` [PATCH v5 16/17] dt-bindings: arm: amlogic: Document the MNT Reform 2 CM4 adapter with a BPI-CM4 Module Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 17:23 ` Conor Dooley
2023-05-30 17:23 ` Conor Dooley
2023-05-30 17:23 ` Conor Dooley
2023-05-30 17:23 ` Conor Dooley
2023-05-30 17:23 ` Conor Dooley
2023-05-30 7:38 ` [PATCH v5 17/17] arm64: dts: amlogic: meson-g12b-bananapi-cm4: add support for MNT Reform2 with CM4 adaper Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-05-30 7:38 ` Neil Armstrong
2023-06-01 14:12 ` (subset) [PATCH v5 00/17] drm/meson: add support for MIPI DSI Display Neil Armstrong
2023-06-01 14:12 ` Neil Armstrong
2023-06-01 14:12 ` Neil Armstrong
2023-06-01 14:12 ` Neil Armstrong
2023-06-01 14:12 ` Neil Armstrong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230512-amlogic-v6-4-upstream-dsi-ccf-vim3-v5-4-56eb7a4d5b8e@linaro.org \
--to=neil.armstrong@linaro.org \
--cc=airlied@gmail.com \
--cc=conor+dt@kernel.org \
--cc=daniel@ffwll.ch \
--cc=devicetree@vger.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=jbrunet@baylibre.com \
--cc=khilman@baylibre.com \
--cc=kishon@kernel.org \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=linux-amlogic@lists.infradead.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-phy@lists.infradead.org \
--cc=lukas@mntre.com \
--cc=martin.blumenstingl@googlemail.com \
--cc=mturquette@baylibre.com \
--cc=nbelin@baylibre.com \
--cc=p.zabel@pengutronix.de \
--cc=robh+dt@kernel.org \
--cc=sam@ravnborg.org \
--cc=sboyd@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.