Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a050ebb0 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

arch/arm/boot/dts/r8a7778.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -455,7 +455,6 @@ 
			#clock-cells = <0>;

			/* This value must be overridden by the board. */

			clock-frequency = <0>;

			status = "disabled";

		};



		/* Special CPG clocks */

arch/arm/boot/dts/r8a7779.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -458,7 +458,6 @@ 
			#clock-cells = <0>;

			/* This value must be overridden by the board. */

			clock-frequency = <0>;

			status = "disabled";

		};



		/* Special CPG clocks */

arch/arm/boot/dts/r8a7790.dtsi

+1 −4
Original line number Diff line number Diff line
@@ -1032,8 +1032,7 @@ 
		pcie_bus_clk: pcie_bus {

			compatible = "fixed-clock";

			#clock-cells = <0>;

			clock-frequency = <100000000>;

			status = "disabled";

			clock-frequency = <0>;

		};



		/*
@@ -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 */
@@ -1078,7 +1076,6 @@ 
			#clock-cells = <0>;

			/* This value must be overridden by the board. */

			clock-frequency = <0>;

			status = "disabled";

		};



		/* Special CPG clocks */

arch/arm/boot/dts/r8a7793.dtsi

+0 −2
Original line number Diff line number Diff line
@@ -907,7 +907,6 @@ 
			#clock-cells = <0>;

			/* This value must be overridden by the board. */

			clock-frequency = <0>;

			status = "disabled";

		};



		/* External SCIF clock */
@@ -916,7 +915,6 @@ 
			#clock-cells = <0>;

			/* This value must be overridden by the board. */

			clock-frequency = <0>;

			status = "disabled";

		};



		/* Special CPG clocks */

arch/arm/boot/dts/r8a7794.dtsi

+0 −2
Original line number Diff line number Diff line
@@ -906,7 +906,6 @@ 
			#clock-cells = <0>;

			/* This value must be overridden by the board. */

			clock-frequency = <0>;

			status = "disabled";

		};



		/* External SCIF clock */
@@ -915,7 +914,6 @@ 
			#clock-cells = <0>;

			/* This value must be overridden by the board. */

			clock-frequency = <0>;

			status = "disabled";

		};



		/* Special CPG clocks */