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

Commit d25b6af9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arc-4.10-rc1-part1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc 

Pull ARC updates from Vineet Gupta:
 "These are mostly timer/clocksource driver updates which were
  Reviewed/Acked by Daniel but had to be merged via ARC tree due to
  dependencies.

  I will follow up with another pull request with actual ARC changes
  early next week !

  Summary:

   - Moving ARC timer driver into drivers/clocksource

   - EZChip timer driver updates [Noam]

   - ARC AXS103 and HAPS platform updates [Alexey]"

* tag 'arc-4.10-rc1-part1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
  ARC: axs10x: really enable ARC PGU
  ARC: rename Zebu platform support to HAPS
  clocksource: nps: avoid maybe-uninitialized warning
  clocksource: Add clockevent support to NPS400 driver
  clocksource: update "fn" at CLOCKSOURCE_OF_DECLARE() of nps400 timer
  soc: Support for NPS HW scheduling
  clocksource: import ARC timer driver
  ARC: breakout timer include code into separate header ...
  ARC: move mcip.h into include/soc and adjust the includes
  ARC: breakout aux handling into a separate header
  ARC: time: move time_init() out of the driver
  ARC: timer: gfrc, rtc: build under same option (64-bit timers)
  ARC: timer: gfrc, rtc: Read BCR to detect whether hardware exists ...
  ARC: timer: gfrc, rtc: deuglify big endian code
parents 179a7ba6 7badf6fe

Documentation/devicetree/bindings/timer/ezchip,nps400-timer0.txt

0 → 100644
+17 −0
Original line number Diff line number Diff line 
NPS Network Processor



Required properties:



- compatible :	should be "ezchip,nps400-timer0"



Clocks required for compatible = "ezchip,nps400-timer0":

- interrupts : The interrupt of the first timer

- clocks : Must contain a single entry describing the clock input



Example:



timer {

	compatible = "ezchip,nps400-timer0";

	interrupts = <3>;

	clocks = <&sysclk>;

};

Documentation/devicetree/bindings/timer/ezchip,nps400-timer.txt→Documentation/devicetree/bindings/timer/ezchip,nps400-timer1.txt

+3 −3
Original line number Diff line number Diff line
@@ -2,14 +2,14 @@ NPS Network Processor 


Required properties:



- compatible :	should be "ezchip,nps400-timer"

- compatible :	should be "ezchip,nps400-timer1"



Clocks required for compatible = "ezchip,nps400-timer":

Clocks required for compatible = "ezchip,nps400-timer1":

- clocks : Must contain a single entry describing the clock input



Example:



timer {

	compatible = "ezchip,nps400-timer";

	compatible = "ezchip,nps400-timer1";

	clocks = <&sysclk>;

};

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -11827,6 +11827,7 @@ S: Supported 
F:	arch/arc/

F:	Documentation/devicetree/bindings/arc/*

F:	Documentation/devicetree/bindings/interrupt-controller/snps,arc*

F:	drivers/clocksource/arc_timer.c

F:	drivers/tty/serial/arc_uart.c

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git

arch/arc/Kconfig

+2 −11
Original line number Diff line number Diff line
@@ -8,9 +8,9 @@ 


config ARC

	def_bool y

	select ARC_TIMERS

	select ARCH_SUPPORTS_ATOMIC_RMW if ARC_HAS_LLSC

	select BUILDTIME_EXTABLE_SORT

	select CLKSRC_OF

	select CLONE_BACKWARDS

	select COMMON_CLK

	select GENERIC_ATOMIC64 if !ISA_ARCV2 || !(ARC_HAS_LL64 && ARC_HAS_LLSC)
@@ -115,6 +115,7 @@ config ISA_ARCOMPACT 


config ISA_ARCV2

	bool "ARC ISA v2"

	select ARC_TIMERS_64BIT

	help

	  ISA for the Next Generation ARC-HS cores
@@ -410,16 +411,6 @@ config ARC_HAS_DIV_REM 
	bool "Insn: div, divu, rem, remu"

	default y



config ARC_HAS_RTC

	bool "Local 64-bit r/o cycle counter"

	default n

	depends on !SMP



config ARC_HAS_GFRC

	bool "SMP synchronized 64-bit cycle counter"

	default y

	depends on SMP



config ARC_NUMBER_OF_INTERRUPTS

	int "Number of interrupts"

	range 8 240

arch/arc/boot/dts/axs101.dts

+1 −1
Original line number Diff line number Diff line
@@ -17,6 +17,6 @@ 
	compatible = "snps,axs101", "snps,arc-sdp";



	chosen {

		bootargs = "earlycon=uart8250,mmio32,0xe0022000,115200n8 console=tty0 console=ttyS3,115200n8 consoleblank=0";

		bootargs = "earlycon=uart8250,mmio32,0xe0022000,115200n8 console=tty0 console=ttyS3,115200n8 consoleblank=0 video=1280x720@60";

	};

};