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

Commit 0bae2f17 authored by Linus Walleij's avatar Linus Walleij
Browse files

Merge branch 'ib-mfd-regulator-gpio-4.6' of... 

Merge branch 'ib-mfd-regulator-gpio-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into devel
parents adf32eaa ca801a22

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ Andrey Ryabinin <ryabinin.a.a@gmail.com> <a.ryabinin@samsung.com> 
Andrew Morton <akpm@linux-foundation.org>

Andrew Vasquez <andrew.vasquez@qlogic.com>

Andy Adamson <andros@citi.umich.edu>

Antonio Ospite <ao2@ao2.it> <ao2@amarulasolutions.com>

Archit Taneja <archit@ti.com>

Arnaud Patard <arnaud.patard@rtp-net.org>

Arnd Bergmann <arnd@arndb.de>

Documentation/Intel-IOMMU.txt

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ Linux IOMMU Support 


The architecture spec can be obtained from the below location.



http://www.intel.com/technology/virtualization/

http://www.intel.com/content/dam/www/public/us/en/documents/product-specifications/vt-directed-io-spec.pdf



This guide gives a quick cheat sheet for some basic understanding.

Documentation/devicetree/bindings/mfd/tps65912.txt

0 → 100644
+50 −0
Original line number Diff line number Diff line 
* TPS65912 Power Management Integrated Circuit bindings



Required properties:

 - compatible		: Should be "ti,tps65912".

 - reg			: Slave address or chip select number (I2C / SPI).

 - interrupt-parent	: The parent interrupt controller.

 - interrupts		: The interrupt line the device is connected to.

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

 - #interrupt-cells	: The number of cells to describe an IRQ, should be 2.

			    The first cell is the IRQ number.

			    The second cell is the flags, encoded as trigger

			    masks from ../interrupt-controller/interrupts.txt.

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

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

			    the second cell is used to specify flags.

			    See ../gpio/gpio.txt for more information.

 - regulators:		: List of child nodes that specify the regulator

			    initialization data. Child nodes must be named

			    after their hardware counterparts: dcdc[1-4] and

			    ldo[1-10]. Each child nodes is defined using the

			    standard binding for regulators.



Example:



	pmic: tps65912@2d {

		compatible = "ti,tps65912";

		reg = <0x2d>;

		interrupt-parent = <&gpio1>;

		interrupts = <28 IRQ_TYPE_LEVEL_LOW>;

		interrupt-controller;

		#interrupt-cells = <2>;

		gpio-controller;

		#gpio-cells = <2>;



		regulators {

			dcdc1 {

				regulator-name = "vdd_core";

				regulator-min-microvolt = <912000>;

				regulator-max-microvolt = <1144000>;

				regulator-boot-on;

				regulator-always-on;

			};



			ldo1 {

				regulator-name = "ldo1";

				regulator-min-microvolt = <1900000>;

				regulator-max-microvolt = <1900000>;

			};

		};

	};

Documentation/virtual/kvm/api.txt

+1 −1
Original line number Diff line number Diff line
@@ -3025,7 +3025,7 @@ len must be a multiple of sizeof(struct kvm_s390_irq). It must be > 0 
and it must not exceed (max_vcpus + 32) * sizeof(struct kvm_s390_irq),

which is the maximum number of possibly pending cpu-local interrupts.



4.90 KVM_SMI

4.96 KVM_SMI



Capability: KVM_CAP_X86_SMM

Architectures: x86

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 5

SUBLEVEL = 0

EXTRAVERSION = -rc1

EXTRAVERSION = -rc2

NAME = Blurry Fish Butt



# *DOCUMENTATION*