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

Commit 1071ec7b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

  Lots of stuff in here, including some new drivers for Intel's "MIC"
  co-processor devices, and a new eeprom driver.  Other things include
  the driver attribute cleanups, extcon driver updates, hyperv updates,
  and a raft of other miscellaneous driver fixes.

  All of these have been in linux-next for a while"

* tag 'char-misc-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (121 commits)
  misc: mic: Fixes for randconfig build errors and warnings.
  tifm: fix error return code in tifm_7xx1_probe()
  w1-gpio: Use devm_* functions
  w1-gpio: Detect of_gpio_error for first gpio
  uio: Pass pointers to virt_to_page(), not integers
  uio: fix memory leak
  misc/at24: avoid infinite loop on write()
  misc/93xx46: avoid infinite loop on write()
  misc: atmel_pwm: add deferred-probing support
  mei: wd: host_init propagate error codes from called functions
  mei: replace stray pr_debug with dev_dbg
  mei: bus: propagate error code returned by mei_me_cl_by_id
  mei: mei_cl_link remove duplicated check for open_handle_count
  mei: print correct device state during unexpected reset
  mei: nfc: fix memory leak in error path
  lkdtm: add tests for additional page permissions
  lkdtm: adjust recursion size to avoid warnings
  lkdtm: isolate stack corruption test
  mei: move host_clients_map cleanup to device init
  mei: me: downgrade two errors to debug level
  ...
parents c287322c 42579226

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

0 → 100644
+157 −0
Original line number Diff line number Diff line 
What:		/sys/class/mic/

Date:		October 2013

KernelVersion:	3.13

Contact:	Sudeep Dutt <sudeep.dutt@intel.com>

Description:

		The mic class directory belongs to Intel MIC devices and

		provides information per MIC device. An Intel MIC device is a

		PCIe form factor add-in Coprocessor card based on the Intel Many

		Integrated Core (MIC) architecture that runs a Linux OS.



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

Date:		October 2013

KernelVersion:	3.13

Contact:	Sudeep Dutt <sudeep.dutt@intel.com>

Description:

		The directories /sys/class/mic/mic0, /sys/class/mic/mic1 etc.,

		represent MIC devices (0,1,..etc). Each directory has

		information specific to that MIC device.



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

Date:		October 2013

KernelVersion:	3.13

Contact:	Sudeep Dutt <sudeep.dutt@intel.com>

Description:

		Provides information about the Coprocessor family for an Intel

		MIC device. For example - "x100"



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

Date:		October 2013

KernelVersion:	3.13

Contact:	Sudeep Dutt <sudeep.dutt@intel.com>

Description:

		Provides information about the silicon stepping for an Intel

		MIC device. For example - "A0" or "B0"



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

Date:		October 2013

KernelVersion:	3.13

Contact:	Sudeep Dutt <sudeep.dutt@intel.com>

Description:

		When read, this entry provides the current state of an Intel

		MIC device in the context of the card OS. Possible values that

		will be read are:

		"offline" - The MIC device is ready to boot the card OS. On

		reading this entry after an OSPM resume, a "boot" has to be

		written to this entry if the card was previously shutdown

		during OSPM suspend.

		"online" - The MIC device has initiated booting a card OS.

		"shutting_down" - The card OS is shutting down.

		"reset_failed" - The MIC device has failed to reset.

		"suspending" - The MIC device is currently being prepared for

		suspend. On reading this entry, a "suspend" has to be written

		to the state sysfs entry to ensure the card is shutdown during

		OSPM suspend.

		"suspended" - The MIC device has been suspended.



		When written, this sysfs entry triggers different state change

		operations depending upon the current state of the card OS.

		Acceptable values are:

		"boot" - Boot the card OS image specified by the combination

			 of firmware, ramdisk, cmdline and bootmode

			sysfs entries.

		"reset" - Initiates device reset.

		"shutdown" - Initiates card OS shutdown.

		"suspend" - Initiates card OS shutdown and also marks the card

		as suspended.



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

Date:		October 2013

KernelVersion:	3.13

Contact:	Sudeep Dutt <sudeep.dutt@intel.com>

Description:

		An Intel MIC device runs a Linux OS during its operation. This

		OS can shutdown because of various reasons. When read, this

		entry provides the status on why the card OS was shutdown.

		Possible values are:

		"nop" -  shutdown status is not applicable, when the card OS is

			"online"

		"crashed" - Shutdown because of a HW or SW crash.

		"halted" - Shutdown because of a halt command.

		"poweroff" - Shutdown because of a poweroff command.

		"restart" - Shutdown because of a restart command.



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

