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

Commit 0ba3307a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull ARM driver updates from Olof Johansson:
 "Updates of SoC-near drivers and other driver updates that makes more
  sense to take through our tree.

  The largest part of this is a conversion of device registration for
  some renesas shmobile/sh devices over to use resources.  This has
  required coordination with the corresponding arch/sh changes, and
  we've agreed to merge the arch/sh changes through our tree.

  Added in this branch is support for Trusted Foundations secure
  firmware, which is what is used on many of the commercial Nvidia Tegra
  products that are in the market, including the Nvidia Shield.  The
  code is local to arch/arm at this time since it's uncertain whether it
  will be shared with arm64 longer-term, if needed we will refactor
  later.

  A couple of new RTC drivers used on ARM boards, merged through our
  tree on request by the RTC maintainer.

  ... plus a bunch of smaller updates across the board, gpio conversions
  for davinci, etc"

* tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (45 commits)
  watchdog: davinci: rename platform driver to davinci-wdt
  tty: serial: Limit msm_serial_hs driver to platforms that use it
  mmc: msm_sdcc: Limit driver to platforms that use it
  usb: phy: msm: Move mach dependent code to platform data
  clk: versatile: fixup IM-PD1 clock implementation
  clk: versatile: pass a name to ICST clock provider
  ARM: integrator: pass parent IRQ to the SIC
  irqchip: versatile FPGA: support cascaded interrupts from DT
  gpio: davinci: don't create irq_domain in case of unbanked irqs
  gpio: davinci: use chained_irq_enter/chained_irq_exit API
  gpio: davinci: add OF support
  gpio: davinci: remove unused variable intc_irq_num
  gpio: davinci: convert to use irqdomain support.
  gpio: introduce GPIO_DAVINCI kconfig option
  gpio: davinci: get rid of DAVINCI_N_GPIO
  gpio: davinci: use {readl|writel}_relaxed() instead of __raw_*
  serial: sh-sci: Add OF support
  serial: sh-sci: Add device tree bindings documentation
  serial: sh-sci: Remove platform data mapbase and irqs fields
  serial: sh-sci: Remove platform data scbrr_algo_id field
  ...
parents 903a9f77 cd2f43a1

Documentation/devicetree/bindings/arm/firmware/tlm,trusted-foundations.txt

0 → 100644
+20 −0
Original line number Diff line number Diff line 
Trusted Foundations

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



Boards that use the Trusted Foundations secure monitor can signal its

presence by declaring a node compatible with "tlm,trusted-foundations"

under the /firmware/ node



Required properties:

- compatible: "tlm,trusted-foundations"

- tlm,version-major: major version number of Trusted Foundations firmware

- tlm,version-minor: minor version number of Trusted Foundations firmware



Example:

	firmware {

		trusted-foundations {

			compatible = "tlm,trusted-foundations";

			tlm,version-major = <2>;

			tlm,version-minor = <8>;

		};

	};

Documentation/devicetree/bindings/arm/tegra.txt

+5 −0
Original line number Diff line number Diff line
@@ -32,3 +32,8 @@ board-specific compatible values: 
  nvidia,whistler

  toradex,colibri_t20-512

  toradex,iris



Trusted Foundations

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

Tegra supports the Trusted Foundation secure monitor. See the

"tlm,trusted-foundations" binding's documentation for more details.

Documentation/devicetree/bindings/arm/versatile-fpga-irq.txt

+5 −0
Original line number Diff line number Diff line
@@ -29,3 +29,8 @@ pic: pic@14000000 { 
        clear-mask = <0xffffffff>;

        valid-mask = <0x003fffff>;

};



Optional properties:

- interrupts: if the FPGA IRQ controller is cascaded, i.e. if its IRQ

  output is simply connected to the input of another IRQ controller,

  then the parent IRQ shall be specified in this property.

Documentation/devicetree/bindings/crypto/atmel-crypto.txt

0 → 100644
+68 −0
Original line number Diff line number Diff line 
* Atmel HW cryptographic accelerators



