Skip to content

Commit

Permalink
Merge tag 'renesas-dt2-for-v4.7' of git://git.kernel.org/pub/scm/linu…
Browse files Browse the repository at this point in the history
…x/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
  • Loading branch information
Arnd Bergmann committed Apr 28, 2016
2 parents 0d6cde5 + c9006ac commit a050ebb
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 10 deletions.
1 change: 0 additions & 1 deletion arch/arm/boot/dts/r8a7778.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,6 @@
#clock-cells = <0>;
/* This value must be overridden by the board. */
clock-frequency = <0>;
status = "disabled";
};

/* Special CPG clocks */
Expand Down
1 change: 0 additions & 1 deletion arch/arm/boot/dts/r8a7779.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,6 @@
#clock-cells = <0>;
/* This value must be overridden by the board. */
clock-frequency = <0>;
status = "disabled";
};

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

/*
Expand Down Expand Up @@ -1062,7 +1061,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 @@ -1078,7 +1076,6 @@
#clock-cells = <0>;
/* This value must be overridden by the board. */
clock-frequency = <0>;
status = "disabled";
};

/* Special CPG clocks */
Expand Down
2 changes: 0 additions & 2 deletions arch/arm/boot/dts/r8a7793.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -907,7 +907,6 @@
#clock-cells = <0>;
/* This value must be overridden by the board. */
clock-frequency = <0>;
status = "disabled";
};

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

/* Special CPG clocks */
Expand Down
2 changes: 0 additions & 2 deletions arch/arm/boot/dts/r8a7794.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -906,7 +906,6 @@
#clock-cells = <0>;
/* This value must be overridden by the board. */
clock-frequency = <0>;
status = "disabled";
};

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

/* Special CPG clocks */
Expand Down

0 comments on commit a050ebb

Please sign in to comment.