Skip to contentSkip to conversation

Move headers from dt-bindings/clk to clock

PATCH Applied Lukas Bulwahn 5 participants 9 messages Jun 13, 2022 – Aug 22, 2022

Subsystems (7)
lore
Share & tools
lore
#0 lore raw

cover Move headers from dt-bindings/clk to clock

Michael, Stephen,

I was investigating the state of ownership of the files in include/dt-bindings/ according to the MAINTAINERS file and noticed that there are two directories, clk and clock, that contain the include files for clock drivers mentioned in dt-bindings.

It seems that by mistake, files were added to include/dt-bindings/clk/ instead of include/dt-bindings/clock/ where the majority of files are located.

In the past, others already took care of moving some files from clk to clock in the 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").

This patch series repeats this activity of moving files from clk to clock for the latest state of the kernel repository.

Michael, Stephen, please pick this minor clean-up patches into your common clock tree.

The references that needed to be adapted was identified with git grep; I have not compile-tested these patches and I am relying that the specific compile-test builds for these drivers will detect any potential issues with this refactoring.

Joe, I was also considering to create a rule in checkpatch.pl to check if a patch creates some file in and warn about it. What do you think? You think this is worth a rule in checkpatch? If so, I will create a first RFC patch for such a rule.

Best regards,

Lukas

Lukas Bulwahn (2):
dt-bindings: clock: Move lochnagar.h to dt-bindings/clock
dt-bindings: clock: Move versaclock.h to dt-bindings/clock

 Documentation/devicetree/bindings/clock/idt,versaclock5.yaml | 4 ++--
 Documentation/devicetree/bindings/mfd/cirrus,lochnagar.yaml  | 2 +-
 MAINTAINERS                                                  | 2 +-
 arch/arm64/boot/dts/renesas/beacon-renesom-baseboard.dtsi    | 2 +-
 arch/arm64/boot/dts/renesas/beacon-renesom-som.dtsi          | 2 +-
 drivers/clk/clk-lochnagar.c                                  | 2 +-
 drivers/clk/clk-versaclock5.c                                | 2 +-
 include/dt-bindings/{clk => clock}/lochnagar.h               | 0
 include/dt-bindings/{clk => clock}/versaclock.h              | 0
 9 files changed, 8 insertions(+), 8 deletions(-)
 rename include/dt-bindings/{clk => clock}/lochnagar.h (100%)
 rename include/dt-bindings/{clk => clock}/versaclock.h (100%)
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/2 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").

---
 Documentation/devicetree/bindings/mfd/cirrus,lochnagar.yaml | 2 +-
 MAINTAINERS                                                 | 2 +-
 drivers/clk/clk-lochnagar.c                                 | 2 +-
 include/dt-bindings/{clk => clock}/lochnagar.h              | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename include/dt-bindings/{clk => clock}/lochnagar.h (100%)
Documentation/devicetree/bindings/mfd/cirrus,lochnagar.yaml +1 -1
index ad285cb480c9..ef4814ced8db 100644
@@ -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>;
MAINTAINERS +1 -1
index 91e9cd30326d..86e6198b206f 100644
@@ -4801,7 +4801,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
drivers/clk/clk-lochnagar.c +1 -1
index 565bcd0cdde9..80944bf482e9 100644
@@ -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)
 
include/dt-bindings/clock/lochnagar.h renamed from include/dt-bindings/clk/lochnagar.h +0 -0
similarity index 100%
rename from include/dt-bindings/clk/lochnagar.h
rename to include/dt-bindings/clock/lochnagar.h
Signature · 1 line
2.17.1
#5 lore raw

PATCH 2/2 dt-bindings: clock: Move versaclock.h to dt-bindings/clock

In reply to Lukas Bulwahn

Most of the clock related dt-binding header files are located in dt-bindings/clock folder. 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").

---
 Documentation/devicetree/bindings/clock/idt,versaclock5.yaml | 4 ++--
 arch/arm64/boot/dts/renesas/beacon-renesom-baseboard.dtsi    | 2 +-
 arch/arm64/boot/dts/renesas/beacon-renesom-som.dtsi          | 2 +-
 drivers/clk/clk-versaclock5.c                                | 2 +-
 include/dt-bindings/{clk => clock}/versaclock.h              | 0
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename include/dt-bindings/{clk => clock}/versaclock.h (100%)
Documentation/devicetree/bindings/clock/idt,versaclock5.yaml +2 -2
index 7c331bfbe370..c1b838524064 100644
@@ -108,7 +108,7 @@ patternProperties:
     properties:
       idt,mode:
         description:
-          The output drive mode. Values defined in dt-bindings/clk/versaclock.h
+          The output drive mode. Values defined in dt-bindings/clock/versaclock.h
         $ref: /schemas/types.yaml#/definitions/uint32
         minimum: 0
         maximum: 6
