Commit a050ebb0 authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'renesas-dt2-for-v4.7' of...

Merge tag 'renesas-dt2-for-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt

Merge "Second Round of Renesas ARM Based SoC DT Updates for v4.7" from Simon Horman

* Don't disable referenced optional clocks in DT of R-Car Gen 1 & 2 SoCs

* tag 'renesas-dt2-for-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: dts: r8a7794: Don't disable referenced optional clocks
  ARM: dts: r8a7793: Don't disable referenced optional clocks
  ARM: dts: r8a7790: Don't disable referenced optional clocks
  ARM: dts: r8a7779: Don't disable referenced optional clocks
  ARM: dts: r8a7778: Don't disable referenced optional clocks
parents 0d6cde50 c9006ac6
...@@ -455,7 +455,6 @@ scif_clk: scif { ...@@ -455,7 +455,6 @@ scif_clk: scif {
#clock-cells = <0>; #clock-cells = <0>;
/* This value must be overridden by the board. */ /* This value must be overridden by the board. */
clock-frequency = <0>; clock-frequency = <0>;
status = "disabled";
}; };
/* Special CPG clocks */ /* Special CPG clocks */
......
...@@ -458,7 +458,6 @@ scif_clk: scif { ...@@ -458,7 +458,6 @@ scif_clk: scif {
#clock-cells = <0>; #clock-cells = <0>;
/* This value must be overridden by the board. */ /* This value must be overridden by the board. */
clock-frequency = <0>; clock-frequency = <0>;
status = "disabled";
}; };
/* Special CPG clocks */ /* Special CPG clocks */
......
...@@ -1032,8 +1032,7 @@ extal_clk: extal { ...@@ -1032,8 +1032,7 @@ extal_clk: extal {
pcie_bus_clk: pcie_bus { pcie_bus_clk: pcie_bus {
compatible = "fixed-clock"; compatible = "fixed-clock";
#clock-cells = <0>; #clock-cells = <0>;
clock-frequency = <100000000>; clock-frequency = <0>;
status = "disabled";
}; };
/* /*
...@@ -1062,7 +1061,6 @@ scif_clk: scif { ...@@ -1062,7 +1061,6 @@ scif_clk: scif {
#clock-cells = <0>; #clock-cells = <0>;
/* This value must be overridden by the board. */ /* This value must be overridden by the board. */
clock-frequency = <0>; clock-frequency = <0>;
status = "disabled";
}; };
/* External USB clock - can be overridden by the board */ /* External USB clock - can be overridden by the board */
...@@ -1078,7 +1076,6 @@ can_clk: can_clk { ...@@ -1078,7 +1076,6 @@ can_clk: can_clk {
#clock-cells = <0>; #clock-cells = <0>;
/* This value must be overridden by the board. */ /* This value must be overridden by the board. */
clock-frequency = <0>; clock-frequency = <0>;
status = "disabled";
}; };
/* Special CPG clocks */ /* Special CPG clocks */
......
...@@ -907,7 +907,6 @@ can_clk: can { ...@@ -907,7 +907,6 @@ can_clk: can {
#clock-cells = <0>; #clock-cells = <0>;
/* This value must be overridden by the board. */ /* This value must be overridden by the board. */
clock-frequency = <0>; clock-frequency = <0>;
status = "disabled";
}; };
/* External SCIF clock */ /* External SCIF clock */
...@@ -916,7 +915,6 @@ scif_clk: scif { ...@@ -916,7 +915,6 @@ scif_clk: scif {
#clock-cells = <0>; #clock-cells = <0>;
/* This value must be overridden by the board. */ /* This value must be overridden by the board. */
clock-frequency = <0>; clock-frequency = <0>;
status = "disabled";
}; };
/* Special CPG clocks */ /* Special CPG clocks */
......
...@@ -906,7 +906,6 @@ can_clk: can { ...@@ -906,7 +906,6 @@ can_clk: can {
#clock-cells = <0>; #clock-cells = <0>;
/* This value must be overridden by the board. */ /* This value must be overridden by the board. */
clock-frequency = <0>; clock-frequency = <0>;
status = "disabled";
}; };
/* External SCIF clock */ /* External SCIF clock */
...@@ -915,7 +914,6 @@ scif_clk: scif { ...@@ -915,7 +914,6 @@ scif_clk: scif {
#clock-cells = <0>; #clock-cells = <0>;
/* This value must be overridden by the board. */ /* This value must be overridden by the board. */
clock-frequency = <0>; clock-frequency = <0>;
status = "disabled";
}; };
/* Special CPG clocks */ /* Special CPG clocks */
......
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