Commit 803b504b authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v5.8/timer-signed' of... 

Merge tag 'omap-for-v5.8/timer-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/soc

System timer changes for omaps for v5.8 merge window

This series of changes finally gets the legacy omap dual-mode timer and
32k counter system timer updated to use drivers/clocksource and device
tree data. And we can now remove the unused legacy platform data.

These changes are based on an immutable clocksource branch set up by
Daniel Lezcano.

* tag 'omap-for-v5.8/timer-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  bus: ti-sysc: Timers no longer need legacy quirk handling
  ARM: OMAP2+: Drop old timer code for dmtimer and 32k counter
  ARM: dts: Configure system timers for omap2
  ARM: dts: Configure system timers for ti81xx
  ARM: dts: Configure system timers for omap3
  ARM: dts: Configure system timers for omap5 and dra7
  ARM: dts: Configure system timers for omap4
  ARM: dts: Configure system timers for am437x
  ARM: dts: Configure system timers for am335x
  ARM: OMAP2+: Add omap_init_time_of()
  bus: ti-sysc: Ignore timer12 on secure omap3
  clk: ti: dm816: enable sysclk6_ck on init
  clocksource/drivers/timer-ti-dm: Fix warning for set but not used
  clocksource/drivers/timer-ti-dm: Add clockevent and clocksource support
  clocksource/drivers/timer-ti-32k: Add support for initializing directly

Link: https://lore.kernel.org/r/pull-1590169577-735045@atomide.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 66ee9359 1a542811

arch/arm/boot/dts/am33xx-l4.dtsi

+2 −4
Original line number Diff line number Diff line
@@ -330,9 +330,8 @@ 
			};

		};



		target-module@31000 {			/* 0x44e31000, ap 25 40.0 */

		timer1_target: target-module@31000 {	/* 0x44e31000, ap 25 40.0 */

			compatible = "ti,sysc-omap2-timer", "ti,sysc";

			ti,hwmods = "timer1";

			reg = <0x31000 0x4>,

			      <0x31010 0x4>,

			      <0x31014 0x4>;
@@ -1117,9 +1116,8 @@ 
			};

		};



		target-module@40000 {			/* 0x48040000, ap 22 1e.0 */

		timer2_target: target-module@40000 {	/* 0x48040000, ap 22 1e.0 */

			compatible = "ti,sysc-omap4-timer", "ti,sysc";

			ti,hwmods = "timer2";

			reg = <0x40000 0x4>,

			      <0x40010 0x4>,

			      <0x40014 0x4>;

arch/arm/boot/dts/am33xx.dtsi

+20 −0
Original line number Diff line number Diff line
@@ -619,3 +619,23 @@ 
		#reset-cells = <1>;

	};

};



/* Preferred always-on timer for clocksource */

&timer1_target {

	ti,no-reset-on-init;

	ti,no-idle;

	timer@0 {

		assigned-clocks = <&timer1_fck>;

		assigned-clock-parents = <&sys_clkin_ck>;

	};

};



/* Preferred timer for clockevent */

&timer2_target {

	ti,no-reset-on-init;

	ti,no-idle;

	timer@0 {

		assigned-clocks = <&timer2_fck>;

		assigned-clock-parents = <&sys_clkin_ck>;

	};

};

arch/arm/boot/dts/am3517.dtsi

+22 −2
Original line number Diff line number Diff line
@@ -169,5 +169,25 @@ 
	status = "disabled";

};



/include/ "am35xx-clocks.dtsi"

/include/ "omap36xx-am35xx-omap3430es2plus-clocks.dtsi"
 
#include "am35xx-clocks.dtsi"

#include "omap36xx-am35xx-omap3430es2plus-clocks.dtsi"



/* Preferred always-on timer for clocksource */

&timer1_target {

	ti,no-reset-on-init;

	ti,no-idle;

	timer@0 {

		assigned-clocks = <&gpt1_fck>;

		assigned-clock-parents = <&sys_ck>;

	};

};



/* Preferred timer for clockevent */

&timer2_target {

	ti,no-reset-on-init;

	ti,no-idle;

	timer@0 {

		assigned-clocks = <&gpt2_fck>;

		assigned-clock-parents = <&sys_ck>;

	};

};

arch/arm/boot/dts/am4372.dtsi

+20 −0
Original line number Diff line number Diff line
@@ -553,3 +553,23 @@ 
		#reset-cells = <1>;

	};

};



/* Preferred always-on timer for clocksource */

&timer1_target {

	ti,no-reset-on-init;

	ti,no-idle;

	timer@0 {

		assigned-clocks = <&timer1_fck>;

		assigned-clock-parents = <&sys_clkin_ck>;

	};

};



/* Preferred timer for clockevent */

&timer2_target {

	ti,no-reset-on-init;

	ti,no-idle;

	timer@0 {

		assigned-clocks = <&timer2_fck>;

		assigned-clock-parents = <&sys_clkin_ck>;

	};

};

arch/arm/boot/dts/am437x-l4.dtsi

+2 −5
Original line number Diff line number Diff line
@@ -328,9 +328,8 @@ 
			};

		};



		target-module@31000 {			/* 0x44e31000, ap 24 40.0 */

		timer1_target: target-module@31000 {	/* 0x44e31000, ap 24 40.0 */

			compatible = "ti,sysc-omap2-timer", "ti,sysc";

			ti,hwmods = "timer1";

			reg = <0x31000 0x4>,

			      <0x31010 0x4>,

			      <0x31014 0x4>;
@@ -450,7 +449,6 @@ 


		target-module@86000 {			/* 0x44e86000, ap 40 70.0 */

			compatible = "ti,sysc-omap2", "ti,sysc";

			ti,hwmods = "counter_32k";

			reg = <0x86000 0x4>,

			      <0x86004 0x4>;

			reg-names = "rev", "sysc";
@@ -868,9 +866,8 @@ 
			};

		};



		target-module@40000 {			/* 0x48040000, ap 18 1e.0 */

		timer2_target: target-module@40000 {	/* 0x48040000, ap 18 1e.0 */

			compatible = "ti,sysc-omap4-timer", "ti,sysc";

			ti,hwmods = "timer2";

			reg = <0x40000 0x4>,

			      <0x40010 0x4>,

			      <0x40014 0x4>;