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> Cc: 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, Neil Armstrong <neil.armstrong@linaro.org> Subject: [PATCH v2 16/19] clk: meson: eeclk: move bindings include to main driver Date: Mon, 12 Jun 2023 11:57:33 +0200 [thread overview] Message-ID: <20230607-topic-amlogic-upstream-clkid-public-migration-v2-16-38172d17c27a@linaro.org> (raw) In-Reply-To: <20230607-topic-amlogic-upstream-clkid-public-migration-v2-0-38172d17c27a@linaro.org> Now the clock ids are no more defined in private headers, cleanup and include the dt-bindings headers from the main driver file. Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> --- drivers/clk/meson/axg.c | 2 ++ drivers/clk/meson/axg.h | 3 --- drivers/clk/meson/g12a.c | 2 ++ drivers/clk/meson/g12a.h | 3 --- drivers/clk/meson/gxbb.c | 2 ++ drivers/clk/meson/gxbb.h | 3 --- 6 files changed, 6 insertions(+), 9 deletions(-) diff --git a/drivers/clk/meson/axg.c b/drivers/clk/meson/axg.c index 75f0912a9805..f132439a33a4 100644 --- a/drivers/clk/meson/axg.c +++ b/drivers/clk/meson/axg.c @@ -21,6 +21,8 @@ #include "axg.h" #include "meson-eeclk.h" +#include <dt-bindings/clock/axg-clkc.h> + static DEFINE_SPINLOCK(meson_clk_lock); static struct clk_regmap axg_fixed_pll_dco = { diff --git a/drivers/clk/meson/axg.h b/drivers/clk/meson/axg.h index ed157532b4d7..624d8d3ce7c4 100644 --- a/drivers/clk/meson/axg.h +++ b/drivers/clk/meson/axg.h @@ -102,7 +102,4 @@ #define HHI_DPLL_TOP_I 0x318 #define HHI_DPLL_TOP2_I 0x31C -/* include the CLKIDs that have been made part of the DT binding */ -#include <dt-bindings/clock/axg-clkc.h> - #endif /* __AXG_H */ diff --git a/drivers/clk/meson/g12a.c b/drivers/clk/meson/g12a.c index e0e295645c9e..ceabd5f4b2ac 100644 --- a/drivers/clk/meson/g12a.c +++ b/drivers/clk/meson/g12a.c @@ -25,6 +25,8 @@ #include "meson-eeclk.h" #include "g12a.h" +#include <dt-bindings/clock/g12a-clkc.h> + static DEFINE_SPINLOCK(meson_clk_lock); static struct clk_regmap g12a_fixed_pll_dco = { diff --git a/drivers/clk/meson/g12a.h b/drivers/clk/meson/g12a.h index 8e08af3c1476..f11ee3c59849 100644 --- a/drivers/clk/meson/g12a.h +++ b/drivers/clk/meson/g12a.h @@ -126,7 +126,4 @@ #define HHI_SYS1_PLL_CNTL5 0x394 #define HHI_SYS1_PLL_CNTL6 0x398 -/* include the CLKIDs that have been made part of the DT binding */ -#include <dt-bindings/clock/g12a-clkc.h> - #endif /* __G12A_H */ diff --git a/drivers/clk/meson/gxbb.c b/drivers/clk/meson/gxbb.c index 116fcb6ba160..1ee0774a9827 100644 --- a/drivers/clk/meson/gxbb.c +++ b/drivers/clk/meson/gxbb.c @@ -17,6 +17,8 @@ #include "meson-eeclk.h" #include "vid-pll-div.h" +#include <dt-bindings/clock/gxbb-clkc.h> + static DEFINE_SPINLOCK(meson_clk_lock); static const struct pll_params_table gxbb_gp0_pll_params_table[] = { diff --git a/drivers/clk/meson/gxbb.h b/drivers/clk/meson/gxbb.h index 798ffb911103..ba5f39a8d746 100644 --- a/drivers/clk/meson/gxbb.h +++ b/drivers/clk/meson/gxbb.h @@ -112,7 +112,4 @@ #define HHI_BT656_CLK_CNTL 0x3D4 /* 0xf5 offset in data sheet */ #define HHI_SAR_CLK_CNTL 0x3D8 /* 0xf6 offset in data sheet */ -/* include the CLKIDs that have been made part of the DT binding */ -#include <dt-bindings/clock/gxbb-clkc.h> - #endif /* __GXBB_H */ -- 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> Cc: 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, Neil Armstrong <neil.armstrong@linaro.org> Subject: [PATCH v2 16/19] clk: meson: eeclk: move bindings include to main driver Date: Mon, 12 Jun 2023 11:57:33 +0200 [thread overview] Message-ID: <20230607-topic-amlogic-upstream-clkid-public-migration-v2-16-38172d17c27a@linaro.org> (raw) In-Reply-To: <20230607-topic-amlogic-upstream-clkid-public-migration-v2-0-38172d17c27a@linaro.org> Now the clock ids are no more defined in private headers, cleanup and include the dt-bindings headers from the main driver file. Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> --- drivers/clk/meson/axg.c | 2 ++ drivers/clk/meson/axg.h | 3 --- drivers/clk/meson/g12a.c | 2 ++ drivers/clk/meson/g12a.h | 3 --- drivers/clk/meson/gxbb.c | 2 ++ drivers/clk/meson/gxbb.h | 3 --- 6 files changed, 6 insertions(+), 9 deletions(-) diff --git a/drivers/clk/meson/axg.c b/drivers/clk/meson/axg.c index 75f0912a9805..f132439a33a4 100644 --- a/drivers/clk/meson/axg.c +++ b/drivers/clk/meson/axg.c @@ -21,6 +21,8 @@ #include "axg.h" #include "meson-eeclk.h" +#include <dt-bindings/clock/axg-clkc.h> + static DEFINE_SPINLOCK(meson_clk_lock); static struct clk_regmap axg_fixed_pll_dco = { diff --git a/drivers/clk/meson/axg.h b/drivers/clk/meson/axg.h index ed157532b4d7..624d8d3ce7c4 100644 --- a/drivers/clk/meson/axg.h +++ b/drivers/clk/meson/axg.h @@ -102,7 +102,4 @@ #define HHI_DPLL_TOP_I 0x318 #define HHI_DPLL_TOP2_I 0x31C -/* include the CLKIDs that have been made part of the DT binding */ -#include <dt-bindings/clock/axg-clkc.h> - #endif /* __AXG_H */ diff --git a/drivers/clk/meson/g12a.c b/drivers/clk/meson/g12a.c index e0e295645c9e..ceabd5f4b2ac 100644 --- a/drivers/clk/meson/g12a.c +++ b/drivers/clk/meson/g12a.c @@ -25,6 +25,8 @@ #include "meson-eeclk.h" #include "g12a.h" +#include <dt-bindings/clock/g12a-clkc.h> + static DEFINE_SPINLOCK(meson_clk_lock); static struct clk_regmap g12a_fixed_pll_dco = { diff --git a/drivers/clk/meson/g12a.h b/drivers/clk/meson/g12a.h index 8e08af3c1476..f11ee3c59849 100644 --- a/drivers/clk/meson/g12a.h +++ b/drivers/clk/meson/g12a.h @@ -126,7 +126,4 @@ #define HHI_SYS1_PLL_CNTL5 0x394 #define HHI_SYS1_PLL_CNTL6 0x398 -/* include the CLKIDs that have been made part of the DT binding */ -#include <dt-bindings/clock/g12a-clkc.h> - #endif /* __G12A_H */ diff --git a/drivers/clk/meson/gxbb.c b/drivers/clk/meson/gxbb.c index 116fcb6ba160..1ee0774a9827 100644 --- a/drivers/clk/meson/gxbb.c +++ b/drivers/clk/meson/gxbb.c @@ -17,6 +17,8 @@ #include "meson-eeclk.h" #include "vid-pll-div.h" +#include <dt-bindings/clock/gxbb-clkc.h> + static DEFINE_SPINLOCK(meson_clk_lock); static const struct pll_params_table gxbb_gp0_pll_params_table[] = { diff --git a/drivers/clk/meson/gxbb.h b/drivers/clk/meson/gxbb.h index 798ffb911103..ba5f39a8d746 100644 --- a/drivers/clk/meson/gxbb.h +++ b/drivers/clk/meson/gxbb.h @@ -112,7 +112,4 @@ #define HHI_BT656_CLK_CNTL 0x3D4 /* 0xf5 offset in data sheet */ #define HHI_SAR_CLK_CNTL 0x3D8 /* 0xf6 offset in data sheet */ -/* include the CLKIDs that have been made part of the DT binding */ -#include <dt-bindings/clock/gxbb-clkc.h> - #endif /* __GXBB_H */ -- 2.34.1 _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic
next prev parent reply other threads:[~2023-06-12 10:55 UTC|newest] Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-06-12 9:57 [PATCH v2 00/19] clk: meson: move all private clk IDs to public dt-bindings headers Neil Armstrong 2023-06-12 9:57 ` Neil Armstrong 2023-06-12 9:57 ` [PATCH v2 01/19] clk: meson: introduce meson-clkc-utils Neil Armstrong 2023-06-12 9:57 ` Neil Armstrong 2023-07-12 12:03 ` Jerome Brunet 2023-07-12 12:03 ` Jerome Brunet 2023-07-12 12:03 ` Jerome Brunet 2023-07-17 12:21 ` Neil Armstrong 2023-07-17 12:21 ` Neil Armstrong 2023-07-17 12:21 ` Neil Armstrong 2023-06-12 9:57 ` [PATCH v2 02/19] clk: meson: migrate meson-eeclk out of hw_onecell_data to drop NR_CLKS Neil Armstrong 2023-06-12 9:57 ` Neil Armstrong 2023-06-12 9:57 ` [PATCH v2 03/19] clk: meson: migrate meson-aoclk " Neil Armstrong 2023-06-12 9:57 ` Neil Armstrong 2023-06-12 9:57 ` [PATCH v2 04/19] clk: meson: migrate a1 clock drivers " Neil Armstrong 2023-06-12 9:57 ` Neil Armstrong 2023-06-22 13:07 ` Dmitry Rokosov 2023-06-22 13:07 ` Dmitry Rokosov 2023-06-22 13:07 ` Dmitry Rokosov 2023-06-22 14:00 ` Dmitry Rokosov 2023-06-22 14:00 ` Dmitry Rokosov 2023-06-22 14:00 ` Dmitry Rokosov 2023-06-12 9:57 ` [PATCH v2 05/19] clk: meson: migrate meson8b " Neil Armstrong 2023-06-12 9:57 ` Neil Armstrong 2023-06-12 9:57 ` [PATCH v2 06/19] clk: meson: migrate axg-audio " Neil Armstrong 2023-06-12 9:57 ` Neil Armstrong 2023-06-12 9:57 ` [PATCH v2 07/19] dt-bindings: clk: gxbb-clkc: expose all clock ids Neil Armstrong 2023-06-12 9:57 ` Neil Armstrong 2023-06-12 9:57 ` [PATCH v2 08/19] dt-bindings: clk: axg-clkc: " Neil Armstrong 2023-06-12 9:57 ` Neil Armstrong 2023-06-12 9:57 ` [PATCH v2 09/19] dt-bindings: clk: g12a-clks: " Neil Armstrong 2023-06-12 9:57 ` Neil Armstrong 2023-06-12 9:57 ` [PATCH v2 10/19] dt-bindings: clk: g12a-aoclkc: " Neil Armstrong 2023-06-12 9:57 ` Neil Armstrong 2023-06-12 9:57 ` [PATCH v2 11/19] dt-bindings: clk: meson8b-clkc: " Neil Armstrong 2023-06-12 9:57 ` Neil Armstrong 2023-06-12 9:57 ` [PATCH v2 12/19] dt-bindings: clk: amlogic,a1-peripherals-clkc: " Neil Armstrong 2023-06-12 9:57 ` Neil Armstrong 2023-06-12 9:57 ` [PATCH v2 13/19] dt-bindings: clk: amlogic,a1-pll-clkc: " Neil Armstrong 2023-06-12 9:57 ` Neil Armstrong 2023-06-12 9:57 ` [PATCH v2 14/19] dt-bindings: clk: axg-audio-clkc: " Neil Armstrong 2023-06-12 9:57 ` Neil Armstrong 2023-06-12 9:57 ` [PATCH v2 15/19] clk: meson: aoclk: move bindings include to main driver Neil Armstrong 2023-06-12 9:57 ` Neil Armstrong 2023-06-12 9:57 ` Neil Armstrong [this message] 2023-06-12 9:57 ` [PATCH v2 16/19] clk: meson: eeclk: " Neil Armstrong 2023-06-12 9:57 ` [PATCH v2 17/19] clk: meson: a1: " Neil Armstrong 2023-06-12 9:57 ` Neil Armstrong 2023-06-22 13:02 ` Dmitry Rokosov 2023-06-22 13:02 ` Dmitry Rokosov 2023-06-22 13:02 ` Dmitry Rokosov 2023-06-12 9:57 ` [PATCH v2 18/19] clk: meson: meson8b: " Neil Armstrong 2023-06-12 9:57 ` Neil Armstrong 2023-06-12 9:57 ` [PATCH v2 19/19] clk: meson: axg-audio: " Neil Armstrong 2023-06-12 9:57 ` Neil Armstrong 2023-07-20 9:31 ` [PATCH v2 00/19] clk: meson: move all private clk IDs to public dt-bindings headers Jerome Brunet 2023-07-20 9:31 ` Jerome Brunet 2023-07-20 9:31 ` Jerome Brunet
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=20230607-topic-amlogic-upstream-clkid-public-migration-v2-16-38172d17c27a@linaro.org \ --to=neil.armstrong@linaro.org \ --cc=conor+dt@kernel.org \ --cc=devicetree@vger.kernel.org \ --cc=jbrunet@baylibre.com \ --cc=khilman@baylibre.com \ --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=martin.blumenstingl@googlemail.com \ --cc=mturquette@baylibre.com \ --cc=robh+dt@kernel.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: linkBe 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.