Commit f4b96f5e authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v3.11/fixes-for-merge-window' of... 

Merge tag 'omap-for-v3.11/fixes-for-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

Omap fixes and minor defconfig updates that would be good to
get in before -rc1.

* tag 'omap-for-v3.11/fixes-for-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: OMAP2+: omap2plus_defconfig: Enable appended DTB support
  ARM: OMAP2+: Enable TI_EDMA in omap2plus_defconfig
  ARM: OMAP2+: omap2plus_defconfig: enable DRA752 thermal support by default
  ARM: OMAP2+: omap2plus_defconfig: enable TI bandgap driver
  ARM: OMAP2+: devices: remove duplicated include from devices.c
  ARM: OMAP3: igep0020: Set DSS pins in correct mux mode.
  ARM: OMAP2+: N900: enable N900-specific drivers even if device tree is enabled
  ARM: OMAP2+: Cocci spatch "ptr_ret.spatch"
  ARM: OMAP2+: Remove obsolete Makefile line
  ARM: OMAP5: Enable Cortex A15 errata 798181
  ARM: scu: provide inline dummy functions when SCU is not present
  ARM: OMAP4: sleep: build OMAP4 specific functions only for OMAP4
  ARM: OMAP2+: timer: initialize before using oh_name

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>

Add/move/change conflicts in arch/arm/mach-omap2/Kconfig resolved.
parents 9d8812df c24a6ae1

Documentation/ABI/testing/sysfs-bus-acpi

0 → 100644
+58 −0
Original line number Diff line number Diff line 
What:		/sys/bus/acpi/devices/.../path

Date:		December 2006

Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>

Description:

		This attribute indicates the full path of ACPI namespace

		object associated with the device object.  For example,

		\_SB_.PCI0.

		This file is not present for device objects representing

		fixed ACPI hardware features (like power and sleep

		buttons).



What:		/sys/bus/acpi/devices/.../modalias

Date:		July 2007

Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>

Description:

		This attribute indicates the PNP IDs of the device object.

		That is acpi:HHHHHHHH:[CCCCCCC:].  Where each HHHHHHHH or

		CCCCCCCC contains device object's PNPID (_HID or _CID).



What:		/sys/bus/acpi/devices/.../hid

Date:		April 2005

Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>

Description:

		This attribute indicates the hardware ID (_HID) of the

		device object.  For example, PNP0103.

		This file is present for device objects having the _HID

		control method.



What:		/sys/bus/acpi/devices/.../description

Date:		October 2012

Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>

Description:

		This attribute contains the output of the device object's

		_STR control method, if present.



What:		/sys/bus/acpi/devices/.../adr

Date:		October 2012

Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>

Description:

		This attribute contains the output of the device object's

		_ADR control method, which is present for ACPI device

		objects representing devices having standard enumeration

		algorithms, such as PCI.



What:		/sys/bus/acpi/devices/.../uid

Date:		October 2012

Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>

Description:

		This attribute contains the output of the device object's

		_UID control method, if present.



What:		/sys/bus/acpi/devices/.../eject

Date:		December 2006

Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>

Description:

		Writing 1 to this attribute will trigger hot removal of

		this device object.  This file exists for every device

		object that has _EJ0 method.

Documentation/ABI/testing/sysfs-bus-event_source-devices-events

+27 −5
Original line number Diff line number Diff line
@@ -27,14 +27,36 @@ Description: Generic performance monitoring events 
		"basename".





What: 		/sys/devices/cpu/events/PM_LD_MISS_L1

		/sys/devices/cpu/events/PM_LD_REF_L1

		/sys/devices/cpu/events/PM_CYC

