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

Commit 1b8b22f4 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] 3761/1: fix armv4t breakage after adding thumb interworking to userspace helpers
  [ARM] Add Integrator support for glibc outb() and friends
  [ARM] Move prototype for register_isa_ports to asm/io.h
  [ARM] Arrange for isa.c to use named initialisers
  [ARM] 3741/1: remove sa1111.c build warning on non-sa1100 systems
  [ARM] 3760/1: This patch adds timeouts while working with SSP registers. Such timeouts were en
  [ARM] 3758/1: Preserve signalling NaNs in conversion
  [ARM] 3749/3: Correct VFP single/double conversion emulation
  [ARM] 3748/3: Correct error check in vfp_raise_exceptions
parents 60d46840 260e98ed

arch/arm/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -47,7 +47,8 @@ comma = , 
# testing for a specific architecture or later rather impossible.

arch-$(CONFIG_CPU_32v6)		:=-D__LINUX_ARM_ARCH__=6 $(call cc-option,-march=armv6,-march=armv5t -Wa$(comma)-march=armv6)

arch-$(CONFIG_CPU_32v6K)	:=-D__LINUX_ARM_ARCH__=6 $(call cc-option,-march=armv6k,-march=armv5t -Wa$(comma)-march=armv6k)

arch-$(CONFIG_CPU_32v5)		:=-D__LINUX_ARM_ARCH__=5 $(call cc-option,-march=armv5te,-march=armv4)

arch-$(CONFIG_CPU_32v5)		:=-D__LINUX_ARM_ARCH__=5 $(call cc-option,-march=armv5te,-march=armv4t)

arch-$(CONFIG_CPU_32v4T)	:=-D__LINUX_ARM_ARCH__=4 -march=armv4t

arch-$(CONFIG_CPU_32v4)		:=-D__LINUX_ARM_ARCH__=4 -march=armv4

arch-$(CONFIG_CPU_32v3)		:=-D__LINUX_ARM_ARCH__=3 -march=armv3

arch/arm/common/sa1111.c

+5 −1
Original line number Diff line number Diff line
@@ -618,7 +618,7 @@ __sa1111_probe(struct device *me, struct resource *mem, int irq) 
{

	struct sa1111 *sachip;

	unsigned long id;

	unsigned int has_devs, val;

	unsigned int has_devs;

	int i, ret = -ENODEV;



	sachip = kzalloc(sizeof(struct sa1111), GFP_KERNEL);
@@ -669,6 +669,9 @@ __sa1111_probe(struct device *me, struct resource *mem, int irq) 
	sa1111_wake(sachip);



#ifdef CONFIG_ARCH_SA1100

	{

	unsigned int val;



	/*

	 * The SDRAM configuration of the SA1110 and the SA1111 must

	 * match.  This is very important to ensure that SA1111 accesses
@@ -692,6 +695,7 @@ __sa1111_probe(struct device *me, struct resource *mem, int irq) 
	 * Enable the SA1110 memory bus request and grant signals.

	 */

	sa1110_mb_enable();

	}

#endif



	/*

arch/arm/kernel/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -13,12 +13,11 @@ obj-y := compat.o entry-armv.o entry-common.o irq.o \ 
obj-$(CONFIG_APM)		+= apm.o

obj-$(CONFIG_ISA_DMA_API)	+= dma.o

obj-$(CONFIG_ARCH_ACORN)	+= ecard.o 

obj-$(CONFIG_FOOTBRIDGE)	+= isa.o

obj-$(CONFIG_FIQ)		+= fiq.o

obj-$(CONFIG_MODULES)		+= armksyms.o module.o

obj-$(CONFIG_ARTHUR)		+= arthur.o

obj-$(CONFIG_ISA_DMA)		+= dma-isa.o

obj-$(CONFIG_PCI)		+= bios32.o

obj-$(CONFIG_PCI)		+= bios32.o isa.o

obj-$(CONFIG_SMP)		+= smp.o

obj-$(CONFIG_OABI_COMPAT)	+= sys_oabi-compat.o

arch/arm/kernel/isa.c

+42 −21
Original line number Diff line number Diff line
@@ -3,21 +3,14 @@ 
 *

 *  Copyright (C) 1999 Phil Blundell

 *

 *  ISA shared memory and I/O port support

 */



/*

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License

 * as published by the Free Software Foundation; either version

 * 2 of the License, or (at your option) any later version.

 *

 *  ISA shared memory and I/O port support, and is required to support

 *  iopl, inb, outb and friends in userspace via glibc emulation.

 */



/* 

 * Nothing about this is actually ARM specific.  One day we could move

 * it into kernel/resource.c or some place like that.  

 */



#include <linux/stddef.h>

#include <linux/types.h>

#include <linux/fs.h>
@@ -27,21 +20,49 @@ 
static unsigned int isa_membase, isa_portbase, isa_portshift;



static ctl_table ctl_isa_vars[4] = {

	{BUS_ISA_MEM_BASE, "membase", &isa_membase, 

	 sizeof(isa_membase), 0444, NULL, &proc_dointvec},

	{BUS_ISA_PORT_BASE, "portbase", &isa_portbase, 

	 sizeof(isa_portbase), 0444, NULL, &proc_dointvec},

	{BUS_ISA_PORT_SHIFT, "portshift", &isa_portshift, 

	 sizeof(isa_portshift), 0444, NULL, &proc_dointvec},

	{0}

	{

		.ctl_name	= BUS_ISA_MEM_BASE,

		.procname	= "membase",

		.data		= &isa_membase, 

		.maxlen		= sizeof(isa_membase),

		.mode		= 0444,

		.proc_handler	= &proc_dointvec,

	}, {

		.ctl_name	= BUS_ISA_PORT_BASE,

		.procname	= "portbase",

		.data		= &isa_portbase, 

		.maxlen		= sizeof(isa_portbase),

		.mode		= 0444,

		.proc_handler	= &proc_dointvec,

	}, {

		.ctl_name	= BUS_ISA_PORT_SHIFT,

		.procname	= "portshift",

		.data		= &isa_portshift, 

		.maxlen		= sizeof(isa_portshift),

		.mode		= 0444,

		.proc_handler	= &proc_dointvec,

	}, {0}

};



static struct ctl_table_header *isa_sysctl_header;



static ctl_table ctl_isa[2] = {{CTL_BUS_ISA, "isa", NULL, 0, 0555, ctl_isa_vars},

			       {0}};

static ctl_table ctl_bus[2] = {{CTL_BUS, "bus", NULL, 0, 0555, ctl_isa},

			       {0}};

static ctl_table ctl_isa[2] = {

	{

		.ctl_name	= CTL_BUS_ISA,

		.procname	= "isa",

		.mode		= 0555,

		.child		= ctl_isa_vars,

	}, {0}

};



static ctl_table ctl_bus[2] = {

	{

		.ctl_name	= CTL_BUS,

		.procname	= "bus",

		.mode		= 0555,

		.child		= ctl_isa,

	}, {0}

};



void __init

register_isa_ports(unsigned int membase, unsigned int portbase, unsigned int portshift)

arch/arm/mach-footbridge/dc21285.c

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 


extern int setup_arm_irq(int, struct irqaction *);

extern void pcibios_report_status(u_int status_mask, int warn);

extern void register_isa_ports(unsigned int, unsigned int, unsigned int);



static unsigned long

dc21285_base_address(struct pci_bus *bus, unsigned int devfn)