Commit 86614b5d authored by Sowjanya Komatineni's avatar Sowjanya Komatineni Committed by Thierry Reding

ARM: tegra: Add clock-cells property to PMC

Tegra PMC has clk_out_1, clk_out_2, clk_out_3, and blink clock.

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.

This patch adds #clock-cells property with 1 clock specifier to the
Tegra PMC node in device tree.
Tested-by: default avatarDmitry Osipenko <digetx@gmail.com>
Reviewed-by: default avatarDmitry Osipenko <digetx@gmail.com>
Signed-off-by: default avatarSowjanya Komatineni <skomatineni@nvidia.com>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent 24d43a30
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#include <dt-bindings/memory/tegra114-mc.h> #include <dt-bindings/memory/tegra114-mc.h>
#include <dt-bindings/pinctrl/pinctrl-tegra.h> #include <dt-bindings/pinctrl/pinctrl-tegra.h>
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/soc/tegra-pmc.h>
/ { / {
compatible = "nvidia,tegra114"; compatible = "nvidia,tegra114";
...@@ -514,11 +515,12 @@ kbc@7000e200 { ...@@ -514,11 +515,12 @@ kbc@7000e200 {
status = "disabled"; status = "disabled";
}; };
pmc@7000e400 { tegra_pmc: pmc@7000e400 {
compatible = "nvidia,tegra114-pmc"; compatible = "nvidia,tegra114-pmc";
reg = <0x7000e400 0x400>; reg = <0x7000e400 0x400>;
clocks = <&tegra_car TEGRA114_CLK_PCLK>, <&clk32k_in>; clocks = <&tegra_car TEGRA114_CLK_PCLK>, <&clk32k_in>;
clock-names = "pclk", "clk32k_in"; clock-names = "pclk", "clk32k_in";
#clock-cells = <1>;
}; };
fuse@7000f800 { fuse@7000f800 {
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/reset/tegra124-car.h> #include <dt-bindings/reset/tegra124-car.h>
#include <dt-bindings/thermal/tegra124-soctherm.h> #include <dt-bindings/thermal/tegra124-soctherm.h>
#include <dt-bindings/soc/tegra-pmc.h>
/ { / {
compatible = "nvidia,tegra124"; compatible = "nvidia,tegra124";
...@@ -595,11 +596,12 @@ rtc@7000e000 { ...@@ -595,11 +596,12 @@ rtc@7000e000 {
clocks = <&tegra_car TEGRA124_CLK_RTC>; clocks = <&tegra_car TEGRA124_CLK_RTC>;
}; };
pmc@7000e400 { tegra_pmc: pmc@7000e400 {
compatible = "nvidia,tegra124-pmc"; compatible = "nvidia,tegra124-pmc";
reg = <0x0 0x7000e400 0x0 0x400>; reg = <0x0 0x7000e400 0x0 0x400>;
clocks = <&tegra_car TEGRA124_CLK_PCLK>, <&clk32k_in>; clocks = <&tegra_car TEGRA124_CLK_PCLK>, <&clk32k_in>;
clock-names = "pclk", "clk32k_in"; clock-names = "pclk", "clk32k_in";
#clock-cells = <1>;
}; };
fuse@7000f800 { fuse@7000f800 {
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#include <dt-bindings/memory/tegra20-mc.h> #include <dt-bindings/memory/tegra20-mc.h>
#include <dt-bindings/pinctrl/pinctrl-tegra.h> #include <dt-bindings/pinctrl/pinctrl-tegra.h>
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/soc/tegra-pmc.h>
/ { / {
compatible = "nvidia,tegra20"; compatible = "nvidia,tegra20";
...@@ -608,11 +609,12 @@ kbc@7000e200 { ...@@ -608,11 +609,12 @@ kbc@7000e200 {
status = "disabled"; status = "disabled";
}; };
pmc@7000e400 { tegra_pmc: pmc@7000e400 {
compatible = "nvidia,tegra20-pmc"; compatible = "nvidia,tegra20-pmc";
reg = <0x7000e400 0x400>; reg = <0x7000e400 0x400>;
clocks = <&tegra_car TEGRA20_CLK_PCLK>, <&clk32k_in>; clocks = <&tegra_car TEGRA20_CLK_PCLK>, <&clk32k_in>;
clock-names = "pclk", "clk32k_in"; clock-names = "pclk", "clk32k_in";
#clock-cells = <1>;
}; };
mc: memory-controller@7000f000 { mc: memory-controller@7000f000 {
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#include <dt-bindings/memory/tegra30-mc.h> #include <dt-bindings/memory/tegra30-mc.h>
#include <dt-bindings/pinctrl/pinctrl-tegra.h> #include <dt-bindings/pinctrl/pinctrl-tegra.h>
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/soc/tegra-pmc.h>
/ { / {
compatible = "nvidia,tegra30"; compatible = "nvidia,tegra30";
...@@ -714,11 +715,12 @@ kbc@7000e200 { ...@@ -714,11 +715,12 @@ kbc@7000e200 {
status = "disabled"; status = "disabled";
}; };
pmc@7000e400 { tegra_pmc: pmc@7000e400 {
compatible = "nvidia,tegra30-pmc"; compatible = "nvidia,tegra30-pmc";
reg = <0x7000e400 0x400>; reg = <0x7000e400 0x400>;
clocks = <&tegra_car TEGRA30_CLK_PCLK>, <&clk32k_in>; clocks = <&tegra_car TEGRA30_CLK_PCLK>, <&clk32k_in>;
clock-names = "pclk", "clk32k_in"; clock-names = "pclk", "clk32k_in";
#clock-cells = <1>;
}; };
mc: memory-controller@7000f000 { mc: memory-controller@7000f000 {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment