lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 's3c-move' into devel

Browse Source 
Conflicts:

	arch/arm/mach-versatile/core.c
This commit is contained in:
Russell King
2008-10-14 22:24:51 +01:00
committed by Russell King
parent b6825d2df5 d5120ae72a
commit 7e69a8c4d0
413 changed files with 3568 additions and 2366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/DMA-mapping.txt
View File

@ -740,7 +740,7 @@ failure can be determined by:
dma_addr_t dma_handle; dma_addr_t dma_handle;
dma_handle = pci_map_single(pdev, addr, size, direction); dma_handle = pci_map_single(pdev, addr, size, direction);
if (pci_dma_mapping_error(dma_handle)) { if (pci_dma_mapping_error(pdev, dma_handle)) {
/* /*
* reduce current DMA mapping usage, * reduce current DMA mapping usage,
* delay and try again later or * delay and try again later or

3
Documentation/HOWTO
View File

@ -77,7 +77,8 @@ documentation files are also added which explain how to use the feature.
When a kernel change causes the interface that the kernel exposes to When a kernel change causes the interface that the kernel exposes to
userspace to change, it is recommended that you send the information or userspace to change, it is recommended that you send the information or
a patch to the manual pages explaining the change to the manual pages a patch to the manual pages explaining the change to the manual pages
maintainer at mtk.manpages@gmail.com. maintainer at mtk.manpages@gmail.com, and CC the list
linux-api@vger.kernel.org.
Here is a list of files that are in the kernel source tree that are Here is a list of files that are in the kernel source tree that are
required reading: required reading:

2
Documentation/SubmitChecklist
View File

@ -67,6 +67,8 @@ kernel patches.
19: All new userspace interfaces are documented in Documentation/ABI/. 19: All new userspace interfaces are documented in Documentation/ABI/.
See Documentation/ABI/README for more information. See Documentation/ABI/README for more information.
Patches that change userspace interfaces should be CCed to
linux-api@vger.kernel.org.
20: Check that it all passes `make headers_check'. 20: Check that it all passes `make headers_check'.

4
Documentation/ioctl/cdrom.txt
View File

@ -271,14 +271,14 @@ CDROMCLOSETRAY pendant of CDROMEJECT
usage: usage:
ioctl(fd, CDROMEJECT, 0); ioctl(fd, CDROMCLOSETRAY, 0);
inputs: none inputs: none
outputs: none outputs: none
error returns: error returns:
ENOSYS cd drive not capable of ejecting ENOSYS cd drive not capable of closing the tray
EBUSY other processes are accessing drive, or door is locked EBUSY other processes are accessing drive, or door is locked
notes: notes:

7
Documentation/sysctl/kernel.txt
View File

@ -351,9 +351,10 @@ kernel. This value defaults to SHMMAX.
softlockup_thresh: softlockup_thresh:
This value can be used to lower the softlockup tolerance This value can be used to lower the softlockup tolerance threshold. The
threshold. The default threshold is 10s. If a cpu is locked up default threshold is 60 seconds. If a cpu is locked up for 60 seconds,
for 10s, the kernel complains. Valid values are 1-60s. the kernel complains. Valid values are 1-60 seconds. Setting this
tunable to zero will disable the softlockup detection altogether.
============================================================== ==============================================================

12
Documentation/usb/anchors.txt
View File

@ -42,9 +42,21 @@ This function kills all URBs associated with an anchor. The URBs
are called in the reverse temporal order they were submitted. are called in the reverse temporal order they were submitted.
This way no data can be reordered. This way no data can be reordered.
usb_unlink_anchored_urbs()
--------------------------
This function unlinks all URBs associated with an anchor. The URBs
are processed in the reverse temporal order they were submitted.
This is similar to usb_kill_anchored_urbs(), but it will not sleep.
Therefore no guarantee is made that the URBs have been unlinked when
the call returns. They may be unlinked later but will be unlinked in
finite time.
usb_wait_anchor_empty_timeout() usb_wait_anchor_empty_timeout()
------------------------------- -------------------------------
This function waits for all URBs associated with an anchor to finish This function waits for all URBs associated with an anchor to finish
or a timeout, whichever comes first. Its return value will tell you or a timeout, whichever comes first. Its return value will tell you
whether the timeout was reached. whether the timeout was reached.

2
Documentation/video4linux/CARDLIST.em28xx
View File

@ -46,7 +46,7 @@
45 -> Pinnacle PCTV DVB-T (em2870) 45 -> Pinnacle PCTV DVB-T (em2870)
46 -> Compro, VideoMate U3 (em2870) [185b:2870] 46 -> Compro, VideoMate U3 (em2870) [185b:2870]
47 -> KWorld DVB-T 305U (em2880) [eb1a:e305] 47 -> KWorld DVB-T 305U (em2880) [eb1a:e305]
48 -> KWorld DVB-T 310U (em2880) 48 -> KWorld DVB-T 310U (em2880) [eb1a:e310]
49 -> MSI DigiVox A/D (em2880) [eb1a:e310] 49 -> MSI DigiVox A/D (em2880) [eb1a:e310]
50 -> MSI DigiVox A/D II (em2880) [eb1a:e320] 50 -> MSI DigiVox A/D II (em2880) [eb1a:e320]
51 -> Terratec Hybrid XS Secam (em2880) [0ccd:004c] 51 -> Terratec Hybrid XS Secam (em2880) [0ccd:004c]

1
Documentation/video4linux/gspca.txt
View File

@ -190,6 +190,7 @@ pac7311 093a:260f SnakeCam
pac7311 093a:2621 PAC731x pac7311 093a:2621 PAC731x
pac7311 093a:2624 PAC7302 pac7311 093a:2624 PAC7302
pac7311 093a:2626 Labtec 2200 pac7311 093a:2626 Labtec 2200
pac7311 093a:262a Webcam 300k
zc3xx 0ac8:0302 Z-star Vimicro zc0302 zc3xx 0ac8:0302 Z-star Vimicro zc0302
vc032x 0ac8:0321 Vimicro generic vc0321 vc032x 0ac8:0321 Vimicro generic vc0321
vc032x 0ac8:0323 Vimicro Vc0323 vc032x 0ac8:0323 Vimicro Vc0323

24
MAINTAINERS
View File

@ -1210,9 +1210,7 @@ M: hpa@zytor.com
S: Maintained S: Maintained
CPUSETS CPUSETS
P: Paul Jackson
P: Paul Menage P: Paul Menage
M: pj@sgi.com
M: menage@google.com M: menage@google.com
L: linux-kernel@vger.kernel.org L: linux-kernel@vger.kernel.org
W: http://www.bullopensource.org/cpuset/ W: http://www.bullopensource.org/cpuset/
@ -1371,7 +1369,7 @@ P: Digi International, Inc
M: Eng.Linux@digi.com M: Eng.Linux@digi.com
L: Eng.Linux@digi.com L: Eng.Linux@digi.com
W: http://www.digi.com W: http://www.digi.com
S: Orphaned S: Orphan
DIRECTORY NOTIFICATION DIRECTORY NOTIFICATION
P: Stephen Rothwell P: Stephen Rothwell
@ -1809,7 +1807,7 @@ FUTURE DOMAIN TMC-16x0 SCSI DRIVER (16-bit)
P: Rik Faith P: Rik Faith
M: faith@cs.unc.edu M: faith@cs.unc.edu
L: linux-scsi@vger.kernel.org L: linux-scsi@vger.kernel.org
S: Odd fixes (e.g., new signatures) S: Odd Fixes (e.g., new signatures)
GDT SCSI DISK ARRAY CONTROLLER DRIVER GDT SCSI DISK ARRAY CONTROLLER DRIVER
P: Achim Leubner P: Achim Leubner
@ -1850,10 +1848,10 @@ S: Maintained
HARDWARE MONITORING HARDWARE MONITORING
L: lm-sensors@lm-sensors.org L: lm-sensors@lm-sensors.org
W: http://www.lm-sensors.org/ W: http://www.lm-sensors.org/
S: Orphaned S: Orphan
HARDWARE RANDOM NUMBER GENERATOR CORE HARDWARE RANDOM NUMBER GENERATOR CORE
S: Orphaned S: Orphan
HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER
P: Robert Love P: Robert Love
@ -1996,7 +1994,7 @@ S: Maintained
I2C/SMBUS STUB DRIVER I2C/SMBUS STUB DRIVER
P: Mark M. Hoffman P: Mark M. Hoffman
M: mhoffman@lightlink.com M: mhoffman@lightlink.com
L: lm-sensors@lm-sensors.org L: i2c@lm-sensors.org
S: Maintained S: Maintained
I2C SUBSYSTEM I2C SUBSYSTEM
@ -2718,6 +2716,7 @@ MAN-PAGES: MANUAL PAGES FOR LINUX -- Sections 2, 3, 4, 5, and 7
P: Michael Kerrisk P: Michael Kerrisk
M: mtk.manpages@gmail.com M: mtk.manpages@gmail.com
W: http://www.kernel.org/doc/man-pages W: http://www.kernel.org/doc/man-pages
L: linux-man@vger.kernel.org
S: Supported S: Supported
MARVELL LIBERTAS WIRELESS DRIVER MARVELL LIBERTAS WIRELESS DRIVER
@ -2747,7 +2746,7 @@ S: Maintained
MEGARAID SCSI DRIVERS MEGARAID SCSI DRIVERS
P: Neela Syam Kolli P: Neela Syam Kolli
M: megaraidlinux@lsi.com M: megaraidlinux@lsi.com
S: linux-scsi@vger.kernel.org L: linux-scsi@vger.kernel.org
W: http://megaraid.lsilogic.com W: http://megaraid.lsilogic.com
S: Maintained S: Maintained
@ -2865,7 +2864,7 @@ MULTIMEDIA CARD (MMC) ETC. OVER SPI
P: David Brownell P: David Brownell
M: dbrownell@users.sourceforge.net M: dbrownell@users.sourceforge.net
L: linux-kernel@vger.kernel.org L: linux-kernel@vger.kernel.org
S: Odd fixes S: Odd Fixes
MULTISOUND SOUND DRIVER MULTISOUND SOUND DRIVER
P: Andrew Veliath P: Andrew Veliath
@ -3738,7 +3737,7 @@ S: Maintained
SIS 96X I2C/SMBUS DRIVER SIS 96X I2C/SMBUS DRIVER
P: Mark M. Hoffman P: Mark M. Hoffman
M: mhoffman@lightlink.com M: mhoffman@lightlink.com
L: lm-sensors@lm-sensors.org L: i2c@lm-sensors.org
S: Maintained S: Maintained
SIS FRAMEBUFFER DRIVER SIS FRAMEBUFFER DRIVER
@ -3845,11 +3844,12 @@ S: Maintained
SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT
P: Liam Girdwood P: Liam Girdwood
M: liam.girdwood@wolfsonmicro.com M: lrg@slimlogic.co.uk
P: Mark Brown P: Mark Brown
M: broonie@opensource.wolfsonmicro.com M: broonie@opensource.wolfsonmicro.com
T: git opensource.wolfsonmicro.com/linux-2.6-asoc T: git opensource.wolfsonmicro.com/linux-2.6-asoc
L: alsa-devel@alsa-project.org (subscribers-only) L: alsa-devel@alsa-project.org (subscribers-only)
W: http://alsa-project.org/main/index.php/ASoC
S: Supported S: Supported
SPI SUBSYSTEM SPI SUBSYSTEM
@ -3937,7 +3937,7 @@ S: Maintained
STARMODE RADIO IP (STRIP) PROTOCOL DRIVER STARMODE RADIO IP (STRIP) PROTOCOL DRIVER
W: http://mosquitonet.Stanford.EDU/strip.html W: http://mosquitonet.Stanford.EDU/strip.html
S: Unsupported ? S: Orphan
STRADIS MPEG-2 DECODER DRIVER STRADIS MPEG-2 DECODER DRIVER
P: Nathan Laredo P: Nathan Laredo

2
Makefile
View File

@ -1,7 +1,7 @@
VERSION = 2 VERSION = 2
PATCHLEVEL = 6 PATCHLEVEL = 6
SUBLEVEL = 27 SUBLEVEL = 27
EXTRAVERSION = -rc6 EXTRAVERSION = -rc9
NAME = Rotary Wombat NAME = Rotary Wombat
# *DOCUMENTATION* # *DOCUMENTATION*

2
arch/arm/Makefile
View File

@ -121,7 +121,7 @@ endif
machine-$(CONFIG_ARCH_OMAP3) := omap2 machine-$(CONFIG_ARCH_OMAP3) := omap2
plat-$(CONFIG_ARCH_OMAP) := omap plat-$(CONFIG_ARCH_OMAP) := omap
machine-$(CONFIG_ARCH_S3C2410) := s3c2410 s3c2400 s3c2412 s3c2440 s3c2442 s3c2443 machine-$(CONFIG_ARCH_S3C2410) := s3c2410 s3c2400 s3c2412 s3c2440 s3c2442 s3c2443
plat-$(CONFIG_PLAT_S3C24XX) := s3c24xx plat-$(CONFIG_PLAT_S3C24XX) := s3c24xx s3c
machine-$(CONFIG_ARCH_LH7A40X) := lh7a40x machine-$(CONFIG_ARCH_LH7A40X) := lh7a40x
machine-$(CONFIG_ARCH_VERSATILE) := versatile machine-$(CONFIG_ARCH_VERSATILE) := versatile
machine-$(CONFIG_ARCH_IMX) := imx machine-$(CONFIG_ARCH_IMX) := imx

2
arch/arm/kernel/kgdb.c
View File

@ -111,8 +111,6 @@ int kgdb_arch_handle_exception(int exception_vector, int signo,
case 'D': case 'D':
case 'k': case 'k':
case 'c': case 'c':
kgdb_contthread = NULL;
/* /*
* Try to read optional parameter, pc unchanged if no parm. * Try to read optional parameter, pc unchanged if no parm.
* If this was a compiled breakpoint, we need to move * If this was a compiled breakpoint, we need to move

3
arch/arm/mach-davinci/psc.c
View File

@ -70,9 +70,6 @@ void davinci_psc_config(unsigned int domain, unsigned int id, char enable)
{ {
u32 epcpr, ptcmd, ptstat, pdstat, pdctl1, mdstat, mdctl, mdstat_mask; u32 epcpr, ptcmd, ptstat, pdstat, pdctl1, mdstat, mdctl, mdstat_mask;
if (id < 0)
return;
mdctl = davinci_readl(DAVINCI_PWR_SLEEP_CNTRL_BASE + MDCTL + 4 * id); mdctl = davinci_readl(DAVINCI_PWR_SLEEP_CNTRL_BASE + MDCTL + 4 * id);
if (enable) if (enable)
mdctl |= 0x00000003; /* Enable Module */ mdctl |= 0x00000003; /* Enable Module */

2
arch/arm/mach-pxa/time.c
View File

@ -17,9 +17,9 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/clockchips.h> #include <linux/clockchips.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/cnt32_to_63.h>
#include <asm/div64.h> #include <asm/div64.h>
#include <asm/cnt32_to_63.h>
#include <asm/mach/irq.h> #include <asm/mach/irq.h>
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include <mach/pxa-regs.h> #include <mach/pxa-regs.h>

2
arch/arm/mach-s3c2410/bast-irq.c
View File

@ -38,7 +38,7 @@
#include <mach/bast-map.h> #include <mach/bast-map.h>
#include <mach/bast-irq.h> #include <mach/bast-irq.h>
#include <asm/plat-s3c24xx/irq.h> #include <plat/irq.h>
#if 0 #if 0
#include <asm/debug-ll.h> #include <asm/debug-ll.h>

8
arch/arm/mach-s3c2410/clock.c
View File

@ -37,13 +37,13 @@
#include <mach/hardware.h> #include <mach/hardware.h>
#include <asm/plat-s3c/regs-serial.h> #include <plat/regs-serial.h>
#include <mach/regs-clock.h> #include <mach/regs-clock.h>
#include <mach/regs-gpio.h> #include <mach/regs-gpio.h>
#include <asm/plat-s3c24xx/s3c2410.h> #include <plat/s3c2410.h>
#include <asm/plat-s3c24xx/clock.h> #include <plat/clock.h>
#include <asm/plat-s3c24xx/cpu.h> #include <plat/cpu.h>
int s3c2410_clkcon_enable(struct clk *clk, int enable) int s3c2410_clkcon_enable(struct clk *clk, int enable)
{ {

6
arch/arm/mach-s3c2410/dma.c
View File

@ -20,10 +20,10 @@
#include <asm/dma.h> #include <asm/dma.h>
#include <mach/dma.h> #include <mach/dma.h>
#include <asm/plat-s3c24xx/cpu.h> #include <plat/cpu.h>
#include <asm/plat-s3c24xx/dma.h> #include <plat/dma.h>
#include <asm/plat-s3c/regs-serial.h> #include <plat/regs-serial.h>
#include <mach/regs-gpio.h> #include <mach/regs-gpio.h>
#include <asm/plat-s3c/regs-ac97.h> #include <asm/plat-s3c/regs-ac97.h>
#include <mach/regs-mem.h> #include <mach/regs-mem.h>

4
arch/arm/mach-s3c2410/include/mach/debug-macro.S
View File

@ -14,7 +14,7 @@
#include <mach/map.h> #include <mach/map.h>
#include <mach/regs-gpio.h> #include <mach/regs-gpio.h>
#include <asm/plat-s3c/regs-serial.h> #include <plat/regs-serial.h>
#define S3C2410_UART1_OFF (0x4000) #define S3C2410_UART1_OFF (0x4000)
#define SHIFT_2440TXF (14-9) #define SHIFT_2440TXF (14-9)
@ -99,4 +99,4 @@
/* include the reset of the code which will do the work */ /* include the reset of the code which will do the work */
#include <asm/plat-s3c/debug-macro.S> #include <plat/debug-macro.S>

2
arch/arm/mach-s3c2410/include/mach/map.h
View File

@ -13,7 +13,7 @@
#ifndef __ASM_ARCH_MAP_H #ifndef __ASM_ARCH_MAP_H
#define __ASM_ARCH_MAP_H #define __ASM_ARCH_MAP_H
#include <asm/plat-s3c/map.h> #include <plat/map.h>
#define S3C2410_ADDR(x) S3C_ADDR(x) #define S3C2410_ADDR(x) S3C_ADDR(x)

2
arch/arm/mach-s3c2410/include/mach/uncompress.h
View File

@ -21,7 +21,7 @@
#undef S3C2410_GPIOREG #undef S3C2410_GPIOREG
#define S3C2410_GPIOREG(x) ((S3C24XX_PA_GPIO + (x))) #define S3C2410_GPIOREG(x) ((S3C24XX_PA_GPIO + (x)))
#include <asm/plat-s3c/uncompress.h> #include <plat/uncompress.h>
static inline int is_arm926(void) static inline int is_arm926(void)
{ {

4
arch/arm/mach-s3c2410/irq.c
View File

@ -25,8 +25,8 @@
#include <linux/ioport.h> #include <linux/ioport.h>
#include <linux/sysdev.h> #include <linux/sysdev.h>
#include <asm/plat-s3c24xx/cpu.h> #include <plat/cpu.h>
#include <asm/plat-s3c24xx/pm.h> #include <plat/pm.h>
static int s3c2410_irq_add(struct sys_device *sysdev) static int s3c2410_irq_add(struct sys_device *sysdev)
{ {

6
arch/arm/mach-s3c2410/mach-amlm5900.c
View File

@ -48,12 +48,12 @@
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <mach/fb.h> #include <mach/fb.h>
#include <asm/plat-s3c/regs-serial.h> #include <plat/regs-serial.h>
#include <mach/regs-lcd.h> #include <mach/regs-lcd.h>
#include <mach/regs-gpio.h> #include <mach/regs-gpio.h>
#include <asm/plat-s3c24xx/devs.h> #include <plat/devs.h>
#include <asm/plat-s3c24xx/cpu.h> #include <plat/cpu.h>
#ifdef CONFIG_MTD_PARTITIONS #ifdef CONFIG_MTD_PARTITIONS

8
arch/arm/mach-s3c2410/mach-bast.c
View File

@ -39,7 +39,7 @@
#include <asm/mach-types.h> #include <asm/mach-types.h>
//#include <asm/debug-ll.h> //#include <asm/debug-ll.h>
#include <asm/plat-s3c/regs-serial.h> #include <plat/regs-serial.h>
#include <mach/regs-gpio.h> #include <mach/regs-gpio.h>
#include <mach/regs-mem.h> #include <mach/regs-mem.h>
#include <mach/regs-lcd.h> #include <mach/regs-lcd.h>
@ -55,9 +55,9 @@
#include <linux/serial_8250.h> #include <linux/serial_8250.h>
#include <asm/plat-s3c24xx/clock.h> #include <plat/clock.h>
#include <asm/plat-s3c24xx/devs.h> #include <plat/devs.h>
#include <asm/plat-s3c24xx/cpu.h> #include <plat/cpu.h>
#include "usb-simtec.h" #include "usb-simtec.h"
#include "nor-simtec.h" #include "nor-simtec.h"

10
arch/arm/mach-s3c2410/mach-h1940.c
View File

@ -30,7 +30,7 @@
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/plat-s3c/regs-serial.h> #include <plat/regs-serial.h>
#include <mach/regs-lcd.h> #include <mach/regs-lcd.h>
#include <mach/regs-gpio.h> #include <mach/regs-gpio.h>
#include <mach/regs-clock.h> #include <mach/regs-clock.h>
@ -40,10 +40,10 @@
#include <mach/fb.h> #include <mach/fb.h>
#include <asm/plat-s3c24xx/udc.h> #include <asm/plat-s3c24xx/udc.h>
#include <asm/plat-s3c24xx/clock.h> #include <plat/clock.h>
#include <asm/plat-s3c24xx/devs.h> #include <plat/devs.h>
#include <asm/plat-s3c24xx/cpu.h> #include <plat/cpu.h>
#include <asm/plat-s3c24xx/pm.h> #include <plat/pm.h>
static struct map_desc h1940_iodesc[] __initdata = { static struct map_desc h1940_iodesc[] __initdata = {
[0] = { [0] = {

10
arch/arm/mach-s3c2410/mach-n30.c
View File

@ -41,12 +41,12 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <asm/plat-s3c/iic.h> #include <asm/plat-s3c/iic.h>
#include <asm/plat-s3c/regs-serial.h> #include <plat/regs-serial.h>
#include <asm/plat-s3c24xx/clock.h> #include <plat/clock.h>
#include <asm/plat-s3c24xx/cpu.h> #include <plat/cpu.h>
#include <asm/plat-s3c24xx/devs.h> #include <plat/devs.h>
#include <asm/plat-s3c24xx/s3c2410.h> #include <plat/s3c2410.h>
#include <asm/plat-s3c24xx/udc.h> #include <asm/plat-s3c24xx/udc.h>
static struct map_desc n30_iodesc[] __initdata = { static struct map_desc n30_iodesc[] __initdata = {

10
arch/arm/mach-s3c2410/mach-otom.c
View File

@ -29,13 +29,13 @@
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/plat-s3c/regs-serial.h> #include <plat/regs-serial.h>
#include <mach/regs-gpio.h> #include <mach/regs-gpio.h>
#include <asm/plat-s3c24xx/s3c2410.h> #include <plat/s3c2410.h>
#include <asm/plat-s3c24xx/clock.h> #include <plat/clock.h>
#include <asm/plat-s3c24xx/devs.h> #include <plat/devs.h>
#include <asm/plat-s3c24xx/cpu.h> #include <plat/cpu.h>
static struct map_desc otom11_iodesc[] __initdata = { static struct map_desc otom11_iodesc[] __initdata = {
/* Device area */ /* Device area */

10
arch/arm/mach-s3c2410/mach-qt2410.c
View File

@ -48,17 +48,17 @@
#include <mach/regs-gpio.h> #include <mach/regs-gpio.h>
#include <mach/leds-gpio.h> #include <mach/leds-gpio.h>
#include <asm/plat-s3c/regs-serial.h> #include <plat/regs-serial.h>
#include <mach/fb.h> #include <mach/fb.h>
#include <asm/plat-s3c/nand.h> #include <asm/plat-s3c/nand.h>
#include <asm/plat-s3c24xx/udc.h> #include <asm/plat-s3c24xx/udc.h>
#include <mach/spi.h> #include <mach/spi.h>
#include <mach/spi-gpio.h> #include <mach/spi-gpio.h>
#include <asm/plat-s3c24xx/common-smdk.h> #include <plat/common-smdk.h>
#include <asm/plat-s3c24xx/devs.h> #include <plat/devs.h>
#include <asm/plat-s3c24xx/cpu.h> #include <plat/cpu.h>
#include <asm/plat-s3c24xx/pm.h> #include <plat/pm.h>
static struct map_desc qt2410_iodesc[] __initdata = { static struct map_desc qt2410_iodesc[] __initdata = {
{ 0xe0000000, __phys_to_pfn(S3C2410_CS3+0x01000000), SZ_1M, MT_DEVICE } { 0xe0000000, __phys_to_pfn(S3C2410_CS3+0x01000000), SZ_1M, MT_DEVICE }

8
arch/arm/mach-s3c2410/mach-smdk2410.c
View File

@ -46,12 +46,12 @@
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/plat-s3c/regs-serial.h> #include <plat/regs-serial.h>
#include <asm/plat-s3c24xx/devs.h> #include <plat/devs.h>
#include <asm/plat-s3c24xx/cpu.h> #include <plat/cpu.h>
#include <asm/plat-s3c24xx/common-smdk.h> #include <plat/common-smdk.h>
static struct map_desc smdk2410_iodesc[] __initdata = { static struct map_desc smdk2410_iodesc[] __initdata = {
/* nothing here yet */ /* nothing here yet */

6
arch/arm/mach-s3c2410/mach-tct_hammer.c
View File

@ -44,9 +44,9 @@
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/plat-s3c/regs-serial.h> #include <plat/regs-serial.h>
#include <asm/plat-s3c24xx/devs.h> #include <plat/devs.h>
#include <asm/plat-s3c24xx/cpu.h> #include <plat/cpu.h>
#ifdef CONFIG_MTD_PARTITIONS #ifdef CONFIG_MTD_PARTITIONS

8
arch/arm/mach-s3c2410/mach-vr1000.c
View File

@ -40,13 +40,13 @@
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/plat-s3c/regs-serial.h> #include <plat/regs-serial.h>
#include <mach/regs-gpio.h> #include <mach/regs-gpio.h>
#include <mach/leds-gpio.h> #include <mach/leds-gpio.h>
#include <asm/plat-s3c24xx/clock.h> #include <plat/clock.h>
#include <asm/plat-s3c24xx/devs.h> #include <plat/devs.h>
#include <asm/plat-s3c24xx/cpu.h> #include <plat/cpu.h>
#include "usb-simtec.h" #include "usb-simtec.h"
#include "nor-simtec.h" #include "nor-simtec.h"

4
arch/arm/mach-s3c2410/pm.c
View File

@ -34,8 +34,8 @@
#include <mach/regs-gpio.h> #include <mach/regs-gpio.h>
#include <mach/h1940.h> #include <mach/h1940.h>
#include <asm/plat-s3c24xx/cpu.h> #include <plat/cpu.h>
#include <asm/plat-s3c24xx/pm.h> #include <plat/pm.h>
#ifdef CONFIG_S3C2410_PM_DEBUG #ifdef CONFIG_S3C2410_PM_DEBUG
extern void pm_dbg(const char *fmt, ...); extern void pm_dbg(const char *fmt, ...);

10
arch/arm/mach-s3c2410/s3c2410.c
View File

@ -29,12 +29,12 @@
#include <asm/irq.h> #include <asm/irq.h>
#include <mach/regs-clock.h> #include <mach/regs-clock.h>
#include <asm/plat-s3c/regs-serial.h> #include <plat/regs-serial.h>
#include <asm/plat-s3c24xx/s3c2410.h> #include <plat/s3c2410.h>
#include <asm/plat-s3c24xx/cpu.h> #include <plat/cpu.h>
#include <asm/plat-s3c24xx/devs.h> #include <plat/devs.h>
#include <asm/plat-s3c24xx/clock.h> #include <plat/clock.h>
/* Initial IO mappings */ /* Initial IO mappings */

2
arch/arm/mach-s3c2410/sleep.S
View File

@ -32,7 +32,7 @@
#include <mach/regs-gpio.h> #include <mach/regs-gpio.h>
#include <mach/regs-clock.h> #include <mach/regs-clock.h>
#include <mach/regs-mem.h> #include <mach/regs-mem.h>
#include <asm/plat-s3c/regs-serial.h> #include <plat/regs-serial.h>
/* s3c2410_cpu_suspend /* s3c2410_cpu_suspend
* *

2
arch/arm/mach-s3c2410/usb-simtec.c
View File

@ -35,7 +35,7 @@
#include <mach/hardware.h> #include <mach/hardware.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/plat-s3c24xx/devs.h> #include <plat/devs.h>
#include "usb-simtec.h" #include "usb-simtec.h"
/* control power and monitor over-current events on various Simtec /* control power and monitor over-current events on various Simtec

8
arch/arm/mach-s3c2412/clock.c
View File

@ -37,13 +37,13 @@
#include <mach/hardware.h> #include <mach/hardware.h>
#include <asm/plat-s3c/regs-serial.h> #include <plat/regs-serial.h>
#include <mach/regs-clock.h> #include <mach/regs-clock.h>
#include <mach/regs-gpio.h> #include <mach/regs-gpio.h>
#include <asm/plat-s3c24xx/s3c2412.h> #include <plat/s3c2412.h>
#include <asm/plat-s3c24xx/clock.h> #include <plat/clock.h>
#include <asm/plat-s3c24xx/cpu.h> #include <plat/cpu.h>
/* We currently have to assume that the system is running /* We currently have to assume that the system is running
* from the XTPll input, and that all ***REFCLKs are being * from the XTPll input, and that all ***REFCLKs are being

6
arch/arm/mach-s3c2412/dma.c
View File

@ -21,10 +21,10 @@
#include <asm/dma.h> #include <asm/dma.h>
#include <mach/dma.h> #include <mach/dma.h>
#include <asm/plat-s3c24xx/dma.h> #include <plat/dma.h>
#include <asm/plat-s3c24xx/cpu.h> #include <plat/cpu.h>
#include <asm/plat-s3c/regs-serial.h> #include <plat/regs-serial.h>
#include <mach/regs-gpio.h> #include <mach/regs-gpio.h>
#include <asm/plat-s3c/regs-ac97.h> #include <asm/plat-s3c/regs-ac97.h>
#include <mach/regs-mem.h> #include <mach/regs-mem.h>

6
arch/arm/mach-s3c2412/irq.c
View File

@ -35,9 +35,9 @@
#include <mach/regs-gpio.h> #include <mach/regs-gpio.h>
#include <mach/regs-power.h> #include <mach/regs-power.h>
#include <asm/plat-s3c24xx/cpu.h> #include <plat/cpu.h>
#include <asm/plat-s3c24xx/irq.h> #include <plat/irq.h>
#include <asm/plat-s3c24xx/pm.h> #include <plat/pm.h>
#define INTMSK(start, end) ((1 << ((end) + 1 - (start))) - 1) #define INTMSK(start, end) ((1 << ((end) + 1 - (start))) - 1)
#define INTMSK_SUB(start, end) (INTMSK(start, end) << ((start - S3C2410_IRQSUB(0)))) #define INTMSK_SUB(start, end) (INTMSK(start, end) << ((start - S3C2410_IRQSUB(0))))

10
arch/arm/mach-s3c2412/mach-jive.c
View File

@ -30,7 +30,7 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <asm/mach/irq.h> #include <asm/mach/irq.h>
#include <asm/plat-s3c/regs-serial.h> #include <plat/regs-serial.h>
#include <asm/plat-s3c/nand.h> #include <asm/plat-s3c/nand.h>
#include <asm/plat-s3c/iic.h> #include <asm/plat-s3c/iic.h>
@ -48,10 +48,10 @@
#include <linux/mtd/nand_ecc.h> #include <linux/mtd/nand_ecc.h>
#include <linux/mtd/partitions.h> #include <linux/mtd/partitions.h>
#include <asm/plat-s3c24xx/clock.h> #include <plat/clock.h>
#include <asm/plat-s3c24xx/devs.h> #include <plat/devs.h>
#include <asm/plat-s3c24xx/cpu.h> #include <plat/cpu.h>
#include <asm/plat-s3c24xx/pm.h> #include <plat/pm.h>
#include <asm/plat-s3c24xx/udc.h> #include <asm/plat-s3c24xx/udc.h>
static struct map_desc jive_iodesc[] __initdata = { static struct map_desc jive_iodesc[] __initdata = {

14
arch/arm/mach-s3c2412/mach-smdk2413.c
View File

@ -32,7 +32,7 @@
#include <asm/mach-types.h> #include <asm/mach-types.h>
//#include <asm/debug-ll.h> //#include <asm/debug-ll.h>
#include <asm/plat-s3c/regs-serial.h> #include <plat/regs-serial.h>
#include <mach/regs-gpio.h> #include <mach/regs-gpio.h>
#include <mach/regs-lcd.h> #include <mach/regs-lcd.h>
@ -40,13 +40,13 @@
#include <asm/plat-s3c24xx/udc.h> #include <asm/plat-s3c24xx/udc.h>
#include <mach/fb.h> #include <mach/fb.h>
#include <asm/plat-s3c24xx/s3c2410.h> #include <plat/s3c2410.h>
#include <asm/plat-s3c24xx/s3c2412.h> #include <plat/s3c2412.h>
#include <asm/plat-s3c24xx/clock.h> #include <plat/clock.h>
#include <asm/plat-s3c24xx/devs.h> #include <plat/devs.h>
#include <asm/plat-s3c24xx/cpu.h> #include <plat/cpu.h>
#include <asm/plat-s3c24xx/common-smdk.h> #include <plat/common-smdk.h>
static struct map_desc smdk2413_iodesc[] __initdata = { static struct map_desc smdk2413_iodesc[] __initdata = {
}; };

12
arch/arm/mach-s3c2412/mach-vstms.c
View File

@ -32,7 +32,7 @@
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/plat-s3c/regs-serial.h> #include <plat/regs-serial.h>
#include <mach/regs-gpio.h> #include <mach/regs-gpio.h>
#include <mach/regs-lcd.h> #include <mach/regs-lcd.h>
@ -41,11 +41,11 @@
#include <asm/plat-s3c/nand.h> #include <asm/plat-s3c/nand.h>
#include <asm/plat-s3c24xx/s3c2410.h> #include <plat/s3c2410.h>
#include <asm/plat-s3c24xx/s3c2412.h> #include <plat/s3c2412.h>
#include <asm/plat-s3c24xx/clock.h> #include <plat/clock.h>
#include <asm/plat-s3c24xx/devs.h> #include <plat/devs.h>
#include <asm/plat-s3c24xx/cpu.h> #include <plat/cpu.h>
static struct map_desc vstms_iodesc[] __initdata = { static struct map_desc vstms_iodesc[] __initdata = {

6
arch/arm/mach-s3c2412/pm.c
View File

@ -28,10 +28,10 @@
#include <mach/regs-gpio.h> #include <mach/regs-gpio.h>
#include <mach/regs-dsc.h> #include <mach/regs-dsc.h>
#include <asm/plat-s3c24xx/cpu.h> #include <plat/cpu.h>
#include <asm/plat-s3c24xx/pm.h> #include <plat/pm.h>
#include <asm/plat-s3c24xx/s3c2412.h> #include <plat/s3c2412.h>
extern void s3c2412_sleep_enter(void); extern void s3c2412_sleep_enter(void);

12
arch/arm/mach-s3c2412/s3c2412.c
View File

@ -34,7 +34,7 @@
#include <mach/idle.h> #include <mach/idle.h>
#include <mach/regs-clock.h> #include <mach/regs-clock.h>
#include <asm/plat-s3c/regs-serial.h> #include <plat/regs-serial.h>
#include <mach/regs-power.h> #include <mach/regs-power.h>
#include <mach/regs-gpio.h> #include <mach/regs-gpio.h>
#include <mach/regs-gpioj.h> #include <mach/regs-gpioj.h>
@ -42,11 +42,11 @@
#include <asm/plat-s3c24xx/regs-spi.h> #include <asm/plat-s3c24xx/regs-spi.h>
#include <mach/regs-s3c2412.h> #include <mach/regs-s3c2412.h>
#include <asm/plat-s3c24xx/s3c2412.h> #include <plat/s3c2412.h>
#include <asm/plat-s3c24xx/cpu.h> #include <plat/cpu.h>
#include <asm/plat-s3c24xx/devs.h> #include <plat/devs.h>
#include <asm/plat-s3c24xx/clock.h> #include <plat/clock.h>
#include <asm/plat-s3c24xx/pm.h> #include <plat/pm.h>
#ifndef CONFIG_CPU_S3C2412_ONLY #ifndef CONFIG_CPU_S3C2412_ONLY
void __iomem *s3c24xx_va_gpio2 = S3C24XX_VA_GPIO; void __iomem *s3c24xx_va_gpio2 = S3C24XX_VA_GPIO;

4
arch/arm/mach-s3c2440/clock.c
View File

@ -41,8 +41,8 @@
#include <mach/regs-clock.h> #include <mach/regs-clock.h>
#include <asm/plat-s3c24xx/clock.h> #include <plat/clock.h>
#include <asm/plat-s3c24xx/cpu.h> #include <plat/cpu.h>
/* S3C2440 extended clock support */ /* S3C2440 extended clock support */

6
arch/arm/mach-s3c2440/dma.c
View File

@ -20,10 +20,10 @@
#include <asm/dma.h> #include <asm/dma.h>
#include <mach/dma.h> #include <mach/dma.h>
#include <asm/plat-s3c24xx/dma.h> #include <plat/dma.h>
#include <asm/plat-s3c24xx/cpu.h> #include <plat/cpu.h>
#include <asm/plat-s3c/regs-serial.h> #include <plat/regs-serial.h>
#include <mach/regs-gpio.h> #include <mach/regs-gpio.h>
#include <asm/plat-s3c/regs-ac97.h> #include <asm/plat-s3c/regs-ac97.h>
#include <mach/regs-mem.h> #include <mach/regs-mem.h>

4
arch/arm/mach-s3c2440/dsc.c
View File

@ -27,8 +27,8 @@
#include <mach/regs-gpio.h> #include <mach/regs-gpio.h>
#include <mach/regs-dsc.h> #include <mach/regs-dsc.h>
#include <asm/plat-s3c24xx/cpu.h> #include <plat/cpu.h>
#include <asm/plat-s3c24xx/s3c2440.h> #include <plat/s3c2440.h>
int s3c2440_set_dsc(unsigned int pin, unsigned int value) int s3c2440_set_dsc(unsigned int pin, unsigned int value)
{ {

6
arch/arm/mach-s3c2440/irq.c
View File

@ -34,9 +34,9 @@
#include <mach/regs-irq.h> #include <mach/regs-irq.h>
#include <mach/regs-gpio.h> #include <mach/regs-gpio.h>
#include <asm/plat-s3c24xx/cpu.h> #include <plat/cpu.h>
#include <asm/plat-s3c24xx/pm.h> #include <plat/pm.h>
#include <asm/plat-s3c24xx/irq.h> #include <plat/irq.h>
/* WDT/AC97 */ /* WDT/AC97 */

8
arch/arm/mach-s3c2440/mach-anubis.c
View File

@ -35,7 +35,7 @@
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/plat-s3c/regs-serial.h> #include <plat/regs-serial.h>
#include <mach/regs-gpio.h> #include <mach/regs-gpio.h>
#include <mach/regs-mem.h> #include <mach/regs-mem.h>
#include <mach/regs-lcd.h> #include <mach/regs-lcd.h>
@ -48,9 +48,9 @@
#include <net/ax88796.h> #include <net/ax88796.h>
#include <asm/plat-s3c24xx/clock.h> #include <plat/clock.h>
#include <asm/plat-s3c24xx/devs.h> #include <plat/devs.h>
#include <asm/plat-s3c24xx/cpu.h> #include <plat/cpu.h>
#define COPYRIGHT ", (c) 2005 Simtec Electronics" #define COPYRIGHT ", (c) 2005 Simtec Electronics"

8
arch/arm/mach-s3c2440/mach-at2440evb.c
View File

@ -31,7 +31,7 @@
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/plat-s3c/regs-serial.h> #include <plat/regs-serial.h>
#include <mach/regs-gpio.h> #include <mach/regs-gpio.h>
#include <mach/regs-mem.h> #include <mach/regs-mem.h>
#include <mach/regs-lcd.h> #include <mach/regs-lcd.h>
@ -42,9 +42,9 @@
#include <linux/mtd/nand_ecc.h> #include <linux/mtd/nand_ecc.h>
#include <linux/mtd/partitions.h> #include <linux/mtd/partitions.h>
#include <asm/plat-s3c24xx/clock.h> #include <plat/clock.h>
#include <asm/plat-s3c24xx/devs.h> #include <plat/devs.h>
#include <asm/plat-s3c24xx/cpu.h> #include <plat/cpu.h>
static struct map_desc at2440evb_iodesc[] __initdata = { static struct map_desc at2440evb_iodesc[] __initdata = {
/* Nothing here */ /* Nothing here */

12
arch/arm/mach-s3c2440/mach-nexcoder.c
View File

@ -36,13 +36,13 @@
//#include <asm/debug-ll.h> //#include <asm/debug-ll.h>
#include <mach/regs-gpio.h> #include <mach/regs-gpio.h>
#include <asm/plat-s3c/regs-serial.h> #include <plat/regs-serial.h>
#include <asm/plat-s3c24xx/s3c2410.h> #include <plat/s3c2410.h>
#include <asm/plat-s3c24xx/s3c2440.h> #include <plat/s3c2440.h>
#include <asm/plat-s3c24xx/clock.h> #include <plat/clock.h>
#include <asm/plat-s3c24xx/devs.h> #include <plat/devs.h>
#include <asm/plat-s3c24xx/cpu.h> #include <plat/cpu.h>
static struct map_desc nexcoder_iodesc[] __initdata = { static struct map_desc nexcoder_iodesc[] __initdata = {
/* nothing here yet */ /* nothing here yet */

8
arch/arm/mach-s3c2440/mach-osiris.c
View File

@ -33,7 +33,7 @@
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/plat-s3c/regs-serial.h> #include <plat/regs-serial.h>
#include <mach/regs-gpio.h> #include <mach/regs-gpio.h>
#include <mach/regs-mem.h> #include <mach/regs-mem.h>
#include <mach/regs-lcd.h> #include <mach/regs-lcd.h>
@ -44,9 +44,9 @@
#include <linux/mtd/nand_ecc.h> #include <linux/mtd/nand_ecc.h>
#include <linux/mtd/partitions.h> #include <linux/mtd/partitions.h>
#include <asm/plat-s3c24xx/clock.h> #include <plat/clock.h>
#include <asm/plat-s3c24xx/devs.h> #include <plat/devs.h>
#include <asm/plat-s3c24xx/cpu.h> #include <plat/cpu.h>
/* onboard perihperal map */ /* onboard perihperal map */

10
arch/arm/mach-s3c2440/mach-rx3715.c
View File

@ -37,7 +37,7 @@
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/plat-s3c/regs-serial.h> #include <plat/regs-serial.h>
#include <mach/regs-gpio.h> #include <mach/regs-gpio.h>
#include <mach/regs-lcd.h> #include <mach/regs-lcd.h>
@ -45,10 +45,10 @@
#include <asm/plat-s3c/nand.h> #include <asm/plat-s3c/nand.h>
#include <mach/fb.h> #include <mach/fb.h>
#include <asm/plat-s3c24xx/clock.h> #include <plat/clock.h>
#include <asm/plat-s3c24xx/devs.h> #include <plat/devs.h>
#include <asm/plat-s3c24xx/cpu.h> #include <plat/cpu.h>
#include <asm/plat-s3c24xx/pm.h> #include <plat/pm.h>
static struct map_desc rx3715_iodesc[] __initdata = { static struct map_desc rx3715_iodesc[] __initdata = {
/* dump ISA space somewhere unused */ /* dump ISA space somewhere unused */

14
arch/arm/mach-s3c2440/mach-smdk2440.c
View File

@ -31,20 +31,20 @@
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/plat-s3c/regs-serial.h> #include <plat/regs-serial.h>
#include <mach/regs-gpio.h> #include <mach/regs-gpio.h>
#include <mach/regs-lcd.h> #include <mach/regs-lcd.h>
#include <mach/idle.h> #include <mach/idle.h>
#include <mach/fb.h> #include <mach/fb.h>
#include <asm/plat-s3c24xx/s3c2410.h> #include <plat/s3c2410.h>
#include <asm/plat-s3c24xx/s3c2440.h> #include <plat/s3c2440.h>
#include <asm/plat-s3c24xx/clock.h> #include <plat/clock.h>
#include <asm/plat-s3c24xx/devs.h> #include <plat/devs.h>
#include <asm/plat-s3c24xx/cpu.h> #include <plat/cpu.h>
#include <asm/plat-s3c24xx/common-smdk.h> #include <plat/common-smdk.h>
static struct map_desc smdk2440_iodesc[] __initdata = { static struct map_desc smdk2440_iodesc[] __initdata = {
/* ISA IO Space map (memory space selected by A24) */ /* ISA IO Space map (memory space selected by A24) */

6
arch/arm/mach-s3c2440/s3c2440.c
View File

@ -29,9 +29,9 @@
#include <mach/hardware.h> #include <mach/hardware.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/plat-s3c24xx/s3c2440.h> #include <plat/s3c2440.h>
#include <asm/plat-s3c24xx/devs.h> #include <plat/devs.h>
#include <asm/plat-s3c24xx/cpu.h> #include <plat/cpu.h>
static struct sys_device s3c2440_sysdev = { static struct sys_device s3c2440_sysdev = {
.cls = &s3c2440_sysclass, .cls = &s3c2440_sysclass,

4
arch/arm/mach-s3c2442/clock.c
View File

@ -41,8 +41,8 @@
#include <mach/regs-clock.h> #include <mach/regs-clock.h>
#include <asm/plat-s3c24xx/clock.h> #include <plat/clock.h>
#include <asm/plat-s3c24xx/cpu.h> #include <plat/cpu.h>
/* S3C2442 extended clock support */ /* S3C2442 extended clock support */

4
arch/arm/mach-s3c2442/s3c2442.c
View File

@ -19,8 +19,8 @@
#include <linux/serial_core.h> #include <linux/serial_core.h>
#include <linux/sysdev.h> #include <linux/sysdev.h>
#include <asm/plat-s3c24xx/s3c2442.h> #include <plat/s3c2442.h>
#include <asm/plat-s3c24xx/cpu.h> #include <plat/cpu.h>
static struct sys_device s3c2442_sysdev = { static struct sys_device s3c2442_sysdev = {
.cls = &s3c2442_sysclass, .cls = &s3c2442_sysclass,

6
arch/arm/mach-s3c2443/clock.c
View File

@ -39,9 +39,9 @@
#include <mach/regs-s3c2443-clock.h> #include <mach/regs-s3c2443-clock.h>
#include <asm/plat-s3c24xx/s3c2443.h> #include <plat/s3c2443.h>
#include <asm/plat-s3c24xx/clock.h> #include <plat/clock.h>
#include <asm/plat-s3c24xx/cpu.h> #include <plat/cpu.h>
/* We currently have to assume that the system is running /* We currently have to assume that the system is running
* from the XTPll input, and that all ***REFCLKs are being * from the XTPll input, and that all ***REFCLKs are being

6
arch/arm/mach-s3c2443/dma.c
View File

@ -21,10 +21,10 @@
#include <asm/dma.h> #include <asm/dma.h>
#include <mach/dma.h> #include <mach/dma.h>
#include <asm/plat-s3c24xx/dma.h> #include <plat/dma.h>
#include <asm/plat-s3c24xx/cpu.h> #include <plat/cpu.h>
#include <asm/plat-s3c/regs-serial.h> #include <plat/regs-serial.h>
#include <mach/regs-gpio.h> #include <mach/regs-gpio.h>
#include <asm/plat-s3c/regs-ac97.h> #include <asm/plat-s3c/regs-ac97.h>
#include <mach/regs-mem.h> #include <mach/regs-mem.h>

6
arch/arm/mach-s3c2443/irq.c
View File

@ -34,9 +34,9 @@
#include <mach/regs-irq.h> #include <mach/regs-irq.h>
#include <mach/regs-gpio.h> #include <mach/regs-gpio.h>
#include <asm/plat-s3c24xx/cpu.h> #include <plat/cpu.h>
#include <asm/plat-s3c24xx/pm.h> #include <plat/pm.h>
#include <asm/plat-s3c24xx/irq.h> #include <plat/irq.h>
#define INTMSK(start, end) ((1 << ((end) + 1 - (start))) - 1) #define INTMSK(start, end) ((1 << ((end) + 1 - (start))) - 1)

14
arch/arm/mach-s3c2443/mach-smdk2443.c
View File

@ -31,20 +31,20 @@
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/plat-s3c/regs-serial.h> #include <plat/regs-serial.h>
#include <mach/regs-gpio.h> #include <mach/regs-gpio.h>
#include <mach/regs-lcd.h> #include <mach/regs-lcd.h>
#include <mach/idle.h> #include <mach/idle.h>
#include <mach/fb.h> #include <mach/fb.h>
#include <asm/plat-s3c24xx/s3c2410.h> #include <plat/s3c2410.h>
#include <asm/plat-s3c24xx/s3c2440.h> #include <plat/s3c2440.h>
#include <asm/plat-s3c24xx/clock.h> #include <plat/clock.h>
#include <asm/plat-s3c24xx/devs.h> #include <plat/devs.h>
#include <asm/plat-s3c24xx/cpu.h> #include <plat/cpu.h>
#include <asm/plat-s3c24xx/common-smdk.h> #include <plat/common-smdk.h>
static struct map_desc smdk2443_iodesc[] __initdata = { static struct map_desc smdk2443_iodesc[] __initdata = {
/* ISA IO Space map (memory space selected by A24) */ /* ISA IO Space map (memory space selected by A24) */

6
arch/arm/mach-s3c2443/s3c2443.c
View File

@ -32,9 +32,9 @@
#include <mach/regs-s3c2443-clock.h> #include <mach/regs-s3c2443-clock.h>
#include <mach/reset.h> #include <mach/reset.h>
#include <asm/plat-s3c24xx/s3c2443.h> #include <plat/s3c2443.h>
#include <asm/plat-s3c24xx/devs.h> #include <plat/devs.h>
#include <asm/plat-s3c24xx/cpu.h> #include <plat/cpu.h>
static struct map_desc s3c2443_iodesc[] __initdata = { static struct map_desc s3c2443_iodesc[] __initdata = {
IODESC_ENT(WATCHDOG), IODESC_ENT(WATCHDOG),

2
arch/arm/mach-sa1100/generic.c
View File

@ -18,9 +18,9 @@
#include <linux/ioport.h> #include <linux/ioport.h>
#include <linux/sched.h> /* just for sched_clock() - funny that */ #include <linux/sched.h> /* just for sched_clock() - funny that */
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/cnt32_to_63.h>
#include <asm/div64.h> #include <asm/div64.h>
#include <asm/cnt32_to_63.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>

11
arch/arm/mach-sa1100/include/mach/jornada720.h
View File

@ -1,10 +1,10 @@
/* /*
* arch/arm/mach-sa1100/include/mach/jornada720.h * arch/arm/mach-sa1100/include/mach/jornada720.h
* *
* This file contains SSP/MCU communication definitions for HP Jornada 710/720/728 * SSP/MCU communication definitions for HP Jornada 710/720/728
* *
* Copyright (C) 2007 Kristoffer Ericson <Kristoffer.Ericson@gmail.com> * Copyright 2007,2008 Kristoffer Ericson <Kristoffer.Ericson@gmail.com>
* Copyright (C) 2000 John Ankcorn <jca@lcs.mit.edu> * Copyright 2000 John Ankcorn <jca@lcs.mit.edu>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as * it under the terms of the GNU General Public License version 2 as
@ -25,3 +25,8 @@
#define PWMOFF 0xDF #define PWMOFF 0xDF
#define TXDUMMY 0x11 #define TXDUMMY 0x11
#define ERRORCODE 0x00 #define ERRORCODE 0x00
extern void jornada_ssp_start(void);
extern void jornada_ssp_end(void);
extern int jornada_ssp_inout(u8 byte);
extern int jornada_ssp_byte(u8 byte);

10
arch/arm/mach-sa1100/jornada720_ssp.c
View File

@ -21,8 +21,8 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <asm/hardware/ssp.h>
#include <mach/jornada720.h> #include <mach/jornada720.h>
#include <asm/hardware/ssp.h>
static DEFINE_SPINLOCK(jornada_ssp_lock); static DEFINE_SPINLOCK(jornada_ssp_lock);
static unsigned long jornada_ssp_flags; static unsigned long jornada_ssp_flags;
@ -109,12 +109,12 @@ EXPORT_SYMBOL(jornada_ssp_inout);
* jornada_ssp_start - enable mcu * jornada_ssp_start - enable mcu
* *
*/ */
int jornada_ssp_start() void jornada_ssp_start(void)
{ {
spin_lock_irqsave(&jornada_ssp_lock, jornada_ssp_flags); spin_lock_irqsave(&jornada_ssp_lock, jornada_ssp_flags);
GPCR = GPIO_GPIO25; GPCR = GPIO_GPIO25;
udelay(50); udelay(50);
return 0; return;
}; };
EXPORT_SYMBOL(jornada_ssp_start); EXPORT_SYMBOL(jornada_ssp_start);
@ -122,11 +122,11 @@ EXPORT_SYMBOL(jornada_ssp_start);
* jornada_ssp_end - disable mcu and turn off lock * jornada_ssp_end - disable mcu and turn off lock
* *
*/ */
int jornada_ssp_end() void jornada_ssp_end(void)
{ {
GPSR = GPIO_GPIO25; GPSR = GPIO_GPIO25;
spin_unlock_irqrestore(&jornada_ssp_lock, jornada_ssp_flags); spin_unlock_irqrestore(&jornada_ssp_lock, jornada_ssp_flags);
return 0; return;
}; };
EXPORT_SYMBOL(jornada_ssp_end); EXPORT_SYMBOL(jornada_ssp_end);

2
arch/arm/mach-versatile/core.c
View File

@ -29,8 +29,8 @@
#include <linux/clocksource.h> #include <linux/clocksource.h>
#include <linux/clockchips.h> #include <linux/clockchips.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/cnt32_to_63.h>
#include <asm/cnt32_to_63.h>
#include <asm/system.h> #include <asm/system.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <asm/irq.h> #include <asm/irq.h>

13
arch/arm/plat-omap/devices.c
View File

@ -313,19 +313,6 @@ static inline void omap_init_mmc_conf(const struct omap_mmc_config *mmc_conf)
omap_cfg_reg(MMC_DAT3); omap_cfg_reg(MMC_DAT3);
} }
} }
#if defined(CONFIG_ARCH_OMAP2420)
if (mmc_conf->mmc[0].internal_clock) {
/*
* Use internal loop-back in MMC/SDIO
* Module Input Clock selection
*/
if (cpu_is_omap24xx()) {
u32 v = omap_ctrl_readl(OMAP2_CONTROL_DEVCONF0);
v |= (1 << 24); /* not used in 243x */
omap_ctrl_writel(v, OMAP2_CONTROL_DEVCONF0);
}
}
#endif
} }
#ifdef CONFIG_ARCH_OMAP16XX #ifdef CONFIG_ARCH_OMAP16XX

3
arch/arm/plat-s3c/Makefile Normal file
View File

@ -0,0 +1,3 @@
# dummy makefile, currently just including asm/arm/plat-s3c/include/plat
obj-n := dummy.o

2
include/asm-arm/plat-s3c/debug-macro.S → arch/arm/plat-s3c/include/plat/debug-macro.S
View File

@ -9,7 +9,7 @@
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
#include <asm/plat-s3c/regs-serial.h> #include <plat/regs-serial.h>
/* The S3C2440 implementations are used by default as they are the /* The S3C2440 implementations are used by default as they are the
* most widely re-used */ * most widely re-used */

0
include/asm-arm/plat-s3c/map.h → arch/arm/plat-s3c/include/plat/map.h
View File

0
include/asm-arm/plat-s3c/regs-adc.h → arch/arm/plat-s3c/include/plat/regs-adc.h
View File

0
include/asm-arm/plat-s3c/regs-serial.h → arch/arm/plat-s3c/include/plat/regs-serial.h
View File

0
include/asm-arm/plat-s3c/regs-timer.h → arch/arm/plat-s3c/include/plat/regs-timer.h
View File

2
include/asm-arm/plat-s3c/uncompress.h → arch/arm/plat-s3c/include/plat/uncompress.h
View File

@ -27,7 +27,7 @@ static void arch_detect_cpu(void);
/* defines for UART registers */ /* defines for UART registers */
#include <asm/plat-s3c/regs-serial.h> #include <plat/regs-serial.h>
#include <asm/plat-s3c/regs-watchdog.h> #include <asm/plat-s3c/regs-watchdog.h>
/* working in physical space... */ /* working in physical space... */

4
arch/arm/plat-s3c24xx/clock.c
View File

@ -47,8 +47,8 @@
#include <mach/regs-clock.h> #include <mach/regs-clock.h>
#include <mach/regs-gpio.h> #include <mach/regs-gpio.h>
#include <asm/plat-s3c24xx/clock.h> #include <plat/clock.h>
#include <asm/plat-s3c24xx/cpu.h> #include <plat/cpu.h>
/* clock information */ /* clock information */

6
arch/arm/plat-s3c24xx/common-smdk.c
View File

@ -40,9 +40,9 @@
#include <asm/plat-s3c/nand.h> #include <asm/plat-s3c/nand.h>
#include <asm/plat-s3c24xx/common-smdk.h> #include <plat/common-smdk.h>
#include <asm/plat-s3c24xx/devs.h> #include <plat/devs.h>
#include <asm/plat-s3c24xx/pm.h> #include <plat/pm.h>
/* LED devices */ /* LED devices */

20
arch/arm/plat-s3c24xx/cpu.c
View File

@ -42,18 +42,18 @@
#include <mach/system-reset.h> #include <mach/system-reset.h>
#include <mach/regs-gpio.h> #include <mach/regs-gpio.h>
#include <asm/plat-s3c/regs-serial.h> #include <plat/regs-serial.h>
#include <asm/plat-s3c24xx/cpu.h> #include <plat/cpu.h>
#include <asm/plat-s3c24xx/devs.h> #include <plat/devs.h>
#include <asm/plat-s3c24xx/clock.h> #include <plat/clock.h>
#include <asm/plat-s3c24xx/s3c2400.h> #include <plat/s3c2400.h>
#include <asm/plat-s3c24xx/s3c2410.h> #include <plat/s3c2410.h>
#include <asm/plat-s3c24xx/s3c2412.h> #include <plat/s3c2412.h>
#include "s3c244x.h" #include "s3c244x.h"
#include <asm/plat-s3c24xx/s3c2440.h> #include <plat/s3c2440.h>
#include <asm/plat-s3c24xx/s3c2442.h> #include <plat/s3c2442.h>
#include <asm/plat-s3c24xx/s3c2443.h> #include <plat/s3c2443.h>
struct cpu_table { struct cpu_table {
unsigned long idcode; unsigned long idcode;

6
arch/arm/plat-s3c24xx/devs.c
View File

@ -28,11 +28,11 @@
#include <mach/hardware.h> #include <mach/hardware.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/plat-s3c/regs-serial.h> #include <plat/regs-serial.h>
#include <asm/plat-s3c24xx/udc.h> #include <asm/plat-s3c24xx/udc.h>
#include <asm/plat-s3c24xx/devs.h> #include <plat/devs.h>
#include <asm/plat-s3c24xx/cpu.h> #include <plat/cpu.h>
#include <asm/plat-s3c24xx/regs-spi.h> #include <asm/plat-s3c24xx/regs-spi.h>
/* Serial port registrations */ /* Serial port registrations */

2
arch/arm/plat-s3c24xx/dma.c
View File

@ -36,7 +36,7 @@
#include <asm/mach/dma.h> #include <asm/mach/dma.h>
#include <mach/map.h> #include <mach/map.h>
#include <asm/plat-s3c24xx/dma.h> #include <plat/dma.h>
/* io map for dma */ /* io map for dma */
static void __iomem *dma_base; static void __iomem *dma_base;

0
include/asm-arm/plat-s3c24xx/clock.h → arch/arm/plat-s3c24xx/include/plat/clock.h
View File

0
include/asm-arm/plat-s3c24xx/common-smdk.h → arch/arm/plat-s3c24xx/include/plat/common-smdk.h
View File

0
include/asm-arm/plat-s3c24xx/cpu.h → arch/arm/plat-s3c24xx/include/plat/cpu.h
View File

0
include/asm-arm/plat-s3c24xx/devs.h → arch/arm/plat-s3c24xx/include/plat/devs.h
View File

0
include/asm-arm/plat-s3c24xx/dma.h → arch/arm/plat-s3c24xx/include/plat/dma.h
View File

0
include/asm-arm/plat-s3c24xx/irq.h → arch/arm/plat-s3c24xx/include/plat/irq.h
View File

0
include/asm-arm/plat-s3c24xx/pm.h → arch/arm/plat-s3c24xx/include/plat/pm.h
View File

0
include/asm-arm/plat-s3c24xx/s3c2400.h → arch/arm/plat-s3c24xx/include/plat/s3c2400.h
View File

0
include/asm-arm/plat-s3c24xx/s3c2410.h → arch/arm/plat-s3c24xx/include/plat/s3c2410.h
View File

0
include/asm-arm/plat-s3c24xx/s3c2412.h → arch/arm/plat-s3c24xx/include/plat/s3c2412.h
View File

0
include/asm-arm/plat-s3c24xx/s3c2440.h → arch/arm/plat-s3c24xx/include/plat/s3c2440.h
View File

0
include/asm-arm/plat-s3c24xx/s3c2442.h → arch/arm/plat-s3c24xx/include/plat/s3c2442.h
View File

0
include/asm-arm/plat-s3c24xx/s3c2443.h → arch/arm/plat-s3c24xx/include/plat/s3c2443.h
View File

6
arch/arm/plat-s3c24xx/irq.c
View File

@ -65,9 +65,9 @@
#include <mach/regs-irq.h> #include <mach/regs-irq.h>
#include <mach/regs-gpio.h> #include <mach/regs-gpio.h>
#include <asm/plat-s3c24xx/cpu.h> #include <plat/cpu.h>
#include <asm/plat-s3c24xx/pm.h> #include <plat/pm.h>
#include <asm/plat-s3c24xx/irq.h> #include <plat/irq.h>
/* wakeup irq control */ /* wakeup irq control */

2
arch/arm/plat-s3c24xx/pm-simtec.c
View File

@ -33,7 +33,7 @@
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/plat-s3c24xx/pm.h> #include <plat/pm.h>
#define COPYRIGHT ", (c) 2005 Simtec Electronics" #define COPYRIGHT ", (c) 2005 Simtec Electronics"

4
arch/arm/plat-s3c24xx/pm.c
View File

@ -40,7 +40,7 @@
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <asm/plat-s3c/regs-serial.h> #include <plat/regs-serial.h>
#include <mach/regs-clock.h> #include <mach/regs-clock.h>
#include <mach/regs-gpio.h> #include <mach/regs-gpio.h>
#include <mach/regs-mem.h> #include <mach/regs-mem.h>
@ -48,7 +48,7 @@
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include <asm/plat-s3c24xx/pm.h> #include <plat/pm.h>
/* for external use */ /* for external use */

6
arch/arm/plat-s3c24xx/pwm-clock.c
View File

@ -24,10 +24,10 @@
#include <mach/regs-clock.h> #include <mach/regs-clock.h>
#include <mach/regs-gpio.h> #include <mach/regs-gpio.h>
#include <asm/plat-s3c24xx/clock.h> #include <plat/clock.h>
#include <asm/plat-s3c24xx/cpu.h> #include <plat/cpu.h>
#include <asm/plat-s3c/regs-timer.h> #include <plat/regs-timer.h>
/* Each of the timers 0 through 5 go through the following /* Each of the timers 0 through 5 go through the following
* clock tree, with the inputs depending on the timers. * clock tree, with the inputs depending on the timers.

4
arch/arm/plat-s3c24xx/pwm.c
View File

@ -19,8 +19,8 @@
#include <linux/io.h> #include <linux/io.h>
#include <linux/pwm.h> #include <linux/pwm.h>
#include <asm/plat-s3c24xx/devs.h> #include <plat/devs.h>
#include <asm/plat-s3c/regs-timer.h> #include <plat/regs-timer.h>
struct pwm_device { struct pwm_device {
struct list_head list; struct list_head list;

4
arch/arm/plat-s3c24xx/s3c244x-clock.c
View File

@ -41,8 +41,8 @@
#include <mach/regs-clock.h> #include <mach/regs-clock.h>
#include <asm/plat-s3c24xx/clock.h> #include <plat/clock.h>
#include <asm/plat-s3c24xx/cpu.h> #include <plat/cpu.h>
static int s3c2440_setparent_armclk(struct clk *clk, struct clk *parent) static int s3c2440_setparent_armclk(struct clk *clk, struct clk *parent)
{ {

6
arch/arm/plat-s3c24xx/s3c244x-irq.c
View File

@ -34,9 +34,9 @@
#include <mach/regs-irq.h> #include <mach/regs-irq.h>
#include <mach/regs-gpio.h> #include <mach/regs-gpio.h>
#include <asm/plat-s3c24xx/cpu.h> #include <plat/cpu.h>
#include <asm/plat-s3c24xx/pm.h> #include <plat/pm.h>
#include <asm/plat-s3c24xx/irq.h> #include <plat/irq.h>
/* camera irq */ /* camera irq */

14
arch/arm/plat-s3c24xx/s3c244x.c
View File

@ -30,18 +30,18 @@
#include <asm/irq.h> #include <asm/irq.h>
#include <mach/regs-clock.h> #include <mach/regs-clock.h>
#include <asm/plat-s3c/regs-serial.h> #include <plat/regs-serial.h>
#include <mach/regs-gpio.h> #include <mach/regs-gpio.h>
#include <mach/regs-gpioj.h> #include <mach/regs-gpioj.h>
#include <mach/regs-dsc.h> #include <mach/regs-dsc.h>
#include <asm/plat-s3c24xx/s3c2410.h> #include <plat/s3c2410.h>
#include <asm/plat-s3c24xx/s3c2440.h> #include <plat/s3c2440.h>
#include "s3c244x.h" #include "s3c244x.h"
#include <asm/plat-s3c24xx/clock.h> #include <plat/clock.h>
#include <asm/plat-s3c24xx/devs.h> #include <plat/devs.h>
#include <asm/plat-s3c24xx/cpu.h> #include <plat/cpu.h>
#include <asm/plat-s3c24xx/pm.h> #include <plat/pm.h>
static struct map_desc s3c244x_iodesc[] __initdata = { static struct map_desc s3c244x_iodesc[] __initdata = {
IODESC_ENT(CLKPWR), IODESC_ENT(CLKPWR),

2
arch/arm/plat-s3c24xx/sleep.S
View File

@ -32,7 +32,7 @@
#include <mach/regs-gpio.h> #include <mach/regs-gpio.h>
#include <mach/regs-clock.h> #include <mach/regs-clock.h>
#include <mach/regs-mem.h> #include <mach/regs-mem.h>
#include <asm/plat-s3c/regs-serial.h> #include <plat/regs-serial.h>
/* CONFIG_DEBUG_RESUME is dangerous if your bootloader does not /* CONFIG_DEBUG_RESUME is dangerous if your bootloader does not
* reset the UART configuration, only enable if you really need this! * reset the UART configuration, only enable if you really need this!

6
arch/arm/plat-s3c24xx/time.c
View File

@ -33,12 +33,12 @@
#include <asm/irq.h> #include <asm/irq.h>
#include <mach/map.h> #include <mach/map.h>
#include <asm/plat-s3c/regs-timer.h> #include <plat/regs-timer.h>
#include <mach/regs-irq.h> #include <mach/regs-irq.h>
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include <asm/plat-s3c24xx/clock.h> #include <plat/clock.h>
#include <asm/plat-s3c24xx/cpu.h> #include <plat/cpu.h>
static unsigned long timer_startval; static unsigned long timer_startval;
static unsigned long timer_usec_ticks; static unsigned long timer_usec_ticks;

Some files were not shown because too many files have changed in this diff Show More