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

Commit 7a53eea1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull char/misc driver updates from Greg KH:
 "Here's the "big" char and misc driver update for 4.9-rc1.

  Lots of little things here, all over the driver tree for subsystems
  that flow through me. Nothing major that I can discern, full details
  are in the shortlog.

  All have been in the linux-next tree with no reported issues"

* tag 'char-misc-4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (144 commits)
  drivers/misc/hpilo: Changes to support new security states in iLO5 FW
  at25: fix debug and error messaging
  misc/genwqe: ensure zero initialization
  vme: fake: remove unexpected unlock in fake_master_set()
  vme: fake: mark symbols static where possible
  spmi: pmic-arb: Return an error code if sanity check fails
  Drivers: hv: get rid of id in struct vmbus_channel
  Drivers: hv: make VMBus bus ids persistent
  mcb: Add a dma_device to mcb_device
  mcb: Enable PCI bus mastering by default
  mei: stop the stall timer worker if not needed
  clk: probe common clock drivers earlier
  vme: fake: fix build for 64-bit dma_addr_t
  ttyprintk: Neaten and simplify printing
  mei: me: add kaby point device ids
  coresight: tmc: mark symbols static where possible
  coresight: perf: deal with error condition properly
  Drivers: hv: hv_util: Avoid dynamic allocation in time synch
  fpga manager: Add hardware dependency to Zynq driver
  Drivers: hv: utils: Support TimeSync version 4.0 protocol samples.
  ...
parents 597f03f9 c9fef1cc

CREDITS

+5 −0
Original line number Diff line number Diff line
@@ -1944,6 +1944,11 @@ E: kraxel@bytesex.org 
E: kraxel@suse.de

D: video4linux, bttv, vesafb, some scsi, misc fixes



N: Hans J. Koch

D: USERSPACE I/O, MAX6650

D: Hans passed away in June 2016, and will be greatly missed.

W: https://lwn.net/Articles/691000/



N: Harald Koenig

E: koenig@tat.physik.uni-tuebingen.de

D: XFree86 (S3), DCF77, some kernel hacks and fixes

Documentation/ABI/testing/sysfs-class-mic.txt

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ Description: 


What:		/sys/class/mic/mic(x)/heartbeat_enable

Date:		March 2015

KernelVersion:	3.20

KernelVersion:	4.4

Contact:	Ashutosh Dixit <ashutosh.dixit@intel.com>

Description:

		The MIC drivers detect and inform user space about card crashes

Documentation/ABI/testing/sysfs-i2c-bmp085

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line 
What:		/sys/bus/i2c/devices/<busnum>-<devaddr>/pressure0_input

Date:		June 2010

Contact:	Christoph Mair <christoph.mair@gmail.com>

Description:	Start a pressure measurement and read the result. Values

		represent the ambient air pressure in pascal (0.01 millibar).



		Reading: returns the current air pressure.





What:		/sys/bus/i2c/devices/<busnum>-<devaddr>/temp0_input

Date:		June 2010

Contact:	Christoph Mair <christoph.mair@gmail.com>

Description:	Measure the ambient temperature. The returned value represents

		the ambient temperature in units of 0.1 degree celsius.



		Reading: returns the current temperature.





What:		/sys/bus/i2c/devices/<busnum>-<devaddr>/oversampling

Date:		June 2010

Contact:	Christoph Mair <christoph.mair@gmail.com>

Description:	Tell the bmp085 to use more samples to calculate a pressure

		value. When writing to this file the chip will use 2^x samples

		to calculate the next pressure value with x being the value

		written. Using this feature will decrease RMS noise and

		increase the measurement time.



		Reading: returns the current oversampling setting.



		Writing: sets a new oversampling setting.

		Accepted values: 0..3.

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

+11 −2
Original line number Diff line number Diff line 
= Rockchip eFuse device tree bindings =



Required properties:

- compatible: Should be "rockchip,rockchip-efuse"

- compatible: Should be one of the following.

  - "rockchip,rk3066a-efuse" - for RK3066a SoCs.

  - "rockchip,rk3188-efuse" - for RK3188 SoCs.

  - "rockchip,rk3288-efuse" - for RK3288 SoCs.

  - "rockchip,rk3399-efuse" - for RK3399 SoCs.

- reg: Should contain the registers location and exact eFuse size

- clocks: Should be the clock id of eFuse

- clock-names: Should be "pclk_efuse"



Deprecated properties:

- compatible: "rockchip,rockchip-efuse"

  Old efuse compatible value compatible to rk3066a, rk3188 and rk3288

  efuses



= Data cells =

Are child nodes of eFuse, bindings of which as described in

bindings/nvmem/nvmem.txt
@@ -13,7 +22,7 @@ bindings/nvmem/nvmem.txt 
Example:



	efuse: efuse@ffb40000 {

		compatible = "rockchip,rockchip-efuse";

		compatible = "rockchip,rk3288-efuse";

		reg = <0xffb40000 0x20>;

		#address-cells = <1>;

		#size-cells = <1>;

Documentation/vme_api.txt

+7 −6
Original line number Diff line number Diff line
@@ -8,13 +8,14 @@ As with other subsystems within the Linux kernel, VME device drivers register 
with the VME subsystem, typically called from the devices init routine.  This is

achieved via a call to the following function:



	int vme_register_driver (struct vme_driver *driver);

	int vme_register_driver (struct vme_driver *driver, unsigned int ndevs);



If driver registration is successful this function returns zero, if an error

occurred a negative error code will be returned.



A pointer to a structure of type 'vme_driver' must be provided to the

registration function. The structure is as follows:

registration function. Along with ndevs, which is the number of devices your

driver is able to support. The structure is as follows:



	struct vme_driver {

		struct list_head node;
@@ -32,8 +33,8 @@ At the minimum, the '.name', '.match' and '.probe' elements of this structure 
should be correctly set. The '.name' element is a pointer to a string holding

the device driver's name.



The '.match' function allows controlling the number of devices that need to

be registered. The match function should return 1 if a device should be

The '.match' function allows control over which VME devices should be registered

with the driver. The match function should return 1 if a device should be

probed and 0 otherwise. This example match function (from vme_user.c) limits

the number of devices probed to one:
@@ -385,13 +386,13 @@ location monitor location. Each location monitor can monitor a number of 
adjacent locations:



	int vme_lm_attach(struct vme_resource *res, int num,

		void (*callback)(int));

		void (*callback)(void *));



	int vme_lm_detach(struct vme_resource *res, int num);



The callback function is declared as follows.



	void callback(int num);

	void callback(void *data);





Slot Detection