Merge branch 'mips-next-3.10' of... (9b3539e0) · Commits · e / devices / android_kernel_teracube_2e

CREDITS

+8 −0

Original line number	Diff line number	Diff line
		@@ -1510,6 +1510,14 @@ D: Natsemi ethernet
		D: Cobalt Networks (x86) support
		D: This-and-That

		N: Mark M. Hoffman
		E: mhoffman@lightlink.com
		D: asb100, lm93 and smsc47b397 hardware monitoring drivers
		D: hwmon subsystem core
		D: hwmon subsystem maintainer
		D: i2c-sis96x and i2c-stub SMBus drivers
		S: USA

		N: Dirk Hohndel
		E: hohndel@suse.de
		D: The XFree86[tm] Project

+1 −1

Original line number	Diff line number	Diff line
		@@ -227,7 +227,7 @@ X!Isound/sound_firmware.c
		<chapter id="uart16x50">
		<title>16x50 UART Driver</title>
		!Edrivers/tty/serial/serial_core.c
		!Edrivers/tty/serial/8250/8250.c
		!Edrivers/tty/serial/8250/8250_core.c
		</chapter>

		<chapter id="fbdev">

+1 −5

Original line number	Diff line number	Diff line
		@@ -13,9 +13,6 @@ Required parent device properties:
		4 = active high level-sensitive
		8 = active low level-sensitive

		Optional parent device properties:
		- reg : contains the PRCMU mailbox address for the AB8500 i2c port

		The AB8500 consists of a large and varied group of sub-devices:

		Device IRQ Names Supply Names Description
		@@ -86,9 +83,8 @@ Non-standard child device properties:
		- stericsson,amic2-bias-vamic1 : Analoge Mic wishes to use a non-standard Vamic
		- stericsson,earpeice-cmv : Earpeice voltage (only: 950 \| 1100 \| 1270 \| 1580)

		ab8500@5 {
		ab8500 {
		compatible = "stericsson,ab8500";
		reg = <5>; /* mailbox 5 is i2c */
		interrupts = <0 40 0x4>;
		interrupt-controller;
		#interrupt-cells = <2>;

0 → 100644

+17 −0

Original line number	Diff line number	Diff line
		Ralink MIPS SoC device tree bindings

		1. SoCs

		Each device tree must specify a compatible value for the Ralink SoC
		it uses in the compatible property of the root node. The compatible
		value must be one of the following values:

		ralink,rt2880-soc
		ralink,rt3050-soc
		ralink,rt3052-soc
		ralink,rt3350-soc
		ralink,rt3352-soc
		ralink,rt3883-soc
		ralink,rt5350-soc
		ralink,mt7620a-soc
		ralink,mt7620n-soc

+3 −0

Original line number	Diff line number	Diff line
		@@ -11,6 +11,9 @@ Required properties:
		- "nvidia,tegra20-uart"
		- "nxp,lpc3220-uart"
		- "ibm,qpace-nwp-serial"
		- "altr,16550-FIFO32"
		- "altr,16550-FIFO64"
		- "altr,16550-FIFO128"
		- "serial" if the port type is unknown.
		- reg : offset and length of the register set for the device.
		- interrupts : should contain uart interrupt.