These are the HW cryptographic accelerators found on some Atmel products.



* Advanced Encryption Standard (AES)



Required properties:

- compatible : Should be "atmel,at91sam9g46-aes".

- reg: Should contain AES registers location and length.

- interrupts: Should contain the IRQ line for the AES.

- dmas: List of two DMA specifiers as described in

        atmel-dma.txt and dma.txt files.

- dma-names: Contains one identifier string for each DMA specifier

             in the dmas property.



Example:

aes@f8038000 {

	compatible = "atmel,at91sam9g46-aes";

	reg = <0xf8038000 0x100>;

	interrupts = <43 4 0>;

	dmas = <&dma1 2 18>,

	       <&dma1 2 19>;

	dma-names = "tx", "rx";



* Triple Data Encryption Standard (Triple DES)



Required properties:

- compatible : Should be "atmel,at91sam9g46-tdes".

- reg: Should contain TDES registers location and length.

- interrupts: Should contain the IRQ line for the TDES.



Optional properties:

- dmas: List of two DMA specifiers as described in

        atmel-dma.txt and dma.txt files.

- dma-names: Contains one identifier string for each DMA specifier

             in the dmas property.



Example:

tdes@f803c000 {

	compatible = "atmel,at91sam9g46-tdes";

	reg = <0xf803c000 0x100>;

	interrupts = <44 4 0>;

	dmas = <&dma1 2 20>,

	       <&dma1 2 21>;

	dma-names = "tx", "rx";

};



* Secure Hash Algorithm (SHA)



Required properties:

- compatible : Should be "atmel,at91sam9g46-sha".

- reg: Should contain SHA registers location and length.

- interrupts: Should contain the IRQ line for the SHA.



Optional properties:

- dmas: One DMA specifiers as described in

        atmel-dma.txt and dma.txt files.

- dma-names: Contains one identifier string for each DMA specifier

             in the dmas property. Only one "tx" string needed.



Example:

sha@f8034000 {

	compatible = "atmel,at91sam9g46-sha";

	reg = <0xf8034000 0x100>;

	interrupts = <42 4 0>;

	dmas = <&dma1 2 17>;

	dma-names = "tx";

};

Documentation/devicetree/bindings/gpio/gpio-davinci.txt

0 → 100644
+41 −0
Original line number Diff line number Diff line 
Davinci GPIO controller bindings



Required Properties:

- compatible: should be "ti,dm6441-gpio"



- reg: Physical base address of the controller and the size of memory mapped

       registers.



- gpio-controller : Marks the device node as a gpio controller.



- interrupt-parent: phandle of the parent interrupt controller.



- interrupts: Array of GPIO interrupt number. Only banked or unbanked IRQs are

	      supported at a time.



- ti,ngpio: The number of GPIO pins supported.



- ti,davinci-gpio-unbanked: The number of GPIOs that have an individual interrupt

		             line to processor.



The GPIO controller also acts as an interrupt controller. It uses the default

two cells specifier as described in Documentation/devicetree/bindings/

interrupt-controller/interrupts.txt.



Example:



gpio: gpio@1e26000 {

	compatible = "ti,dm6441-gpio";

	gpio-controller;

	reg = <0x226000 0x1000>;

	interrupt-parent = <&intc>;

	interrupts = <42 IRQ_TYPE_EDGE_BOTH 43 IRQ_TYPE_EDGE_BOTH

		44 IRQ_TYPE_EDGE_BOTH 45 IRQ_TYPE_EDGE_BOTH

		46 IRQ_TYPE_EDGE_BOTH 47 IRQ_TYPE_EDGE_BOTH

		48 IRQ_TYPE_EDGE_BOTH 49 IRQ_TYPE_EDGE_BOTH

		50 IRQ_TYPE_EDGE_BOTH>;

	ti,ngpio = <144>;

	ti,davinci-gpio-unbanked = <0>;

	interrupt-controller;

	#interrupt-cells = <2>;

};