Skip to content

Commit

Permalink
ARM: dts: r8a7791: Don't disable referenced optional clocks
Browse files Browse the repository at this point in the history
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 clocks property.

Update the various disabled external clock nodes to default to a
frequency of 0, but don't disable them to prevent this.

Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
  • Loading branch information
Sjoerd Simons authored and Simon Horman committed Apr 19, 2016
1 parent f55532a commit ac6908b
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
1 change: 1 addition & 0 deletions arch/arm/boot/dts/r8a7791-koelsch.dts
Original file line number Diff line number Diff line change
Expand Up @@ -661,6 +661,7 @@
};

&pcie_bus_clk {
clock-frequency = <100000000>;
status = "okay";
};

Expand Down
1 change: 1 addition & 0 deletions arch/arm/boot/dts/r8a7791-porter.dts
Original file line number Diff line number Diff line change
Expand Up @@ -414,6 +414,7 @@
};

&pcie_bus_clk {
clock-frequency = <100000000>;
status = "okay";
};

Expand Down
5 changes: 1 addition & 4 deletions arch/arm/boot/dts/r8a7791.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -1083,9 +1083,8 @@
pcie_bus_clk: pcie_bus_clk {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <100000000>;
clock-frequency = <0>;
clock-output-names = "pcie_bus";
status = "disabled";
};

/* External SCIF clock */
Expand All @@ -1094,7 +1093,6 @@
#clock-cells = <0>;
/* This value must be overridden by the board. */
clock-frequency = <0>;
status = "disabled";
};

/* External USB clock - can be overridden by the board */
Expand All @@ -1112,7 +1110,6 @@
/* This value must be overridden by the board. */
clock-frequency = <0>;
clock-output-names = "can_clk";
status = "disabled";
};

/* Special CPG clocks */
Expand Down

0 comments on commit ac6908b

Please sign in to comment.