Merge branch 's3c-move' into devel
Conflicts: arch/arm/mach-versatile/core.c
This commit is contained in:
Russell King
Russell King
commit
7e69a8c4d0
413 changed files with 3568 additions and 2366 deletions
|
|
@ -740,7 +740,7 @@ failure can be determined by:
|
|||
dma_addr_t dma_handle;
|
||||
|
||||
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,
|
||||
* delay and try again later or
|
||||
|
|
|
|||
|
|
@ -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
|
||||
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
|
||||
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
|
||||
required reading:
|
||||
|
|
|
|||
|
|
@ -67,6 +67,8 @@ kernel patches.
|
|||
|
||||
19: All new userspace interfaces are documented in Documentation/ABI/.
|
||||
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'.
|
||||
|
||||
|
|
|
|||
|
|
@ -271,14 +271,14 @@ CDROMCLOSETRAY pendant of CDROMEJECT
|
|||
|
||||
usage:
|
||||
|
||||
ioctl(fd, CDROMEJECT, 0);
|
||||
ioctl(fd, CDROMCLOSETRAY, 0);
|
||||
|
||||
inputs: none
|
||||
|
||||
outputs: none
|
||||
|
||||
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
|
||||
|
||||
notes:
|
||||
|
|
|
|||
|
|
@ -351,9 +351,10 @@ kernel. This value defaults to SHMMAX.
|
|||
|
||||
softlockup_thresh:
|
||||
|
||||
This value can be used to lower the softlockup tolerance
|
||||
threshold. The default threshold is 10s. If a cpu is locked up
|
||||
for 10s, the kernel complains. Valid values are 1-60s.
|
||||
This value can be used to lower the softlockup tolerance threshold. The
|
||||
default threshold is 60 seconds. If a cpu is locked up for 60 seconds,
|
||||
the kernel complains. Valid values are 1-60 seconds. Setting this
|
||||
tunable to zero will disable the softlockup detection altogether.
|
||||
|
||||
==============================================================
|
||||
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
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()
|
||||
-------------------------------
|
||||
|
||||
This function waits for all URBs associated with an anchor to finish
|
||||
or a timeout, whichever comes first. Its return value will tell you
|
||||
whether the timeout was reached.
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@
|
|||
45 -> Pinnacle PCTV DVB-T (em2870)
|
||||
46 -> Compro, VideoMate U3 (em2870) [185b:2870]
|
||||
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]
|
||||
50 -> MSI DigiVox A/D II (em2880) [eb1a:e320]
|
||||
51 -> Terratec Hybrid XS Secam (em2880) [0ccd:004c]
|
||||
|
|
|
|||
|
|
@ -190,6 +190,7 @@ pac7311 093a:260f SnakeCam
|
|||
pac7311 093a:2621 PAC731x
|
||||
pac7311 093a:2624 PAC7302
|
||||
pac7311 093a:2626 Labtec 2200
|
||||
pac7311 093a:262a Webcam 300k
|
||||
zc3xx 0ac8:0302 Z-star Vimicro zc0302
|
||||
vc032x 0ac8:0321 Vimicro generic vc0321
|
||||
vc032x 0ac8:0323 Vimicro Vc0323
|
||||
|
|
|
|||
24
MAINTAINERS
24
MAINTAINERS
|
|
@ -1210,9 +1210,7 @@ M: hpa@zytor.com
|
|||
S: Maintained
|
||||
|
||||
CPUSETS
|
||||
P: Paul Jackson
|
||||
P: Paul Menage
|
||||
M: pj@sgi.com
|
||||
M: menage@google.com
|
||||
L: linux-kernel@vger.kernel.org
|
||||
W: http://www.bullopensource.org/cpuset/
|
||||
|
|
@ -1371,7 +1369,7 @@ P: Digi International, Inc
|
|||
M: Eng.Linux@digi.com
|
||||
L: Eng.Linux@digi.com
|
||||
W: http://www.digi.com
|
||||
S: Orphaned
|
||||
S: Orphan
|
||||
|
||||
DIRECTORY NOTIFICATION
|
||||
P: Stephen Rothwell
|
||||
|
|
@ -1809,7 +1807,7 @@ FUTURE DOMAIN TMC-16x0 SCSI DRIVER (16-bit)
|
|||
P: Rik Faith
|
||||
M: faith@cs.unc.edu
|
||||
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
|
||||
P: Achim Leubner
|
||||
|
|
@ -1850,10 +1848,10 @@ S: Maintained
|
|||
HARDWARE MONITORING
|
||||
L: lm-sensors@lm-sensors.org
|
||||
W: http://www.lm-sensors.org/
|
||||
S: Orphaned
|
||||
S: Orphan
|
||||
|
||||
HARDWARE RANDOM NUMBER GENERATOR CORE
|
||||
S: Orphaned
|
||||
S: Orphan
|
||||
|
||||
HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER
|
||||
P: Robert Love
|
||||
|
|
@ -1996,7 +1994,7 @@ S: Maintained
|
|||
I2C/SMBUS STUB DRIVER
|
||||
P: Mark M. Hoffman
|
||||
M: mhoffman@lightlink.com
|
||||
L: lm-sensors@lm-sensors.org
|
||||
L: i2c@lm-sensors.org
|
||||
S: Maintained
|
||||
|
||||
I2C SUBSYSTEM
|
||||
|
|
@ -2718,6 +2716,7 @@ MAN-PAGES: MANUAL PAGES FOR LINUX -- Sections 2, 3, 4, 5, and 7
|
|||
P: Michael Kerrisk
|
||||
M: mtk.manpages@gmail.com
|
||||
W: http://www.kernel.org/doc/man-pages
|
||||
L: linux-man@vger.kernel.org
|
||||
S: Supported
|
||||
|
||||
MARVELL LIBERTAS WIRELESS DRIVER
|
||||
|
|
@ -2747,7 +2746,7 @@ S: Maintained
|
|||
MEGARAID SCSI DRIVERS
|
||||
P: Neela Syam Kolli
|
||||
M: megaraidlinux@lsi.com
|
||||
S: linux-scsi@vger.kernel.org
|
||||
L: linux-scsi@vger.kernel.org
|
||||
W: http://megaraid.lsilogic.com
|
||||
S: Maintained
|
||||
|
||||
|
|
@ -2865,7 +2864,7 @@ MULTIMEDIA CARD (MMC) ETC. OVER SPI
|
|||
P: David Brownell
|
||||
M: dbrownell@users.sourceforge.net
|
||||
L: linux-kernel@vger.kernel.org
|
||||
S: Odd fixes
|
||||
S: Odd Fixes
|
||||
|
||||
MULTISOUND SOUND DRIVER
|
||||
P: Andrew Veliath
|
||||
|
|
@ -3738,7 +3737,7 @@ S: Maintained
|
|||
SIS 96X I2C/SMBUS DRIVER
|
||||
P: Mark M. Hoffman
|
||||
M: mhoffman@lightlink.com
|
||||
L: lm-sensors@lm-sensors.org
|
||||
L: i2c@lm-sensors.org
|
||||
S: Maintained
|
||||
|
||||
SIS FRAMEBUFFER DRIVER
|
||||
|
|
@ -3845,11 +3844,12 @@ S: Maintained
|
|||
|
||||
SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT
|
||||
P: Liam Girdwood
|
||||
M: liam.girdwood@wolfsonmicro.com
|
||||
M: lrg@slimlogic.co.uk
|
||||
P: Mark Brown
|
||||
M: broonie@opensource.wolfsonmicro.com
|
||||
T: git opensource.wolfsonmicro.com/linux-2.6-asoc
|
||||
L: alsa-devel@alsa-project.org (subscribers-only)
|
||||
W: http://alsa-project.org/main/index.php/ASoC
|
||||
S: Supported
|
||||
|
||||
SPI SUBSYSTEM
|
||||
|
|
@ -3937,7 +3937,7 @@ S: Maintained
|
|||
|
||||
STARMODE RADIO IP (STRIP) PROTOCOL DRIVER
|
||||
W: http://mosquitonet.Stanford.EDU/strip.html
|
||||
S: Unsupported ?
|
||||
S: Orphan
|
||||
|
||||
STRADIS MPEG-2 DECODER DRIVER
|
||||
P: Nathan Laredo
|
||||
|
|
|
|||
2
Makefile
2
Makefile
|
|
@ -1,7 +1,7 @@
|
|||
VERSION = 2
|
||||
PATCHLEVEL = 6
|
||||
SUBLEVEL = 27
|
||||
EXTRAVERSION = -rc6
|
||||
EXTRAVERSION = -rc9
|
||||
NAME = Rotary Wombat
|
||||
|
||||
# *DOCUMENTATION*
|
||||
|
|
|
|||
|
|
@ -121,7 +121,7 @@ endif
|
|||
machine-$(CONFIG_ARCH_OMAP3) := omap2
|
||||
plat-$(CONFIG_ARCH_OMAP) := omap
|
||||
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_VERSATILE) := versatile
|
||||
machine-$(CONFIG_ARCH_IMX) := imx
|
||||
|
|
|
|||
|
|
@ -111,8 +111,6 @@ int kgdb_arch_handle_exception(int exception_vector, int signo,
|
|||
case 'D':
|
||||
case 'k':
|
||||
case 'c':
|
||||
kgdb_contthread = NULL;
|
||||
|
||||
/*
|
||||
* Try to read optional parameter, pc unchanged if no parm.
|
||||
* If this was a compiled breakpoint, we need to move
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
if (id < 0)
|
||||
return;
|
||||
|
||||
mdctl = davinci_readl(DAVINCI_PWR_SLEEP_CNTRL_BASE + MDCTL + 4 * id);
|
||||
if (enable)
|
||||
mdctl |= 0x00000003; /* Enable Module */
|
||||
|
|
|
|||
|
|
@ -17,9 +17,9 @@
|
|||
#include <linux/interrupt.h>
|
||||
#include <linux/clockchips.h>
|
||||
#include <linux/sched.h>
|
||||
#include <linux/cnt32_to_63.h>
|
||||
|
||||
#include <asm/div64.h>
|
||||
#include <asm/cnt32_to_63.h>
|
||||
#include <asm/mach/irq.h>
|
||||
#include <asm/mach/time.h>
|
||||
#include <mach/pxa-regs.h>
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@
|
|||
#include <mach/bast-map.h>
|
||||
#include <mach/bast-irq.h>
|
||||
|
||||
#include <asm/plat-s3c24xx/irq.h>
|
||||
#include <plat/irq.h>
|
||||
|
||||
#if 0
|
||||
#include <asm/debug-ll.h>
|
||||
|
|
|
|||
|
|
@ -37,13 +37,13 @@
|
|||
|
||||
#include <mach/hardware.h>
|
||||
|
||||
#include <asm/plat-s3c/regs-serial.h>
|
||||
#include <plat/regs-serial.h>
|
||||
#include <mach/regs-clock.h>
|
||||
#include <mach/regs-gpio.h>
|
||||
|
||||
#include <asm/plat-s3c24xx/s3c2410.h>
|
||||
#include <asm/plat-s3c24xx/clock.h>
|
||||
#include <asm/plat-s3c24xx/cpu.h>
|
||||
#include <plat/s3c2410.h>
|
||||
#include <plat/clock.h>
|
||||
#include <plat/cpu.h>
|
||||
|
||||
int s3c2410_clkcon_enable(struct clk *clk, int enable)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -20,10 +20,10 @@
|
|||
#include <asm/dma.h>
|
||||
#include <mach/dma.h>
|
||||
|
||||
#include <asm/plat-s3c24xx/cpu.h>
|
||||
#include <asm/plat-s3c24xx/dma.h>
|
||||
#include <plat/cpu.h>
|
||||
#include <plat/dma.h>
|
||||
|
||||
#include <asm/plat-s3c/regs-serial.h>
|
||||
#include <plat/regs-serial.h>
|
||||
#include <mach/regs-gpio.h>
|
||||
#include <asm/plat-s3c/regs-ac97.h>
|
||||
#include <mach/regs-mem.h>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
#include <mach/map.h>
|
||||
#include <mach/regs-gpio.h>
|
||||
#include <asm/plat-s3c/regs-serial.h>
|
||||
#include <plat/regs-serial.h>
|
||||
|
||||
#define S3C2410_UART1_OFF (0x4000)
|
||||
#define SHIFT_2440TXF (14-9)
|
||||
|
|
@ -99,4 +99,4 @@
|
|||
|
||||
/* include the reset of the code which will do the work */
|
||||
|
||||
#include <asm/plat-s3c/debug-macro.S>
|
||||
#include <plat/debug-macro.S>
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
#ifndef __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)
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
#undef S3C2410_GPIOREG
|
||||
#define S3C2410_GPIOREG(x) ((S3C24XX_PA_GPIO + (x)))
|
||||
|
||||
#include <asm/plat-s3c/uncompress.h>
|
||||
#include <plat/uncompress.h>
|
||||
|
||||
static inline int is_arm926(void)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -25,8 +25,8 @@
|
|||
#include <linux/ioport.h>
|
||||
#include <linux/sysdev.h>
|
||||
|
||||
#include <asm/plat-s3c24xx/cpu.h>
|
||||
#include <asm/plat-s3c24xx/pm.h>
|
||||
#include <plat/cpu.h>
|
||||
#include <plat/pm.h>
|
||||
|
||||
static int s3c2410_irq_add(struct sys_device *sysdev)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -48,12 +48,12 @@
|
|||
#include <asm/mach-types.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-gpio.h>
|
||||
|
||||
#include <asm/plat-s3c24xx/devs.h>
|
||||
#include <asm/plat-s3c24xx/cpu.h>
|
||||
#include <plat/devs.h>
|
||||
#include <plat/cpu.h>
|
||||
|
||||
#ifdef CONFIG_MTD_PARTITIONS
|
||||
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
#include <asm/mach-types.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-mem.h>
|
||||
#include <mach/regs-lcd.h>
|
||||
|
|
@ -55,9 +55,9 @@
|
|||
|
||||
#include <linux/serial_8250.h>
|
||||
|
||||
#include <asm/plat-s3c24xx/clock.h>
|
||||
#include <asm/plat-s3c24xx/devs.h>
|
||||
#include <asm/plat-s3c24xx/cpu.h>
|
||||
#include <plat/clock.h>
|
||||
#include <plat/devs.h>
|
||||
#include <plat/cpu.h>
|
||||
|
||||
#include "usb-simtec.h"
|
||||
#include "nor-simtec.h"
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
#include <asm/irq.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-gpio.h>
|
||||
#include <mach/regs-clock.h>
|
||||
|
|
@ -40,10 +40,10 @@
|
|||
#include <mach/fb.h>
|
||||
#include <asm/plat-s3c24xx/udc.h>
|
||||
|
||||
#include <asm/plat-s3c24xx/clock.h>
|
||||
#include <asm/plat-s3c24xx/devs.h>
|
||||
#include <asm/plat-s3c24xx/cpu.h>
|
||||
#include <asm/plat-s3c24xx/pm.h>
|
||||
#include <plat/clock.h>
|
||||
#include <plat/devs.h>
|
||||
#include <plat/cpu.h>
|
||||
#include <plat/pm.h>
|
||||
|
||||
static struct map_desc h1940_iodesc[] __initdata = {
|
||||
[0] = {
|
||||
|
|
|
|||
|
|
@ -41,12 +41,12 @@
|
|||
#include <asm/mach/map.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 <asm/plat-s3c24xx/cpu.h>
|
||||
#include <asm/plat-s3c24xx/devs.h>
|
||||
#include <asm/plat-s3c24xx/s3c2410.h>
|
||||
#include <plat/clock.h>
|
||||
#include <plat/cpu.h>
|
||||
#include <plat/devs.h>
|
||||
#include <plat/s3c2410.h>
|
||||
#include <asm/plat-s3c24xx/udc.h>
|
||||
|
||||
static struct map_desc n30_iodesc[] __initdata = {
|
||||
|
|
|
|||
|
|
@ -29,13 +29,13 @@
|
|||
#include <asm/irq.h>
|
||||
#include <asm/mach-types.h>
|
||||
|
||||
#include <asm/plat-s3c/regs-serial.h>
|
||||
#include <plat/regs-serial.h>
|
||||
#include <mach/regs-gpio.h>
|
||||
|
||||
#include <asm/plat-s3c24xx/s3c2410.h>
|
||||
#include <asm/plat-s3c24xx/clock.h>
|
||||
#include <asm/plat-s3c24xx/devs.h>
|
||||
#include <asm/plat-s3c24xx/cpu.h>
|
||||
#include <plat/s3c2410.h>
|
||||
#include <plat/clock.h>
|
||||
#include <plat/devs.h>
|
||||
#include <plat/cpu.h>
|
||||
|
||||
static struct map_desc otom11_iodesc[] __initdata = {
|
||||
/* Device area */
|
||||
|
|
|
|||
|
|
@ -48,17 +48,17 @@
|
|||
|
||||
#include <mach/regs-gpio.h>
|
||||
#include <mach/leds-gpio.h>
|
||||
#include <asm/plat-s3c/regs-serial.h>
|
||||
#include <plat/regs-serial.h>
|
||||
#include <mach/fb.h>
|
||||
#include <asm/plat-s3c/nand.h>
|
||||
#include <asm/plat-s3c24xx/udc.h>
|
||||
#include <mach/spi.h>
|
||||
#include <mach/spi-gpio.h>
|
||||
|
||||
#include <asm/plat-s3c24xx/common-smdk.h>
|
||||
#include <asm/plat-s3c24xx/devs.h>
|
||||
#include <asm/plat-s3c24xx/cpu.h>
|
||||
#include <asm/plat-s3c24xx/pm.h>
|
||||
#include <plat/common-smdk.h>
|
||||
#include <plat/devs.h>
|
||||
#include <plat/cpu.h>
|
||||
#include <plat/pm.h>
|
||||
|
||||
static struct map_desc qt2410_iodesc[] __initdata = {
|
||||
{ 0xe0000000, __phys_to_pfn(S3C2410_CS3+0x01000000), SZ_1M, MT_DEVICE }
|
||||
|
|
|
|||
|
|
@ -46,12 +46,12 @@
|
|||
#include <asm/irq.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 <asm/plat-s3c24xx/cpu.h>
|
||||
#include <plat/devs.h>
|
||||
#include <plat/cpu.h>
|
||||
|
||||
#include <asm/plat-s3c24xx/common-smdk.h>
|
||||
#include <plat/common-smdk.h>
|
||||
|
||||
static struct map_desc smdk2410_iodesc[] __initdata = {
|
||||
/* nothing here yet */
|
||||
|
|
|
|||
|
|
@ -44,9 +44,9 @@
|
|||
#include <asm/irq.h>
|
||||
#include <asm/mach-types.h>
|
||||
|
||||
#include <asm/plat-s3c/regs-serial.h>
|
||||
#include <asm/plat-s3c24xx/devs.h>
|
||||
#include <asm/plat-s3c24xx/cpu.h>
|
||||
#include <plat/regs-serial.h>
|
||||
#include <plat/devs.h>
|
||||
#include <plat/cpu.h>
|
||||
|
||||
#ifdef CONFIG_MTD_PARTITIONS
|
||||
|
||||
|
|
|
|||
|
|
@ -40,13 +40,13 @@
|
|||
#include <asm/irq.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/leds-gpio.h>
|
||||
|
||||
#include <asm/plat-s3c24xx/clock.h>
|
||||
#include <asm/plat-s3c24xx/devs.h>
|
||||
#include <asm/plat-s3c24xx/cpu.h>
|
||||
#include <plat/clock.h>
|
||||
#include <plat/devs.h>
|
||||
#include <plat/cpu.h>
|
||||
|
||||
#include "usb-simtec.h"
|
||||
#include "nor-simtec.h"
|
||||
|
|
|
|||
|
|
@ -34,8 +34,8 @@
|
|||
#include <mach/regs-gpio.h>
|
||||
#include <mach/h1940.h>
|
||||
|
||||
#include <asm/plat-s3c24xx/cpu.h>
|
||||
#include <asm/plat-s3c24xx/pm.h>
|
||||
#include <plat/cpu.h>
|
||||
#include <plat/pm.h>
|
||||
|
||||
#ifdef CONFIG_S3C2410_PM_DEBUG
|
||||
extern void pm_dbg(const char *fmt, ...);
|
||||
|
|
|
|||
|
|
@ -29,12 +29,12 @@
|
|||
#include <asm/irq.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 <asm/plat-s3c24xx/cpu.h>
|
||||
#include <asm/plat-s3c24xx/devs.h>
|
||||
#include <asm/plat-s3c24xx/clock.h>
|
||||
#include <plat/s3c2410.h>
|
||||
#include <plat/cpu.h>
|
||||
#include <plat/devs.h>
|
||||
#include <plat/clock.h>
|
||||
|
||||
/* Initial IO mappings */
|
||||
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
#include <mach/regs-gpio.h>
|
||||
#include <mach/regs-clock.h>
|
||||
#include <mach/regs-mem.h>
|
||||
#include <asm/plat-s3c/regs-serial.h>
|
||||
#include <plat/regs-serial.h>
|
||||
|
||||
/* s3c2410_cpu_suspend
|
||||
*
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
#include <mach/hardware.h>
|
||||
#include <asm/irq.h>
|
||||
|
||||
#include <asm/plat-s3c24xx/devs.h>
|
||||
#include <plat/devs.h>
|
||||
#include "usb-simtec.h"
|
||||
|
||||
/* control power and monitor over-current events on various Simtec
|
||||
|
|
|
|||
|
|
@ -37,13 +37,13 @@
|
|||
|
||||
#include <mach/hardware.h>
|
||||
|
||||
#include <asm/plat-s3c/regs-serial.h>
|
||||
#include <plat/regs-serial.h>
|
||||
#include <mach/regs-clock.h>
|
||||
#include <mach/regs-gpio.h>
|
||||
|
||||
#include <asm/plat-s3c24xx/s3c2412.h>
|
||||
#include <asm/plat-s3c24xx/clock.h>
|
||||
#include <asm/plat-s3c24xx/cpu.h>
|
||||
#include <plat/s3c2412.h>
|
||||
#include <plat/clock.h>
|
||||
#include <plat/cpu.h>
|
||||
|
||||
/* We currently have to assume that the system is running
|
||||
* from the XTPll input, and that all ***REFCLKs are being
|
||||
|
|
|
|||
|
|
@ -21,10 +21,10 @@
|
|||
#include <asm/dma.h>
|
||||
#include <mach/dma.h>
|
||||
|
||||
#include <asm/plat-s3c24xx/dma.h>
|
||||
#include <asm/plat-s3c24xx/cpu.h>
|
||||
#include <plat/dma.h>
|
||||
#include <plat/cpu.h>
|
||||
|
||||
#include <asm/plat-s3c/regs-serial.h>
|
||||
#include <plat/regs-serial.h>
|
||||
#include <mach/regs-gpio.h>
|
||||
#include <asm/plat-s3c/regs-ac97.h>
|
||||
#include <mach/regs-mem.h>
|
||||
|
|
|
|||
|
|
@ -35,9 +35,9 @@
|
|||
#include <mach/regs-gpio.h>
|
||||
#include <mach/regs-power.h>
|
||||
|
||||
#include <asm/plat-s3c24xx/cpu.h>
|
||||
#include <asm/plat-s3c24xx/irq.h>
|
||||
#include <asm/plat-s3c24xx/pm.h>
|
||||
#include <plat/cpu.h>
|
||||
#include <plat/irq.h>
|
||||
#include <plat/pm.h>
|
||||
|
||||
#define INTMSK(start, end) ((1 << ((end) + 1 - (start))) - 1)
|
||||
#define INTMSK_SUB(start, end) (INTMSK(start, end) << ((start - S3C2410_IRQSUB(0))))
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
#include <asm/mach/map.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/iic.h>
|
||||
|
||||
|
|
@ -48,10 +48,10 @@
|
|||
#include <linux/mtd/nand_ecc.h>
|
||||
#include <linux/mtd/partitions.h>
|
||||
|
||||
#include <asm/plat-s3c24xx/clock.h>
|
||||
#include <asm/plat-s3c24xx/devs.h>
|
||||
#include <asm/plat-s3c24xx/cpu.h>
|
||||
#include <asm/plat-s3c24xx/pm.h>
|
||||
#include <plat/clock.h>
|
||||
#include <plat/devs.h>
|
||||
#include <plat/cpu.h>
|
||||
#include <plat/pm.h>
|
||||
#include <asm/plat-s3c24xx/udc.h>
|
||||
|
||||
static struct map_desc jive_iodesc[] __initdata = {
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
#include <asm/mach-types.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-lcd.h>
|
||||
|
||||
|
|
@ -40,13 +40,13 @@
|
|||
#include <asm/plat-s3c24xx/udc.h>
|
||||
#include <mach/fb.h>
|
||||
|
||||
#include <asm/plat-s3c24xx/s3c2410.h>
|
||||
#include <asm/plat-s3c24xx/s3c2412.h>
|
||||
#include <asm/plat-s3c24xx/clock.h>
|
||||
#include <asm/plat-s3c24xx/devs.h>
|
||||
#include <asm/plat-s3c24xx/cpu.h>
|
||||
#include <plat/s3c2410.h>
|
||||
#include <plat/s3c2412.h>
|
||||
#include <plat/clock.h>
|
||||
#include <plat/devs.h>
|
||||
#include <plat/cpu.h>
|
||||
|
||||
#include <asm/plat-s3c24xx/common-smdk.h>
|
||||
#include <plat/common-smdk.h>
|
||||
|
||||
static struct map_desc smdk2413_iodesc[] __initdata = {
|
||||
};
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
#include <asm/irq.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-lcd.h>
|
||||
|
||||
|
|
@ -41,11 +41,11 @@
|
|||
|
||||
#include <asm/plat-s3c/nand.h>
|
||||
|
||||
#include <asm/plat-s3c24xx/s3c2410.h>
|
||||
#include <asm/plat-s3c24xx/s3c2412.h>
|
||||
#include <asm/plat-s3c24xx/clock.h>
|
||||
#include <asm/plat-s3c24xx/devs.h>
|
||||
#include <asm/plat-s3c24xx/cpu.h>
|
||||
#include <plat/s3c2410.h>
|
||||
#include <plat/s3c2412.h>
|
||||
#include <plat/clock.h>
|
||||
#include <plat/devs.h>
|
||||
#include <plat/cpu.h>
|
||||
|
||||
|
||||
static struct map_desc vstms_iodesc[] __initdata = {
|
||||
|
|
|
|||
|
|
@ -28,10 +28,10 @@
|
|||
#include <mach/regs-gpio.h>
|
||||
#include <mach/regs-dsc.h>
|
||||
|
||||
#include <asm/plat-s3c24xx/cpu.h>
|
||||
#include <asm/plat-s3c24xx/pm.h>
|
||||
#include <plat/cpu.h>
|
||||
#include <plat/pm.h>
|
||||
|
||||
#include <asm/plat-s3c24xx/s3c2412.h>
|
||||
#include <plat/s3c2412.h>
|
||||
|
||||
extern void s3c2412_sleep_enter(void);
|
||||
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
#include <mach/idle.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-gpio.h>
|
||||
#include <mach/regs-gpioj.h>
|
||||
|
|
@ -42,11 +42,11 @@
|
|||
#include <asm/plat-s3c24xx/regs-spi.h>
|
||||
#include <mach/regs-s3c2412.h>
|
||||
|
||||
#include <asm/plat-s3c24xx/s3c2412.h>
|
||||
#include <asm/plat-s3c24xx/cpu.h>
|
||||
#include <asm/plat-s3c24xx/devs.h>
|
||||
#include <asm/plat-s3c24xx/clock.h>
|
||||
#include <asm/plat-s3c24xx/pm.h>
|
||||
#include <plat/s3c2412.h>
|
||||
#include <plat/cpu.h>
|
||||
#include <plat/devs.h>
|
||||
#include <plat/clock.h>
|
||||
#include <plat/pm.h>
|
||||
|
||||
#ifndef CONFIG_CPU_S3C2412_ONLY
|
||||
void __iomem *s3c24xx_va_gpio2 = S3C24XX_VA_GPIO;
|
||||
|
|
|
|||
|
|
@ -41,8 +41,8 @@
|
|||
|
||||
#include <mach/regs-clock.h>
|
||||
|
||||
#include <asm/plat-s3c24xx/clock.h>
|
||||
#include <asm/plat-s3c24xx/cpu.h>
|
||||
#include <plat/clock.h>
|
||||
#include <plat/cpu.h>
|
||||
|
||||
/* S3C2440 extended clock support */
|
||||
|
||||
|
|
|
|||
|
|
@ -20,10 +20,10 @@
|
|||
#include <asm/dma.h>
|
||||
#include <mach/dma.h>
|
||||
|
||||
#include <asm/plat-s3c24xx/dma.h>
|
||||
#include <asm/plat-s3c24xx/cpu.h>
|
||||
#include <plat/dma.h>
|
||||
#include <plat/cpu.h>
|
||||
|
||||
#include <asm/plat-s3c/regs-serial.h>
|
||||
#include <plat/regs-serial.h>
|
||||
#include <mach/regs-gpio.h>
|
||||
#include <asm/plat-s3c/regs-ac97.h>
|
||||
#include <mach/regs-mem.h>
|
||||
|
|
|
|||
|
|
@ -27,8 +27,8 @@
|
|||
#include <mach/regs-gpio.h>
|
||||
#include <mach/regs-dsc.h>
|
||||
|
||||
#include <asm/plat-s3c24xx/cpu.h>
|
||||
#include <asm/plat-s3c24xx/s3c2440.h>
|
||||
#include <plat/cpu.h>
|
||||
#include <plat/s3c2440.h>
|
||||
|
||||
int s3c2440_set_dsc(unsigned int pin, unsigned int value)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -34,9 +34,9 @@
|
|||
#include <mach/regs-irq.h>
|
||||
#include <mach/regs-gpio.h>
|
||||
|
||||
#include <asm/plat-s3c24xx/cpu.h>
|
||||
#include <asm/plat-s3c24xx/pm.h>
|
||||
#include <asm/plat-s3c24xx/irq.h>
|
||||
#include <plat/cpu.h>
|
||||
#include <plat/pm.h>
|
||||
#include <plat/irq.h>
|
||||
|
||||
/* WDT/AC97 */
|
||||
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
#include <asm/irq.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-mem.h>
|
||||
#include <mach/regs-lcd.h>
|
||||
|
|
@ -48,9 +48,9 @@
|
|||
|
||||
#include <net/ax88796.h>
|
||||
|
||||
#include <asm/plat-s3c24xx/clock.h>
|
||||
#include <asm/plat-s3c24xx/devs.h>
|
||||
#include <asm/plat-s3c24xx/cpu.h>
|
||||
#include <plat/clock.h>
|
||||
#include <plat/devs.h>
|
||||
#include <plat/cpu.h>
|
||||
|
||||
#define COPYRIGHT ", (c) 2005 Simtec Electronics"
|
||||
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
#include <asm/irq.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-mem.h>
|
||||
#include <mach/regs-lcd.h>
|
||||
|
|
@ -42,9 +42,9 @@
|
|||
#include <linux/mtd/nand_ecc.h>
|
||||
#include <linux/mtd/partitions.h>
|
||||
|
||||
#include <asm/plat-s3c24xx/clock.h>
|
||||
#include <asm/plat-s3c24xx/devs.h>
|
||||
#include <asm/plat-s3c24xx/cpu.h>
|
||||
#include <plat/clock.h>
|
||||
#include <plat/devs.h>
|
||||
#include <plat/cpu.h>
|
||||
|
||||
static struct map_desc at2440evb_iodesc[] __initdata = {
|
||||
/* Nothing here */
|
||||
|
|
|
|||
|
|
@ -36,13 +36,13 @@
|
|||
|
||||
//#include <asm/debug-ll.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 <asm/plat-s3c24xx/s3c2440.h>
|
||||
#include <asm/plat-s3c24xx/clock.h>
|
||||
#include <asm/plat-s3c24xx/devs.h>
|
||||
#include <asm/plat-s3c24xx/cpu.h>
|
||||
#include <plat/s3c2410.h>
|
||||
#include <plat/s3c2440.h>
|
||||
#include <plat/clock.h>
|
||||
#include <plat/devs.h>
|
||||
#include <plat/cpu.h>
|
||||
|
||||
static struct map_desc nexcoder_iodesc[] __initdata = {
|
||||
/* nothing here yet */
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
#include <asm/irq.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-mem.h>
|
||||
#include <mach/regs-lcd.h>
|
||||
|
|
@ -44,9 +44,9 @@
|
|||
#include <linux/mtd/nand_ecc.h>
|
||||
#include <linux/mtd/partitions.h>
|
||||
|
||||
#include <asm/plat-s3c24xx/clock.h>
|
||||
#include <asm/plat-s3c24xx/devs.h>
|
||||
#include <asm/plat-s3c24xx/cpu.h>
|
||||
#include <plat/clock.h>
|
||||
#include <plat/devs.h>
|
||||
#include <plat/cpu.h>
|
||||
|
||||
/* onboard perihperal map */
|
||||
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@
|
|||
#include <asm/irq.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-lcd.h>
|
||||
|
||||
|
|
@ -45,10 +45,10 @@
|
|||
#include <asm/plat-s3c/nand.h>
|
||||
#include <mach/fb.h>
|
||||
|
||||
#include <asm/plat-s3c24xx/clock.h>
|
||||
#include <asm/plat-s3c24xx/devs.h>
|
||||
#include <asm/plat-s3c24xx/cpu.h>
|
||||
#include <asm/plat-s3c24xx/pm.h>
|
||||
#include <plat/clock.h>
|
||||
#include <plat/devs.h>
|
||||
#include <plat/cpu.h>
|
||||
#include <plat/pm.h>
|
||||
|
||||
static struct map_desc rx3715_iodesc[] __initdata = {
|
||||
/* dump ISA space somewhere unused */
|
||||
|
|
|
|||
|
|
@ -31,20 +31,20 @@
|
|||
#include <asm/irq.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-lcd.h>
|
||||
|
||||
#include <mach/idle.h>
|
||||
#include <mach/fb.h>
|
||||
|
||||
#include <asm/plat-s3c24xx/s3c2410.h>
|
||||
#include <asm/plat-s3c24xx/s3c2440.h>
|
||||
#include <asm/plat-s3c24xx/clock.h>
|
||||
#include <asm/plat-s3c24xx/devs.h>
|
||||
#include <asm/plat-s3c24xx/cpu.h>
|
||||
#include <plat/s3c2410.h>
|
||||
#include <plat/s3c2440.h>
|
||||
#include <plat/clock.h>
|
||||
#include <plat/devs.h>
|
||||
#include <plat/cpu.h>
|
||||
|
||||
#include <asm/plat-s3c24xx/common-smdk.h>
|
||||
#include <plat/common-smdk.h>
|
||||
|
||||
static struct map_desc smdk2440_iodesc[] __initdata = {
|
||||
/* ISA IO Space map (memory space selected by A24) */
|
||||
|
|
|
|||
|
|
@ -29,9 +29,9 @@
|
|||
#include <mach/hardware.h>
|
||||
#include <asm/irq.h>
|
||||
|
||||
#include <asm/plat-s3c24xx/s3c2440.h>
|
||||
#include <asm/plat-s3c24xx/devs.h>
|
||||
#include <asm/plat-s3c24xx/cpu.h>
|
||||
#include <plat/s3c2440.h>
|
||||
#include <plat/devs.h>
|
||||
#include <plat/cpu.h>
|
||||
|
||||
static struct sys_device s3c2440_sysdev = {
|
||||
.cls = &s3c2440_sysclass,
|
||||
|
|
|
|||
|
|
@ -41,8 +41,8 @@
|
|||
|
||||
#include <mach/regs-clock.h>
|
||||
|
||||
#include <asm/plat-s3c24xx/clock.h>
|
||||
#include <asm/plat-s3c24xx/cpu.h>
|
||||
#include <plat/clock.h>
|
||||
#include <plat/cpu.h>
|
||||
|
||||
/* S3C2442 extended clock support */
|
||||
|
||||
|
|
|
|||
|
|
@ -19,8 +19,8 @@
|
|||
#include <linux/serial_core.h>
|
||||
#include <linux/sysdev.h>
|
||||
|
||||
#include <asm/plat-s3c24xx/s3c2442.h>
|
||||
#include <asm/plat-s3c24xx/cpu.h>
|
||||
#include <plat/s3c2442.h>
|
||||
#include <plat/cpu.h>
|
||||
|
||||
static struct sys_device s3c2442_sysdev = {
|
||||
.cls = &s3c2442_sysclass,
|
||||
|
|
|
|||
|
|
@ -39,9 +39,9 @@
|
|||
|
||||
#include <mach/regs-s3c2443-clock.h>
|
||||
|
||||
#include <asm/plat-s3c24xx/s3c2443.h>
|
||||
#include <asm/plat-s3c24xx/clock.h>
|
||||
#include <asm/plat-s3c24xx/cpu.h>
|
||||
#include <plat/s3c2443.h>
|
||||
#include <plat/clock.h>
|
||||
#include <plat/cpu.h>
|
||||
|
||||
/* We currently have to assume that the system is running
|
||||
* from the XTPll input, and that all ***REFCLKs are being
|
||||
|
|
|
|||
|
|
@ -21,10 +21,10 @@
|
|||
#include <asm/dma.h>
|
||||
#include <mach/dma.h>
|
||||
|
||||
#include <asm/plat-s3c24xx/dma.h>
|
||||
#include <asm/plat-s3c24xx/cpu.h>
|
||||
#include <plat/dma.h>
|
||||
#include <plat/cpu.h>
|
||||
|
||||
#include <asm/plat-s3c/regs-serial.h>
|
||||
#include <plat/regs-serial.h>
|
||||
#include <mach/regs-gpio.h>
|
||||
#include <asm/plat-s3c/regs-ac97.h>
|
||||
#include <mach/regs-mem.h>
|
||||
|
|
|
|||
|
|
@ -34,9 +34,9 @@
|
|||
#include <mach/regs-irq.h>
|
||||
#include <mach/regs-gpio.h>
|
||||
|
||||
#include <asm/plat-s3c24xx/cpu.h>
|
||||
#include <asm/plat-s3c24xx/pm.h>
|
||||
#include <asm/plat-s3c24xx/irq.h>
|
||||
#include <plat/cpu.h>
|
||||
#include <plat/pm.h>
|
||||
#include <plat/irq.h>
|
||||
|
||||
#define INTMSK(start, end) ((1 << ((end) + 1 - (start))) - 1)
|
||||
|
||||
|
|
|
|||
|
|
@ -31,20 +31,20 @@
|
|||
#include <asm/irq.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-lcd.h>
|
||||
|
||||
#include <mach/idle.h>
|
||||
#include <mach/fb.h>
|
||||
|
||||
#include <asm/plat-s3c24xx/s3c2410.h>
|
||||
#include <asm/plat-s3c24xx/s3c2440.h>
|
||||
#include <asm/plat-s3c24xx/clock.h>
|
||||
#include <asm/plat-s3c24xx/devs.h>
|
||||
#include <asm/plat-s3c24xx/cpu.h>
|
||||
#include <plat/s3c2410.h>
|
||||
#include <plat/s3c2440.h>
|
||||
#include <plat/clock.h>
|
||||
#include <plat/devs.h>
|
||||
#include <plat/cpu.h>
|
||||
|
||||
#include <asm/plat-s3c24xx/common-smdk.h>
|
||||
#include <plat/common-smdk.h>
|
||||
|
||||
static struct map_desc smdk2443_iodesc[] __initdata = {
|
||||
/* ISA IO Space map (memory space selected by A24) */
|
||||
|
|
|
|||
|
|
@ -32,9 +32,9 @@
|
|||
#include <mach/regs-s3c2443-clock.h>
|
||||
#include <mach/reset.h>
|
||||
|
||||
#include <asm/plat-s3c24xx/s3c2443.h>
|
||||
#include <asm/plat-s3c24xx/devs.h>
|
||||
#include <asm/plat-s3c24xx/cpu.h>
|
||||
#include <plat/s3c2443.h>
|
||||
#include <plat/devs.h>
|
||||
#include <plat/cpu.h>
|
||||
|
||||
static struct map_desc s3c2443_iodesc[] __initdata = {
|
||||
IODESC_ENT(WATCHDOG),
|
||||
|
|
|
|||
|
|
@ -18,9 +18,9 @@
|
|||
#include <linux/ioport.h>
|
||||
#include <linux/sched.h> /* just for sched_clock() - funny that */
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/cnt32_to_63.h>
|
||||
|
||||
#include <asm/div64.h>
|
||||
#include <asm/cnt32_to_63.h>
|
||||
#include <mach/hardware.h>
|
||||
#include <asm/system.h>
|
||||
#include <asm/pgtable.h>
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
/*
|
||||
* 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 (C) 2000 John Ankcorn <jca@lcs.mit.edu>
|
||||
* Copyright 2007,2008 Kristoffer Ericson <Kristoffer.Ericson@gmail.com>
|
||||
* Copyright 2000 John Ankcorn <jca@lcs.mit.edu>
|
||||
*
|
||||
* 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
|
||||
|
|
@ -25,3 +25,8 @@
|
|||
#define PWMOFF 0xDF
|
||||
#define TXDUMMY 0x11
|
||||
#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);
|
||||
|
|
|
|||
|
|
@ -21,8 +21,8 @@
|
|||
#include <linux/slab.h>
|
||||
|
||||
#include <mach/hardware.h>
|
||||
#include <asm/hardware/ssp.h>
|
||||
#include <mach/jornada720.h>
|
||||
#include <asm/hardware/ssp.h>
|
||||
|
||||
static DEFINE_SPINLOCK(jornada_ssp_lock);
|
||||
static unsigned long jornada_ssp_flags;
|
||||
|
|
@ -109,12 +109,12 @@ EXPORT_SYMBOL(jornada_ssp_inout);
|
|||
* jornada_ssp_start - enable mcu
|
||||
*
|
||||
*/
|
||||
int jornada_ssp_start()
|
||||
void jornada_ssp_start(void)
|
||||
{
|
||||
spin_lock_irqsave(&jornada_ssp_lock, jornada_ssp_flags);
|
||||
GPCR = GPIO_GPIO25;
|
||||
udelay(50);
|
||||
return 0;
|
||||
return;
|
||||
};
|
||||
EXPORT_SYMBOL(jornada_ssp_start);
|
||||
|
||||
|
|
@ -122,11 +122,11 @@ EXPORT_SYMBOL(jornada_ssp_start);
|
|||
* jornada_ssp_end - disable mcu and turn off lock
|
||||
*
|
||||
*/
|
||||
int jornada_ssp_end()
|
||||
void jornada_ssp_end(void)
|
||||
{
|
||||
GPSR = GPIO_GPIO25;
|
||||
spin_unlock_irqrestore(&jornada_ssp_lock, jornada_ssp_flags);
|
||||
return 0;
|
||||
return;
|
||||
};
|
||||
EXPORT_SYMBOL(jornada_ssp_end);
|
||||
|
||||
|
|
|
|||
|
|
@ -29,8 +29,8 @@
|
|||
#include <linux/clocksource.h>
|
||||
#include <linux/clockchips.h>
|
||||
#include <linux/io.h>
|
||||
#include <linux/cnt32_to_63.h>
|
||||
|
||||
#include <asm/cnt32_to_63.h>
|
||||
#include <asm/system.h>
|
||||
#include <mach/hardware.h>
|
||||
#include <asm/irq.h>
|
||||
|
|
|
|||
|
|
@ -313,19 +313,6 @@ static inline void omap_init_mmc_conf(const struct omap_mmc_config *mmc_conf)
|
|||
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
|
||||
|
|
|
|||
3
arch/arm/plat-s3c/Makefile
Normal file
3
arch/arm/plat-s3c/Makefile
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
# dummy makefile, currently just including asm/arm/plat-s3c/include/plat
|
||||
|
||||
obj-n := dummy.o
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
* 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
|
||||
* most widely re-used */
|
||||
|
|
@ -27,7 +27,7 @@ static void arch_detect_cpu(void);
|
|||
|
||||
/* defines for UART registers */
|
||||
|
||||
#include <asm/plat-s3c/regs-serial.h>
|
||||
#include <plat/regs-serial.h>
|
||||
#include <asm/plat-s3c/regs-watchdog.h>
|
||||
|
||||
/* working in physical space... */
|
||||
|
|
@ -47,8 +47,8 @@
|
|||
#include <mach/regs-clock.h>
|
||||
#include <mach/regs-gpio.h>
|
||||
|
||||
#include <asm/plat-s3c24xx/clock.h>
|
||||
#include <asm/plat-s3c24xx/cpu.h>
|
||||
#include <plat/clock.h>
|
||||
#include <plat/cpu.h>
|
||||
|
||||
/* clock information */
|
||||
|
||||
|
|
|
|||
|
|
@ -40,9 +40,9 @@
|
|||
|
||||
#include <asm/plat-s3c/nand.h>
|
||||
|
||||
#include <asm/plat-s3c24xx/common-smdk.h>
|
||||
#include <asm/plat-s3c24xx/devs.h>
|
||||
#include <asm/plat-s3c24xx/pm.h>
|
||||
#include <plat/common-smdk.h>
|
||||
#include <plat/devs.h>
|
||||
#include <plat/pm.h>
|
||||
|
||||
/* LED devices */
|
||||
|
||||
|
|
|
|||
|
|
@ -42,18 +42,18 @@
|
|||
#include <mach/system-reset.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 <asm/plat-s3c24xx/devs.h>
|
||||
#include <asm/plat-s3c24xx/clock.h>
|
||||
#include <asm/plat-s3c24xx/s3c2400.h>
|
||||
#include <asm/plat-s3c24xx/s3c2410.h>
|
||||
#include <asm/plat-s3c24xx/s3c2412.h>
|
||||
#include <plat/cpu.h>
|
||||
#include <plat/devs.h>
|
||||
#include <plat/clock.h>
|
||||
#include <plat/s3c2400.h>
|
||||
#include <plat/s3c2410.h>
|
||||
#include <plat/s3c2412.h>
|
||||
#include "s3c244x.h"
|
||||
#include <asm/plat-s3c24xx/s3c2440.h>
|
||||
#include <asm/plat-s3c24xx/s3c2442.h>
|
||||
#include <asm/plat-s3c24xx/s3c2443.h>
|
||||
#include <plat/s3c2440.h>
|
||||
#include <plat/s3c2442.h>
|
||||
#include <plat/s3c2443.h>
|
||||
|
||||
struct cpu_table {
|
||||
unsigned long idcode;
|
||||
|
|
|
|||
|
|
@ -28,11 +28,11 @@
|
|||
#include <mach/hardware.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/devs.h>
|
||||
#include <asm/plat-s3c24xx/cpu.h>
|
||||
#include <plat/devs.h>
|
||||
#include <plat/cpu.h>
|
||||
#include <asm/plat-s3c24xx/regs-spi.h>
|
||||
|
||||
/* Serial port registrations */
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
#include <asm/mach/dma.h>
|
||||
#include <mach/map.h>
|
||||
|
||||
#include <asm/plat-s3c24xx/dma.h>
|
||||
#include <plat/dma.h>
|
||||
|
||||
/* io map for dma */
|
||||
static void __iomem *dma_base;
|
||||
|
|
|
|||
|
|
@ -65,9 +65,9 @@
|
|||
#include <mach/regs-irq.h>
|
||||
#include <mach/regs-gpio.h>
|
||||
|
||||
#include <asm/plat-s3c24xx/cpu.h>
|
||||
#include <asm/plat-s3c24xx/pm.h>
|
||||
#include <asm/plat-s3c24xx/irq.h>
|
||||
#include <plat/cpu.h>
|
||||
#include <plat/pm.h>
|
||||
#include <plat/irq.h>
|
||||
|
||||
/* wakeup irq control */
|
||||
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
|
||||
#include <asm/mach-types.h>
|
||||
|
||||
#include <asm/plat-s3c24xx/pm.h>
|
||||
#include <plat/pm.h>
|
||||
|
||||
#define COPYRIGHT ", (c) 2005 Simtec Electronics"
|
||||
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@
|
|||
#include <asm/cacheflush.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-gpio.h>
|
||||
#include <mach/regs-mem.h>
|
||||
|
|
@ -48,7 +48,7 @@
|
|||
|
||||
#include <asm/mach/time.h>
|
||||
|
||||
#include <asm/plat-s3c24xx/pm.h>
|
||||
#include <plat/pm.h>
|
||||
|
||||
/* for external use */
|
||||
|
||||
|
|
|
|||
|
|
@ -24,10 +24,10 @@
|
|||
#include <mach/regs-clock.h>
|
||||
#include <mach/regs-gpio.h>
|
||||
|
||||
#include <asm/plat-s3c24xx/clock.h>
|
||||
#include <asm/plat-s3c24xx/cpu.h>
|
||||
#include <plat/clock.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
|
||||
* clock tree, with the inputs depending on the timers.
|
||||
|
|
|
|||
|
|
@ -19,8 +19,8 @@
|
|||
#include <linux/io.h>
|
||||
#include <linux/pwm.h>
|
||||
|
||||
#include <asm/plat-s3c24xx/devs.h>
|
||||
#include <asm/plat-s3c/regs-timer.h>
|
||||
#include <plat/devs.h>
|
||||
#include <plat/regs-timer.h>
|
||||
|
||||
struct pwm_device {
|
||||
struct list_head list;
|
||||
|
|
|
|||
|
|
@ -41,8 +41,8 @@
|
|||
|
||||
#include <mach/regs-clock.h>
|
||||
|
||||
#include <asm/plat-s3c24xx/clock.h>
|
||||
#include <asm/plat-s3c24xx/cpu.h>
|
||||
#include <plat/clock.h>
|
||||
#include <plat/cpu.h>
|
||||
|
||||
static int s3c2440_setparent_armclk(struct clk *clk, struct clk *parent)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -34,9 +34,9 @@
|
|||
#include <mach/regs-irq.h>
|
||||
#include <mach/regs-gpio.h>
|
||||
|
||||
#include <asm/plat-s3c24xx/cpu.h>
|
||||
#include <asm/plat-s3c24xx/pm.h>
|
||||
#include <asm/plat-s3c24xx/irq.h>
|
||||
#include <plat/cpu.h>
|
||||
#include <plat/pm.h>
|
||||
#include <plat/irq.h>
|
||||
|
||||
/* camera irq */
|
||||
|
||||
|
|
|
|||
|
|
@ -30,18 +30,18 @@
|
|||
#include <asm/irq.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-gpioj.h>
|
||||
#include <mach/regs-dsc.h>
|
||||
|
||||
#include <asm/plat-s3c24xx/s3c2410.h>
|
||||
#include <asm/plat-s3c24xx/s3c2440.h>
|
||||
#include <plat/s3c2410.h>
|
||||
#include <plat/s3c2440.h>
|
||||
#include "s3c244x.h"
|
||||
#include <asm/plat-s3c24xx/clock.h>
|
||||
#include <asm/plat-s3c24xx/devs.h>
|
||||
#include <asm/plat-s3c24xx/cpu.h>
|
||||
#include <asm/plat-s3c24xx/pm.h>
|
||||
#include <plat/clock.h>
|
||||
#include <plat/devs.h>
|
||||
#include <plat/cpu.h>
|
||||
#include <plat/pm.h>
|
||||
|
||||
static struct map_desc s3c244x_iodesc[] __initdata = {
|
||||
IODESC_ENT(CLKPWR),
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
#include <mach/regs-gpio.h>
|
||||
#include <mach/regs-clock.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
|
||||
* reset the UART configuration, only enable if you really need this!
|
||||
|
|
|
|||
|
|
@ -33,12 +33,12 @@
|
|||
|
||||
#include <asm/irq.h>
|
||||
#include <mach/map.h>
|
||||
#include <asm/plat-s3c/regs-timer.h>
|
||||
#include <plat/regs-timer.h>
|
||||
#include <mach/regs-irq.h>
|
||||
#include <asm/mach/time.h>
|
||||
|
||||
#include <asm/plat-s3c24xx/clock.h>
|
||||
#include <asm/plat-s3c24xx/cpu.h>
|
||||
#include <plat/clock.h>
|
||||
#include <plat/cpu.h>
|
||||
|
||||
static unsigned long timer_startval;
|
||||
static unsigned long timer_usec_ticks;
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue