Merge branch 'master' (5a476def) · Commits · e / devices / android_kernel_sony_msm8994

MAINTAINERS

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1618,6 +1618,13 @@ M: vandrove@vc.cvut.cz
	L: linux-fbdev-devel@lists.sourceforge.net		L: linux-fbdev-devel@lists.sourceforge.net
	S: Maintained		S: Maintained

			MEGARAID SCSI DRIVERS
			P: Neela Syam Kolli
			M: Neela.Kolli@engenio.com
			S: linux-scsi@vger.kernel.org
			W: http://megaraid.lsilogic.com
			S: Maintained

	MEMORY TECHNOLOGY DEVICES		MEMORY TECHNOLOGY DEVICES
	P: David Woodhouse		P: David Woodhouse
	M: dwmw2@infradead.org		M: dwmw2@infradead.org

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -660,8 +660,10 @@ quiet_cmd_sysmap = SYSMAP
	# Link of vmlinux		# Link of vmlinux
	# If CONFIG_KALLSYMS is set .version is already updated		# If CONFIG_KALLSYMS is set .version is already updated
	# Generate System.map and verify that the content is consistent		# Generate System.map and verify that the content is consistent
			# Use + in front of the vmlinux_version rule to silent warning with make -j2
			# First command is ':' to allow us to use + in front of the rule
	define rule_vmlinux__		define rule_vmlinux__
			:
	$(if $(CONFIG_KALLSYMS),,+$(call cmd,vmlinux_version))		$(if $(CONFIG_KALLSYMS),,+$(call cmd,vmlinux_version))

	$(call cmd,vmlinux__)		$(call cmd,vmlinux__)

+8 −7

Original line number	Original line	Diff line number	Diff line
	@@ -89,13 +89,6 @@ SECTIONS
	(.got) / Global offset table */		(.got) / Global offset table */
	}		}

	. = ALIGN(16);
	__ex_table : { /* Exception table */
	__start___ex_table = .;
	*(__ex_table)
	__stop___ex_table = .;
	}

	RODATA		RODATA

	_etext = .; /* End of text and rodata section */		_etext = .; /* End of text and rodata section */
	@@ -137,6 +130,14 @@ SECTIONS
	. = ALIGN(32);		. = ALIGN(32);
	*(.data.cacheline_aligned)		*(.data.cacheline_aligned)

			/*
			* The exception fixup table (might need resorting at runtime)
			*/
			. = ALIGN(32);
			__start___ex_table = .;
			*(__ex_table)
			__stop___ex_table = .;

	/*		/*
	* and the usual data section		* and the usual data section
	*/		*/

+15 −5

Original line number	Original line	Diff line number	Diff line
	@@ -7,11 +7,17 @@
	*/		*/
	#include <linux/kernel.h>		#include <linux/kernel.h>
	#include <linux/init.h>		#include <linux/init.h>
			#include <linux/device.h>

			#include <asm/types.h>
			#include <asm/irq.h>
			#include <asm/mach-types.h>
	#include <asm/hardware.h>		#include <asm/hardware.h>
	#include <asm/page.h>		#include <asm/page.h>

			#include <asm/mach/arch.h>
	#include <asm/mach/map.h>		#include <asm/mach/map.h>
			#include <asm/mach/irq.h>

	/*		/*
	* IRQ base register		* IRQ base register
	@@ -48,6 +54,12 @@ static void l7200_unmask_irq(unsigned int irq)
	IRQ_ENABLE = 1 << irq;		IRQ_ENABLE = 1 << irq;
	}		}

			static struct irqchip l7200_irq_chip = {
			.ack = l7200_mask_irq,
			.mask = l7200_mask_irq,
			.unmask = l7200_unmask_irq
			};

	static void __init l7200_init_irq(void)		static void __init l7200_init_irq(void)
	{		{
	int irq;		int irq;
	@@ -56,11 +68,9 @@ static void __init l7200_init_irq(void)
	FIQ_ENABLECLEAR = 0xffffffff; /* clear all fast interrupt enables */		FIQ_ENABLECLEAR = 0xffffffff; /* clear all fast interrupt enables */

	for (irq = 0; irq < NR_IRQS; irq++) {		for (irq = 0; irq < NR_IRQS; irq++) {
	irq_desc[irq].valid = 1;		set_irq_chip(irq, &l7200_irq_chip);
	irq_desc[irq].probe_ok = 1;		set_irq_flags(irq, IRQF_VALID);
	irq_desc[irq].mask_ack = l7200_mask_irq;		set_irq_handler(irq, do_level_IRQ);
	irq_desc[irq].mask = l7200_mask_irq;
	irq_desc[irq].unmask = l7200_unmask_irq;
	}		}

	init_FIQ();		init_FIQ();

+19 −1

Original line number	Original line	Diff line number	Diff line
	@@ -467,6 +467,7 @@ void corgi_put_hsync(void)
	{		{
	if (get_hsync_time)		if (get_hsync_time)
	symbol_put(w100fb_get_hsynclen);		symbol_put(w100fb_get_hsynclen);
			get_hsync_time = NULL;
	}		}

	void corgi_wait_hsync(void)		void corgi_wait_hsync(void)
	@@ -476,20 +477,37 @@ void corgi_wait_hsync(void)
	#endif		#endif

	#ifdef CONFIG_PXA_SHARP_Cxx00		#ifdef CONFIG_PXA_SHARP_Cxx00
			static struct device *spitz_pxafb_dev;

			static int is_pxafb_device(struct device * dev, void * data)
			{
			struct platform_device *pdev = container_of(dev, struct platform_device, dev);

			return (strncmp(pdev->name, "pxa2xx-fb", 9) == 0);
			}

	unsigned long spitz_get_hsync_len(void)		unsigned long spitz_get_hsync_len(void)
	{		{
			if (!spitz_pxafb_dev) {
			spitz_pxafb_dev = bus_find_device(&platform_bus_type, NULL, NULL, is_pxafb_device);
			if (!spitz_pxafb_dev)
			return 0;
			}
	if (!get_hsync_time)		if (!get_hsync_time)
	get_hsync_time = symbol_get(pxafb_get_hsync_time);		get_hsync_time = symbol_get(pxafb_get_hsync_time);
	if (!get_hsync_time)		if (!get_hsync_time)
	return 0;		return 0;

	return pxafb_get_hsync_time(&pxafb_device.dev);		return pxafb_get_hsync_time(spitz_pxafb_dev);
	}		}

	void spitz_put_hsync(void)		void spitz_put_hsync(void)
	{		{
			put_device(spitz_pxafb_dev);
	if (get_hsync_time)		if (get_hsync_time)
	symbol_put(pxafb_get_hsync_time);		symbol_put(pxafb_get_hsync_time);
			spitz_pxafb_dev = NULL;
			get_hsync_time = NULL;
	}		}

	void spitz_wait_hsync(void)		void spitz_wait_hsync(void)