Merge branch 'rmobile/mmcif' into rmobile-latest (1ad2096c) · Commits · e / devices / android_kernel_fairphone_FP3

Documentation/DocBook/sh.tmpl

+0 −4

Original line number	Diff line number	Diff line
		@@ -79,10 +79,6 @@
		</sect2>
		</sect1>
		</chapter>
		<chapter id="clk">
		<title>Clock Framework Extensions</title>
		!Iinclude/linux/sh_clk.h
		</chapter>
		<chapter id="mach">
		<title>Machine Specific Interfaces</title>
		<sect1 id="dreamcast">

Documentation/fb/00-INDEX

+25 −7

Original line number	Diff line number	Diff line
		@@ -4,33 +4,41 @@ please mail me.
		Geert Uytterhoeven <geert@linux-m68k.org>

		00-INDEX
		- this file
		- this file.
		arkfb.txt
		- info on the fbdev driver for ARK Logic chips.
		aty128fb.txt
		- info on the ATI Rage128 frame buffer driver.
		cirrusfb.txt
		- info on the driver for Cirrus Logic chipsets.
		cmap_xfbdev.txt
		- an introduction to fbdev's cmap structures.
		deferred_io.txt
		- an introduction to deferred IO.
		efifb.txt
		- info on the EFI platform driver for Intel based Apple computers.
		ep93xx-fb.txt
		- info on the driver for EP93xx LCD controller.
		fbcon.txt
		- intro to and usage guide for the framebuffer console (fbcon).
		framebuffer.txt
		- introduction to frame buffer devices.
		imacfb.txt
		- info on the generic EFI platform driver for Intel based Macs.
		gxfb.txt
		- info on the framebuffer driver for AMD Geode GX2 based processors.
		intel810.txt
		- documentation for the Intel 810/815 framebuffer driver.
		intelfb.txt
		- docs for Intel 830M/845G/852GM/855GM/865G/915G/945G fb driver.
		internals.txt
		- quick overview of frame buffer device internals.
		lxfb.txt
		- info on the framebuffer driver for AMD Geode LX based processors.
		matroxfb.txt
		- info on the Matrox framebuffer driver for Alpha, Intel and PPC.
		metronomefb.txt
		- info on the driver for the Metronome display controller.
		modedb.txt
		- info on the video mode database.
		matroxfb.txt
		- info on the Matrox frame buffer driver.
		pvr2fb.txt
		- info on the PowerVR 2 frame buffer driver.
		pxafb.txt
		@@ -39,13 +47,23 @@ s3fb.txt
		- info on the fbdev driver for S3 Trio/Virge chips.
		sa1100fb.txt
		- information about the driver for the SA-1100 LCD controller.
		sh7760fb.txt
		- info on the SH7760/SH7763 integrated LCDC Framebuffer driver.
		sisfb.txt
		- info on the framebuffer device driver for various SiS chips.
		sstfb.txt
		- info on the frame buffer driver for 3dfx' Voodoo Graphics boards.
		tgafb.txt
		- info on the TGA (DECChip 21030) frame buffer driver
		- info on the TGA (DECChip 21030) frame buffer driver.
		tridentfb.txt
		info on the framebuffer driver for some Trident chip based cards.
		uvesafb.txt
		- info on the userspace VESA (VBE2+ compliant) frame buffer device.
		vesafb.txt
		- info on the VESA frame buffer device
		- info on the VESA frame buffer device.
		viafb.modes
		- list of modes for VIA Integration Graphic Chip.
		viafb.txt
		- info on the VIA Integration Graphic Chip console framebuffer driver.
		vt8623fb.txt
		- info on the fb driver for the graphics core in VIA VT8623 chipsets.

Documentation/kernel-parameters.txt

+5 −0

Original line number	Diff line number	Diff line
		@@ -2385,6 +2385,11 @@ and is between 256 and 4096 characters. It is defined in the file
		improve throughput, but will also increase the
		amount of memory reserved for use by the client.

		swapaccount[=0\|1]
		[KNL] Enable accounting of swap in memory resource
		controller if no parameter or 1 is given or disable
		it if 0 is given (See Documentation/cgroups/memory.txt)

		swiotlb= [IA-64] Number of I/O TLB slabs

		switches= [HW,M68k]

Documentation/sh/clk.txt

deleted100644 → 0

+0 −32

Original line number	Diff line number	Diff line
		Clock framework on SuperH architecture

		The framework on SH extends existing API by the function clk_set_rate_ex,
		which prototype is as follows:

		clk_set_rate_ex (struct clk *clk, unsigned long rate, int algo_id)

		The algo_id parameter is used to specify algorithm used to recalculate clocks,
		adjanced to clock, specified as first argument. It is assumed that algo_id==0
		means no changes to adjanced clock

		Internally, the clk_set_rate_ex forwards request to clk->ops->set_rate method,
		if it is present in ops structure. The method should set the clock rate and adjust
		all needed clocks according to the passed algo_id.
		Exact values for algo_id are machine-dependent. For the sh7722, the following
		values are defined:

		NO_CHANGE = 0,
		IUS_N1_N1, /* I:U = N:1, U:Sh = N:1 */
		IUS_322, /* I:U:Sh = 3:2:2 */
		IUS_522, /* I:U:Sh = 5:2:2 */
		IUS_N11, /* I:U:Sh = N:1:1 */
		SB_N1, /* Sh:B = N:1 */
		SB3_N1, /* Sh:B3 = N:1 */
		SB3_32, /* Sh:B3 = 3:2 */
		SB3_43, /* Sh:B3 = 4:3 */
		SB3_54, /* Sh:B3 = 5:4 */
		BP_N1, /* B:P = N:1 */
		IP_N1 /* I:P = N:1 */

		Each of these constants means relation between clocks that can be set via the FRQCR
		register

MAINTAINERS

+5 −1

Original line number	Diff line number	Diff line
		@@ -2444,10 +2444,12 @@ F: drivers/net/wan/sdla.c
		FRAMEBUFFER LAYER
		L: linux-fbdev@vger.kernel.org
		W: http://linux-fbdev.sourceforge.net/
		Q: http://patchwork.kernel.org/project/linux-fbdev/list/
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6.git
		S: Orphan
		F: Documentation/fb/
		F: drivers/video/fb*
		F: drivers/video/
		F: include/video/
		F: include/linux/fb.h

		FREESCALE DMA DRIVER
		@@ -5837,6 +5839,8 @@ M: Chris Metcalf <cmetcalf@tilera.com>
		W: http://www.tilera.com/scm/
		S: Supported
		F: arch/tile/
		F: drivers/char/hvc_tile.c
		F: drivers/net/tile/

		TLAN NETWORK DRIVER
		M: Samuel Chessman <chessman@tux.org>