Commit fd781337 authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge tag 'omap-for-v3.13/dt-signed' of... 

Merge tag 'omap-for-v3.13/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt

From Tony Lindgren:
omap device tree related changes via Benoit Cousson <bcousson@baylibre.com>:

Add the minimal DTS support for DRA7xx based SoC core.
Add the initial support for N900 and gta04 phones.
Enable USB3 on OMAP5 evm board.
Add support for cryto accelerators
Add new IGEP AQUILA board
Add AM33XX EDMA support
Update HSUSB node to use the reset-gpios fmwk

* tag 'omap-for-v3.13/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

: (58 commits)
  ARM: dts: dra7-evm: Add mmc2 node for eMMC support
  ARM: dts: dra7-evm: Add mmc1 node for micro-sd support
  ARM: dts: omap5-uevm: mark TWL6037 as system-power-controller
  ARM: dts: omap3-igep0020: use standard constant for IRQ flags
  ARM: dts: omap3-igep0020: Add HS USB Host support
  ARM: dts: omap3-igep: Add USB OTG support
  ARM: dts: AM33XX beagle black: add pinmux and hdmi node to enable display
  ARM: dts: AM33XX: Add LCDC info into am335x-evm
  ARM: dts: AM437X: Add DES node
  ARM: dts: AM437X: Add AES node
  ARM: dts: AM33XX: Fix AES interrupt number
  ARM: dts: AM33XX: Add AES data and documentation
  ARM: dts: AM33XX: Add SHAM data and documentation
  ARM: dts: OMAP4: Add DES3DES node
  ARM: dts: OMAP4: Add AES node
  ARM: dts: am335x-evm[sdk]: switch mmc1 to 4-bit mode
  ARM: dts: am335x-bone-common: correct mux mode for cmd line
  ARM: dts: AM33XX: Add support for IGEP AQUILA EXPANSION board.
  ARM: dts: AM33XX: Add support for IGEP COM AQUILA
  ARM: dts: am335x-boneblack: move fixed regulator to board level
  ...

Signed-off-by: default avatarKevin Hilman <khilman@linaro.org>
parents 7587b596 c49f4984

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";

	};

arch/arm/boot/dts/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -174,7 +174,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 \
@@ -188,9 +190,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 \

arch/arm/boot/dts/am335x-base0033.dts

0 → 100644
+16 −0
Original line number Diff line number Diff line 
/*

 * am335x-base0033.dts - Device Tree file for IGEP AQUILA EXPANSION

 *

 * Copyright (C) 2013 ISEE 2007 SL - http://www.isee.biz

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#include "am335x-igep0033.dtsi"



/ {

	model = "IGEP COM AM335x on AQUILA Expansion";

	compatible = "isee,am335x-base0033", "isee,am335x-igep0033", "ti,am33xx";

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE