aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert+renesas@glider.be>2016-04-25 10:08:30 -0400
committerSimon Horman <horms+renesas@verge.net.au>2016-04-26 21:48:34 -0400
commit9f33a8a9e1b7dbb0b91a58af958d1c301a6fab1a (patch)
tree12e21165d2603147270afb483bbe48040ca5cbb1
parentde5a79f125dd8c260d8c39b2bdced2a8fa957518 (diff)
arm64: dts: r8a7795: Don't disable referenced optional clocks
clk_get() on a disabled clock node will return -EPROBE_DEFER, which can cause drivers to be deferred forever if such clocks are referenced in their devices' clocks properties. Update the various disabled external clock nodes to default to a frequency of 0, but don't disable them, to prevent this. Reported-by: Jürg Billeter <j@bitron.ch> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
-rw-r--r--arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts1
-rw-r--r--arch/arm64/boot/dts/renesas/r8a7795.dtsi5
2 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
index 78c02937697e..8d8de245a845 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
+++ b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
@@ -394,6 +394,7 @@
394}; 394};
395 395
396&pcie_bus_clk { 396&pcie_bus_clk {
397 clock-frequency = <100000000>;
397 status = "okay"; 398 status = "okay";
398}; 399};
399 400
diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
index 11f9971a8543..7cb2d72e7378 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
@@ -120,7 +120,6 @@
120 compatible = "fixed-clock"; 120 compatible = "fixed-clock";
121 #clock-cells = <0>; 121 #clock-cells = <0>;
122 clock-frequency = <0>; 122 clock-frequency = <0>;
123 status = "disabled";
124 }; 123 };
125 124
126 /* External SCIF clock - to be overridden by boards that provide it */ 125 /* External SCIF clock - to be overridden by boards that provide it */
@@ -128,15 +127,13 @@
128 compatible = "fixed-clock"; 127 compatible = "fixed-clock";
129 #clock-cells = <0>; 128 #clock-cells = <0>;
130 clock-frequency = <0>; 129 clock-frequency = <0>;
131 status = "disabled";
132 }; 130 };
133 131
134 /* External PCIe clock - can be overridden by the board */ 132 /* External PCIe clock - can be overridden by the board */
135 pcie_bus_clk: pcie_bus { 133 pcie_bus_clk: pcie_bus {
136 compatible = "fixed-clock"; 134 compatible = "fixed-clock";
137 #clock-cells = <0>; 135 #clock-cells = <0>;
138 clock-frequency = <100000000>; 136 clock-frequency = <0>;
139 status = "disabled";
140 }; 137 };
141 138
142 soc { 139 soc {