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

Commit f41509ad authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branches 'omap-for-v3.13/dt' and 'omap-for-v3.13/quirk' into omap-for-v3.13/board-removal 

We need the fixes in v3.12-rc5, dts changes in omap-for-v3.13/dt, and
the platform data quirk changes in omap-for-v3.13/quirk to start
removing omap3 board files without breaking things.
parents 61e6cfa8 c49f4984 8d715283

Documentation/devicetree/bindings/crypto/omap-aes.txt

0 → 100644
+31 −0
Original line number Diff line number Diff line 
OMAP SoC AES crypto Module



Required properties:



- compatible : Should contain entries for this and backward compatible

  AES versions:

  - "ti,omap2-aes" for OMAP2.

  - "ti,omap3-aes" for OMAP3.

  - "ti,omap4-aes" for OMAP4 and AM33XX.

  Note that the OMAP2 and 3 versions are compatible (OMAP3 supports

  more algorithms) but they are incompatible with OMAP4.

- ti,hwmods: Name of the hwmod associated with the AES module

- reg : Offset and length of the register set for the module

- interrupts : the interrupt-specifier for the AES module.



Optional properties:

- dmas: DMA specifiers for tx and rx dma. See the DMA client binding,

	Documentation/devicetree/bindings/dma/dma.txt

- dma-names: DMA request names should include "tx" and "rx" if present.



Example:

	/* AM335x */

	aes: aes@53500000 {

		compatible = "ti,omap4-aes";

		ti,hwmods = "aes";

		reg = <0x53500000 0xa0>;

		interrupts = <102>;

		dmas = <&edma 6>,

		       <&edma 5>;

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

	};

Documentation/devicetree/bindings/crypto/omap-sham.txt

0 → 100644
+28 −0
Original line number Diff line number Diff line 
OMAP SoC SHA crypto Module



Required properties:



- compatible : Should contain entries for this and backward compatible

  SHAM versions:

  - "ti,omap2-sham" for OMAP2 & OMAP3.

  - "ti,omap4-sham" for OMAP4 and AM33XX.

  Note that these two versions are incompatible.

- ti,hwmods: Name of the hwmod associated with the SHAM module

- reg : Offset and length of the register set for the module

- interrupts : the interrupt-specifier for the SHAM module.



Optional properties:

- dmas: DMA specifiers for the rx dma. See the DMA client binding,

	Documentation/devicetree/bindings/dma/dma.txt

- dma-names: DMA request name. Should be "rx" if a dma is present.



Example:

	/* AM335x */

	sham: sham@53100000 {

		compatible = "ti,omap4-sham";

		ti,hwmods = "sham";

		reg = <0x53100000 0x200>;

		interrupts = <109>;

		dmas = <&edma 36>;

		dma-names = "rx";

	};

Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt

+25 −1
Original line number Diff line number Diff line
@@ -20,8 +20,29 @@ ti,dual-volt: boolean, supports dual voltage cards 
ti,non-removable: non-removable slot (like eMMC)

ti,needs-special-reset: Requires a special softreset sequence

ti,needs-special-hs-handling: HSMMC IP needs special setting for handling High Speed

dmas: List of DMA specifiers with the controller specific format

as described in the generic DMA client binding. A tx and rx

specifier is required.

dma-names: List of DMA request names. These strings correspond

1:1 with the DMA specifiers listed in dmas. The string naming is

to be "rx" and "tx" for RX and TX DMA requests, respectively.



Examples:



[hwmod populated DMA resources]



	mmc1: mmc@0x4809c000 {

		compatible = "ti,omap4-hsmmc";

		reg = <0x4809c000 0x400>;

		ti,hwmods = "mmc1";

		ti,dual-volt;

		bus-width = <4>;

		vmmc-supply = <&vmmc>; /* phandle to regulator node */

		ti,non-removable;

	};



[generic DMA request binding]



Example:

	mmc1: mmc@0x4809c000 {

		compatible = "ti,omap4-hsmmc";

		reg = <0x4809c000 0x400>;
@@ -30,4 +51,7 @@ Example: 
		bus-width = <4>;

		vmmc-supply = <&vmmc>; /* phandle to regulator node */

		ti,non-removable;

		dmas = <&edma 24

			&edma 25>;

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

	};

Documentation/devicetree/bindings/pinctrl/pinctrl-single.txt

+11 −0
Original line number Diff line number Diff line
@@ -72,6 +72,13 @@ Optional properties: 
		/* pin base, nr pins & gpio function */

		pinctrl-single,gpio-range = <&range 0 3 0 &range 3 9 1>;



- interrupt-controller : standard interrupt controller binding if using

  interrupts for wake-up events for example. In this case pinctrl-single

  is set up as a chained interrupt controller and the wake-up interrupts

  can be requested by the drivers using request_irq().



- #interrupt-cells : standard interrupt binding if using interrupts



This driver assumes that there is only one register for each pin (unless the

pinctrl-single,bit-per-mux is set), and uses the common pinctrl bindings as

specified in the pinctrl-bindings.txt document in this directory.
@@ -121,6 +128,8 @@ pmx_core: pinmux@4a100040 { 
	reg = <0x4a100040 0x0196>;

	#address-cells = <1>;

	#size-cells = <0>;

	#interrupt-cells = <1>;

	interrupt-controller;

	pinctrl-single,register-width = <16>;

	pinctrl-single,function-mask = <0xffff>;

};
@@ -131,6 +140,8 @@ pmx_wkup: pinmux@4a31e040 { 
	reg = <0x4a31e040 0x0038>;

	#address-cells = <1>;

	#size-cells = <0>;

	#interrupt-cells = <1>;

	interrupt-controller;

	pinctrl-single,register-width = <16>;

	pinctrl-single,function-mask = <0xffff>;

};

arch/arm/boot/dts/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -172,7 +172,9 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ 
	omap3-devkit8000.dtb \

	omap3-beagle-xm.dtb \

	omap3-evm.dtb \

	omap3-n900.dtb \

	omap3-tobi.dtb \

	omap3-gta04.dtb \

	omap3-igep0020.dtb \

	omap3-igep0030.dtb \

	omap4-panda.dtb \
@@ -186,9 +188,11 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ 
	am335x-evmsk.dtb \

	am335x-bone.dtb \

	am335x-boneblack.dtb \

	am335x-base0033.dtb \

	am3517-evm.dtb \

	am3517_mt_ventoux.dtb \

	am43x-epos-evm.dtb

	am43x-epos-evm.dtb \

	dra7-evm.dtb

dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-ethernet-disk-mini-v2.dtb

dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb

dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \