Merge branch 'next-s3c' of git://aeryn.fluff.org.uk/bjdooks/linux into devel (413427b5) · Commits · e / devices / android_kernel_xiaomi_markw

Documentation/kernel-parameters.txt

+21 −0

Original line number	Diff line number	Diff line
		@@ -1362,6 +1362,27 @@ and is between 256 and 4096 characters. It is defined in the file
		min_addr=nn[KMG] [KNL,BOOT,ia64] All physical memory below this
		physical address is ignored.

		mini2440= [ARM,HW,KNL]
		Format:[0..2][b][c][t]
		Default: "0tb"
		MINI2440 configuration specification:
		0 - The attached screen is the 3.5" TFT
		1 - The attached screen is the 7" TFT
		2 - The VGA Shield is attached (1024x768)
		Leaving out the screen size parameter will not load
		the TFT driver, and the framebuffer will be left
		unconfigured.
		b - Enable backlight. The TFT backlight pin will be
		linked to the kernel VESA blanking code and a GPIO
		LED. This parameter is not necessary when using the
		VGA shield.
		c - Enable the s3c camera interface.
		t - Reserved for enabling touchscreen support. The
		touchscreen support is not enabled in the mainstream
		kernel as of 2.6.30, a preliminary port can be found
		in the "bleeding edge" mini2440 support kernel at
		http://repo.or.cz/w/linux-2.6/mini2440.git

		mminit_loglevel=
		[KNL] When CONFIG_DEBUG_MEMORY_INIT is set, this
		parameter allows control of the logging verbosity for

+7 −0

Original line number	Diff line number	Diff line
		@@ -788,6 +788,13 @@ P: Michael Petchkovsky
		M: mkpetch@internode.on.net
		S: Maintained

		ARM/OPENMOKO NEO FREERUNNER (GTA02) MACHINE SUPPORT
		P: Nelson Castillo
		M: arhuaco@freaks-unidos.net
		L: openmoko-kernel@lists.openmoko.org (subscribers-only)
		W: http://wiki.openmoko.org/wiki/Neo_FreeRunner
		S: Supported

		ARM/TOSA MACHINE SUPPORT
		P: Dmitry Eremin-Solenikov
		M: dbaryshkov@gmail.com

+5 −1

Original line number	Diff line number	Diff line
		@@ -1241,7 +1241,7 @@ endmenu

		menu "CPU Power Management"

		if (ARCH_SA1100 \|\| ARCH_INTEGRATOR \|\| ARCH_OMAP \|\| ARCH_PXA)
		if (ARCH_SA1100 \|\| ARCH_INTEGRATOR \|\| ARCH_OMAP \|\| ARCH_PXA \|\| ARCH_S3C64XX)

		source "drivers/cpufreq/Kconfig"

		@@ -1272,6 +1272,10 @@ config CPU_FREQ_PXA
		default y
		select CPU_FREQ_DEFAULT_GOV_USERSPACE

		config CPU_FREQ_S3C64XX
		bool "CPUfreq support for Samsung S3C64XX CPUs"
		depends on CPU_FREQ && CPU_S3C6410

		endif

		source "drivers/cpuidle/Kconfig"

+6 −2

Original line number	Diff line number	Diff line
		@@ -229,14 +229,18 @@ static int vic_set_wake(unsigned int irq, unsigned int on)
		{
		struct vic_device *v = vic_from_irq(irq);
		unsigned int off = irq & 31;
		u32 bit = 1 << off;

		if (!v)
		return -EINVAL;

		if (!(bit & v->resume_sources))
		return -EINVAL;

		if (on)
		v->resume_irqs \|= 1 << off;
		v->resume_irqs \|= bit;
		else
		v->resume_irqs &= ~(1 << off);
		v->resume_irqs &= ~bit;

		return 0;
		}