Merge /spare/repo/linux-2.6/ (4c0e176d) · Commits · e / devices / android_kernel_sony_msm8994

CREDITS

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -2380,8 +2380,8 @@ E: tmolina@cablespeed.com
	D: bug fixes, documentation, minor hackery		D: bug fixes, documentation, minor hackery

	N: James Morris		N: James Morris
	E: jmorris@redhat.com		E: jmorris@namei.org
	W: http://www.intercode.com.au/jmorris/		W: http://namei.org/
	D: Netfilter, Linux Security Modules (LSM), SELinux, IPSec,		D: Netfilter, Linux Security Modules (LSM), SELinux, IPSec,
	D: Crypto API, general networking, miscellaneous.		D: Crypto API, general networking, miscellaneous.
	S: PO Box 707		S: PO Box 707

Documentation/SubmittingPatches

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -149,6 +149,11 @@ USB, framebuffer devices, the VFS, the SCSI subsystem, etc. See the
	MAINTAINERS file for a mailing list that relates specifically to		MAINTAINERS file for a mailing list that relates specifically to
	your change.		your change.

			If changes affect userland-kernel interfaces, please send
			the MAN-PAGES maintainer (as listed in the MAINTAINERS file)
			a man-pages patch, or at least a notification of the change,
			so that some information makes its way into the manual pages.

	Even if the maintainer did not respond in step #4, make sure to ALWAYS		Even if the maintainer did not respond in step #4, make sure to ALWAYS
	copy the maintainer when you change their code.		copy the maintainer when you change their code.

Documentation/arm/Samsung-S3C24XX/USB-Host.txt

0 → 100644

+93 −0

Original line number	Original line	Diff line number	Diff line
			S3C24XX USB Host support
			========================



			Introduction
			------------

			This document details the S3C2410/S3C2440 in-built OHCI USB host support.

			Configuration
			-------------

			Enable at least the following kernel options:

			menuconfig:

			Device Drivers --->
			USB support --->
			<*> Support for Host-side USB
			<*> OHCI HCD support


			.config:
			CONFIG_USB
			CONFIG_USB_OHCI_HCD


			Once these options are configured, the standard set of USB device
			drivers can be configured and used.


			Board Support
			-------------

			The driver attaches to a platform device, which will need to be
			added by the board specific support file in linux/arch/arm/mach-s3c2410,
			such as mach-bast.c or mach-smdk2410.c

			The platform device's platform_data field is only needed if the
			board implements extra power control or over-current monitoring.

			The OHCI driver does not ensure the state of the S3C2410's MISCCTRL
			register, so if both ports are to be used for the host, then it is
			the board support file's responsibility to ensure that the second
			port is configured to be connected to the OHCI core.


			Platform Data
			-------------

			See linux/include/asm-arm/arch-s3c2410/usb-control.h for the
			descriptions of the platform device data. An implementation
			can be found in linux/arch/arm/mach-s3c2410/usb-simtec.c .

			The `struct s3c2410_hcd_info` contains a pair of functions
			that get called to enable over-current detection, and to
			control the port power status.

			The ports are numbered 0 and 1.

			power_control:

			Called to enable or disable the power on the port.

			enable_oc:

			Called to enable or disable the over-current monitoring.
			This should claim or release the resources being used to
			check the power condition on the port, such as an IRQ.

			report_oc:

			The OHCI driver fills this field in for the over-current code
			to call when there is a change to the over-current state on
			an port. The ports argument is a bitmask of 1 bit per port,
			with bit X being 1 for an over-current on port X.

			The function s3c2410_usb_report_oc() has been provided to
			ensure this is called correctly.

			port[x]:

			This is struct describes each port, 0 or 1. The platform driver
			should set the flags field of each port to S3C_HCDFLG_USED if
			the port is enabled.



			Document Author
			---------------

			Ben Dooks, (c) 2005 Simtec Electronics

Documentation/dontdiff

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -104,6 +104,7 @@ logo_*.c
	logo_*_clut224.c		logo_*_clut224.c
	logo_*_mono.c		logo_*_mono.c
	lxdialog		lxdialog
			mach-types
	mach-types.h		mach-types.h
	make_times_h		make_times_h
	map		map

Documentation/fb/vesafb.txt

+15 −1

Original line number	Original line	Diff line number	Diff line
	@@ -144,7 +144,21 @@ vgapal Use the standard vga registers for palette changes.
	This is the default.		This is the default.
	pmipal Use the protected mode interface for palette changes.		pmipal Use the protected mode interface for palette changes.

	mtrr setup memory type range registers for the vesafb framebuffer.		mtrr:n setup memory type range registers for the vesafb framebuffer
			where n:
			0 - disabled (equivalent to nomtrr)
			1 - uncachable
			2 - write-back
			3 - write-combining (default)
			4 - write-through

			If you see the following in dmesg, choose the type that matches the
			old one. In this example, use "mtrr:2".
			...
			mtrr: type mismatch for e0000000,8000000 old: write-back new: write-combining
			...

			nomtrr disable mtrr

	vremap:n		vremap:n
	remap 'n' MiB of video RAM. If 0 or not specified, remap memory		remap 'n' MiB of video RAM. If 0 or not specified, remap memory