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

Commit 813004a3 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'zynq-dt-for-3.15' of git://git.xilinx.com/linux-xlnx into next/dt

Merge "arm: Xilinx Zynq dt patches for v3.15" from Michal Simek:

- Define fclk-enable property

* tag 'zynq-dt-for-3.15' of git://git.xilinx.com/linux-xlnx

:
  arm: dt: zynq: Add fclk-enable property to clkc node

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 891f1866 3795e91d
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@
					#clock-cells = <1>;
					compatible = "xlnx,ps7-clkc";
					ps-clk-frequency = <33333333>;
					fclk-enable = <0>;
					clock-output-names = "armpll", "ddrpll", "iopll", "cpu_6or4x",
							"cpu_3or2x", "cpu_2x", "cpu_1x", "ddr2x", "ddr3x",
							"dci", "lqspi", "smc", "pcap", "gem0", "gem1",