dt-bindings: clock: Move lochnagar.h to dt-bindings/clock

Most of the clock-related dt-binding header files are located in
include/dt-bindings/clock. It would be good to keep all the similar
header files at a single location.

This was discovered while investigating the state of ownership of the files
in include/dt-bindings/ according to the MAINTAINERS file.

This change here is similar to commit 8e28918a85a0 ("dt-bindings: clock:
Move ti-dra7-atl.h to dt-bindings/clock") and commit 35d35aae8177
("dt-bindings: clock: Move at91.h to dt-bindigs/clock").

Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
Link: https://lore.kernel.org/r/20220613081632.2159-2-lukas.bulwahn@gmail.com
Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>

diff --git a/Documentation/devicetree/bindings/mfd/cirrus,lochnagar.yaml b/Documentation/devicetree/bindings/mfd/cirrus,lochnagar.yaml
index ad285cb..ef4814c 100644 (file)
--- a/Documentation/devicetree/bindings/mfd/cirrus,lochnagar.yaml
+++ b/Documentation/devicetree/bindings/mfd/cirrus,lochnagar.yaml
@@ -261,7 +261,7 @@ additionalProperties: false
 
 examples:
   - |
-    #include <dt-bindings/clk/lochnagar.h>
+    #include <dt-bindings/clock/lochnagar.h>
     #include <dt-bindings/pinctrl/lochnagar.h>
     i2c@e0004000 {
         #address-cells = <1>;

diff --git a/MAINTAINERS b/MAINTAINERS
index 8a5012b..160a40e 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4957,7 +4957,7 @@ F:        drivers/hwmon/lochnagar-hwmon.c
 F:     drivers/mfd/lochnagar-i2c.c
 F:     drivers/pinctrl/cirrus/pinctrl-lochnagar.c
 F:     drivers/regulator/lochnagar-regulator.c
-F:     include/dt-bindings/clk/lochnagar.h
+F:     include/dt-bindings/clock/lochnagar.h
 F:     include/dt-bindings/pinctrl/lochnagar.h
 F:     include/linux/mfd/lochnagar*
 F:     sound/soc/codecs/lochnagar-sc.c

diff --git a/drivers/clk/clk-lochnagar.c b/drivers/clk/clk-lochnagar.c
index 565bcd0..80944bf 100644 (file)
--- a/drivers/clk/clk-lochnagar.c
+++ b/drivers/clk/clk-lochnagar.c
@@ -19,7 +19,7 @@
 #include <linux/mfd/lochnagar1_regs.h>
 #include <linux/mfd/lochnagar2_regs.h>
 
-#include <dt-bindings/clk/lochnagar.h>
+#include <dt-bindings/clock/lochnagar.h>
 
 #define LOCHNAGAR_NUM_CLOCKS   (LOCHNAGAR_SPDIF_CLKOUT + 1)
 

diff --git a/include/dt-bindings/clk/lochnagar.h b/include/dt-bindings/clk/lochnagar.h
deleted file mode 100644 (file)
index 8fa2055..0000000
--- a/include/dt-bindings/clk/lochnagar.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * Device Tree defines for Lochnagar clocking
- *
- * Copyright (c) 2017-2018 Cirrus Logic, Inc. and
- *                         Cirrus Logic International Semiconductor Ltd.
- *
- * Author: Charles Keepax <ckeepax@opensource.cirrus.com>
- */
-
-#ifndef DT_BINDINGS_CLK_LOCHNAGAR_H
-#define DT_BINDINGS_CLK_LOCHNAGAR_H
-
-#define LOCHNAGAR_CDC_MCLK1            0
-#define LOCHNAGAR_CDC_MCLK2            1
-#define LOCHNAGAR_DSP_CLKIN            2
-#define LOCHNAGAR_GF_CLKOUT1           3
-#define LOCHNAGAR_GF_CLKOUT2           4
-#define LOCHNAGAR_PSIA1_MCLK           5
-#define LOCHNAGAR_PSIA2_MCLK           6
-#define LOCHNAGAR_SPDIF_MCLK           7
-#define LOCHNAGAR_ADAT_MCLK            8
-#define LOCHNAGAR_SOUNDCARD_MCLK       9
-#define LOCHNAGAR_SPDIF_CLKOUT         10
-
-#endif

diff --git a/include/dt-bindings/clock/lochnagar.h b/include/dt-bindings/clock/lochnagar.h
new file mode 100644 (file)
index 0000000..8fa2055
--- /dev/null
+++ b/include/dt-bindings/clock/lochnagar.h
@@ -0,0 +1,26 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Device Tree defines for Lochnagar clocking
+ *
+ * Copyright (c) 2017-2018 Cirrus Logic, Inc. and
+ *                         Cirrus Logic International Semiconductor Ltd.
+ *
+ * Author: Charles Keepax <ckeepax@opensource.cirrus.com>
+ */
+
+#ifndef DT_BINDINGS_CLK_LOCHNAGAR_H
+#define DT_BINDINGS_CLK_LOCHNAGAR_H
+
+#define LOCHNAGAR_CDC_MCLK1            0
+#define LOCHNAGAR_CDC_MCLK2            1
+#define LOCHNAGAR_DSP_CLKIN            2
+#define LOCHNAGAR_GF_CLKOUT1           3
+#define LOCHNAGAR_GF_CLKOUT2           4
+#define LOCHNAGAR_PSIA1_MCLK           5
+#define LOCHNAGAR_PSIA2_MCLK           6
+#define LOCHNAGAR_SPDIF_MCLK           7
+#define LOCHNAGAR_ADAT_MCLK            8
+#define LOCHNAGAR_SOUNDCARD_MCLK       9
+#define LOCHNAGAR_SPDIF_CLKOUT         10
+
+#endif