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

Commit 6dc64725 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt
Browse files

Merge commit 'origin' 

Manual fixup of conflicts on:

	arch/powerpc/include/asm/dcr-regs.h
	drivers/net/ibm_newemac/core.h
parents ee673eaa 8acd3a60

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -96,4 +96,6 @@ Tejun Heo <htejun@gmail.com> 
Thomas Graf <tgraf@suug.ch>

Tony Luck <tony.luck@intel.com>

Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>

Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>

Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>

Valdis Kletnieks <Valdis.Kletnieks@vt.edu>

Documentation/00-INDEX

+0 −4
Original line number Diff line number Diff line
@@ -159,8 +159,6 @@ hayes-esp.txt 
	- info on using the Hayes ESP serial driver.

highuid.txt

	- notes on the change from 16 bit to 32 bit user/group IDs.

hpet.txt

	- High Precision Event Timer Driver for Linux.

timers/

	- info on the timer related topics

hw_random.txt
@@ -251,8 +249,6 @@ mono.txt 
	- how to execute Mono-based .NET binaries with the help of BINFMT_MISC.

moxa-smartio

	- file with info on installing/using Moxa multiport serial driver.

mtrr.txt

	- how to use PPro Memory Type Range Registers to increase performance.

mutex-design.txt

	- info on the generic mutex subsystem.

namespaces/

Documentation/ABI/testing/sysfs-class-regulator

+34 −21
Original line number Diff line number Diff line 
What:		/sys/class/regulator/.../state

Date:		April 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Contact:	Liam Girdwood <lrg@slimlogic.co.uk>

Description:

		Each regulator directory will contain a field called

		state. This holds the regulator output state.
@@ -27,7 +27,7 @@ Description: 
What:		/sys/class/regulator/.../type

Date:		April 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Contact:	Liam Girdwood <lrg@slimlogic.co.uk>

Description:

		Each regulator directory will contain a field called

		type. This holds the regulator type.
@@ -51,7 +51,7 @@ Description: 
What:		/sys/class/regulator/.../microvolts

Date:		April 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Contact:	Liam Girdwood <lrg@slimlogic.co.uk>

Description:

		Each regulator directory will contain a field called

		microvolts. This holds the regulator output voltage setting
@@ -65,7 +65,7 @@ Description: 
What:		/sys/class/regulator/.../microamps

Date:		April 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Contact:	Liam Girdwood <lrg@slimlogic.co.uk>

Description:

		Each regulator directory will contain a field called

		microamps. This holds the regulator output current limit
@@ -79,7 +79,7 @@ Description: 
What:		/sys/class/regulator/.../opmode

Date:		April 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Contact:	Liam Girdwood <lrg@slimlogic.co.uk>

Description:

		Each regulator directory will contain a field called

		opmode. This holds the regulator operating mode setting.
@@ -102,7 +102,7 @@ Description: 
What:		/sys/class/regulator/.../min_microvolts

Date:		April 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Contact:	Liam Girdwood <lrg@slimlogic.co.uk>

Description:

		Each regulator directory will contain a field called

		min_microvolts. This holds the minimum safe working regulator
@@ -116,7 +116,7 @@ Description: 
What:		/sys/class/regulator/.../max_microvolts

Date:		April 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Contact:	Liam Girdwood <lrg@slimlogic.co.uk>

Description:

		Each regulator directory will contain a field called

		max_microvolts. This holds the maximum safe working regulator
@@ -130,7 +130,7 @@ Description: 
What:		/sys/class/regulator/.../min_microamps

Date:		April 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Contact:	Liam Girdwood <lrg@slimlogic.co.uk>

Description:

		Each regulator directory will contain a field called

		min_microamps. This holds the minimum safe working regulator
@@ -145,7 +145,7 @@ Description: 
What:		/sys/class/regulator/.../max_microamps

Date:		April 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Contact:	Liam Girdwood <lrg@slimlogic.co.uk>

Description:

		Each regulator directory will contain a field called

		max_microamps. This holds the maximum safe working regulator
@@ -157,10 +157,23 @@ Description: 
		platform code.





What:		/sys/class/regulator/.../name

Date:		October 2008

KernelVersion:	2.6.28

Contact:	Liam Girdwood <lrg@slimlogic.co.uk>

Description:

		Each regulator directory will contain a field called

		name. This holds a string identifying the regulator for

		display purposes.



		NOTE: this will be empty if no suitable name is provided

		by platform or regulator drivers.





What:		/sys/class/regulator/.../num_users

Date:		April 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Contact:	Liam Girdwood <lrg@slimlogic.co.uk>

Description:

		Each regulator directory will contain a field called

		num_users. This holds the number of consumer devices that
@@ -170,7 +183,7 @@ Description: 
What:		/sys/class/regulator/.../requested_microamps

Date:		April 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Contact:	Liam Girdwood <lrg@slimlogic.co.uk>

Description:

		Each regulator directory will contain a field called

		requested_microamps. This holds the total requested load
