Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 39b945a3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-arm 

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] pxa: fix tosa.c build error
  [ARM] 5067/1: _raw_write_can_lock macro bugfix
  [ARM] 5070/1: pxa: add GPIO104_PSKTSEL to pxa27x MFP configuration
  [ARM] 5068/1: PXA2xx Additional gpio definitions
  [ARM] 5066/2: EM-X270: Fix DM9000 IRQ flags initialisation
  [ARM] 5065/2: CM-X270: Fix DM9000 IRQ flags initialisation
  [ARM] 5062/1: pxa: remove unused definition of CONFIG_ARCH_COTULLA_IDP
  [ARM] 5060/1: remove unnecessary include of asm/io.h
  [ARM] fix AT91 include loops
parents 203c8018 0ef2cfc0

arch/arm/boot/compressed/head-xscale.S

+0 −4
Original line number Original line Diff line number Diff line
@@ -33,10 +33,6 @@ __XScale_start: 
		bic	r0, r0, #0x1000		@ clear Icache

		bic	r0, r0, #0x1000		@ clear Icache

		mcr	p15, 0, r0, c1, c0, 0

		mcr	p15, 0, r0, c1, c0, 0





#ifdef CONFIG_ARCH_COTULLA_IDP

		mov	r7, #MACH_TYPE_COTULLA_IDP

#endif



#ifdef CONFIG_ARCH_IXP2000

#ifdef CONFIG_ARCH_IXP2000

		mov	r1, #-1

		mov	r1, #-1

		mov	r0, #0xd6000000

		mov	r0, #0xd6000000

arch/arm/mach-pxa/cm-x270.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -59,7 +59,7 @@ static struct resource cmx270_dm9k_resource[] = { 
	[2] = {

	[2] = {

		.start = CMX270_ETHIRQ,

		.start = CMX270_ETHIRQ,

		.end   = CMX270_ETHIRQ,

		.end   = CMX270_ETHIRQ,

		.flags = IORESOURCE_IRQ,

		.flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,

	}

	}

};

};

arch/arm/mach-pxa/em-x270.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -50,7 +50,7 @@ static struct resource em_x270_dm9k_resource[] = { 
	[2] = {

	[2] = {

		.start = EM_X270_ETHIRQ,

		.start = EM_X270_ETHIRQ,

		.end   = EM_X270_ETHIRQ,

		.end   = EM_X270_ETHIRQ,

		.flags = IORESOURCE_IRQ,

		.flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,

	}

	}

};

};

arch/arm/mach-pxa/tosa.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -467,8 +467,8 @@ static struct platform_device *devices[] __initdata = { 




static void tosa_poweroff(void)

static void tosa_poweroff(void)

{

{

	pxa_gpio_mode(TOSA_GPIO_ON_RESET | GPIO_OUT);

	gpio_direction_output(TOSA_GPIO_ON_RESET, 0);

	GPSR(TOSA_GPIO_ON_RESET) = GPIO_bit(TOSA_GPIO_ON_RESET);

	gpio_set_value(TOSA_GPIO_ON_RESET, 1);





	mdelay(1000);

	mdelay(1000);

	arm_machine_restart('h');

	arm_machine_restart('h');

include/asm-arm/arch-at91/io.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -21,8 +21,6 @@ 
#ifndef __ASM_ARCH_IO_H

#ifndef __ASM_ARCH_IO_H

#define __ASM_ARCH_IO_H

#define __ASM_ARCH_IO_H





#include <asm/io.h>



#define IO_SPACE_LIMIT		0xFFFFFFFF

#define IO_SPACE_LIMIT		0xFFFFFFFF





#define __io(a)			((void __iomem *)(a))

#define __io(a)			((void __iomem *)(a))