What: 		/sys/devices/cpu/events/PM_1PLUS_PPC_CMPL

		/sys/devices/cpu/events/PM_BRU_FIN

		/sys/devices/cpu/events/PM_GCT_NOSLOT_CYC

		/sys/devices/cpu/events/PM_BRU_MPRED

		/sys/devices/cpu/events/PM_INST_CMPL

		/sys/devices/cpu/events/PM_CMPLU_STALL

		/sys/devices/cpu/events/PM_CMPLU_STALL_BRU

		/sys/devices/cpu/events/PM_CMPLU_STALL_DCACHE_MISS

		/sys/devices/cpu/events/PM_CMPLU_STALL_DFU

		/sys/devices/cpu/events/PM_CMPLU_STALL_DIV

		/sys/devices/cpu/events/PM_CMPLU_STALL_ERAT_MISS

		/sys/devices/cpu/events/PM_CMPLU_STALL_FXU

		/sys/devices/cpu/events/PM_CMPLU_STALL_IFU

		/sys/devices/cpu/events/PM_CMPLU_STALL_LSU

		/sys/devices/cpu/events/PM_CMPLU_STALL_REJECT

		/sys/devices/cpu/events/PM_CMPLU_STALL_SCALAR

		/sys/devices/cpu/events/PM_CMPLU_STALL_SCALAR_LONG

		/sys/devices/cpu/events/PM_CMPLU_STALL_STORE

		/sys/devices/cpu/events/PM_CMPLU_STALL_THRD

		/sys/devices/cpu/events/PM_CMPLU_STALL_VECTOR

		/sys/devices/cpu/events/PM_CMPLU_STALL_VECTOR_LONG

		/sys/devices/cpu/events/PM_CYC

		/sys/devices/cpu/events/PM_GCT_NOSLOT_BR_MPRED

		/sys/devices/cpu/events/PM_GCT_NOSLOT_BR_MPRED_IC_MISS

		/sys/devices/cpu/events/PM_GCT_NOSLOT_CYC

		/sys/devices/cpu/events/PM_GCT_NOSLOT_IC_MISS

		/sys/devices/cpu/events/PM_GRP_CMPL

		/sys/devices/cpu/events/PM_INST_CMPL

		/sys/devices/cpu/events/PM_LD_MISS_L1

		/sys/devices/cpu/events/PM_LD_REF_L1

		/sys/devices/cpu/events/PM_RUN_CYC

		/sys/devices/cpu/events/PM_RUN_INST_CMPL



Date:		2013/01/08

Documentation/ABI/testing/sysfs-bus-event_source-devices-format

+6 −0
Original line number Diff line number Diff line
@@ -9,6 +9,12 @@ Description: 
		we want to export, so that userspace can deal with sane

		name/value pairs.



		Userspace must be prepared for the possibility that attributes

		define overlapping bit ranges. For example:

			attr1 = 'config:0-23'

			attr2 = 'config:0-7'

			attr3 = 'config:12-35'



		Example: 'config1:1,6-10,44'

		Defines contents of attribute that occupies bits 1,6-10,44 of

		perf_event_attr::config1.

Documentation/ABI/testing/sysfs-class-devfreq

+20 −0
Original line number Diff line number Diff line
@@ -78,3 +78,23 @@ Contact: Nishanth Menon <nm@ti.com> 
Description:

		The /sys/class/devfreq/.../available_governors shows

		currently available governors in the system.



What:		/sys/class/devfreq/.../min_freq

Date:		January 2013

Contact:	MyungJoo Ham <myungjoo.ham@samsung.com>

Description:

		The /sys/class/devfreq/.../min_freq shows and stores

		the minimum frequency requested by users. It is 0 if

		the user does not care. min_freq overrides the

		frequency requested by governors.



What:		/sys/class/devfreq/.../max_freq

Date:		January 2013

Contact:	MyungJoo Ham <myungjoo.ham@samsung.com>

Description:

		The /sys/class/devfreq/.../max_freq shows and stores

		the maximum frequency requested by users. It is 0 if

		the user does not care. max_freq overrides the

		frequency requested by governors and min_freq.

		The max_freq overrides min_freq because max_freq may be

		used to throttle devices to avoid overheating.

Documentation/ABI/testing/sysfs-devices-online

0 → 100644
+20 −0
Original line number Diff line number Diff line 
What:		/sys/devices/.../online

Date:		April 2013

Contact:	Rafael J. Wysocki <rafael.j.wysocki@intel.com>

Description:

		The /sys/devices/.../online attribute is only present for

		devices whose bus types provide .online() and .offline()

		callbacks.  The number read from it (0 or 1) reflects the value

		of the device's 'offline' field.  If that number is 1 and '0'

		(or 'n', or 'N') is written to this file, the device bus type's

		.offline() callback is executed for the device and (if

		successful) its 'offline' field is updated accordingly.  In

		turn, if that number is 0 and '1' (or 'y', or 'Y') is written to

		this file, the device bus type's .online() callback is executed

		for the device and (if successful) its 'offline' field is

		updated as appropriate.



		After a successful execution of the bus type's .offline()

		callback the device cannot be used for any purpose until either

		it is removed (i.e. device_del() is called for it), or its bus

		type's .online() is exeucted successfully.

CRA Git | Maintained and supported by SUSTech CRA and CCSE