Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 (e4d80637) · Commits · e / devices / android_kernel_fairphone_FP5

arch/sh/include/asm/mmu.h

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -66,6 +66,13 @@ int pmb_unmap(void __iomem *addr);

	#else		#else

			static inline int
			pmb_bolt_mapping(unsigned long virt, phys_addr_t phys,
			unsigned long size, pgprot_t prot)
			{
			return -EINVAL;
			}

	static inline void __iomem *		static inline void __iomem *
	pmb_remap_caller(phys_addr_t phys, unsigned long size,		pmb_remap_caller(phys_addr_t phys, unsigned long size,
	pgprot_t prot, void *caller)		pgprot_t prot, void *caller)

arch/sh/mm/uncached.c

+9 −0

Original line number	Original line	Diff line number	Diff line
	#include <linux/init.h>		#include <linux/init.h>
			#include <linux/module.h>
	#include <asm/sizes.h>		#include <asm/sizes.h>
	#include <asm/page.h>		#include <asm/page.h>
			#include <asm/addrspace.h>

	/*		/*
	* This is the offset of the uncached section from its cached alias.		* This is the offset of the uncached section from its cached alias.
	@@ -15,15 +17,22 @@
	unsigned long cached_to_uncached = SZ_512M;		unsigned long cached_to_uncached = SZ_512M;
	unsigned long uncached_size = SZ_512M;		unsigned long uncached_size = SZ_512M;
	unsigned long uncached_start, uncached_end;		unsigned long uncached_start, uncached_end;
			EXPORT_SYMBOL(uncached_start);
			EXPORT_SYMBOL(uncached_end);

	int virt_addr_uncached(unsigned long kaddr)		int virt_addr_uncached(unsigned long kaddr)
	{		{
	return (kaddr >= uncached_start) && (kaddr < uncached_end);		return (kaddr >= uncached_start) && (kaddr < uncached_end);
	}		}
			EXPORT_SYMBOL(virt_addr_uncached);

	void __init uncached_init(void)		void __init uncached_init(void)
	{		{
			#ifdef CONFIG_29BIT
			uncached_start = P2SEG;
			#else
	uncached_start = memory_end;		uncached_start = memory_end;
			#endif
	uncached_end = uncached_start + uncached_size;		uncached_end = uncached_start + uncached_size;
	}		}

drivers/serial/sh-sci.c

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -50,7 +50,6 @@
	#include <linux/list.h>		#include <linux/list.h>
	#include <linux/dmaengine.h>		#include <linux/dmaengine.h>
	#include <linux/scatterlist.h>		#include <linux/scatterlist.h>
	#include <linux/timer.h>

	#ifdef CONFIG_SUPERH		#ifdef CONFIG_SUPERH
	#include <asm/sh_bios.h>		#include <asm/sh_bios.h>

drivers/sh/intc.c

+30 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2,7 +2,7 @@
	* Shared interrupt handling code for IPR and INTC2 types of IRQs.		* Shared interrupt handling code for IPR and INTC2 types of IRQs.
	*		*
	* Copyright (C) 2007, 2008 Magnus Damm		* Copyright (C) 2007, 2008 Magnus Damm
	* Copyright (C) 2009 Paul Mundt		* Copyright (C) 2009, 2010 Paul Mundt
	*		*
	* Based on intc2.c and ipr.c		* Based on intc2.c and ipr.c
	*		*
	@@ -26,6 +26,7 @@
	#include <linux/list.h>		#include <linux/list.h>
	#include <linux/topology.h>		#include <linux/topology.h>
	#include <linux/bitmap.h>		#include <linux/bitmap.h>
			#include <linux/cpumask.h>

	#define _INTC_MK(fn, mode, addr_e, addr_d, width, shift) \		#define _INTC_MK(fn, mode, addr_e, addr_d, width, shift) \
	((shift) \| ((width) << 5) \| ((fn) << 9) \| ((mode) << 13) \| \		((shift) \| ((width) << 5) \| ((fn) << 9) \| ((mode) << 13) \| \
	@@ -234,6 +235,10 @@ static inline void _intc_enable(unsigned int irq, unsigned long handle)
	unsigned int cpu;		unsigned int cpu;

	for (cpu = 0; cpu < SMP_NR(d, _INTC_ADDR_E(handle)); cpu++) {		for (cpu = 0; cpu < SMP_NR(d, _INTC_ADDR_E(handle)); cpu++) {
			#ifdef CONFIG_SMP
			if (!cpumask_test_cpu(cpu, irq_to_desc(irq)->affinity))
			continue;
			#endif
	addr = INTC_REG(d, _INTC_ADDR_E(handle), cpu);		addr = INTC_REG(d, _INTC_ADDR_E(handle), cpu);
	intc_enable_fns[_INTC_MODE(handle)](addr, handle, intc_reg_fns\		intc_enable_fns[_INTC_MODE(handle)](addr, handle, intc_reg_fns\
	[_INTC_FN(handle)], irq);		[_INTC_FN(handle)], irq);
	@@ -253,6 +258,10 @@ static void intc_disable(unsigned int irq)
	unsigned int cpu;		unsigned int cpu;

	for (cpu = 0; cpu < SMP_NR(d, _INTC_ADDR_D(handle)); cpu++) {		for (cpu = 0; cpu < SMP_NR(d, _INTC_ADDR_D(handle)); cpu++) {
			#ifdef CONFIG_SMP
			if (!cpumask_test_cpu(cpu, irq_to_desc(irq)->affinity))
			continue;
			#endif
	addr = INTC_REG(d, _INTC_ADDR_D(handle), cpu);		addr = INTC_REG(d, _INTC_ADDR_D(handle), cpu);
	intc_disable_fns[_INTC_MODE(handle)](addr, handle,intc_reg_fns\		intc_disable_fns[_INTC_MODE(handle)](addr, handle,intc_reg_fns\
	[_INTC_FN(handle)], irq);		[_INTC_FN(handle)], irq);
	@@ -301,6 +310,23 @@ static int intc_set_wake(unsigned int irq, unsigned int on)
	return 0; /* allow wakeup, but setup hardware in intc_suspend() */		return 0; /* allow wakeup, but setup hardware in intc_suspend() */
	}		}

			#ifdef CONFIG_SMP
			/*
			* This is held with the irq desc lock held, so we don't require any
			* additional locking here at the intc desc level. The affinity mask is
			* later tested in the enable/disable paths.
			*/
			static int intc_set_affinity(unsigned int irq, const struct cpumask *cpumask)
			{
			if (!cpumask_intersects(cpumask, cpu_online_mask))
			return -1;

			cpumask_copy(irq_to_desc(irq)->affinity, cpumask);

			return 0;
			}
			#endif

	static void intc_mask_ack(unsigned int irq)		static void intc_mask_ack(unsigned int irq)
	{		{
	struct intc_desc_int *d = get_intc_desc(irq);		struct intc_desc_int *d = get_intc_desc(irq);
	@@ -847,6 +873,9 @@ void __init register_intc_controller(struct intc_desc *desc)
	d->chip.shutdown = intc_disable;		d->chip.shutdown = intc_disable;
	d->chip.set_type = intc_set_sense;		d->chip.set_type = intc_set_sense;
	d->chip.set_wake = intc_set_wake;		d->chip.set_wake = intc_set_wake;
			#ifdef CONFIG_SMP
			d->chip.set_affinity = intc_set_affinity;
			#endif

	if (hw->ack_regs) {		if (hw->ack_regs) {
	for (i = 0; i < hw->nr_ack_regs; i++)		for (i = 0; i < hw->nr_ack_regs; i++)

include/linux/serial_sci.h

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2,7 +2,9 @@
	#define __LINUX_SERIAL_SCI_H		#define __LINUX_SERIAL_SCI_H

	#include <linux/serial_core.h>		#include <linux/serial_core.h>
			#ifdef CONFIG_SERIAL_SH_SCI_DMA
	#include <asm/dmaengine.h>		#include <asm/dmaengine.h>
			#endif

	/*		/*
	* Generic header for SuperH SCI(F) (used by sh/sh64/h8300 and related parts)		* Generic header for SuperH SCI(F) (used by sh/sh64/h8300 and related parts)
	@@ -30,8 +32,10 @@ struct plat_sci_port {
	upf_t flags; /* UPF_* flags */		upf_t flags; /* UPF_* flags */
	char clk; / clock string */		char clk; / clock string */
	struct device *dma_dev;		struct device *dma_dev;
			#ifdef CONFIG_SERIAL_SH_SCI_DMA
	enum sh_dmae_slave_chan_id dma_slave_tx;		enum sh_dmae_slave_chan_id dma_slave_tx;
	enum sh_dmae_slave_chan_id dma_slave_rx;		enum sh_dmae_slave_chan_id dma_slave_rx;
			#endif
	};		};

	#endif /* __LINUX_SERIAL_SCI_H */		#endif /* __LINUX_SERIAL_SCI_H */