Commit bbd77147 authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

Merge branch 'x86/trampoline' into x86/urgent 



x86/trampoline contains an urgent commit which is necessarily on a
newer baseline.

Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parents 403e1c5b 319b6ffc

Documentation/ABI/testing/sysfs-bus-i2c-devices-lm3533

0 → 100644
+15 −0
Original line number Diff line number Diff line 
What:		/sys/bus/i2c/devices/.../output_hvled[n]

Date:		April 2012

KernelVersion:	3.5

Contact:	Johan Hovold <jhovold@gmail.com>

Description:

		Set the controlling backlight device for high-voltage current

		sink HVLED[n] (n = 1, 2) (0, 1).



What:		/sys/bus/i2c/devices/.../output_lvled[n]

Date:		April 2012

KernelVersion:	3.5

Contact:	Johan Hovold <jhovold@gmail.com>

Description:

		Set the controlling led device for low-voltage current sink

		LVLED[n] (n = 1..5) (0..3).

Documentation/ABI/testing/sysfs-class-backlight-driver-lm3533

0 → 100644
+48 −0
Original line number Diff line number Diff line 
What:		/sys/class/backlight/<backlight>/als_channel

Date:		May 2012

KernelVersion:	3.5

Contact:	Johan Hovold <jhovold@gmail.com>

Description:

		Get the ALS output channel used as input in

		ALS-current-control mode (0, 1), where



		0 - out_current0 (backlight 0)

		1 - out_current1 (backlight 1)



What:		/sys/class/backlight/<backlight>/als_en

Date:		May 2012

KernelVersion:	3.5

Contact:	Johan Hovold <jhovold@gmail.com>

Description:

		Enable ALS-current-control mode (0, 1).



What:		/sys/class/backlight/<backlight>/id

Date:		April 2012

KernelVersion:	3.5

Contact:	Johan Hovold <jhovold@gmail.com>

Description:

		Get the id of this backlight (0, 1).



What:		/sys/class/backlight/<backlight>/linear

Date:		April 2012

KernelVersion:	3.5

Contact:	Johan Hovold <jhovold@gmail.com>

Description:

		Set the brightness-mapping mode (0, 1), where



		0 - exponential mode

		1 - linear mode



What:		/sys/class/backlight/<backlight>/pwm

Date:		April 2012

KernelVersion:	3.5

Contact:	Johan Hovold <jhovold@gmail.com>

Description:

		Set the PWM-input control mask (5 bits), where



		bit 5 - PWM-input enabled in Zone 4

		bit 4 - PWM-input enabled in Zone 3

		bit 3 - PWM-input enabled in Zone 2

		bit 2 - PWM-input enabled in Zone 1

		bit 1 - PWM-input enabled in Zone 0

		bit 0 - PWM-input enabled

Documentation/ABI/testing/sysfs-class-led-driver-lm3533

0 → 100644
+65 −0
Original line number Diff line number Diff line 
What:		/sys/class/leds/<led>/als_channel

Date:		May 2012

KernelVersion:	3.5

Contact:	Johan Hovold <jhovold@gmail.com>

Description:

		Set the ALS output channel to use as input in

		ALS-current-control mode (1, 2), where



		1 - out_current1

		2 - out_current2



What:		/sys/class/leds/<led>/als_en

Date:		May 2012

KernelVersion:	3.5

Contact:	Johan Hovold <jhovold@gmail.com>

Description:

		Enable ALS-current-control mode (0, 1).



What:		/sys/class/leds/<led>/falltime

What:		/sys/class/leds/<led>/risetime

Date:		April 2012

KernelVersion:	3.5

Contact:	Johan Hovold <jhovold@gmail.com>

Description:

		Set the pattern generator fall and rise times (0..7), where



		0 - 2048 us

		1 - 262 ms

		2 - 524 ms

		3 - 1.049 s

		4 - 2.097 s

		5 - 4.194 s

		6 - 8.389 s

		7 - 16.78 s



What:		/sys/class/leds/<led>/id

Date:		April 2012

KernelVersion:	3.5

Contact:	Johan Hovold <jhovold@gmail.com>

Description:

		Get the id of this led (0..3).



What:		/sys/class/leds/<led>/linear

