Commit 8eee93e2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'char-misc-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc 

Pull char/misc updates from Greg KH:
 "Here is the big char/misc driver update for 4.6-rc1.

  The majority of the patches here is hwtracing and some new mic
  drivers, but there's a lot of other driver updates as well.  Full
  details in the shortlog.

  All have been in linux-next for a while with no reported issues"

* tag 'char-misc-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (238 commits)
  goldfish: Fix build error of missing ioremap on UM
  nvmem: mediatek: Fix later provider initialization
  nvmem: imx-ocotp: Fix return value of imx_ocotp_read
  nvmem: Fix dependencies for !HAS_IOMEM archs
  char: genrtc: replace blacklist with whitelist
  drivers/hwtracing: make coresight-etm-perf.c explicitly non-modular
  drivers: char: mem: fix IS_ERROR_VALUE usage
  char: xillybus: Fix internal data structure initialization
  pch_phub: return -ENODATA if ROM can't be mapped
  Drivers: hv: vmbus: Support kexec on ws2012 r2 and above
  Drivers: hv: vmbus: Support handling messages on multiple CPUs
  Drivers: hv: utils: Remove util transport handler from list if registration fails
  Drivers: hv: util: Pass the channel information during the init call
  Drivers: hv: vmbus: avoid unneeded compiler optimizations in vmbus_wait_for_unload()
  Drivers: hv: vmbus: remove code duplication in message handling
  Drivers: hv: vmbus: avoid wait_for_completion() on crash
  Drivers: hv: vmbus: don't loose HVMSG_TIMER_EXPIRED messages
  misc: at24: replace memory_accessor with nvmem_device_read
  eeprom: 93xx46: extend driver to plug into the NVMEM framework
  eeprom: at25: extend driver to plug into the NVMEM framework
  ...
parents 1a4ab084 16617535

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/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>;

  };

Documentation/devicetree/bindings/nvmem/mtk-efuse.txt

0 → 100644
+36 −0
Original line number Diff line number Diff line 
= Mediatek MTK-EFUSE device tree bindings =



This binding is intended to represent MTK-EFUSE which is found in most Mediatek SOCs.



Required properties:

- compatible: should be "mediatek,mt8173-efuse" or "mediatek,efuse"

- reg: Should contain registers location and length



= Data cells =

Are child nodes of MTK-EFUSE, bindings of which as described in

bindings/nvmem/nvmem.txt



Example:



	efuse: efuse@10206000 {

		compatible = "mediatek,mt8173-efuse";

		reg	   = <0 0x10206000 0 0x1000>;

		#address-cells = <1>;

		#size-cells = <1>;



		/* Data cells */

		thermal_calibration: calib@528 {

			reg = <0x528 0xc>;

		};

	};



= Data consumers =

Are device nodes which consume nvmem data cells.



For example:



	thermal {

		...

		nvmem-cells = <&thermal_calibration>;

		nvmem-cell-names = "calibration";

	};

CRA Git | Maintained and supported by SUSTech CRA and CCSE