arm64: tegra: Add clock-cells property to Tegra PMC node

Tegra132 and Tegra210 PMC blocks have clk_out_1, clk_out_2, clk_out_3,
and a blink clock as a part of the PMC.

These clocks were erroneously provided by the clock and reset controller
and are now provided by the PMC instead because that's where the primary
controls are.

Clock IDs for these clocks are defined in the PMC dt-bindings.

This patch updates the device tree to include the PMC dt-bindings header
and adds the #clock-cells property with one clock specifier to the PMC
node.

Reviewed-by: Dmitry Osipenko <digetx@gmail.com>
Signed-off-by: Sowjanya Komatineni <skomatineni@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>

diff --git a/arch/arm64/boot/dts/nvidia/tegra132.dtsi b/arch/arm64/boot/dts/nvidia/tegra132.dtsi
index 6238e6e274b4b09c7e226e7b1fa77cd998613941..11a1bb428595a8b6780d623a377d706f46d6b68b 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra132.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra132.dtsi
@@ -6,6 +6,7 @@
 #include <dt-bindings/pinctrl/pinctrl-tegra-xusb.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/thermal/tegra124-soctherm.h>
+#include <dt-bindings/soc/tegra-pmc.h>
 
 / {
        compatible = "nvidia,tegra132", "nvidia,tegra124";
@@ -577,11 +578,12 @@
                clock-names = "rtc";
        };
 
-       pmc@7000e400 {
+       tegra_pmc: pmc@7000e400 {
                compatible = "nvidia,tegra124-pmc";
                reg = <0x0 0x7000e400 0x0 0x400>;
                clocks = <&tegra_car TEGRA124_CLK_PCLK>, <&clk32k_in>;
                clock-names = "pclk", "clk32k_in";
+               #clock-cells = <1>;
        };
 
        fuse@7000f800 {

diff --git a/arch/arm64/boot/dts/nvidia/tegra210.dtsi b/arch/arm64/boot/dts/nvidia/tegra210.dtsi
index dfce47b4c6577833422d72c8da6c7e3251157799..64c46ce3849dd5e1edc392ac64305734b7697fd8 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra210.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra210.dtsi
@@ -7,6 +7,7 @@
 #include <dt-bindings/reset/tegra210-car.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/thermal/tegra124-soctherm.h>
+#include <dt-bindings/soc/tegra-pmc.h>
 
 / {
        compatible = "nvidia,tegra210";
@@ -770,16 +771,17 @@
                compatible = "nvidia,tegra210-rtc", "nvidia,tegra20-rtc";
                reg = <0x0 0x7000e000 0x0 0x100>;
                interrupts = <16 IRQ_TYPE_LEVEL_HIGH>;
-               interrupt-parent = <&pmc>;
+               interrupt-parent = <&tegra_pmc>;
                clocks = <&tegra_car TEGRA210_CLK_RTC>;
                clock-names = "rtc";
        };
 
-       pmc: pmc@7000e400 {
+       tegra_pmc: pmc@7000e400 {
                compatible = "nvidia,tegra210-pmc";
                reg = <0x0 0x7000e400 0x0 0x400>;
                clocks = <&tegra_car TEGRA210_CLK_PCLK>, <&clk32k_in>;
                clock-names = "pclk", "clk32k_in";
+               #clock-cells = <1>;
                #interrupt-cells = <2>;
                interrupt-controller;