Skip to content

Commit

Permalink
Merge branch 'for-linus-merged' of master.kernel.org:/home/rmk/linux-…
Browse files Browse the repository at this point in the history 
…2.6-arm

* 'for-linus-merged' of master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 5177/1: arm/mach-sa1100/Makefile: remove CONFIG_SA1100_USB
  [ARM] 5166/1: magician: add MAINTAINERS entry
  [ARM] fix pnx4008 build errors
  [ARM] Fix SMP booting with non-zero PHYS_OFFSET
  [ARM] 5185/1: Fix spi num_chipselect for lubbock
  [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach
  [ARM] Add support for arch/arm/mach-*/include and arch/arm/plat-*/include
  [ARM] Remove asm/hardware.h, use asm/arch/hardware.h instead
  [ARM] Eliminate useless includes of asm/mach-types.h
  [ARM] Fix circular include dependency with IRQ headers
  avr32: Use <mach/foo.h> instead of <asm/arch/foo.h>
  avr32: Introduce arch/avr32/mach-*/include/mach
  avr32: Move include/asm-avr32 to arch/avr32/include/asm
  [ARM] sa1100_wdt: use reset_status to remember watchdog reset status
  [ARM] pxa: introduce reset_status and clear_reset_status for driver's usage
  [ARM] pxa: introduce reset.h for reset specific header information
  • Loading branch information
Linus Torvalds committed Aug 8, 2008
2 parents f1c7f79 + 097d9eb commit 49b75b8
Show file tree
Hide file tree
Showing 2,160 changed files with 30,614 additions and 30,069 deletions.
2 changes: 1 addition & 1 deletion Documentation/arm/IXP4xx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Linux currently supports the following features on the IXP4xx chips:
- Flash access (MTD/JFFS)
- I2C through GPIO on IXP42x
- GPIO for input/output/interrupts
See include/asm-arm/arch-ixp4xx/platform.h for access functions.
See arch/arm/mach-ixp4xx/include/mach/platform.h for access functions.
- Timers (watchdog, OS)

The following components of the chips are not supported by Linux and
Expand Down
2 changes: 1 addition & 1 deletion Documentation/arm/Interrupts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ So, what's changed?
be re-checked for pending events. (see the Neponset IRQ handler for
details).

7. fixup_irq() is gone, as is include/asm-arm/arch-*/irq.h
7. fixup_irq() is gone, as is arch/arm/mach-*/include/mach/irq.h

Please note that this will not solve all problems - some of them are
hardware based. Mixing level-based and edge-based IRQs on the same
Expand Down
4 changes: 2 additions & 2 deletions Documentation/arm/README
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ Machine/Platform support
To this end, we now have arch/arm/mach-$(MACHINE) directories which are
designed to house the non-driver files for a particular machine (eg, PCI,
memory management, architecture definitions etc). For all future
machines, there should be a corresponding include/asm-arm/arch-$(MACHINE)
machines, there should be a corresponding arch/arm/mach-$(MACHINE)/include/mach
directory.


Expand Down Expand Up @@ -176,7 +176,7 @@ Kernel entry (head.S)
class typically based around one or more system on a chip devices, and
acts as a natural container around the actual implementations. These
classes are given directories - arch/arm/mach-<class> and
include/asm-arm/arch-<class> - which contain the source files to
arch/arm/mach-<class> - which contain the source files to/include/mach
support the machine class. This directories also contain any machine
specific supporting code.

Expand Down
8 changes: 4 additions & 4 deletions Documentation/arm/Samsung-S3C24XX/GPIO.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ Introduction
Headers
-------

See include/asm-arm/arch-s3c2410/regs-gpio.h for the list
See arch/arm/mach-s3c2410/include/mach/regs-gpio.h for the list
of GPIO pins, and the configuration values for them. This
is included by using #include <asm/arch/regs-gpio.h>
is included by using #include <mach/regs-gpio.h>

The GPIO management functions are defined in the hardware
header include/asm-arm/arch-s3c2410/hardware.h which can be
included by #include <asm/arch/hardware.h>
header arch/arm/mach-s3c2410/include/mach/hardware.h which can be
included by #include <mach/hardware.h>

A useful amount of documentation can be found in the hardware
header on how the GPIO functions (and others) work.
Expand Down
2 changes: 1 addition & 1 deletion Documentation/arm/Samsung-S3C24XX/Overview.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Layout
in arch/arm/mach-s3c2410 and S3C2440 in arch/arm/mach-s3c2440

Register, kernel and platform data definitions are held in the
include/asm-arm/arch-s3c2410 directory.
arch/arm/mach-s3c2410 directory./include/mach


Machines
Expand Down
2 changes: 1 addition & 1 deletion Documentation/arm/Samsung-S3C24XX/USB-Host.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ Board Support
Platform Data
-------------

See linux/include/asm-arm/arch-s3c2410/usb-control.h for the
See arch/arm/mach-s3c2410/include/mach/usb-control.h for the
descriptions of the platform device data. An implementation
can be found in linux/arch/arm/mach-s3c2410/usb-simtec.c .

Expand Down
4 changes: 2 additions & 2 deletions Documentation/spi/pxa2xx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Declaring PXA2xx Master Controllers
-----------------------------------
Typically a SPI master is defined in the arch/.../mach-*/board-*.c as a
"platform device". The master configuration is passed to the driver via a table
found in include/asm-arm/arch-pxa/pxa2xx_spi.h:
found in arch/arm/mach-pxa/include/mach/pxa2xx_spi.h:

struct pxa2xx_spi_master {
enum pxa_ssp_type ssp_type;
Expand Down Expand Up @@ -94,7 +94,7 @@ using the "spi_board_info" structure found in "linux/spi/spi.h". See

Each slave device attached to the PXA must provide slave specific configuration
information via the structure "pxa2xx_spi_chip" found in
"include/asm-arm/arch-pxa/pxa2xx_spi.h". The pxa2xx_spi master controller driver
"arch/arm/mach-pxa/include/mach/pxa2xx_spi.h". The pxa2xx_spi master controller driver
will uses the configuration whenever the driver communicates with the slave
device.

Expand Down
4 changes: 2 additions & 2 deletions Documentation/spi/spi-summary
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ board should normally be set up and registered.

So for example arch/.../mach-*/board-*.c files might have code like:

#include <asm/arch/spi.h> /* for mysoc_spi_data */
#include <mach/spi.h> /* for mysoc_spi_data */

/* if your mach-* infrastructure doesn't support kernels that can
* run on multiple boards, pdata wouldn't benefit from "__init".
Expand All @@ -227,7 +227,7 @@ So for example arch/.../mach-*/board-*.c files might have code like:

And SOC-specific utility code might look something like:

#include <asm/arch/spi.h>
#include <mach/spi.h>

static struct platform_device spi2 = { ... };

Expand Down
5 changes: 5 additions & 0 deletions MAINTAINERS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -594,6 +594,11 @@ M: kernel@wantstofly.org
L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
S: Maintained

ARM/MAGICIAN MACHINE SUPPORT
P: Philipp Zabel
M: philipp.zabel@gmail.com
S: Maintained

ARM/TOSA MACHINE SUPPORT
P: Dmitry Baryshkov
M: dbaryshkov@gmail.com
Expand Down
54 changes: 19 additions & 35 deletions arch/arm/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,7 @@ textofs-y := 0x00008000
machine-$(CONFIG_ARCH_RPC) := rpc
machine-$(CONFIG_ARCH_EBSA110) := ebsa110
machine-$(CONFIG_ARCH_CLPS7500) := clps7500
incdir-$(CONFIG_ARCH_CLPS7500) := cl7500
machine-$(CONFIG_FOOTBRIDGE) := footbridge
incdir-$(CONFIG_FOOTBRIDGE) := ebsa285
machine-$(CONFIG_ARCH_SHARK) := shark
machine-$(CONFIG_ARCH_SA1100) := sa1100
ifeq ($(CONFIG_ARCH_SA1100),y)
Expand All @@ -114,13 +112,15 @@ endif
machine-$(CONFIG_ARCH_IOP32X) := iop32x
machine-$(CONFIG_ARCH_IOP33X) := iop33x
machine-$(CONFIG_ARCH_IOP13XX) := iop13xx
plat-$(CONFIG_PLAT_IOP) := iop
machine-$(CONFIG_ARCH_IXP4XX) := ixp4xx
machine-$(CONFIG_ARCH_IXP2000) := ixp2000
machine-$(CONFIG_ARCH_IXP23XX) := ixp23xx
machine-$(CONFIG_ARCH_OMAP1) := omap1
machine-$(CONFIG_ARCH_OMAP2) := omap2
incdir-$(CONFIG_ARCH_OMAP) := omap
machine-$(CONFIG_ARCH_S3C2410) := s3c2410
plat-$(CONFIG_ARCH_OMAP) := omap
machine-$(CONFIG_ARCH_S3C2410) := s3c2410 s3c2400 s3c2412 s3c2440 s3c2442 s3c2443
plat-$(CONFIG_PLAT_S3C24XX) := s3c24xx
machine-$(CONFIG_ARCH_LH7A40X) := lh7a40x
machine-$(CONFIG_ARCH_VERSATILE) := versatile
machine-$(CONFIG_ARCH_IMX) := imx
Expand All @@ -135,10 +135,11 @@ endif
machine-$(CONFIG_ARCH_DAVINCI) := davinci
machine-$(CONFIG_ARCH_KIRKWOOD) := kirkwood
machine-$(CONFIG_ARCH_KS8695) := ks8695
incdir-$(CONFIG_ARCH_MXC) := mxc
plat-$(CONFIG_ARCH_MXC) := mxc
machine-$(CONFIG_ARCH_MX2) := mx2
machine-$(CONFIG_ARCH_MX3) := mx3
machine-$(CONFIG_ARCH_ORION5X) := orion5x
plat-$(CONFIG_PLAT_ORION) := orion
machine-$(CONFIG_ARCH_MSM7X00A) := msm
machine-$(CONFIG_ARCH_LOKI) := loki
machine-$(CONFIG_ARCH_MV78XX0) := mv78xx0
Expand All @@ -153,17 +154,22 @@ endif
# The byte offset of the kernel image in RAM from the start of RAM.
TEXT_OFFSET := $(textofs-y)

ifeq ($(incdir-y),)
incdir-y := $(machine-y)
endif
INCDIR := arch-$(incdir-y)

# The first directory contains additional information for the boot setup code
ifneq ($(machine-y),)
MACHINE := arch/arm/mach-$(machine-y)/
MACHINE := arch/arm/mach-$(word 1,$(machine-y))/
else
MACHINE :=
endif

machdirs := $(patsubst %,arch/arm/mach-%/,$(machine-y))
platdirs := $(patsubst %,arch/arm/plat-%/,$(plat-y))

ifeq ($(KBUILD_SRC),)
KBUILD_CPPFLAGS += $(patsubst %,-I%include,$(machdirs) $(platdirs))
else
KBUILD_CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(machdirs) $(platdirs))
endif

export TEXT_OFFSET GZFLAGS MMUEXT

# Do we have FASTFPE?
Expand All @@ -174,23 +180,11 @@ endif

# If we have a machine-specific directory, then include it in the build.
core-y += arch/arm/kernel/ arch/arm/mm/ arch/arm/common/
core-y += $(MACHINE)
core-$(CONFIG_ARCH_S3C2410) += arch/arm/mach-s3c2400/
core-$(CONFIG_ARCH_S3C2410) += arch/arm/mach-s3c2412/
core-$(CONFIG_ARCH_S3C2410) += arch/arm/mach-s3c2440/
core-$(CONFIG_ARCH_S3C2410) += arch/arm/mach-s3c2442/
core-$(CONFIG_ARCH_S3C2410) += arch/arm/mach-s3c2443/
core-y += $(machdirs) $(platdirs)
core-$(CONFIG_FPE_NWFPE) += arch/arm/nwfpe/
core-$(CONFIG_FPE_FASTFPE) += $(FASTFPE_OBJ)
core-$(CONFIG_VFP) += arch/arm/vfp/

# If we have a common platform directory, then include it in the build.
core-$(CONFIG_PLAT_IOP) += arch/arm/plat-iop/
core-$(CONFIG_PLAT_ORION) += arch/arm/plat-orion/
core-$(CONFIG_ARCH_OMAP) += arch/arm/plat-omap/
core-$(CONFIG_PLAT_S3C24XX) += arch/arm/plat-s3c24xx/
core-$(CONFIG_ARCH_MXC) += arch/arm/plat-mxc/

drivers-$(CONFIG_OPROFILE) += arch/arm/oprofile/

libs-y := arch/arm/lib/ $(libs-y)
Expand All @@ -210,20 +204,10 @@ boot := arch/arm/boot
# them changed. We use .arch to indicate when they were updated
# last, otherwise make uses the target directory mtime.

include/asm-arm/.arch: $(wildcard include/config/arch/*.h) include/config/auto.conf
@echo ' SYMLINK include/asm-arm/arch -> include/asm-arm/$(INCDIR)'
ifneq ($(KBUILD_SRC),)
$(Q)mkdir -p include/asm-arm
$(Q)ln -fsn $(srctree)/include/asm-arm/$(INCDIR) include/asm-arm/arch
else
$(Q)ln -fsn $(INCDIR) include/asm-arm/arch
endif
@touch $@

archprepare: maketools

PHONY += maketools FORCE
maketools: include/linux/version.h include/asm-arm/.arch FORCE
maketools: include/linux/version.h FORCE
$(Q)$(MAKE) $(build)=arch/arm/tools include/asm-arm/mach-types.h

# Convert bzImage to zImage
Expand Down
1 change: 0 additions & 1 deletion arch/arm/boot/compressed/head-xscale.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
*/

#include <linux/linkage.h>
#include <asm/mach-types.h>

.section ".start", "ax"

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/compressed/head.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@

#else

#include <asm/arch/debug-macro.S>
#include <mach/debug-macro.S>

.macro writeb, ch, rb
senduart \ch, \rb
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/compressed/misc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ unsigned int __machine_arch_type;
static void putstr(const char *ptr);

#include <linux/compiler.h>
#include <asm/arch/uncompress.h>
#include <mach/uncompress.h>

#ifdef CONFIG_DEBUG_ICEDCC

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/common/locomo.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include <linux/slab.h>
#include <linux/spinlock.h>

#include <asm/hardware.h>
#include <mach/hardware.h>
#include <asm/io.h>
#include <asm/irq.h>
#include <asm/mach/irq.h>
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/common/sa1111.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include <linux/dma-mapping.h>
#include <linux/clk.h>

#include <asm/hardware.h>
#include <mach/hardware.h>
#include <asm/mach-types.h>
#include <asm/io.h>
#include <asm/irq.h>
Expand Down
11 changes: 5 additions & 6 deletions arch/arm/common/sharpsl_pm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,12 @@
#include <linux/apm-emulation.h>
#include <linux/suspend.h>

#include <asm/hardware.h>
#include <asm/mach-types.h>
#include <mach/hardware.h>
#include <asm/irq.h>
#include <asm/arch/pm.h>
#include <asm/arch/pxa-regs.h>
#include <asm/arch/pxa2xx-regs.h>
#include <asm/arch/sharpsl.h>
#include <mach/pm.h>
#include <mach/pxa-regs.h>
#include <mach/pxa2xx-regs.h>
#include <mach/sharpsl.h>
#include <asm/hardware/sharpsl_pm.h>

/*
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/common/time-acorn.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include <linux/interrupt.h>
#include <linux/irq.h>

#include <asm/hardware.h>
#include <mach/hardware.h>
#include <asm/io.h>
#include <asm/hardware/ioc.h>

Expand Down
3 changes: 1 addition & 2 deletions arch/arm/common/uengine.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@
#include <linux/slab.h>
#include <linux/module.h>
#include <linux/string.h>
#include <asm/hardware.h>
#include <asm/arch/hardware.h>
#include <mach/hardware.h>
#include <asm/hardware/uengine.h>
#include <asm/io.h>

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/include/asm/dma.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ typedef unsigned int dmach_t;
#include <linux/spinlock.h>
#include <asm/system.h>
#include <asm/scatterlist.h>
#include <asm/arch/dma.h>
#include <mach/dma.h>

/*
* This is the maximum virtual address which can be DMA'd from.
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/include/asm/floppy.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#ifndef __ASM_ARM_FLOPPY_H
#define __ASM_ARM_FLOPPY_H
#if 0
#include <asm/arch/floppy.h>
#include <mach/floppy.h>
#endif

#define fd_outb(val,port) \
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/include/asm/gpio.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
#define _ARCH_ARM_GPIO_H

/* not all ARM platforms necessarily support this API ... */
#include <asm/arch/gpio.h>
#include <mach/gpio.h>

#endif /* _ARCH_ARM_GPIO_H */
18 changes: 0 additions & 18 deletions arch/arm/include/asm/hardware.h
View file

This file was deleted.

2 changes: 1 addition & 1 deletion arch/arm/include/asm/hardware/dec21285.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#define DC21285_PCI_MEM 0x80000000

#ifndef __ASSEMBLY__
#include <asm/hardware.h>
#include <mach/hardware.h>
#define DC21285_IO(x) ((volatile unsigned long *)(ARMCSR_BASE+(x)))
#else
#define DC21285_IO(x) (x)
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/include/asm/hardware/iop3xx-adma.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#define _ADMA_H
#include <linux/types.h>
#include <linux/io.h>
#include <asm/hardware.h>
#include <mach/hardware.h>
#include <asm/hardware/iop_adma.h>

/* Memory copy units */
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/include/asm/hardware/iop3xx-gpio.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#ifndef __ASM_ARM_HARDWARE_IOP3XX_GPIO_H
#define __ASM_ARM_HARDWARE_IOP3XX_GPIO_H

#include <asm/hardware.h>
#include <mach/hardware.h>
#include <asm-generic/gpio.h>

#define IOP3XX_N_GPIOS 8
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/include/asm/hardware/sa1111.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#ifndef _ASM_ARCH_SA1111
#define _ASM_ARCH_SA1111

#include <asm/arch/bitfield.h>
#include <mach/bitfield.h>

/*
* The SA1111 is always located at virtual 0xf4000000, and is always
Expand Down
Loading

0 comments on commit 49b75b8

Please sign in to comment.