@@ -181,7 +194,7 @@ Description: 
What:		/sys/class/regulator/.../parent

Date:		April 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Contact:	Liam Girdwood <lrg@slimlogic.co.uk>

Description:

		Some regulator directories will contain a link called parent.

		This points to the parent or supply regulator if one exists.
@@ -189,7 +202,7 @@ Description: 
What:		/sys/class/regulator/.../suspend_mem_microvolts

Date:		May 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Contact:	Liam Girdwood <lrg@slimlogic.co.uk>

Description:

		Each regulator directory will contain a field called

		suspend_mem_microvolts. This holds the regulator output
@@ -203,7 +216,7 @@ Description: 
What:		/sys/class/regulator/.../suspend_disk_microvolts

Date:		May 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Contact:	Liam Girdwood <lrg@slimlogic.co.uk>

Description:

		Each regulator directory will contain a field called

		suspend_disk_microvolts. This holds the regulator output
@@ -217,7 +230,7 @@ Description: 
What:		/sys/class/regulator/.../suspend_standby_microvolts

Date:		May 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Contact:	Liam Girdwood <lrg@slimlogic.co.uk>

Description:

		Each regulator directory will contain a field called

		suspend_standby_microvolts. This holds the regulator output
@@ -231,7 +244,7 @@ Description: 
What:		/sys/class/regulator/.../suspend_mem_mode

Date:		May 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Contact:	Liam Girdwood <lrg@slimlogic.co.uk>

Description:

		Each regulator directory will contain a field called

		suspend_mem_mode. This holds the regulator operating mode
@@ -245,7 +258,7 @@ Description: 
What:		/sys/class/regulator/.../suspend_disk_mode

Date:		May 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Contact:	Liam Girdwood <lrg@slimlogic.co.uk>

Description:

		Each regulator directory will contain a field called

		suspend_disk_mode. This holds the regulator operating mode
@@ -258,7 +271,7 @@ Description: 
What:		/sys/class/regulator/.../suspend_standby_mode

Date:		May 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Contact:	Liam Girdwood <lrg@slimlogic.co.uk>

Description:

		Each regulator directory will contain a field called

		suspend_standby_mode. This holds the regulator operating mode
@@ -272,7 +285,7 @@ Description: 
What:		/sys/class/regulator/.../suspend_mem_state

Date:		May 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Contact:	Liam Girdwood <lrg@slimlogic.co.uk>

Description:

		Each regulator directory will contain a field called

		suspend_mem_state. This holds the regulator operating state
@@ -287,7 +300,7 @@ Description: 
What:		/sys/class/regulator/.../suspend_disk_state

Date:		May 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Contact:	Liam Girdwood <lrg@slimlogic.co.uk>

Description:

		Each regulator directory will contain a field called

		suspend_disk_state. This holds the regulator operating state
@@ -302,7 +315,7 @@ Description: 
What:		/sys/class/regulator/.../suspend_standby_state

Date:		May 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Contact:	Liam Girdwood <lrg@slimlogic.co.uk>

Description:

		Each regulator directory will contain a field called

		suspend_standby_state. This holds the regulator operating

Documentation/ABI/testing/sysfs-gpio

0 → 100644
+26 −0
Original line number Diff line number Diff line 
What:		/sys/class/gpio/

Date:		July 2008

KernelVersion:	2.6.27

Contact:	David Brownell <dbrownell@users.sourceforge.net>

Description:



  As a Kconfig option, individual GPIO signals may be accessed from

  userspace.  GPIOs are only made available to userspace by an explicit

  "export" operation.  If a given GPIO is not claimed for use by

  kernel code, it may be exported by userspace (and unexported later).

  Kernel code may export it for complete or partial access.



  GPIOs are identified as they are inside the kernel, using integers in

  the range 0..INT_MAX.  See Documentation/gpio.txt for more information.



    /sys/class/gpio

	/export ... asks the kernel to export a GPIO to userspace

	/unexport ... to return a GPIO to the kernel

	/gpioN ... for each exported GPIO #N

	    /value ... always readable, writes fail for input GPIOs

	    /direction ... r/w as: in, out (default low); write: high, low

	/gpiochipN ... for each gpiochip; #N is its first GPIO

	    /base ... (r/o) same as N

	    /label ... (r/o) descriptive, not necessarily unique

	    /ngpio ... (r/o) number of GPIOs; numbered N to N + (ngpio - 1)

Documentation/DMA-API.txt

+1 −1
Original line number Diff line number Diff line
@@ -337,7 +337,7 @@ With scatterlists, you use the resulting mapping like this: 
	int i, count = dma_map_sg(dev, sglist, nents, direction);

	struct scatterlist *sg;



	for (i = 0, sg = sglist; i < count; i++, sg++) {

	for_each_sg(sglist, sg, count, i) {

		hw_address[i] = sg_dma_address(sg);

		hw_len[i] = sg_dma_len(sg);

	}