Commit f165eb77 authored by Russell King's avatar Russell King
Browse files

Merge branch 'devel' of... 

Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable

Conflicts:
	arch/arm/mach-pxa/palmt5.c
	arch/arm/mach-pxa/palmtreo.c
parents fc1caf6e a6cd7eb3

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -693,6 +693,13 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/kristoffer/linux-hpc.git 
F:	arch/arm/mach-sa1100/jornada720.c

F:	arch/arm/mach-sa1100/include/mach/jornada720.h



ARM/INCOME PXA270 SUPPORT

M:	Marek Vasut <marek.vasut@gmail.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/mach-pxa/income.c

F:	arch/arm/mach-pxa/include/mach-pxa/income.h



ARM/INTEL IOP32X ARM ARCHITECTURE

M:	Lennert Buytenhek <kernel@wantstofly.org>

M:	Dan Williams <dan.j.williams@intel.com>

arch/arm/boot/compressed/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ ifeq ($(CONFIG_CPU_XSCALE),y) 
OBJS		+= head-xscale.o

endif



ifeq ($(CONFIG_PXA_SHARPSL),y)

ifeq ($(CONFIG_PXA_SHARPSL_DETECT_MACH_ID),y)

OBJS		+= head-sharpsl.o

endif

arch/arm/common/it8152.c

+0 −8
Original line number Diff line number Diff line
@@ -263,14 +263,6 @@ static int it8152_pci_platform_notify_remove(struct device *dev) 
	return 0;

}



int dma_needs_bounce(struct device *dev, dma_addr_t dma_addr, size_t size)

{

	dev_dbg(dev, "%s: dma_addr %08x, size %08x\n",

		__func__, dma_addr, size);

	return (dev->bus == &pci_bus_type) &&

		((dma_addr + size - PHYS_OFFSET) >= SZ_64M);

}



int __init it8152_pci_setup(int nr, struct pci_sys_data *sys)

{

	it8152_io.start = IT8152_IO_BASE + 0x12000;

arch/arm/include/asm/dma-mapping.h

+8 −0
Original line number Diff line number Diff line
@@ -298,7 +298,15 @@ extern void dmabounce_unregister_dev(struct device *); 
 * DMA access and 1 if the buffer needs to be bounced.

 *

 */

#ifdef CONFIG_SA1111

extern int dma_needs_bounce(struct device*, dma_addr_t, size_t);

#else

static inline int dma_needs_bounce(struct device *dev, dma_addr_t addr,

				   size_t size)

{

	return 0;

}

#endif



/*

 * The DMA API, implemented by dmabounce.c.  See below for descriptions.

arch/arm/include/asm/hardware/scoop.h

+17 −12
Original line number Diff line number Diff line
@@ -22,6 +22,11 @@ 
#define SCOOP_GPWR 0x24

#define SCOOP_GPRR 0x28



#define SCOOP_CPR_OUT	(1 << 7)

#define SCOOP_CPR_SD_3V	(1 << 2)

#define SCOOP_CPR_CF_XV	(1 << 1)

#define SCOOP_CPR_CF_3V	(1 << 0)



#define SCOOP_GPCR_PA22	(1 << 12)

#define SCOOP_GPCR_PA21	(1 << 11)

#define SCOOP_GPCR_PA20	(1 << 10)