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 17/19] clk: meson: a1: move bindings include to main driver Date: Mon, 12 Jun 2023 11:57:34 +0200 [thread overview] Message-ID: <20230607-topic-amlogic-upstream-clkid-public-migration-v2-17-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/a1-peripherals.c | 2 ++ drivers/clk/meson/a1-peripherals.h | 3 --- drivers/clk/meson/a1-pll.c | 2 ++ drivers/clk/meson/a1-pll.h | 3 --- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/clk/meson/a1-peripherals.c b/drivers/clk/meson/a1-peripherals.c index a5cab418736a..070ea1427d73 100644 --- a/drivers/clk/meson/a1-peripherals.c +++ b/drivers/clk/meson/a1-peripherals.c @@ -15,6 +15,8 @@ #include "clk-regmap.h" #include "meson-clkc-utils.h" +#include <dt-bindings/clock/amlogic,a1-peripherals-clkc.h> + static struct clk_regmap xtal_in = { .data = &(struct clk_regmap_gate_data){ .offset = SYS_OSCIN_CTRL, diff --git a/drivers/clk/meson/a1-peripherals.h b/drivers/clk/meson/a1-peripherals.h index 842b52634ed0..26de8530184a 100644 --- a/drivers/clk/meson/a1-peripherals.h +++ b/drivers/clk/meson/a1-peripherals.h @@ -43,7 +43,4 @@ #define PSRAM_CLK_CTRL 0xf4 #define DMC_CLK_CTRL 0xf8 -/* include the CLKIDs that have been made part of the DT binding */ -#include <dt-bindings/clock/amlogic,a1-peripherals-clkc.h> - #endif /* __A1_PERIPHERALS_H */ diff --git a/drivers/clk/meson/a1-pll.c b/drivers/clk/meson/a1-pll.c index 25e6b567afd5..7de7d78c3813 100644 --- a/drivers/clk/meson/a1-pll.c +++ b/drivers/clk/meson/a1-pll.c @@ -14,6 +14,8 @@ #include "clk-regmap.h" #include "meson-clkc-utils.h" +#include <dt-bindings/clock/amlogic,a1-pll-clkc.h> + static struct clk_regmap fixed_pll_dco = { .data = &(struct meson_clk_pll_data){ .en = { diff --git a/drivers/clk/meson/a1-pll.h b/drivers/clk/meson/a1-pll.h index 0add1c7ea9f5..4be17b2bf383 100644 --- a/drivers/clk/meson/a1-pll.h +++ b/drivers/clk/meson/a1-pll.h @@ -25,7 +25,4 @@ #define ANACTRL_HIFIPLL_CTRL4 0xd0 #define ANACTRL_HIFIPLL_STS 0xd4 -/* include the CLKIDs that have been made part of the DT binding */ -#include <dt-bindings/clock/amlogic,a1-pll-clkc.h> - #endif /* __A1_PLL_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 17/19] clk: meson: a1: move bindings include to main driver Date: Mon, 12 Jun 2023 11:57:34 +0200 [thread overview] Message-ID: <20230607-topic-amlogic-upstream-clkid-public-migration-v2-17-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/a1-peripherals.c | 2 ++ drivers/clk/meson/a1-peripherals.h | 3 --- drivers/clk/meson/a1-pll.c | 2 ++ drivers/clk/meson/a1-pll.h | 3 --- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/clk/meson/a1-peripherals.c b/drivers/clk/meson/a1-peripherals.c index a5cab418736a..070ea1427d73 100644 --- a/drivers/clk/meson/a1-peripherals.c +++ b/drivers/clk/meson/a1-peripherals.c @@ -15,6 +15,8 @@ #include "clk-regmap.h" #include "meson-clkc-utils.h" +#include <dt-bindings/clock/amlogic,a1-peripherals-clkc.h> + static struct clk_regmap xtal_in = { .data = &(struct clk_regmap_gate_data){ .offset = SYS_OSCIN_CTRL, diff --git a/drivers/clk/meson/a1-peripherals.h b/drivers/clk/meson/a1-peripherals.h index 842b52634ed0..26de8530184a 100644 --- a/drivers/clk/meson/a1-peripherals.h +++ b/drivers/clk/meson/a1-peripherals.h @@ -43,7 +43,4 @@ #define PSRAM_CLK_CTRL 0xf4 #define DMC_CLK_CTRL 0xf8 -/* include the CLKIDs that have been made part of the DT binding */ -#include <dt-bindings/clock/amlogic,a1-peripherals-clkc.h> - #endif /* __A1_PERIPHERALS_H */ diff --git a/drivers/clk/meson/a1-pll.c b/drivers/clk/meson/a1-pll.c index 25e6b567afd5..7de7d78c3813 100644 --- a/drivers/clk/meson/a1-pll.c +++ b/drivers/clk/meson/a1-pll.c @@ -14,6 +14,8 @@ #include "clk-regmap.h" #include "meson-clkc-utils.h" +#include <dt-bindings/clock/amlogic,a1-pll-clkc.h> + static struct clk_regmap fixed_pll_dco = { .data = &(struct meson_clk_pll_data){ .en = { diff --git a/drivers/clk/meson/a1-pll.h b/drivers/clk/meson/a1-pll.h index 0add1c7ea9f5..4be17b2bf383 100644 --- a/drivers/clk/meson/a1-pll.h +++ b/drivers/clk/meson/a1-pll.h @@ -25,7 +25,4 @@ #define ANACTRL_HIFIPLL_CTRL4 0xd0 #define ANACTRL_HIFIPLL_STS 0xd4 -/* include the CLKIDs that have been made part of the DT binding */ -#include <dt-bindings/clock/amlogic,a1-pll-clkc.h> - #endif /* __A1_PLL_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:19 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 ` [PATCH v2 16/19] clk: meson: eeclk: " 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 17/19] clk: meson: a1: " 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-17-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.