Date:		October 2013

KernelVersion:	3.13

Contact:	Sudeep Dutt <sudeep.dutt@intel.com>

Description:

		An Intel MIC device runs a Linux OS during its operation. Before

		booting this card OS, it is possible to pass kernel command line

		options to configure various features in it, similar to

		self-bootable machines. When read, this entry provides

		information about the current kernel command line options set to

		boot the card OS. This entry can be written to change the

		existing kernel command line options. Typically, the user would

		want to read the current command line options, append new ones

		or modify existing ones and then write the whole kernel command

		line back to this entry.



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

Date:		October 2013

KernelVersion:	3.13

Contact:	Sudeep Dutt <sudeep.dutt@intel.com>

Description:

		When read, this sysfs entry provides the path name under

		/lib/firmware/ where the firmware image to be booted on the

		card can be found. The entry can be written to change the

		firmware image location under /lib/firmware/.



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

Date:		October 2013

KernelVersion:	3.13

Contact:	Sudeep Dutt <sudeep.dutt@intel.com>

Description:

		When read, this sysfs entry provides the path name under

		/lib/firmware/ where the ramdisk image to be used during card

		OS boot can be found. The entry can be written to change

		the ramdisk image location under /lib/firmware/.



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

Date:		October 2013

KernelVersion:	3.13

Contact:	Sudeep Dutt <sudeep.dutt@intel.com>

Description:

		When read, this sysfs entry provides the current bootmode for

		the card. This sysfs entry can be written with the following

		valid strings:

		a) linux - Boot a Linux image.

		b) elf - Boot an elf image for flash updates.



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

Date:		October 2013

KernelVersion:	3.13

Contact:	Sudeep Dutt <sudeep.dutt@intel.com>

Description:

		An Intel MIC device runs a Linux OS during its operation. For

		debugging purpose and early kernel boot messages, the user can

		access the card OS log buffer via debugfs. When read, this entry

		provides the kernel virtual address of the buffer where the card

		OS log buffer can be read. This entry is written by the host

		configuration daemon to set the log buffer address. The correct

		log buffer address to be written can be found in the System.map

		file of the card OS.



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

Date:		October 2013

KernelVersion:	3.13

Contact:	Sudeep Dutt <sudeep.dutt@intel.com>

Description:

		An Intel MIC device runs a Linux OS during its operation. For

		debugging purpose and early kernel boot messages, the user can

		access the card OS log buffer via debugfs. When read, this entry

		provides the kernel virtual address where the card OS log buffer

		length can be read. This entry is written by host configuration

		daemon to set the log buffer length address. The correct log

		buffer length address to be written can be found in the

		System.map file of the card OS.

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

0 → 100644
+22 −0
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/misc/allwinner,sunxi-sid.txt

0 → 100644
+17 −0
Original line number Diff line number Diff line 
Allwinner sunxi-sid



Required properties:

- compatible: "allwinner,sun4i-sid" or "allwinner,sun7i-a20-sid".

- reg: Should contain registers location and length



Example for sun4i:

	sid@01c23800 {

		compatible = "allwinner,sun4i-sid";

		reg = <0x01c23800 0x10>

	};



Example for sun7i:

	sid@01c23800 {

		compatible = "allwinner,sun7i-a20-sid";

		reg = <0x01c23800 0x200>

	};

Documentation/devicetree/bindings/misc/ti,dac7512.txt

0 → 100644
+20 −0
Original line number Diff line number Diff line 
TI DAC7512 DEVICETREE BINDINGS



Required properties:



	- "compatible"		Must be set to "ti,dac7512"



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

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





Example:



	spi_master {

		dac7512: dac7512@0 {

			compatible = "ti,dac7512";

			reg = <0>; /* CS0 */

			spi-max-frequency = <1000000>;

		};

	};

Documentation/extcon/porting-android-switch-class

+4 −2
Original line number Diff line number Diff line
@@ -25,8 +25,10 @@ MyungJoo Ham <myungjoo.ham@samsung.com> 
    @print_state: no change but type change (switch_dev->extcon_dev)



- switch_dev_register(sdev, dev)

	=> extcon_dev_register(edev, dev)

	: no change but type change (sdev->edev)

	=> extcon_dev_register(edev)

	: type change (sdev->edev)

	: remove second param('dev'). if edev has parent device, should store

	  'dev' to 'edev.dev.parent' before registering extcon device

- switch_dev_unregister(sdev)

	=> extcon_dev_unregister(edev)

	: no change but type change (sdev->edev)