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

Commit 4a522463 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'driver-core-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core 

Pull driver core patches for 3.4-rc1 from Greg KH:
 "Here's the big driver core merge for 3.4-rc1.

  Lots of various things here, sysfs fixes/tweaks (with the nlink
  breakage reverted), dynamic debugging updates, w1 drivers, hyperv
  driver updates, and a variety of other bits and pieces, full
  information in the shortlog."

* tag 'driver-core-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (78 commits)
  Tools: hv: Support enumeration from all the pools
  Tools: hv: Fully support the new KVP verbs in the user level daemon
  Drivers: hv: Support the newly introduced KVP messages in the driver
  Drivers: hv: Add new message types to enhance KVP
  regulator: Support driver probe deferral
  Revert "sysfs: Kill nlink counting."
  uevent: send events in correct order according to seqnum (v3)
  driver core: minor comment formatting cleanups
  driver core: move the deferred probe pointer into the private area
  drivercore: Add driver probe deferral mechanism
  DS2781 Maxim Stand-Alone Fuel Gauge battery and w1 slave drivers
  w1_bq27000: Only one thread can access the bq27000 at a time.
  w1_bq27000 - remove w1_bq27000_write
  w1_bq27000: remove unnecessary NULL test.
  sysfs: Fix memory leak in sysfs_sd_setsecdata().
  intel_idle: Revert change of auto_demotion_disable_flags for Nehalem
  w1: Fix w1_bq27000
  driver-core: documentation: fix up Greg's email address
  powernow-k6: Really enable auto-loading
  powernow-k7: Fix CPU family number
  ...
parents 9f9d2760 adc80ae6

Documentation/ABI/removed/devfs

+1 −1
Original line number Diff line number Diff line 
What:		devfs

Date:		July 2005 (scheduled), finally removed in kernel v2.6.18

Contact:	Greg Kroah-Hartman <gregkh@suse.de>

Contact:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Description:

	devfs has been unmaintained for a number of years, has unfixable

	races, contains a naming policy within the kernel that is

Documentation/ABI/stable/sysfs-driver-usb-usbtmc

+5 −5
Original line number Diff line number Diff line 
What:		/sys/bus/usb/drivers/usbtmc/devices/*/interface_capabilities

What:		/sys/bus/usb/drivers/usbtmc/devices/*/device_capabilities

Date:		August 2008

Contact:	Greg Kroah-Hartman <gregkh@suse.de>

Contact:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Description:

		These files show the various USB TMC capabilities as described

		by the device itself.  The full description of the bitfields
@@ -15,7 +15,7 @@ Description: 
What:		/sys/bus/usb/drivers/usbtmc/devices/*/usb488_interface_capabilities

What:		/sys/bus/usb/drivers/usbtmc/devices/*/usb488_device_capabilities

Date:		August 2008

Contact:	Greg Kroah-Hartman <gregkh@suse.de>

Contact:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Description:

		These files show the various USB TMC capabilities as described

		by the device itself.  The full description of the bitfields
@@ -29,7 +29,7 @@ Description: 


What:		/sys/bus/usb/drivers/usbtmc/devices/*/TermChar

Date:		August 2008

Contact:	Greg Kroah-Hartman <gregkh@suse.de>

Contact:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Description:

		This file is the TermChar value to be sent to the USB TMC

		device as described by the document, "Universal Serial Bus Test
@@ -42,7 +42,7 @@ Description: 


What:		/sys/bus/usb/drivers/usbtmc/devices/*/TermCharEnabled

Date:		August 2008

Contact:	Greg Kroah-Hartman <gregkh@suse.de>

Contact:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Description:

		This file determines if the TermChar is to be sent to the

		device on every transaction or not.  For more details about
@@ -53,7 +53,7 @@ Description: 


What:		/sys/bus/usb/drivers/usbtmc/devices/*/auto_abort

Date:		August 2008

Contact:	Greg Kroah-Hartman <gregkh@suse.de>

Contact:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Description:

		This file determines if the the transaction of the USB TMC

		device is to be automatically aborted if there is any error.

Documentation/ABI/testing/sysfs-class

+1 −1
Original line number Diff line number Diff line 
What:		/sys/class/

Date:		Febuary 2006

Contact:	Greg Kroah-Hartman <gregkh@suse.de>

Contact:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Description:

		The /sys/class directory will consist of a group of

		subdirectories describing individual classes of devices

Documentation/ABI/testing/sysfs-devices

+1 −1
Original line number Diff line number Diff line 
What:		/sys/devices

Date:		February 2006

Contact:	Greg Kroah-Hartman <gregkh@suse.de>

Contact:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Description:

		The /sys/devices tree contains a snapshot of the

		internal state of the kernel device tree.  Devices will

Documentation/ABI/testing/sysfs-devices-soc

0 → 100644
+58 −0
Original line number Diff line number Diff line 
What:		/sys/devices/socX

Date:		January 2012

contact:	Lee Jones <lee.jones@linaro.org>

Description:

		The /sys/devices/ directory contains a sub-directory for each

		System-on-Chip (SoC) device on a running platform. Information

		regarding each SoC can be obtained by reading sysfs files. This

		functionality is only available if implemented by the platform.



		The directory created for each SoC will also house information

		about devices which are commonly contained in /sys/devices/platform.

		It has been agreed that if an SoC device exists, its supported

		devices would be better suited to appear as children of that SoC.



What:		/sys/devices/socX/machine

Date:		January 2012

contact:	Lee Jones <lee.jones@linaro.org>

Description:

		Read-only attribute common to all SoCs. Contains the SoC machine

		name (e.g. Ux500).



What:		/sys/devices/socX/family

Date:		January 2012

contact:	Lee Jones <lee.jones@linaro.org>

Description:

		Read-only attribute common to all SoCs. Contains SoC family name

		(e.g. DB8500).



What:		/sys/devices/socX/soc_id

Date:		January 2012

contact:	Lee Jones <lee.jones@linaro.org>

Description:

		Read-only attribute supported by most SoCs. In the case of

		ST-Ericsson's chips this contains the SoC serial number.



What:		/sys/devices/socX/revision

Date:		January 2012

contact:	Lee Jones <lee.jones@linaro.org>

Description:

		Read-only attribute supported by most SoCs. Contains the SoC's

		manufacturing revision number.



What:		/sys/devices/socX/process

Date:		January 2012

contact:	Lee Jones <lee.jones@linaro.org>

Description:

		Read-only attribute supported ST-Ericsson's silicon. Contains the

		the process by which the silicon chip was manufactured.



What:		/sys/bus/soc

Date:		January 2012

contact:	Lee Jones <lee.jones@linaro.org>

Description:

		The /sys/bus/soc/ directory contains the usual sub-folders

		expected under most buses. /sys/bus/soc/devices is of particular

		interest, as it contains a symlink for each SoC device found on

		the system. Each symlink points back into the aforementioned

		/sys/devices/socX devices.