Commit 1c00038c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

  Not much really interesting here, just a number of little changes all
  over the place, and some nice consolidation of the nvmem drivers to a
  common framework.  As usual, the mei drivers stand out as the largest
  "churn" to handle new devices and features in their hardware.

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

* tag 'char-misc-4.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (136 commits)
  auxdisplay: ks0108: initialize local parport variable
  extcon: palmas: Fix build break due to devm_gpiod_get_optional API change
  extcon: palmas: Support GPIO based USB ID detection
  extcon: Fix signedness bugs about break error handling
  extcon: Drop owner assignment from i2c_driver
  extcon: arizona: Simplify pdata symantics for micd_dbtime
  extcon: arizona: Declare 3-pole jack if we detect open circuit on mic
  extcon: Add exception handling to prevent the NULL pointer access
  extcon: arizona: Ensure variables are set for headphone detection
  extcon: arizona: Use gpiod inteface to handle micd_pol_gpio gpio
  extcon: arizona: Add basic microphone detection DT/ACPI bindings
  extcon: arizona: Update to use the new device properties API
  extcon: palmas: Remove the mutually_exclusive array
  extcon: Remove optional print_state() function pointer of struct extcon_dev
  extcon: Remove duplicate header file in extcon.h
  extcon: max77843: Clear IRQ bits state before request IRQ
  toshiba laptop: replace ioremap_cache with ioremap
  misc: eeprom: max6875: clean up max6875_read()
  misc: eeprom: clean up eeprom_read()
  misc: eeprom: 93xx46: clean up eeprom_93xx46_bin_read/write
  ...
parents 44e98edc 672cfeeb

Documentation/ABI/stable/sysfs-bus-vmbus

0 → 100644
+29 −0
Original line number Diff line number Diff line 
What:		/sys/bus/vmbus/devices/vmbus_*/id

Date:		Jul 2009

KernelVersion:	2.6.31

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

Description:	The VMBus child_relid of the device's primary channel

Users:		tools/hv/lsvmbus



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

Date:		Jul 2009

KernelVersion:	2.6.31

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

Description:	The VMBus interface type GUID of the device

Users:		tools/hv/lsvmbus



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

Date:		Jul 2009

KernelVersion:	2.6.31

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

Description:	The VMBus interface instance GUID of the device

Users:		tools/hv/lsvmbus



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

Date:		Jul 2015

KernelVersion:	4.2.0

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

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

Documentation/ABI/testing/sysfs-bus-coresight-devices-etm3x

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ KernelVersion: 3.19 
Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>

Description: 	(RW) Mask to apply to all the context ID comparator.



What:		/sys/bus/coresight/devices/<memory_map>.[etm|ptm]/ctxid_val

What:		/sys/bus/coresight/devices/<memory_map>.[etm|ptm]/ctxid_pid

Date:		November 2014

KernelVersion:	3.19

Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>

Documentation/ABI/testing/sysfs-bus-coresight-devices-etm4x

+1 −1
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ KernelVersion: 4.01 
Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>

Description:	(RW) Select which context ID comparator to work with.



What:		/sys/bus/coresight/devices/<memory_map>.etm/ctxid_val

What:		/sys/bus/coresight/devices/<memory_map>.etm/ctxid_pid

Date:		April 2015

KernelVersion:	4.01

Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>

Documentation/ABI/testing/sysfs-driver-sunxi-sid

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
What:		/sys/devices/*/<our-device>/eeprom

Date:		August 2013

Contact:	Oliver Schinagl <oliver@schinagl.nl>

Description:	read-only access to the SID (Security-ID) on current

		A-series SoC's from Allwinner. Currently supports A10, A10s, A13

		and A20 CPU's. The earlier A1x series of SoCs exports 16 bytes,

		whereas the newer A20 SoC exposes 512 bytes split into sections.

		Besides the 16 bytes of SID, there's also an SJTAG area,

		HDMI-HDCP key and some custom keys. Below a quick overview, for

		details see the user manual:

		0x000  128 bit root-key (sun[457]i)

		0x010  128 bit boot-key (sun7i)

		0x020   64 bit security-jtag-key (sun7i)

		0x028   16 bit key configuration (sun7i)

		0x02b   16 bit custom-vendor-key (sun7i)

		0x02c  320 bit low general key (sun7i)

		0x040   32 bit read-control access (sun7i)

		0x064  224 bit low general key (sun7i)

		0x080 2304 bit HDCP-key (sun7i)

		0x1a0  768 bit high general key (sun7i)

Users:		any user space application which wants to read the SID on

		Allwinner's A-series of CPU's.

Documentation/devicetree/bindings/arm/coresight.txt

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ its hardware characteristcs. 
		- "arm,coresight-tmc", "arm,primecell";

		- "arm,coresight-funnel", "arm,primecell";

		- "arm,coresight-etm3x", "arm,primecell";

		- "arm,coresight-etm4x", "arm,primecell";

		- "qcom,coresight-replicator1x", "arm,primecell";



	* reg: physical base address and length of the register

CRA Git | Maintained and supported by SUSTech CRA and CCSE