@@ -151,7 +151,7 @@ additionalProperties: false
 
 examples:
   - |
-    #include <dt-bindings/clk/versaclock.h>
+    #include <dt-bindings/clock/versaclock.h>
 
     /* 25MHz reference crystal */
     ref25: ref25m {
arch/arm64/boot/dts/renesas/beacon-renesom-baseboard.dtsi +1 -1
index 63e7a39e100e..8166e3c1ff4e 100644
@@ -5,7 +5,7 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
-#include <dt-bindings/clk/versaclock.h>
+#include <dt-bindings/clock/versaclock.h>
 
 / {
 	backlight_lvds: backlight-lvds {
arch/arm64/boot/dts/renesas/beacon-renesom-som.dtsi +1 -1
index f5c1d74b738b..d3fc8ffd5b4c 100644
@@ -4,7 +4,7 @@
  */
 
 #include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/clk/versaclock.h>
+#include <dt-bindings/clock/versaclock.h>
 
 / {
 	memory@48000000 {
drivers/clk/clk-versaclock5.c +1 -1
index e7be3e54b9be..b8c556dbeba0 100644
@@ -24,7 +24,7 @@
 #include <linux/regmap.h>
 #include <linux/slab.h>
 
-#include <dt-bindings/clk/versaclock.h>
+#include <dt-bindings/clock/versaclock.h>
 
 /* VersaClock5 registers */
 #define VC5_OTP_CONTROL				0x00
include/dt-bindings/clock/versaclock.h renamed from include/dt-bindings/clk/versaclock.h +0 -0
similarity index 100%
rename from include/dt-bindings/clk/versaclock.h
rename to include/dt-bindings/clock/versaclock.h
Signature · 1 line
2.17.1
maintainer Acked-by on v1 1/2
#2 lore raw

Re: [PATCH 1/2] dt-bindings: clock: Move lochnagar.h to dt-bindings/clock

In reply to Lukas Bulwahn
Quoted 7 lines · Lukas Bulwahn

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.

Quoted 6 lines

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").

---

Thanks,
Charles

maintainer Reviewed-by Reviewed-by on v1 2/2
#6 lore raw

Re: [PATCH 2/2] dt-bindings: clock: Move versaclock.h to dt-bindings/clock

In reply to Lukas Bulwahn

Hi Lukas,

Quoted 4 lines · Lukas Bulwahn

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

Quoted 8 lines

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").

(I'm switching to the Bootlin address, patches are out but the MAINTAINERS one is not yet on master(

Signature · 1 line
Luca
maintainer Acked-by on v1 1/2
#3 lore raw

Re: [PATCH 1/2] dt-bindings: clock: Move lochnagar.h to dt-bindings/clock

In reply to Lukas Bulwahn
Quoted 11 lines · Lukas Bulwahn

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").

Quoted 9 lines
---
 Documentation/devicetree/bindings/mfd/cirrus,lochnagar.yaml | 2 +-
 MAINTAINERS                                                 | 2 +-
 drivers/clk/clk-lochnagar.c                                 | 2 +-
 include/dt-bindings/{clk => clock}/lochnagar.h              | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename include/dt-bindings/{clk => clock}/lochnagar.h (100%)
maintainer Acked-by on v1 2/2
#7 lore raw

Re: [PATCH 2/2] dt-bindings: clock: Move versaclock.h to dt-bindings/clock

In reply to Lukas Bulwahn
Quoted 12 lines · Lukas Bulwahn

Most of the clock related dt-binding header files are located in dt-bindings/clock folder. 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").

Quoted 9 lines
---
 Documentation/devicetree/bindings/clock/idt,versaclock5.yaml | 4 ++--
 arch/arm64/boot/dts/renesas/beacon-renesom-baseboard.dtsi    | 2 +-
 arch/arm64/boot/dts/renesas/beacon-renesom-som.dtsi          | 2 +-
 drivers/clk/clk-versaclock5.c                                | 2 +-
 include/dt-bindings/{clk => clock}/versaclock.h              | 0
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename include/dt-bindings/{clk => clock}/versaclock.h (100%)
maintainer Applied
#4 lore raw

Re: [PATCH 1/2] dt-bindings: clock: Move lochnagar.h to dt-bindings/clock

In reply to Lukas Bulwahn

Quoting Lukas Bulwahn (2022-06-13 01:16:31)

Quoted 7 lines

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.

Quoted 6 lines

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").

---

Applied to clk-next

maintainer Applied
#8 lore raw

Re: [PATCH 2/2] dt-bindings: clock: Move versaclock.h to dt-bindings/clock

In reply to Lukas Bulwahn

Quoting Lukas Bulwahn (2022-06-13 01:16:32)

Quoted 7 lines

Most of the clock related dt-binding header files are located in dt-bindings/clock folder. 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.

Quoted 6 lines

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").

---

Applied to clk-next