linux-toradex.git/drivers/misc, branch imx-android-r13.2

Merge remote branch 'fsl-linux-sdk/imx_3.0.15' into imx_3.0.15_android

2012-02-15T08:23:38+00:00

Conflicts:
	arch/arm/mach-mx6/board-mx6q_arm2.c
	arch/arm/mach-mx6/board-mx6q_sabresd.c
	drivers/mmc/core/bus.c

ENGR00174018 MX6Q/perfmon : fix the compiling error

2012-02-08T02:23:03+00:00

reduce one parameter to fix the built error.

Signed-off-by: Huang Shijie

ENGR00170215 pmem: remove ioremap for virtual address

2012-02-02T08:59:08+00:00

ioremapped virtual address is only used by kenrel drivers
who need to access pmem. But on our platform, we never have
such use case. So remove this ioremap to save the vmalloc
virtual kernel spaces for lowmem mapping.

Signed-off-by: Xinyu Chen

ENGR00137611 pmem: Add write through cache policy for android pmem

2012-02-02T08:59:07+00:00

For cached pmem, use write through cache policy.

Signed-off-by: Xinyu Chen

ENGR00133690 Android pmem: fix bug of first open check to pmem device

2012-02-02T08:59:07+00:00

Due to the change: d405640539555b601e52f7d18f1f0b1345d18bf5,
the file->private_data is no longer initialized to NULL.
But assigned to miscdevice structure.

Signed-off-by: Xinyu Chen

ENGR00133687 Android pmem: change the noncached buffer prot to writecombine.

2012-02-02T08:59:07+00:00

Workaround for imx5x M4IF burst len errata when armv7 neon enabled:
if the burst len > 8bytes, access the strongly ordered memory,
the result is not correct.
Use pgprot_writecombine to map the memory to uncached and normal memory type,
instead of pgprot_noncached which maps to strongly ordered memory,
to avoid burst len > 8.

Signed-off-by: Hu Hui

Merge branch 'android-3.0' into imx_3.0.15_android

2012-02-02T08:58:05+00:00

Conflicts:
	drivers/misc/Kconfig
	drivers/misc/Makefile
	drivers/net/wireless/Makefile
	kernel/power/main.c
	sound/soc/soc-core.c

ENGR00161951-1 [mx6q]performance monitor driver

2012-01-09T13:07:39+00:00

add plt_init & plt_exit functions to structure, so that
the driver would have chance to do platform specific init and exit

Signed-off-by: Tony Lin

ENGR00137979-1 add performance monitor driver

2012-01-09T12:08:04+00:00

	add performance monitor driver.
	sample:
		cd /sys/devices/platform/mxs-perfmon.0/
   		'echo 1 > MIDn-xxx' to enable monitor this channel
			n: channel number; xxx: name of channel (PXP, LCD...)
			you can enable the multiple channels you want to
			monitor respectively using this command.
			use following command to check the channel is enabled
		'cat MIDn-xxx'
			1: enable; 0: disable

		'echo read > Monitor' to monitor all read activities
		'echo start > Monitor' to start monitoring
		'echo fetch > Monitor' to get a snapshot of monitor statistics.
		'cat xxx_Count' to show the statistics.
			xxx: name of statistics, (Data, Transfer, Latency...)

		'echo clear > Monitor' to clear snapshot of monitor statistics.
		'echo stop > Monitor' to stop monitoring

Signed-off-by: Tony Lin

pcie-gadget-spear: Add "platform:" prefix for platform modalias

2011-11-26T17:09:59+00:00

commit 161f14191dc166c4e3f37f68af1bc199c6868b7d upstream.

Since 43cc71eed1250755986da4c0f9898f9a635cb3bf (platform: prefix MODALIAS
with "platform:"), the platform modalias is prefixed with "platform:".

Signed-off-by: Axel Lin 
Acked-by: Pratyush Anand 
Signed-off-by: Greg Kroah-Hartman