Date:		April 2012

KernelVersion:	3.5

Contact:	Johan Hovold <jhovold@gmail.com>

Description:

		Set the brightness-mapping mode (0, 1), where



		0 - exponential mode

		1 - linear mode



What:		/sys/class/leds/<led>/pwm

Date:		April 2012

KernelVersion:	3.5

Contact:	Johan Hovold <jhovold@gmail.com>

Description:

		Set the PWM-input control mask (5 bits), where



		bit 5 - PWM-input enabled in Zone 4

		bit 4 - PWM-input enabled in Zone 3

		bit 3 - PWM-input enabled in Zone 2

		bit 2 - PWM-input enabled in Zone 1

		bit 1 - PWM-input enabled in Zone 0

		bit 0 - PWM-input enabled

Documentation/SubmittingPatches

+2 −1
Original line number Diff line number Diff line
@@ -150,7 +150,8 @@ be able to justify all violations that remain in your patch. 


Look through the MAINTAINERS file and the source code, and determine

if your change applies to a specific subsystem of the kernel, with

an assigned maintainer.  If so, e-mail that person.

an assigned maintainer.  If so, e-mail that person.  The script

scripts/get_maintainer.pl can be very useful at this step.



If no maintainer is listed, or the maintainer does not respond, send

your patch to the primary Linux kernel developer's mailing list,

Documentation/arm/SPEAr/overview.txt

+17 −15
Original line number Diff line number Diff line
@@ -8,9 +8,8 @@ Introduction 
  weblink : http://www.st.com/spear



  The ST Microelectronics SPEAr range of ARM9/CortexA9 System-on-Chip CPUs are

  supported by the 'spear' platform of ARM Linux. Currently SPEAr300,

  SPEAr310, SPEAr320 and SPEAr600 SOCs are supported. Support for the SPEAr13XX

  series is in progress.

  supported by the 'spear' platform of ARM Linux. Currently SPEAr1310,

  SPEAr1340, SPEAr300, SPEAr310, SPEAr320 and SPEAr600 SOCs are supported.



  Hierarchy in SPEAr is as follows:
@@ -26,33 +25,36 @@ Introduction 
		- SPEAr600 (SOC)

			- SPEAr600 Evaluation Board

	- SPEAr13XX (13XX SOC series, based on ARM CORTEXA9)

		- SPEAr1300 (SOC)

		- SPEAr1310 (SOC)

			- SPEAr1310 Evaluation Board

		- SPEAr1340 (SOC)

			- SPEAr1340 Evaluation Board



  Configuration

  -------------



  A generic configuration is provided for each machine, and can be used as the

  default by

	make spear600_defconfig

	make spear300_defconfig

	make spear310_defconfig

	make spear320_defconfig

	make spear13xx_defconfig

	make spear3xx_defconfig

	make spear6xx_defconfig



  Layout

  ------



  The common files for multiple machine families (SPEAr3XX, SPEAr6XX and

  SPEAr13XX) are located in the platform code contained in arch/arm/plat-spear

  The common files for multiple machine families (SPEAr3xx, SPEAr6xx and

  SPEAr13xx) are located in the platform code contained in arch/arm/plat-spear

  with headers in plat/.



  Each machine series have a directory with name arch/arm/mach-spear followed by

  series name. Like mach-spear3xx, mach-spear6xx and mach-spear13xx.



  Common file for machines of spear3xx family is mach-spear3xx/spear3xx.c and for

  spear6xx is mach-spear6xx/spear6xx.c. mach-spear* also contain soc/machine

  specific files, like spear300.c, spear310.c, spear320.c and spear600.c.

  mach-spear* doesn't contains board specific files as they fully support

  Flattened Device Tree.

  Common file for machines of spear3xx family is mach-spear3xx/spear3xx.c, for

  spear6xx is mach-spear6xx/spear6xx.c and for spear13xx family is

  mach-spear13xx/spear13xx.c. mach-spear* also contain soc/machine specific

  files, like spear1310.c, spear1340.c spear300.c, spear310.c, spear320.c and

  spear600.c.  mach-spear* doesn't contains board specific files as they fully

  support Flattened Device Tree.





  Document Author