Merge tag 'tegra-soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra into tegra/soc2

Embedded Memory Controller

Properties:

- name : Should be emc

- #address-cells : Should be 1

- #size-cells : Should be 0

- compatible : Should contain "nvidia,tegra20-emc".

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

- nvidia,use-ram-code : If present, the sub-nodes will be addressed

  and chosen using the ramcode board selector. If omitted, only one

  set of tables can be present and said tables will be used

  irrespective of ram-code configuration.

Child device nodes describe the memory settings for different configurations and clock rates.

Example:

	emc@7000f400 {

		#address-cells = < 1 >;

		#size-cells = < 0 >;

		compatible = "nvidia,tegra20-emc";

		reg = <0x7000f4000 0x200>;

	}

Embedded Memory Controller ram-code table

If the emc node has the nvidia,use-ram-code property present, then the

next level of nodes below the emc table are used to specify which settings

apply for which ram-code settings.

If the emc node lacks the nvidia,use-ram-code property, this level is omitted

and the tables are stored directly under the emc node (see below).

Properties:

- name : Should be emc-tables

- nvidia,ram-code : the binary representation of the ram-code board strappings

  for which this node (and children) are valid.

Embedded Memory Controller configuration table

This is a table containing the EMC register settings for the various

operating speeds of the memory controller. They are always located as

subnodes of the emc controller node.

There are two ways of specifying which tables to use:

* The simplest is if there is just one set of tables in the device tree,

  and they will always be used (based on which frequency is used).

  This is the preferred method, especially when firmware can fill in

  this information based on the specific system information and just

  pass it on to the kernel.

* The slightly more complex one is when more than one memory configuration

  might exist on the system.  The Tegra20 platform handles this during

  early boot by selecting one out of possible 4 memory settings based

  on a 2-pin "ram code" bootstrap setting on the board. The values of

  these strappings can be read through a register in the SoC, and thus

  used to select which tables to use.

Properties:

- name : Should be emc-table

- compatible : Should contain "nvidia,tegra20-emc-table".

- reg : either an opaque enumerator to tell different tables apart, or

  the valid frequency for which the table should be used (in kHz).

- clock-frequency : the clock frequency for the EMC at which this

  table should be used (in kHz).

- nvidia,emc-registers : a 46 word array of EMC registers to be programmed

  for operation at the 'clock-frequency' setting.

  The order and contents of the registers are:

    RC, RFC, RAS, RP, R2W, W2R, R2P, W2P, RD_RCD, WR_RCD, RRD, REXT,

    WDV, QUSE, QRST, QSAFE, RDV, REFRESH, BURST_REFRESH_NUM, PDEX2WR,

    PDEX2RD, PCHG2PDEN, ACT2PDEN, AR2PDEN, RW2PDEN, TXSR, TCKE, TFAW,

    TRPAB, TCLKSTABLE, TCLKSTOP, TREFBW, QUSE_EXTRA, FBIO_CFG6, ODT_WRITE,

    ODT_READ, FBIO_CFG5, CFG_DIG_DLL, DLL_XFORM_DQS, DLL_XFORM_QUSE,

    ZCAL_REF_CNT, ZCAL_WAIT_CNT, AUTO_CAL_INTERVAL, CFG_CLKTRIM_0,

    CFG_CLKTRIM_1, CFG_CLKTRIM_2

		emc-table@166000 {

			reg = <166000>;

			compatible = "nvidia,tegra20-emc-table";

			clock-frequency = < 166000 >;

			nvidia,emc-registers = < 0 0 0 0 0 0 0 0 0 0 0 0 0 0

						 0 0 0 0 0 0 0 0 0 0 0 0 0 0

						 0 0 0 0 0 0 0 0 0 0 0 0 0 0

						 0 0 0 0 >;

		};

		emc-table@333000 {

			reg = <333000>;

			compatible = "nvidia,tegra20-emc-table";

			clock-frequency = < 333000 >;

			nvidia,emc-registers = < 0 0 0 0 0 0 0 0 0 0 0 0 0 0

						 0 0 0 0 0 0 0 0 0 0 0 0 0 0

						 0 0 0 0 0 0 0 0 0 0 0 0 0 0

						 0 0 0 0 >;

		};

NVIDIA Tegra Power Management Controller (PMC)

Properties:

- name : Should be pmc

- compatible : Should contain "nvidia,tegra<chip>-pmc".

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

- nvidia,invert-interrupt : If present, inverts the PMU interrupt signal.

  The PMU is an external Power Management Unit, whose interrupt output

  signal is fed into the PMC. This signal is optionally inverted, and then

  fed into the ARM GIC. The PMC is not involved in the detection or

  handling of this interrupt signal, merely its inversion.

Example:

pmc@7000f400 {

	compatible = "nvidia,tegra20-pmc";

	reg = <0x7000e400 0x400>;

	nvidia,invert-interrupt;

};

* NVIDIA Tegra APB DMA controller

Required properties:

- compatible: Should be "nvidia,<chip>-apbdma"

- reg: Should contain DMA registers location and length. This shuld include

  all of the per-channel registers.

- interrupts: Should contain all of the per-channel DMA interrupts.

Examples:

apbdma: dma@6000a000 {

	compatible = "nvidia,tegra20-apbdma";

	reg = <0x6000a000 0x1200>;

	interrupts = < 0 136 0x04

		       0 137 0x04

		       0 138 0x04

		       0 139 0x04

		       0 140 0x04

		       0 141 0x04

		       0 142 0x04

		       0 143 0x04

		       0 144 0x04

		       0 145 0x04

		       0 146 0x04

		       0 147 0x04

		       0 148 0x04

		       0 149 0x04

		       0 150 0x04

		       0 151 0x04 >;

};

NVIDIA Tegra 2 GPIO controller

NVIDIA Tegra GPIO controller

Required properties:

- compatible : "nvidia,tegra20-gpio"

- compatible : "nvidia,tegra<chip>-gpio"

- reg : Physical base address and length of the controller's registers.

- interrupts : The interrupt outputs from the controller. For Tegra20,

  there should be 7 interrupts specified, and for Tegra30, there should

  be 8 interrupts specified.

- #gpio-cells : Should be two. The first cell is the pin number and the

  second cell is used to specify optional parameters:

  - bit 0 specifies polarity (0 for normal, 1 for inverted)

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

- #interrupt-cells : Should be 2.

  The first cell is the GPIO number.

  The second cell is used to specify flags:

    bits[3:0] trigger type and level flags:

      1 = low-to-high edge triggered.

      2 = high-to-low edge triggered.

      4 = active high level-sensitive.

      8 = active low level-sensitive.

      Valid combinations are 1, 2, 3, 4, 8.

- interrupt-controller : Marks the device node as an interrupt controller.

Example:

gpio: gpio@6000d000 {

	compatible = "nvidia,tegra20-gpio";

	reg = < 0x6000d000 0x1000 >;

	interrupts = < 0 32 0x04

		       0 33 0x04

		       0 34 0x04

		       0 35 0x04

		       0 55 0x04

		       0 87 0x04

		       0 89 0x04 >;

	#gpio-cells = <2>;

	gpio-controller;

	#interrupt-cells = <2>;

	interrupt-controller;

};

F:	drivers/platform/x86/wmi.c

AD1889 ALSA SOUND DRIVER

M:	Kyle McMartin <kyle@mcmartin.ca>

M:	Thibaut Varene <T-Bone@parisc-linux.org>

W:	http://wiki.parisc-linux.org/AD1889

L:	linux-parisc@vger.kernel.org

F:	include/linux/hwspinlock.h

HARMONY SOUND DRIVER

M:	Kyle McMartin <kyle@mcmartin.ca>

L:	linux-parisc@vger.kernel.org

S:	Maintained

F:	sound/parisc/harmony.*

F:	net/ieee802154/

F:	drivers/ieee802154/

IIO SUBSYSTEM AND DRIVERS

M:	Jonathan Cameron <jic23@cam.ac.uk>

L:	linux-iio@vger.kernel.org

S:	Maintained

F:	drivers/staging/iio/

IKANOS/ADI EAGLE ADSL USB DRIVER

M:	Matthieu Castet <castet.matthieu@free.fr>

M:	Stanislaw Gruszka <stf_xl@wp.pl>

F:	drivers/block/paride/

PARISC ARCHITECTURE

M:	Kyle McMartin <kyle@mcmartin.ca>

M:	Helge Deller <deller@gmx.de>

M:	"James E.J. Bottomley" <jejb@parisc-linux.org>

M:	Helge Deller <deller@gmx.de>

L:	linux-parisc@vger.kernel.org

W:	http://www.parisc-linux.org/

Q:	http://patchwork.kernel.org/project/linux-parisc/list/

F:	drivers/mmc/host/sdhci-spear.c

SECURITY SUBSYSTEM

M:	James Morris <jmorris@namei.org>

M:	James Morris <james.l.morris@oracle.com>

L:	linux-security-module@vger.kernel.org (suggested Cc:)

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git

W:	http://security.wiki.kernel.org/

SELINUX SECURITY MODULE

M:	Stephen Smalley <sds@tycho.nsa.gov>

M:	James Morris <jmorris@namei.org>

M:	James Morris <james.l.morris@oracle.com>

M:	Eric Paris <eparis@parisplace.org>

L:	selinux@tycho.nsa.gov (subscribers-only, general discussion)

W:	http://selinuxproject.org