devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 18/19] clk: meson: meson8b: move bindings include to main driver
Date: Mon, 12 Jun 2023 11:57:35 +0200	[thread overview]
Message-ID: <20230607-topic-amlogic-upstream-clkid-public-migration-v2-18-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/meson8b.c | 3 +++
 drivers/clk/meson/meson8b.h | 7 -------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/drivers/clk/meson/meson8b.c b/drivers/clk/meson/meson8b.c
index cea246daea39..b7417ac262d3 100644
--- a/drivers/clk/meson/meson8b.c
+++ b/drivers/clk/meson/meson8b.c
@@ -22,6 +22,9 @@
 #include "clk-pll.h"
 #include "clk-mpll.h"
 
+#include <dt-bindings/clock/meson8b-clkc.h>
+#include <dt-bindings/reset/amlogic,meson8b-clkc-reset.h>
+
 static DEFINE_SPINLOCK(meson_clk_lock);
 
 struct meson8b_clk_reset {
diff --git a/drivers/clk/meson/meson8b.h b/drivers/clk/meson/meson8b.h
index 2a9c4fe29ca2..a5b6e67eeefb 100644
--- a/drivers/clk/meson/meson8b.h
+++ b/drivers/clk/meson/meson8b.h
@@ -77,11 +77,4 @@
 #define HHI_MPLL_CNTL9			0x2A0 /* 0xa8 offset in data sheet */
 #define HHI_MPLL_CNTL10			0x2A4 /* 0xa9 offset in data sheet */
 
-/*
- * include the CLKID and RESETID that have
- * been made part of the stable DT binding
- */
-#include <dt-bindings/clock/meson8b-clkc.h>
-#include <dt-bindings/reset/amlogic,meson8b-clkc-reset.h>
-
 #endif /* __MESON8B_H */

-- 
2.34.1


  parent reply	other threads:[~2023-06-12 10:19 UTC|newest]

Thread overview: 26+ 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 ` [PATCH v2 01/19] clk: meson: introduce meson-clkc-utils Neil Armstrong
2023-07-12 12:03   ` Jerome Brunet
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 ` [PATCH v2 03/19] clk: meson: migrate meson-aoclk " Neil Armstrong
2023-06-12  9:57 ` [PATCH v2 04/19] clk: meson: migrate a1 clock drivers " Neil Armstrong
2023-06-22 13:07   ` 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 ` [PATCH v2 06/19] clk: meson: migrate axg-audio " 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 ` [PATCH v2 08/19] dt-bindings: clk: axg-clkc: " Neil Armstrong
2023-06-12  9:57 ` [PATCH v2 09/19] dt-bindings: clk: g12a-clks: " Neil Armstrong
2023-06-12  9:57 ` [PATCH v2 10/19] dt-bindings: clk: g12a-aoclkc: " Neil Armstrong
2023-06-12  9:57 ` [PATCH v2 11/19] dt-bindings: clk: meson8b-clkc: " 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 ` [PATCH v2 13/19] dt-bindings: clk: amlogic,a1-pll-clkc: " Neil Armstrong
2023-06-12  9:57 ` [PATCH v2 14/19] dt-bindings: clk: axg-audio-clkc: " 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 ` [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-22 13:02   ` Dmitry Rokosov
2023-06-12  9:57 ` Neil Armstrong [this message]
2023-06-12  9:57 ` [PATCH v2 19/19] clk: meson: axg-audio: " 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

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-18-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: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).