Commit 0c6cda58 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'actions-arm-dt-for-4.13' of... 

Merge tag 'actions-arm-dt-for-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-actions into next/dt

Pull "Actions Semi ARM based SoC DT for v4.13" from Andreas Färber:

This adds an initial DT for the S500 SoC and a devboard based on it.

* tag 'actions-arm-dt-for-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-actions:
  ARM: dts: owl-s500: Add SPS node
  ARM: dts: owl-s500: Set CPU enable-method
  dt-bindings: arm: cpus: Add S500 enable-method
  ARM: dts: Add Actions Semi S500 and LeMaker Guitar
  dt-bindings: arm: Document Actions Semi S900
  dt-bindings: timer: Document Owl timer
  dt-bindings: arm: Document Actions Semi S500
  dt-bindings: Add vendor prefix for Actions Semi
parents 1964babb 740f6beb

Documentation/devicetree/bindings/arm/actions.txt

0 → 100644
+39 −0
Original line number Diff line number Diff line 
Actions Semi platforms device tree bindings

-------------------------------------------





S500 SoC

========



Required root node properties:



 - compatible :  must contain "actions,s500"





Modules:



Root node property compatible must contain, depending on module:



 - LeMaker Guitar: "lemaker,guitar"





Boards:



Root node property compatible must contain, depending on board:



 - LeMaker Guitar Base Board rev. B: "lemaker,guitar-bb-rev-b", "lemaker,guitar"





S900 SoC

========



Required root node properties:



- compatible :  must contain "actions,s900"





Boards:



Root node property compatible must contain, depending on board:



 - uCRobotics Bubblegum-96: "ucrobotics,bubblegum-96"

Documentation/devicetree/bindings/arm/cpus.txt

+1 −0
Original line number Diff line number Diff line
@@ -193,6 +193,7 @@ nodes to be present and contain the properties described below. 
			     "spin-table"

			# On ARM 32-bit systems this property is optional and

			  can be one of:

			    "actions,s500-smp"

			    "allwinner,sun6i-a31"

			    "allwinner,sun8i-a23"

			    "arm,realview-smp"

Documentation/devicetree/bindings/timer/actions,owl-timer.txt

0 → 100644
+20 −0
Original line number Diff line number Diff line 
Actions Semi Owl Timer



Required properties:

- compatible      :  "actions,s500-timer" for S500

                     "actions,s900-timer" for S900

- reg             :  Offset and length of the register set for the device.

- interrupts      :  Should contain the interrupts.

- interrupt-names :  Valid names are: "2hz0", "2hz1",

                                      "timer0", "timer1", "timer2", "timer3"

                     See ../resource-names.txt



Example:



		timer@b0168000 {

			compatible = "actions,s500-timer";

			reg = <0xb0168000 0x100>;

			interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>,

			             <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "timer0", "timer1";

		};

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ using them to avoid name-space collisions. 


abcn	Abracon Corporation

abilis	Abilis Systems

actions	Actions Semiconductor Co., Ltd.

active-semi	Active-Semi International Inc

ad	Avionic Design GmbH

adapteva	Adapteva, Inc.

arch/arm/boot/dts/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -669,6 +669,8 @@ dtb-$(CONFIG_ARCH_ORION5X) += \ 
	orion5x-maxtor-shared-storage-2.dtb \

	orion5x-netgear-wnr854t.dtb \

	orion5x-rd88f5182-nas.dtb

dtb-$(CONFIG_ARCH_ACTIONS) += \

	owl-s500-guitar-bb-rev-b.dtb

dtb-$(CONFIG_ARCH_PRIMA2) += \

	prima2-evb.dtb

dtb-$(CONFIG_ARCH_OXNAS) += \

CRA Git | Maintained and supported by SUSTech CRA and CCSE