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

Commit bb27d499 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge char-misc-next into staging-next 



This resolves the merge issues and confusions people were having with
the goldfish drivers due to changes for them showing up in two different
trees.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 9676e84d 35bf7692

Documentation/ABI/stable/sysfs-bus-vmbus

+14 −0
Original line number Diff line number Diff line
@@ -27,3 +27,17 @@ Description: The mapping of which primary/sub channels are bound to which 
		Virtual Processors.

		Format: <channel's child_relid:the bound cpu's number>

Users:		tools/hv/lsvmbus



What:		/sys/bus/vmbus/devices/vmbus_*/device

Date:		Dec. 2015

KernelVersion:	4.5

Contact:	K. Y. Srinivasan <kys@microsoft.com>

Description:	The 16 bit device ID of the device

Users:		tools/hv/lsvmbus and user level RDMA libraries



What:		/sys/bus/vmbus/devices/vmbus_*/vendor

Date:		Dec. 2015

KernelVersion:	4.5

Contact:	K. Y. Srinivasan <kys@microsoft.com>

Description:	The 16 bit vendor ID of the device

Users:		tools/hv/lsvmbus and user level RDMA libraries

Documentation/cgroup-v2.txt

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ This is the authoritative documentation on the design, interface and 
conventions of cgroup v2.  It describes all userland-visible aspects

of cgroup including core and specific controller behaviors.  All

future changes must be reflected in this document.  Documentation for

v1 is available under Documentation/cgroup-legacy/.

v1 is available under Documentation/cgroup-v1/.



CONTENTS

Documentation/devicetree/bindings/goldfish/pipe.txt

0 → 100644
+17 −0
Original line number Diff line number Diff line 
Android Goldfish QEMU Pipe



Andorid pipe virtual device generated by android emulator.



Required properties:



- compatible : should contain "google,android-pipe" to match emulator

- reg        : <registers mapping>

- interrupts : <interrupt mapping>



Example:



	android_pipe@a010000 {

		compatible = "google,android-pipe";

		reg = <ff018000 0x2000>;

		interrupts = <0x12>;

	};

Documentation/devicetree/bindings/misc/eeprom-93xx46.txt

0 → 100644
+25 −0
Original line number Diff line number Diff line 
EEPROMs (SPI) compatible with Microchip Technology 93xx46 family.



Required properties:

- compatible : shall be one of:

    "atmel,at93c46d"

    "eeprom-93xx46"

- data-size : number of data bits per word (either 8 or 16)



Optional properties:

- read-only : parameter-less property which disables writes to the EEPROM

- select-gpios : if present, specifies the GPIO that will be asserted prior to

  each access to the EEPROM (e.g. for SPI bus multiplexing)



Property rules described in Documentation/devicetree/bindings/spi/spi-bus.txt

apply.  In particular, "reg" and "spi-max-frequency" properties must be given.



Example:

	eeprom@0 {

		compatible = "eeprom-93xx46";

		reg = <0>;

		spi-max-frequency = <1000000>;

		spi-cs-high;

		data-size = <8>;

		select-gpios = <&gpio4 4 GPIO_ACTIVE_HIGH>;

	};

Documentation/devicetree/bindings/nvmem/lpc1857-eeprom.txt

0 → 100644
+28 −0
Original line number Diff line number Diff line 
* NXP LPC18xx EEPROM memory NVMEM driver



Required properties:

  - compatible: Should be "nxp,lpc1857-eeprom"

  - reg: Must contain an entry with the physical base address and length

    for each entry in reg-names.

  - reg-names: Must include the following entries.

    - reg: EEPROM registers.

    - mem: EEPROM address space.

  - clocks: Must contain an entry for each entry in clock-names.

  - clock-names: Must include the following entries.

    - eeprom: EEPROM operating clock.

  - resets: Should contain a reference to the reset controller asserting

    the EEPROM in reset.

  - interrupts: Should contain EEPROM interrupt.



Example:



  eeprom: eeprom@4000e000 {

    compatible = "nxp,lpc1857-eeprom";

    reg = <0x4000e000 0x1000>,

          <0x20040000 0x4000>;

    reg-names = "reg", "mem";

    clocks = <&ccu1 CLK_CPU_EEPROM>;

    clock-names = "eeprom";

    resets = <&rgu 27>;

    interrupts = <4>;

  };