Skip to contentSkip to conversation

Move header files from dt-bindings/clk to dt-bindings/clock

PATCH New Tushar Behera 7 participants 12 messages Mar 6, 2014 – Apr 18, 2014

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

cover Move header files from dt-bindings/clk to dt-bindings/clock

Clock related headers files are mostly located in include/dt-bindings/clock folder. There are only 2 header files left in include/dt-bindings/clk. Move them to the most used folder.

All changes related to a single file movement are contained in a single patch to avoid any build breakage.

The patches are based next-20140305.

Tushar Behera (2):
dt-bindings: clock: Move at91.h to dt-bindigs/clock
dt-bindings: clock: Move exynos-audss-clk.h to dt-bindings/clock

 .../devicetree/bindings/clock/at91-clock.txt       |    2 +-
 arch/arm/boot/dts/exynos5250.dtsi                  |    2 +-
 arch/arm/boot/dts/exynos5420.dtsi                  |    2 +-
 arch/arm/boot/dts/sama5d3.dtsi                     |    2 +-
 arch/arm/boot/dts/sama5d3_mci2.dtsi                |    2 +-
 arch/arm/boot/dts/sama5d3_tcb1.dtsi                |    2 +-
 arch/arm/boot/dts/sama5d3_uart.dtsi                |    2 +-
 drivers/clk/samsung/clk-exynos-audss.c             |    2 +-
 include/dt-bindings/{clk => clock}/at91.h          |    0
 .../dt-bindings/{clk => clock}/exynos-audss-clk.h  |    0
 10 files changed, 8 insertions(+), 8 deletions(-)
 rename include/dt-bindings/{clk => clock}/at91.h (100%)
 rename include/dt-bindings/{clk => clock}/exynos-audss-clk.h (100%)
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/2 dt-bindings: clock: Move at91.h to dt-bindigs/clock

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.

CC Rob Landley <[email protected]>
CC Andrew Victor <[email protected]>
CC Jean-Christophe Plagniol-Villard <[email protected]>
---
 .../devicetree/bindings/clock/at91-clock.txt       |    2 +-
 arch/arm/boot/dts/sama5d3.dtsi                     |    2 +-
 arch/arm/boot/dts/sama5d3_mci2.dtsi                |    2 +-
 arch/arm/boot/dts/sama5d3_tcb1.dtsi                |    2 +-
 arch/arm/boot/dts/sama5d3_uart.dtsi                |    2 +-
 include/dt-bindings/{clk => clock}/at91.h          |    0
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename include/dt-bindings/{clk => clock}/at91.h (100%)
Documentation/devicetree/bindings/clock/at91-clock.txt +1 -1
index cd5e239..6794cdc 100644
@@ -62,7 +62,7 @@ Required properties for PMC node:
 - interrupt-controller : tell that the PMC is an interrupt controller.
 - #interrupt-cells : must be set to 1. The first cell encodes the interrupt id,
 	and reflect the bit position in the PMC_ER/DR/SR registers.
-	You can use the dt macros defined in dt-bindings/clk/at91.h.
+	You can use the dt macros defined in dt-bindings/clock/at91.h.
 	0 (AT91_PMC_MOSCS) -> main oscillator ready
 	1 (AT91_PMC_LOCKA) -> PLL A ready
 	2 (AT91_PMC_LOCKB) -> PLL B ready
arch/arm/boot/dts/sama5d3.dtsi +1 -1
index 3d5faf8..8c977b5 100644
@@ -13,7 +13,7 @@
 #include <dt-bindings/pinctrl/at91.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/clk/at91.h>
+#include <dt-bindings/clock/at91.h>
 
 / {
 	model = "Atmel SAMA5D3 family SoC";
arch/arm/boot/dts/sama5d3_mci2.dtsi +1 -1
index b029fe7..1b02208 100644
@@ -9,7 +9,7 @@
 
 #include <dt-bindings/pinctrl/at91.h>
 #include <dt-bindings/interrupt-controller/irq.h>
-#include <dt-bindings/clk/at91.h>
+#include <dt-bindings/clock/at91.h>
 
 / {
 	ahb {
arch/arm/boot/dts/sama5d3_tcb1.dtsi +1 -1
index 382b044..0284845 100644
@@ -9,7 +9,7 @@
 
 #include <dt-bindings/pinctrl/at91.h>
 #include <dt-bindings/interrupt-controller/irq.h>
-#include <dt-bindings/clk/at91.h>
+#include <dt-bindings/clock/at91.h>
 
 / {
 	aliases {
arch/arm/boot/dts/sama5d3_uart.dtsi +1 -1
index a9fa75e..7a8d4c6 100644
@@ -9,7 +9,7 @@
 
 #include <dt-bindings/pinctrl/at91.h>
 #include <dt-bindings/interrupt-controller/irq.h>
-#include <dt-bindings/clk/at91.h>
+#include <dt-bindings/clock/at91.h>
 
 / {
 	aliases {
include/dt-bindings/clock/at91.h renamed from include/dt-bindings/clk/at91.h +0 -0
similarity index 100%
rename from include/dt-bindings/clk/at91.h
rename to include/dt-bindings/clock/at91.h
Signature · 1 line
1.7.9.5
#2 lore raw

PATCH 1/2 dt-bindings: clock: Move at91.h to dt-bindigs/clock

Le 06/03/2014 07:04, Tushar Behera a ?crit :

Quoted 3 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.

It seems I chose the wrong place when I decided to put at91 macros in this directory :-)

Quoted 2 lines
Quoted 82 lines
CC Rob Landley <[email protected]>
CC Andrew Victor <[email protected]>
CC Jean-Christophe Plagniol-Villard <[email protected]>
---
  .../devicetree/bindings/clock/at91-clock.txt       |    2 +-
  arch/arm/boot/dts/sama5d3.dtsi                     |    2 +-
  arch/arm/boot/dts/sama5d3_mci2.dtsi                |    2 +-
  arch/arm/boot/dts/sama5d3_tcb1.dtsi                |    2 +-
  arch/arm/boot/dts/sama5d3_uart.dtsi                |    2 +-
  include/dt-bindings/{clk => clock}/at91.h          |    0
  6 files changed, 5 insertions(+), 5 deletions(-)

rename include/dt-bindings/{clk => clock}/at91.h (100%)

Documentation/devicetree/bindings/clock/at91-clock.txt +1 -1
index cd5e239..6794cdc 100644
@@ -62,7 +62,7 @@ Required properties for PMC node:
  - interrupt-controller : tell that the PMC is an interrupt controller.
  - #interrupt-cells : must be set to 1. The first cell encodes the interrupt id,
  	and reflect the bit position in the PMC_ER/DR/SR registers.
-	You can use the dt macros defined in dt-bindings/clk/at91.h.
+	You can use the dt macros defined in dt-bindings/clock/at91.h.
  	0 (AT91_PMC_MOSCS) -> main oscillator ready
  	1 (AT91_PMC_LOCKA) -> PLL A ready
  	2 (AT91_PMC_LOCKB) -> PLL B ready
arch/arm/boot/dts/sama5d3.dtsi +1 -1
index 3d5faf8..8c977b5 100644
@@ -13,7 +13,7 @@
  #include <dt-bindings/pinctrl/at91.h>
  #include <dt-bindings/interrupt-controller/irq.h>
  #include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/clk/at91.h>
+#include <dt-bindings/clock/at91.h>
 
  / {
  	model = "Atmel SAMA5D3 family SoC";
arch/arm/boot/dts/sama5d3_mci2.dtsi +1 -1
index b029fe7..1b02208 100644
@@ -9,7 +9,7 @@
 
  #include <dt-bindings/pinctrl/at91.h>
  #include <dt-bindings/interrupt-controller/irq.h>
-#include <dt-bindings/clk/at91.h>
+#include <dt-bindings/clock/at91.h>
 
  / {
  	ahb {
arch/arm/boot/dts/sama5d3_tcb1.dtsi +1 -1
index 382b044..0284845 100644
@@ -9,7 +9,7 @@
 
  #include <dt-bindings/pinctrl/at91.h>
  #include <dt-bindings/interrupt-controller/irq.h>
-#include <dt-bindings/clk/at91.h>
+#include <dt-bindings/clock/at91.h>
 
  / {
  	aliases {
arch/arm/boot/dts/sama5d3_uart.dtsi +1 -1
index a9fa75e..7a8d4c6 100644
@@ -9,7 +9,7 @@
 
  #include <dt-bindings/pinctrl/at91.h>
  #include <dt-bindings/interrupt-controller/irq.h>
-#include <dt-bindings/clk/at91.h>
+#include <dt-bindings/clock/at91.h>
 
  / {
  	aliases {
include/dt-bindings/clock/at91.h renamed from include/dt-bindings/clk/at91.h +0 -0
similarity index 100%
rename from include/dt-bindings/clk/at91.h
rename to include/dt-bindings/clock/at91.h
#3 lore raw

PATCH 1/2 dt-bindings: clock: Move at91.h to dt-bindigs/clock

In reply to Tushar Behera

On 06/03/2014 07:04, Tushar Behera :

Quoted 8 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.

CC Rob Landley <[email protected]>
CC Andrew Victor <[email protected]>
CC Jean-Christophe Plagniol-Villard <[email protected]>
Quoted 80 lines
---
 .../devicetree/bindings/clock/at91-clock.txt       |    2 +-
 arch/arm/boot/dts/sama5d3.dtsi                     |    2 +-
 arch/arm/boot/dts/sama5d3_mci2.dtsi                |    2 +-
 arch/arm/boot/dts/sama5d3_tcb1.dtsi                |    2 +-
 arch/arm/boot/dts/sama5d3_uart.dtsi                |    2 +-
 include/dt-bindings/{clk => clock}/at91.h          |    0
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename include/dt-bindings/{clk => clock}/at91.h (100%)
Documentation/devicetree/bindings/clock/at91-clock.txt +1 -1
index cd5e239..6794cdc 100644
@@ -62,7 +62,7 @@ Required properties for PMC node:
 - interrupt-controller : tell that the PMC is an interrupt controller.
 - #interrupt-cells : must be set to 1. The first cell encodes the interrupt id,
 	and reflect the bit position in the PMC_ER/DR/SR registers.
-	You can use the dt macros defined in dt-bindings/clk/at91.h.
+	You can use the dt macros defined in dt-bindings/clock/at91.h.
 	0 (AT91_PMC_MOSCS) -> main oscillator ready
 	1 (AT91_PMC_LOCKA) -> PLL A ready
 	2 (AT91_PMC_LOCKB) -> PLL B ready
arch/arm/boot/dts/sama5d3.dtsi +1 -1
index 3d5faf8..8c977b5 100644
@@ -13,7 +13,7 @@
 #include <dt-bindings/pinctrl/at91.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/clk/at91.h>
+#include <dt-bindings/clock/at91.h>
 
 / {
 	model = "Atmel SAMA5D3 family SoC";
arch/arm/boot/dts/sama5d3_mci2.dtsi +1 -1
index b029fe7..1b02208 100644
@@ -9,7 +9,7 @@
 
 #include <dt-bindings/pinctrl/at91.h>
 #include <dt-bindings/interrupt-controller/irq.h>
-#include <dt-bindings/clk/at91.h>
+#include <dt-bindings/clock/at91.h>
 
 / {
 	ahb {
arch/arm/boot/dts/sama5d3_tcb1.dtsi +1 -1
index 382b044..0284845 100644
@@ -9,7 +9,7 @@
 
 #include <dt-bindings/pinctrl/at91.h>
 #include <dt-bindings/interrupt-controller/irq.h>
-#include <dt-bindings/clk/at91.h>
+#include <dt-bindings/clock/at91.h>
 
 / {
 	aliases {
arch/arm/boot/dts/sama5d3_uart.dtsi +1 -1
index a9fa75e..7a8d4c6 100644
@@ -9,7 +9,7 @@
 
 #include <dt-bindings/pinctrl/at91.h>
 #include <dt-bindings/interrupt-controller/irq.h>
-#include <dt-bindings/clk/at91.h>
+#include <dt-bindings/clock/at91.h>
 
 / {
 	aliases {
include/dt-bindings/clock/at91.h renamed from include/dt-bindings/clk/at91.h +0 -0
similarity index 100%
rename from include/dt-bindings/clk/at91.h
rename to include/dt-bindings/clock/at91.h
Signature · 1 line
Nicolas Ferre
#4 lore raw

PATCH 1/2 dt-bindings: clock: Move at91.h to dt-bindigs/clock

In reply to Tushar Behera

On 06/03/2014 07:04, Tushar Behera :

Quoted 8 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.

CC Rob Landley <[email protected]>
CC Andrew Victor <[email protected]>
CC Jean-Christophe Plagniol-Villard <[email protected]>

I have just added at91sam9261 and at91sam9rl which appeared in 3.15 merge window and stacked this patch on top of at91-3.15-fixes.

I hope that it will be accepted for 3.15.

Bye,

Quoted 80 lines
---
 .../devicetree/bindings/clock/at91-clock.txt       |    2 +-
 arch/arm/boot/dts/sama5d3.dtsi                     |    2 +-
 arch/arm/boot/dts/sama5d3_mci2.dtsi                |    2 +-
 arch/arm/boot/dts/sama5d3_tcb1.dtsi                |    2 +-
 arch/arm/boot/dts/sama5d3_uart.dtsi                |    2 +-
 include/dt-bindings/{clk => clock}/at91.h          |    0
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename include/dt-bindings/{clk => clock}/at91.h (100%)
Documentation/devicetree/bindings/clock/at91-clock.txt +1 -1
index cd5e239..6794cdc 100644
@@ -62,7 +62,7 @@ Required properties for PMC node:
 - interrupt-controller : tell that the PMC is an interrupt controller.
 - #interrupt-cells : must be set to 1. The first cell encodes the interrupt id,
 	and reflect the bit position in the PMC_ER/DR/SR registers.
-	You can use the dt macros defined in dt-bindings/clk/at91.h.
+	You can use the dt macros defined in dt-bindings/clock/at91.h.
 	0 (AT91_PMC_MOSCS) -> main oscillator ready
 	1 (AT91_PMC_LOCKA) -> PLL A ready
 	2 (AT91_PMC_LOCKB) -> PLL B ready
arch/arm/boot/dts/sama5d3.dtsi +1 -1
index 3d5faf8..8c977b5 100644
@@ -13,7 +13,7 @@
 #include <dt-bindings/pinctrl/at91.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/clk/at91.h>
+#include <dt-bindings/clock/at91.h>
 
 / {
 	model = "Atmel SAMA5D3 family SoC";
arch/arm/boot/dts/sama5d3_mci2.dtsi +1 -1
index b029fe7..1b02208 100644
@@ -9,7 +9,7 @@
 
 #include <dt-bindings/pinctrl/at91.h>
 #include <dt-bindings/interrupt-controller/irq.h>
-#include <dt-bindings/clk/at91.h>
+#include <dt-bindings/clock/at91.h>
 
 / {
 	ahb {
arch/arm/boot/dts/sama5d3_tcb1.dtsi +1 -1
index 382b044..0284845 100644
@@ -9,7 +9,7 @@
 
 #include <dt-bindings/pinctrl/at91.h>
 #include <dt-bindings/interrupt-controller/irq.h>
-#include <dt-bindings/clk/at91.h>
+#include <dt-bindings/clock/at91.h>
 
 / {
 	aliases {
arch/arm/boot/dts/sama5d3_uart.dtsi +1 -1
index a9fa75e..7a8d4c6 100644
@@ -9,7 +9,7 @@
 
 #include <dt-bindings/pinctrl/at91.h>
 #include <dt-bindings/interrupt-controller/irq.h>
-#include <dt-bindings/clk/at91.h>
+#include <dt-bindings/clock/at91.h>
 
 / {
 	aliases {
include/dt-bindings/clock/at91.h renamed from include/dt-bindings/clk/at91.h +0 -0
similarity index 100%
rename from include/dt-bindings/clk/at91.h
rename to include/dt-bindings/clock/at91.h
Signature · 1 line
Nicolas Ferre
#5 lore raw

PATCH 2/2 dt-bindings: clock: Move exynos-audss-clk.h to dt-bindings/clock

In reply to Tushar Behera

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.

CC Kukjin Kim <[email protected]>
CC Tomasz Figa <[email protected]>
---
 arch/arm/boot/dts/exynos5250.dtsi                  |    2 +-
 arch/arm/boot/dts/exynos5420.dtsi                  |    2 +-
 drivers/clk/samsung/clk-exynos-audss.c             |    2 +-
 .../dt-bindings/{clk => clock}/exynos-audss-clk.h  |    0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename include/dt-bindings/{clk => clock}/exynos-audss-clk.h (100%)
arch/arm/boot/dts/exynos5250.dtsi +1 -1
index 8f6300f..2048012 100644
@@ -20,7 +20,7 @@
 #include "exynos5.dtsi"
 #include "exynos5250-pinctrl.dtsi"
 
-#include <dt-bindings/clk/exynos-audss-clk.h>
+#include <dt-bindings/clock/exynos-audss-clk.h>
 
 / {
 	compatible = "samsung,exynos5250";
arch/arm/boot/dts/exynos5420.dtsi +1 -1
index 45e2e65..64c7f6d 100644
@@ -16,7 +16,7 @@
 #include "exynos5.dtsi"
 #include "exynos5420-pinctrl.dtsi"
 
-#include <dt-bindings/clk/exynos-audss-clk.h>
+#include <dt-bindings/clock/exynos-audss-clk.h>
 
 / {
 	compatible = "samsung,exynos5420";
drivers/clk/samsung/clk-exynos-audss.c +1 -1
index 884187f..13eae14c 100644
@@ -17,7 +17,7 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 
-#include <dt-bindings/clk/exynos-audss-clk.h>
+#include <dt-bindings/clock/exynos-audss-clk.h>
 
 enum exynos_audss_clk_type {
 	TYPE_EXYNOS4210,
include/dt-bindings/clock/exynos-audss-clk.h renamed from include/dt-bindings/clk/exynos-audss-clk.h +0 -0
similarity index 100%
rename from include/dt-bindings/clk/exynos-audss-clk.h
rename to include/dt-bindings/clock/exynos-audss-clk.h
Signature · 1 line
1.7.9.5
#6 lore raw

PATCH 2/2 dt-bindings: clock: Move exynos-audss-clk.h to dt-bindings/clock

Quoted 8 lines · Tushar Behera

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.

CC Kukjin Kim <[email protected]>
CC Tomasz Figa <[email protected]>

---

Sensible move.

Now that the dt-bindings/clk folder is empty (with these 2 patches applied), it can be deleted as well.

Signature · 2 lines
With warm regards,
Sachin
#7 lore raw

PATCH 2/2 dt-bindings: clock: Move exynos-audss-clk.h to dt-bindings/clock

Quoted 5 lines · Sachin Kamat
Quoted 4 lines · Tushar Behera

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
Quoted 4 lines
CC Kukjin Kim <[email protected]>
CC Tomasz Figa <[email protected]>

---

Sensible move.

Thanks for the review.

Quoted 3 lines

Now that the dt-bindings/clk folder is empty (with these 2 patches applied), it can be deleted as well.

Sure, I will wait till both these patches are merged and send another patch for that later.

Quoted 3 lines

--
With warm regards,
Sachin

Signature · 1 line
Tushar Behera
#8 lore raw

PATCH 2/2 dt-bindings: clock: Move exynos-audss-clk.h to dt-bindings/clock

In reply to Tushar Behera
Quoted 7 lines · Tushar Behera

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.

CC Kukjin Kim <[email protected]>
CC Tomasz Figa <[email protected]>
Quoted 7 lines
---
  arch/arm/boot/dts/exynos5250.dtsi                  |    2 +-
  arch/arm/boot/dts/exynos5420.dtsi                  |    2 +-
  drivers/clk/samsung/clk-exynos-audss.c             |    2 +-
  .../dt-bindings/{clk => clock}/exynos-audss-clk.h  |    0
  4 files changed, 3 insertions(+), 3 deletions(-)

rename include/dt-bindings/{clk => clock}/exynos-audss-clk.h (100%)

Best regards,
Tomasz

#9 lore raw

PATCH 2/2 dt-bindings: clock: Move exynos-audss-clk.h to dt-bindings/clock

Quoted 7 lines · Tomasz Figa
Quoted 6 lines · Tushar Behera

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.

Or shall I take this into samsung tree?

Thanks,
Kukjin

Quoted 13 lines
Quoted 8 lines
CC Tomasz Figa <[email protected]>

---
arch/arm/boot/dts/exynos5250.dtsi | 2 +- arch/arm/boot/dts/exynos5420.dtsi | 2 +- drivers/clk/samsung/clk-exynos-audss.c | 2 +- .../dt-bindings/{clk => clock}/exynos-audss-clk.h | 0

4 files changed, 3 insertions(+), 3 deletions(-)

rename include/dt-bindings/{clk => clock}/exynos-audss-clk.h (100%)

Best regards,
Tomasz

#10 lore raw

PATCH 2/2 dt-bindings: clock: Move exynos-audss-clk.h to dt-bindings/clock

Quoted 6 lines · Kukjin Kim
Quoted 5 lines · Tomasz Figa
Quoted 4 lines · Tushar Behera

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 6 lines
Quoted 2 lines
Quoted 2 lines

Or shall I take this into samsung tree?

I guess so.

Or should this whole series go through DT tree?

Best regards,
Tomasz

#11 lore raw

PATCH 2/2 dt-bindings: clock: Move exynos-audss-clk.h to dt-bindings/clock

Quoted 10 lines · Tomasz Figa
Quoted 9 lines · Kukjin Kim
Quoted 7 lines · Tomasz Figa
Quoted 6 lines · Tushar Behera

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
Quoted 3 lines

Or shall I take this into samsung tree?

I guess so.

Or should this whole series go through DT tree?

OK, I've applied into samsung tree.

Thanks,
Kukjin