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

Commit 74b533c5 authored by Lee Jones's avatar Lee Jones
Browse files

Merge branches 'ib-extcon-mfd-4.4', 'ib-mfd-i2c-v4.4', 'ib-mfd-power-4.4',... 

Merge branches 'ib-extcon-mfd-4.4', 'ib-mfd-i2c-v4.4', 'ib-mfd-power-4.4', 'ib-mfd-regmap-4.4' and 'ib-mfd-regulator-4.4' into ibs-for-mfd-merged
parents 6c20b934 40d8edc9 1d7f833f b4fe8ba7 7e507119

Documentation/Changes

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ o udev 081 # udevd --version 
o  grub                   0.93                    # grub --version || grub-install --version

o  mcelog                 0.6                     # mcelog --version

o  iptables               1.4.2                   # iptables -V

o  openssl & libcrypto    1.0.1k                  # openssl version

o  openssl & libcrypto    1.0.0                   # openssl version





Kernel compilation

Documentation/acpi/enumeration.txt

+8 −3
Original line number Diff line number Diff line
@@ -347,13 +347,18 @@ For the first case, the MFD drivers do not need to do anything. The 
resulting child platform device will have its ACPI_COMPANION() set to point

to the parent device.



If the ACPI namespace has a device that we can match using an ACPI id,

the id should be set like:

If the ACPI namespace has a device that we can match using an ACPI id or ACPI

adr, the cell should be set like:



	static struct mfd_cell_acpi_match my_subdevice_cell_acpi_match = {

		.pnpid = "XYZ0001",

		.adr = 0,

	};



	static struct mfd_cell my_subdevice_cell = {

		.name = "my_subdevice",

		/* set the resources relative to the parent */

		.acpi_pnpid = "XYZ0001",

		.acpi_match = &my_subdevice_cell_acpi_match,

	};



The ACPI id "XYZ0001" is then used to lookup an ACPI device directly under

Documentation/devicetree/bindings/arm/gic-v3.txt

+5 −0
Original line number Diff line number Diff line
@@ -57,6 +57,8 @@ used to route Message Signalled Interrupts (MSI) to the CPUs. 
These nodes must have the following properties:

- compatible : Should at least contain  "arm,gic-v3-its".

- msi-controller : Boolean property. Identifies the node as an MSI controller

- #msi-cells: Must be <1>. The single msi-cell is the DeviceID of the device

  which will generate the MSI.

- reg: Specifies the base physical address and size of the ITS

  registers.
@@ -83,6 +85,7 @@ Examples: 
		gic-its@2c200000 {

			compatible = "arm,gic-v3-its";

			msi-controller;

			#msi-cells = <1>;

			reg = <0x0 0x2c200000 0 0x200000>;

		};

	};
@@ -107,12 +110,14 @@ Examples: 
		gic-its@2c200000 {

			compatible = "arm,gic-v3-its";

			msi-controller;

			#msi-cells = <1>;

			reg = <0x0 0x2c200000 0 0x200000>;

		};



		gic-its@2c400000 {

			compatible = "arm,gic-v3-its";

			msi-controller;

			#msi-cells = <1>;

			reg = <0x0 0x2c400000 0 0x200000>;

		};

	};

Documentation/devicetree/bindings/arm/idle-states.txt

+1 −1
Original line number Diff line number Diff line
@@ -497,7 +497,7 @@ cpus { 
	};



	idle-states {

		entry-method = "arm,psci";

		entry-method = "psci";



		CPU_RETENTION_0_0: cpu-retention-0-0 {

			compatible = "arm,idle-state";

Documentation/devicetree/bindings/gpio/gpio.txt

+3 −1
Original line number Diff line number Diff line
@@ -16,7 +16,9 @@ properties, each containing a 'gpio-list': 
GPIO properties should be named "[<name>-]gpios", with <name> being the purpose

of this GPIO for the device. While a non-existent <name> is considered valid

for compatibility reasons (resolving to the "gpios" property), it is not allowed

for new bindings.

for new bindings. Also, GPIO properties named "[<name>-]gpio" are valid and old

bindings use it, but are only supported for compatibility reasons and should not

be used for newer bindings since it has been deprecated.



GPIO properties can contain one or more GPIO phandles, but only in exceptional

cases should they contain more than one. If your device uses several GPIOs with