From 07ba3c2f28c2bf58aa6044ef02617309fb0a62ad Mon Sep 17 00:00:00 2001 From: Ulf Magnusson Date: Fri, 16 Aug 2019 09:53:49 +0200 Subject: [PATCH] dts: bindings: Rename clock.yaml to clock-controller.yaml Renaming bindings to consistently be called foo-controller.yaml for controllers and foo-device.yaml for devices (last one mostly makes sense for devices on buses and the like). I was thinking of having a plain foo.yaml be the controller as well, but !include interrupt.yaml reads much worse than !include interrupt-controller.yaml Another advantage of this approach is that no binding changes meaning (which could be risky). It's just adding suffixes to filenames. Signed-off-by: Ulf Magnusson --- dts/bindings/arm/nxp,kinetis-mcg.yaml | 2 +- dts/bindings/arm/nxp,kinetis-pcc.yaml | 2 +- dts/bindings/arm/nxp,kinetis-scg.yaml | 2 +- dts/bindings/clock/{clock.yaml => clock-controller.yaml} | 0 dts/bindings/clock/fixed-clock.yaml | 2 +- dts/bindings/clock/nxp,imx-ccm.yaml | 2 +- dts/bindings/clock/st,stm32-rcc.yaml | 2 +- dts/bindings/riscv/openisa,rv32m1-pcc.yaml | 2 +- 8 files changed, 7 insertions(+), 7 deletions(-) rename dts/bindings/clock/{clock.yaml => clock-controller.yaml} (100%) diff --git a/dts/bindings/arm/nxp,kinetis-mcg.yaml b/dts/bindings/arm/nxp,kinetis-mcg.yaml index 92f51800789..106d6643dea 100644 --- a/dts/bindings/arm/nxp,kinetis-mcg.yaml +++ b/dts/bindings/arm/nxp,kinetis-mcg.yaml @@ -10,7 +10,7 @@ description: > This is a representation of the NXP Kinetis MCG IP node inherits: - !include [clock.yaml, base.yaml] + !include [clock-controller.yaml, base.yaml] properties: compatible: diff --git a/dts/bindings/arm/nxp,kinetis-pcc.yaml b/dts/bindings/arm/nxp,kinetis-pcc.yaml index 52049d1cec2..d1d6c62c700 100644 --- a/dts/bindings/arm/nxp,kinetis-pcc.yaml +++ b/dts/bindings/arm/nxp,kinetis-pcc.yaml @@ -10,7 +10,7 @@ description: > This is a representation of the NXP Kinetis PCC IP node inherits: - !include [clock.yaml, base.yaml] + !include [clock-controller.yaml, base.yaml] properties: compatible: diff --git a/dts/bindings/arm/nxp,kinetis-scg.yaml b/dts/bindings/arm/nxp,kinetis-scg.yaml index e1ddf004cab..91a522344ab 100644 --- a/dts/bindings/arm/nxp,kinetis-scg.yaml +++ b/dts/bindings/arm/nxp,kinetis-scg.yaml @@ -10,7 +10,7 @@ description: > This is a representation of the NXP Kinetis SCG IP node inherits: - !include [clock.yaml, base.yaml] + !include [clock-controller.yaml, base.yaml] properties: compatible: diff --git a/dts/bindings/clock/clock.yaml b/dts/bindings/clock/clock-controller.yaml similarity index 100% rename from dts/bindings/clock/clock.yaml rename to dts/bindings/clock/clock-controller.yaml diff --git a/dts/bindings/clock/fixed-clock.yaml b/dts/bindings/clock/fixed-clock.yaml index c7a43a86827..1db7554ad73 100644 --- a/dts/bindings/clock/fixed-clock.yaml +++ b/dts/bindings/clock/fixed-clock.yaml @@ -10,7 +10,7 @@ description: > This is a representation of a generic fixed rate clock provider. inherits: - !include clock.yaml + !include clock-controller.yaml properties: compatible: diff --git a/dts/bindings/clock/nxp,imx-ccm.yaml b/dts/bindings/clock/nxp,imx-ccm.yaml index c95c1b04851..dd3f8e52d39 100644 --- a/dts/bindings/clock/nxp,imx-ccm.yaml +++ b/dts/bindings/clock/nxp,imx-ccm.yaml @@ -10,7 +10,7 @@ description: > This is a representation of the i.MX CCM IP node inherits: - !include [clock.yaml, base.yaml] + !include [clock-controller.yaml, base.yaml] properties: compatible: diff --git a/dts/bindings/clock/st,stm32-rcc.yaml b/dts/bindings/clock/st,stm32-rcc.yaml index c127107b276..52cd93f7541 100644 --- a/dts/bindings/clock/st,stm32-rcc.yaml +++ b/dts/bindings/clock/st,stm32-rcc.yaml @@ -4,7 +4,7 @@ description: > This binding gives a base representation of the STM32 Clock control inherits: - !include [clock.yaml, base.yaml] + !include [clock-controller.yaml, base.yaml] properties: compatible: diff --git a/dts/bindings/riscv/openisa,rv32m1-pcc.yaml b/dts/bindings/riscv/openisa,rv32m1-pcc.yaml index 52227142ec0..db0d53d78c9 100644 --- a/dts/bindings/riscv/openisa,rv32m1-pcc.yaml +++ b/dts/bindings/riscv/openisa,rv32m1-pcc.yaml @@ -10,7 +10,7 @@ description: > This is a representation of the RV32M1 PCC IP node inherits: - !include [clock.yaml, base.yaml] + !include [clock-controller.yaml, base.yaml] properties: compatible: