'bus' and 'ip' are sufficient because naming is local to the module.
As the bindings have not made a release yet, rename the cmu_misc
clock-names.
Fixes: 0a910f160638 ("dt-bindings: clock: Add Google gs101 clock management unit bindings")
Suggested-by: Rob Herring <[email protected]>
Signed-off-by: Tudor Ambarus <[email protected]>
---
.../devicetree/bindings/clock/google,gs101-clock.yaml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/clock/google,gs101-clock.yaml b/Documentation/devicetree/bindings/clock/google,gs101-clock.yaml
index 3eebc03a309b..ca7fdada3ff2 100644
--- a/Documentation/devicetree/bindings/clock/google,gs101-clock.yaml
+++ b/Documentation/devicetree/bindings/clock/google,gs101-clock.yaml
@@ -85,8 +85,8 @@ allOf:
clock-names:
items:
- - const: dout_cmu_misc_bus
- - const: dout_cmu_misc_sss
+ - const: bus
+ - const: sss
additionalProperties: false
--
2.43.0.472.g3155946c3a-goog
The cmu_misc clock-names were renamed to just "bus" and "sss" because
naming is local to the module, so cmu_misc is implied. As the bindings
and the device tree have not made a release yet, comply with the
renamed clocks.
Suggested-by: Rob Herring <[email protected]>
Signed-off-by: Tudor Ambarus <[email protected]>
---
arch/arm64/boot/dts/exynos/google/gs101.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/exynos/google/gs101.dtsi b/arch/arm64/boot/dts/exynos/google/gs101.dtsi
index 9747cb3fa03a..d838e3a7af6e 100644
--- a/arch/arm64/boot/dts/exynos/google/gs101.dtsi
+++ b/arch/arm64/boot/dts/exynos/google/gs101.dtsi
@@ -289,7 +289,7 @@ cmu_misc: clock-controller@10010000 {
#clock-cells = <1>;
clocks = <&cmu_top CLK_DOUT_CMU_MISC_BUS>,
<&cmu_top CLK_DOUT_CMU_MISC_SSS>;
- clock-names = "dout_cmu_misc_bus", "dout_cmu_misc_sss";
+ clock-names = "bus", "sss";
};
watchdog_cl0: watchdog@10060000 {
--
2.43.0.472.g3155946c3a-goog
Hi Tudor,
> diff --git a/arch/arm64/boot/dts/exynos/google/gs101.dtsi b/arch/arm64/boot/dts/exynos/google/gs101.dtsi
> index 9747cb3fa03a..d838e3a7af6e 100644
> --- a/arch/arm64/boot/dts/exynos/google/gs101.dtsi
> +++ b/arch/arm64/boot/dts/exynos/google/gs101.dtsi
> @@ -289,7 +289,7 @@ cmu_misc: clock-controller@10010000 {
> #clock-cells = <1>;
> clocks = <&cmu_top CLK_DOUT_CMU_MISC_BUS>,
> <&cmu_top CLK_DOUT_CMU_MISC_SSS>;
> - clock-names = "dout_cmu_misc_bus", "dout_cmu_misc_sss";
> + clock-names = "bus", "sss";
> };
>
With this change, parent clock enablement fails, and we get:
exynos_arm64_register_cmu: could not enable bus clock dout_cmu_misc_bus; err = -2
during boot.
Cheers,
Andre'
On 12/21/23 09:00, Tudor Ambarus wrote:
> The cmu_misc clock-names were renamed to just "bus" and "sss" because
> naming is local to the module, so cmu_misc is implied. As the bindings
> and the device tree have not made a release yet, comply with the
> renamed clocks.
>
> Suggested-by: Rob Herring <[email protected]>
> Signed-off-by: Tudor Ambarus <[email protected]>
> ---
> arch/arm64/boot/dts/exynos/google/gs101.dtsi | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm64/boot/dts/exynos/google/gs101.dtsi b/arch/arm64/boot/dts/exynos/google/gs101.dtsi
> index 9747cb3fa03a..d838e3a7af6e 100644
> --- a/arch/arm64/boot/dts/exynos/google/gs101.dtsi
> +++ b/arch/arm64/boot/dts/exynos/google/gs101.dtsi
> @@ -289,7 +289,7 @@ cmu_misc: clock-controller@10010000 {
> #clock-cells = <1>;
> clocks = <&cmu_top CLK_DOUT_CMU_MISC_BUS>,
> <&cmu_top CLK_DOUT_CMU_MISC_SSS>;
> - clock-names = "dout_cmu_misc_bus", "dout_cmu_misc_sss";
> + clock-names = "bus", "sss";
> };
>
> watchdog_cl0: watchdog@10060000 {
argh, please ignore the patch set. It seems that the clock driver has to
be updated as well:
[ 0.050947] exynos_arm64_register_cmu: could not enable bus clock
dout_cmu_misc_bus; err = -2
[ 0.052385] exynos_arm64_register_cmu: could not enable bus clock
dout_cmu_peric0_bus; err = -2