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
This commit is contained in:
Arnd Bergmann
2016-04-28 15:50:31 +02:00
5 changed files with 1 additions and 10 deletions

View File

@@ -455,7 +455,6 @@ scif_clk: scif {
#clock-cells = <0>;
/* This value must be overridden by the board. */
clock-frequency = <0>;
status = "disabled";
};
/* Special CPG clocks */

View File

@@ -458,7 +458,6 @@ scif_clk: scif {
#clock-cells = <0>;
/* This value must be overridden by the board. */
clock-frequency = <0>;
status = "disabled";
};
/* Special CPG clocks */

View File

@@ -1032,8 +1032,7 @@ extal_clk: extal {
pcie_bus_clk: pcie_bus {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <100000000>;
status = "disabled";
clock-frequency = <0>;
};
/*
@@ -1062,7 +1061,6 @@ scif_clk: scif {
#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 */
@@ -1078,7 +1076,6 @@ can_clk: can_clk {
#clock-cells = <0>;
/* This value must be overridden by the board. */
clock-frequency = <0>;
status = "disabled";
};
/* Special CPG clocks */

View File

@@ -907,7 +907,6 @@ can_clk: can {
#clock-cells = <0>;
/* This value must be overridden by the board. */
clock-frequency = <0>;
status = "disabled";
};
/* External SCIF clock */
@@ -916,7 +915,6 @@ scif_clk: scif {
#clock-cells = <0>;
/* This value must be overridden by the board. */
clock-frequency = <0>;
status = "disabled";
};
/* Special CPG clocks */

View File

@@ -906,7 +906,6 @@ can_clk: can {
#clock-cells = <0>;
/* This value must be overridden by the board. */
clock-frequency = <0>;
status = "disabled";
};
/* External SCIF clock */
@@ -915,7 +914,6 @@ scif_clk: scif {
#clock-cells = <0>;
/* This value must be overridden by the board. */
clock-frequency = <0>;
status = "disabled";
};
/* Special CPG clocks */