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

Commit 6b5606e0 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'zynq/clksrc/cleanup' of git://git.xilinx.com/linux-xlnx into next/drivers 

From Michal Simek <michal.simek@xilinx.com>:

* 'zynq/clksrc/cleanup' of git://git.xilinx.com/linux-xlnx

:
  arm: zynq: Move timer to generic location
  arm: zynq: Do not use xilinx specific function names
  arm: zynq: Move timer to clocksource interface
  arm: zynq: Use standard timer binding

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents e9069cf8 4f0f234f

Documentation/devicetree/bindings/timer/cadence,ttc-timer.txt

0 → 100644
+17 −0
Original line number Original line Diff line number Diff line 
Cadence TTC - Triple Timer Counter



Required properties:

- compatible : Should be "cdns,ttc".

- reg : Specifies base physical address and size of the registers.

- interrupts : A list of 3 interrupts; one per timer channel.

- clocks: phandle to the source clock



Example:



ttc0: ttc0@f8001000 {

	interrupt-parent = <&intc>;

	interrupts = < 0 10 4 0 11 4 0 12 4 >;

	compatible = "cdns,ttc";

	reg = <0xF8001000 0x1000>;

	clocks = <&cpu_clk 3>;

};

arch/arm/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -1598,6 +1598,7 @@ config HAVE_ARM_ARCH_TIMER 
config HAVE_ARM_TWD

config HAVE_ARM_TWD

	bool

	bool

	depends on SMP

	depends on SMP

	select CLKSRC_OF if OF

	help

	help

	  This options enables support for the ARM timer and watchdog unit

	  This options enables support for the ARM timer and watchdog unit

arch/arm/boot/dts/zynq-7000.dtsi

+6 −39
Original line number Original line Diff line number Diff line
@@ -111,56 +111,23 @@ 
		};

		};





		ttc0: ttc0@f8001000 {

		ttc0: ttc0@f8001000 {

			#address-cells = <1>;

			interrupt-parent = <&intc>;

			#size-cells = <0>;

			interrupts = < 0 10 4 0 11 4 0 12 4 >;

			compatible = "xlnx,ttc";

			compatible = "cdns,ttc";

			reg = <0xF8001000 0x1000>;

			reg = <0xF8001000 0x1000>;

			clocks = <&cpu_clk 3>;

			clocks = <&cpu_clk 3>;

			clock-names = "cpu_1x";

			clock-names = "cpu_1x";

			clock-ranges;

			clock-ranges;



			ttc0_0: ttc0.0 {

				status = "disabled";

				reg = <0>;

				interrupts = <0 10 4>;

			};

			ttc0_1: ttc0.1 {

				status = "disabled";

				reg = <1>;

				interrupts = <0 11 4>;

			};

			ttc0_2: ttc0.2 {

				status = "disabled";

				reg = <2>;

				interrupts = <0 12 4>;

			};

		};

		};





		ttc1: ttc1@f8002000 {

		ttc1: ttc1@f8002000 {

			#interrupt-parent = <&intc>;

			interrupt-parent = <&intc>;

			#address-cells = <1>;

			interrupts = < 0 37 4 0 38 4 0 39 4 >;

			#size-cells = <0>;

			compatible = "cdns,ttc";

			compatible = "xlnx,ttc";

			reg = <0xF8002000 0x1000>;

			reg = <0xF8002000 0x1000>;

			clocks = <&cpu_clk 3>;

			clocks = <&cpu_clk 3>;

			clock-names = "cpu_1x";

			clock-names = "cpu_1x";

			clock-ranges;

			clock-ranges;



			ttc1_0: ttc1.0 {

				status = "disabled";

				reg = <0>;

				interrupts = <0 37 4>;

			};

			ttc1_1: ttc1.1 {

				status = "disabled";

				reg = <1>;

				interrupts = <0 38 4>;

			};

			ttc1_2: ttc1.2 {

				status = "disabled";

				reg = <2>;

				interrupts = <0 39 4>;

			};

		};

		};

	};

	};

};
 
};

arch/arm/boot/dts/zynq-zc702.dts

+0 −10
Original line number Original line Diff line number Diff line
@@ -32,13 +32,3 @@ 
&ps_clk {

&ps_clk {

	clock-frequency = <33333330>;

	clock-frequency = <33333330>;

};
 
};
 


&ttc0_0 {

	status = "ok";

	compatible = "xlnx,ttc-counter-clocksource";

};



&ttc0_1 {

	status = "ok";

	compatible = "xlnx,ttc-counter-clockevent";

};

arch/arm/include/asm/smp_twd.h

+0 −8
Original line number Original line Diff line number Diff line
@@ -34,12 +34,4 @@ struct twd_local_timer name __initdata = { \ 




int twd_local_timer_register(struct twd_local_timer *);

int twd_local_timer_register(struct twd_local_timer *);





#ifdef CONFIG_HAVE_ARM_TWD

void twd_local_timer_of_register(void);

#else

static inline void twd_local_timer_of_register(void)

{

}

#endif



#endif
 
#endif