aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arch/arm/boot/compressed/head.S30
-rw-r--r--arch/arm/common/sa1111.c12
-rw-r--r--arch/arm/configs/s3c2410_defconfig119
-rw-r--r--arch/arm/mach-pxa/corgi_lcd.c2
-rw-r--r--arch/arm/mach-realview/core.h2
-rw-r--r--arch/arm/mach-realview/localtimer.c2
-rw-r--r--arch/arm/mach-realview/platsmp.c3
-rw-r--r--arch/arm/mach-s3c2410/mach-bast.c28
-rw-r--r--arch/arm/plat-omap/dmtimer.c2
-rw-r--r--arch/arm/plat-omap/ocpi.c2
-rw-r--r--arch/arm/plat-omap/pm.c2
-rw-r--r--arch/arm/plat-omap/sram-fn.S2
-rw-r--r--include/asm-arm/arch-clps711x/uncompress.h2
-rw-r--r--include/asm-arm/arch-epxa10db/uncompress.h2
-rw-r--r--include/asm-arm/arch-h720x/uncompress.h2
-rw-r--r--include/asm-arm/arch-imx/irqs.h2
-rw-r--r--include/asm-arm/arch-imx/timex.h2
-rw-r--r--include/asm-arm/arch-integrator/smp.h2
-rw-r--r--include/asm-arm/arch-l7200/aux_reg.h2
-rw-r--r--include/asm-arm/arch-l7200/gp_timers.h2
-rw-r--r--include/asm-arm/arch-omap/gpio.h2
-rw-r--r--include/asm-arm/arch-omap/irqs.h2
-rw-r--r--include/asm-arm/arch-omap/mcbsp.h2
-rw-r--r--include/asm-arm/arch-omap/system.h2
-rw-r--r--include/asm-arm/arch-realview/hardware.h1
-rw-r--r--include/asm-arm/arch-realview/system.h2
-rw-r--r--include/asm-arm/arch-rpc/system.h2
-rw-r--r--include/asm-arm/arch-sa1100/memory.h14
-rw-r--r--include/asm-arm/atomic.h4
-rw-r--r--include/asm-arm/bitops.h1
-rw-r--r--include/asm-arm/hardware/dec21285.h2
-rw-r--r--include/asm-arm/mmu_context.h1
-rw-r--r--include/asm-arm/system.h4
-rw-r--r--include/asm-arm/thread_info.h1
34 files changed, 163 insertions, 99 deletions
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
index 7c7f475e213e..6abafb6f1844 100644
--- a/arch/arm/boot/compressed/head.S
+++ b/arch/arm/boot/compressed/head.S
@@ -19,38 +19,28 @@
19 */ 19 */
20#ifdef DEBUG 20#ifdef DEBUG
21 21
22#include <asm/arch/debug-macro.S>
23
24#if defined(CONFIG_DEBUG_ICEDCC) 22#if defined(CONFIG_DEBUG_ICEDCC)
25 .macro loadsp, rb 23 .macro loadsp, rb
26 .endm 24 .endm
27 .macro writeb, ch, rb 25 .macro writeb, ch, rb
28 mcr p14, 0, \ch, c0, c1, 0 26 mcr p14, 0, \ch, c0, c1, 0
29 .endm 27 .endm
30#else 28#else
29
30#include <asm/arch/debug-macro.S>
31
31 .macro writeb, ch, rb 32 .macro writeb, ch, rb
32 senduart \ch, \rb 33 senduart \ch, \rb
33 .endm 34 .endm
34 35
35#if defined(CONFIG_FOOTBRIDGE) || \ 36#if defined(CONFIG_ARCH_SA1100)
36 defined(CONFIG_ARCH_RPC) || \
37 defined(CONFIG_ARCH_INTEGRATOR) || \
38 defined(CONFIG_ARCH_PXA) || \
39 defined(CONFIG_ARCH_IXP4XX) || \
40 defined(CONFIG_ARCH_IXP2000) || \
41 defined(CONFIG_ARCH_LH7A40X) || \
42 defined(CONFIG_ARCH_OMAP)
43 .macro loadsp, rb
44 addruart \rb
45 .endm
46#elif defined(CONFIG_ARCH_SA1100)
47 .macro loadsp, rb 37 .macro loadsp, rb
48 mov \rb, #0x80000000 @ physical base address 38 mov \rb, #0x80000000 @ physical base address
49# if defined(CONFIG_DEBUG_LL_SER3) 39#ifdef CONFIG_DEBUG_LL_SER3
50 add \rb, \rb, #0x00050000 @ Ser3 40 add \rb, \rb, #0x00050000 @ Ser3
51# else 41#else
52 add \rb, \rb, #0x00010000 @ Ser1 42 add \rb, \rb, #0x00010000 @ Ser1
53# endif 43#endif
54 .endm 44 .endm
55#elif defined(CONFIG_ARCH_IOP331) 45#elif defined(CONFIG_ARCH_IOP331)
56 .macro loadsp, rb 46 .macro loadsp, rb
@@ -64,7 +54,9 @@
64 add \rb, \rb, #0x4000 * CONFIG_S3C2410_LOWLEVEL_UART_PORT 54 add \rb, \rb, #0x4000 * CONFIG_S3C2410_LOWLEVEL_UART_PORT
65 .endm 55 .endm
66#else 56#else
67#error no serial architecture defined 57 .macro loadsp, rb
58 addruart \rb
59 .endm
68#endif 60#endif
69#endif 61#endif
70#endif 62#endif
diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c
index 39a6eea300a2..d0d6e6d2d649 100644
--- a/arch/arm/common/sa1111.c
+++ b/arch/arm/common/sa1111.c
@@ -32,6 +32,7 @@
32#include <asm/io.h> 32#include <asm/io.h>
33#include <asm/irq.h> 33#include <asm/irq.h>
34#include <asm/mach/irq.h> 34#include <asm/mach/irq.h>
35#include <asm/sizes.h>
35 36
36#include <asm/hardware/sa1111.h> 37#include <asm/hardware/sa1111.h>
37 38
@@ -132,6 +133,17 @@ static struct sa1111_dev_info sa1111_devices[] = {
132 }, 133 },
133}; 134};
134 135
136void __init sa1111_adjust_zones(int node, unsigned long *size, unsigned long *holes)
137{
138 unsigned int sz = SZ_1M >> PAGE_SHIFT;
139
140 if (node != 0)
141 sz = 0;
142
143 size[1] = size[0] - sz;
144 size[0] = sz;
145}
146
135/* 147/*
136 * SA1111 interrupt support. Since clearing an IRQ while there are 148 * SA1111 interrupt support. Since clearing an IRQ while there are
137 * active IRQs causes the interrupt output to pulse, the upper levels 149 * active IRQs causes the interrupt output to pulse, the upper levels
diff --git a/arch/arm/configs/s3c2410_defconfig b/arch/arm/configs/s3c2410_defconfig
index 756348bf5170..3f97590c91f2 100644
--- a/arch/arm/configs/s3c2410_defconfig
+++ b/arch/arm/configs/s3c2410_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.13-git8 3# Linux kernel version: 2.6.15-rc1
4# Thu Sep 8 19:24:02 2005 4# Sun Nov 13 17:41:24 2005
5# 5#
6CONFIG_ARM=y 6CONFIG_ARM=y
7CONFIG_MMU=y 7CONFIG_MMU=y
@@ -62,6 +62,23 @@ CONFIG_OBSOLETE_MODPARM=y
62CONFIG_KMOD=y 62CONFIG_KMOD=y
63 63
64# 64#
65# Block layer
66#
67
68#
69# IO Schedulers
70#
71CONFIG_IOSCHED_NOOP=y
72CONFIG_IOSCHED_AS=y
73CONFIG_IOSCHED_DEADLINE=y
74CONFIG_IOSCHED_CFQ=y
75CONFIG_DEFAULT_AS=y
76# CONFIG_DEFAULT_DEADLINE is not set
77# CONFIG_DEFAULT_CFQ is not set
78# CONFIG_DEFAULT_NOOP is not set
79CONFIG_DEFAULT_IOSCHED="anticipatory"
80
81#
65# System Type 82# System Type
66# 83#
67# CONFIG_ARCH_CLPS7500 is not set 84# CONFIG_ARCH_CLPS7500 is not set
@@ -83,6 +100,7 @@ CONFIG_ARCH_S3C2410=y
83# CONFIG_ARCH_LH7A40X is not set 100# CONFIG_ARCH_LH7A40X is not set
84# CONFIG_ARCH_OMAP is not set 101# CONFIG_ARCH_OMAP is not set
85# CONFIG_ARCH_VERSATILE is not set 102# CONFIG_ARCH_VERSATILE is not set
103# CONFIG_ARCH_REALVIEW is not set
86# CONFIG_ARCH_IMX is not set 104# CONFIG_ARCH_IMX is not set
87# CONFIG_ARCH_H720X is not set 105# CONFIG_ARCH_H720X is not set
88# CONFIG_ARCH_AAEC2000 is not set 106# CONFIG_ARCH_AAEC2000 is not set
@@ -108,6 +126,7 @@ CONFIG_CPU_S3C2440=y
108# S3C2410 Boot 126# S3C2410 Boot
109# 127#
110# CONFIG_S3C2410_BOOT_WATCHDOG is not set 128# CONFIG_S3C2410_BOOT_WATCHDOG is not set
129# CONFIG_S3C2410_BOOT_ERROR_RESET is not set
111 130
112# 131#
113# S3C2410 Setup 132# S3C2410 Setup
@@ -142,6 +161,7 @@ CONFIG_CPU_TLB_V4WBI=y
142# 161#
143# Bus support 162# Bus support
144# 163#
164CONFIG_ISA=y
145CONFIG_ISA_DMA_API=y 165CONFIG_ISA_DMA_API=y
146 166
147# 167#
@@ -152,7 +172,6 @@ CONFIG_ISA_DMA_API=y
152# 172#
153# Kernel Features 173# Kernel Features
154# 174#
155# CONFIG_SMP is not set
156# CONFIG_PREEMPT is not set 175# CONFIG_PREEMPT is not set
157# CONFIG_NO_IDLE_HZ is not set 176# CONFIG_NO_IDLE_HZ is not set
158# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set 177# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
@@ -163,6 +182,7 @@ CONFIG_FLATMEM_MANUAL=y
163CONFIG_FLATMEM=y 182CONFIG_FLATMEM=y
164CONFIG_FLAT_NODE_MEM_MAP=y 183CONFIG_FLAT_NODE_MEM_MAP=y
165# CONFIG_SPARSEMEM_STATIC is not set 184# CONFIG_SPARSEMEM_STATIC is not set
185CONFIG_SPLIT_PTLOCK_CPUS=4096
166CONFIG_ALIGNMENT_TRAP=y 186CONFIG_ALIGNMENT_TRAP=y
167 187
168# 188#
@@ -253,6 +273,10 @@ CONFIG_TCP_CONG_BIC=y
253# CONFIG_NET_DIVERT is not set 273# CONFIG_NET_DIVERT is not set
254# CONFIG_ECONET is not set 274# CONFIG_ECONET is not set
255# CONFIG_WAN_ROUTER is not set 275# CONFIG_WAN_ROUTER is not set
276
277#
278# QoS and/or fair queueing
279#
256# CONFIG_NET_SCHED is not set 280# CONFIG_NET_SCHED is not set
257# CONFIG_NET_CLS_ROUTE is not set 281# CONFIG_NET_CLS_ROUTE is not set
258 282
@@ -260,7 +284,6 @@ CONFIG_TCP_CONG_BIC=y
260# Network testing 284# Network testing
261# 285#
262# CONFIG_NET_PKTGEN is not set 286# CONFIG_NET_PKTGEN is not set
263# CONFIG_NETFILTER_NETLINK is not set
264# CONFIG_HAMRADIO is not set 287# CONFIG_HAMRADIO is not set
265# CONFIG_IRDA is not set 288# CONFIG_IRDA is not set
266# CONFIG_BT is not set 289# CONFIG_BT is not set
@@ -300,6 +323,7 @@ CONFIG_MTD_BLOCK=y
300# CONFIG_FTL is not set 323# CONFIG_FTL is not set
301# CONFIG_NFTL is not set 324# CONFIG_NFTL is not set
302# CONFIG_INFTL is not set 325# CONFIG_INFTL is not set
326# CONFIG_RFD_FTL is not set
303 327
304# 328#
305# RAM/ROM/Flash chip drivers 329# RAM/ROM/Flash chip drivers
@@ -335,7 +359,6 @@ CONFIG_MTD_ROM=y
335# CONFIG_MTD_COMPLEX_MAPPINGS is not set 359# CONFIG_MTD_COMPLEX_MAPPINGS is not set
336# CONFIG_MTD_PHYSMAP is not set 360# CONFIG_MTD_PHYSMAP is not set
337# CONFIG_MTD_ARM_INTEGRATOR is not set 361# CONFIG_MTD_ARM_INTEGRATOR is not set
338# CONFIG_MTD_EDB7312 is not set
339# CONFIG_MTD_IMPA7 is not set 362# CONFIG_MTD_IMPA7 is not set
340CONFIG_MTD_BAST=y 363CONFIG_MTD_BAST=y
341CONFIG_MTD_BAST_MAXSIZE=4 364CONFIG_MTD_BAST_MAXSIZE=4
@@ -370,6 +393,11 @@ CONFIG_MTD_NAND_S3C2410=y
370# CONFIG_MTD_NAND_NANDSIM is not set 393# CONFIG_MTD_NAND_NANDSIM is not set
371 394
372# 395#
396# OneNAND Flash Device Drivers
397#
398# CONFIG_MTD_ONENAND is not set
399
400#
373# Parallel port support 401# Parallel port support
374# 402#
375CONFIG_PARPORT=y 403CONFIG_PARPORT=y
@@ -381,10 +409,12 @@ CONFIG_PARPORT_1284=y
381# 409#
382# Plug and Play support 410# Plug and Play support
383# 411#
412# CONFIG_PNP is not set
384 413
385# 414#
386# Block devices 415# Block devices
387# 416#
417# CONFIG_BLK_DEV_XD is not set
388# CONFIG_PARIDE is not set 418# CONFIG_PARIDE is not set
389# CONFIG_BLK_DEV_COW_COMMON is not set 419# CONFIG_BLK_DEV_COW_COMMON is not set
390CONFIG_BLK_DEV_LOOP=y 420CONFIG_BLK_DEV_LOOP=y
@@ -395,14 +425,6 @@ CONFIG_BLK_DEV_RAM_COUNT=16
395CONFIG_BLK_DEV_RAM_SIZE=4096 425CONFIG_BLK_DEV_RAM_SIZE=4096
396CONFIG_BLK_DEV_INITRD=y 426CONFIG_BLK_DEV_INITRD=y
397# CONFIG_CDROM_PKTCDVD is not set 427# CONFIG_CDROM_PKTCDVD is not set
398
399#
400# IO Schedulers
401#
402CONFIG_IOSCHED_NOOP=y
403CONFIG_IOSCHED_AS=y
404CONFIG_IOSCHED_DEADLINE=y
405CONFIG_IOSCHED_CFQ=y
406CONFIG_ATA_OVER_ETH=m 428CONFIG_ATA_OVER_ETH=m
407 429
408# 430#
@@ -428,6 +450,7 @@ CONFIG_BLK_DEV_IDEFLOPPY=m
428CONFIG_IDE_GENERIC=y 450CONFIG_IDE_GENERIC=y
429# CONFIG_IDE_ARM is not set 451# CONFIG_IDE_ARM is not set
430CONFIG_BLK_DEV_IDE_BAST=y 452CONFIG_BLK_DEV_IDE_BAST=y
453# CONFIG_IDE_CHIPSETS is not set
431# CONFIG_BLK_DEV_IDEDMA is not set 454# CONFIG_BLK_DEV_IDEDMA is not set
432# CONFIG_IDEDMA_AUTO is not set 455# CONFIG_IDEDMA_AUTO is not set
433# CONFIG_BLK_DEV_HD is not set 456# CONFIG_BLK_DEV_HD is not set
@@ -467,6 +490,11 @@ CONFIG_NETDEVICES=y
467# CONFIG_TUN is not set 490# CONFIG_TUN is not set
468 491
469# 492#
493# ARCnet devices
494#
495# CONFIG_ARCNET is not set
496
497#
470# PHY device support 498# PHY device support
471# 499#
472# CONFIG_PHYLIB is not set 500# CONFIG_PHYLIB is not set
@@ -475,9 +503,19 @@ CONFIG_NETDEVICES=y
475# Ethernet (10 or 100Mbit) 503# Ethernet (10 or 100Mbit)
476# 504#
477CONFIG_NET_ETHERNET=y 505CONFIG_NET_ETHERNET=y
478CONFIG_MII=m 506CONFIG_MII=y
507# CONFIG_NET_VENDOR_3COM is not set
508# CONFIG_LANCE is not set
509# CONFIG_NET_VENDOR_SMC is not set
479# CONFIG_SMC91X is not set 510# CONFIG_SMC91X is not set
480CONFIG_DM9000=m 511CONFIG_DM9000=y
512# CONFIG_NET_VENDOR_RACAL is not set
513# CONFIG_AT1700 is not set
514# CONFIG_DEPCA is not set
515# CONFIG_HP100 is not set
516# CONFIG_NET_ISA is not set
517# CONFIG_NET_PCI is not set
518# CONFIG_NET_POCKET is not set
481 519
482# 520#
483# Ethernet (1000 Mbit) 521# Ethernet (1000 Mbit)
@@ -490,6 +528,7 @@ CONFIG_DM9000=m
490# 528#
491# Token Ring devices 529# Token Ring devices
492# 530#
531# CONFIG_TR is not set
493 532
494# 533#
495# Wireless LAN (non-hamradio) 534# Wireless LAN (non-hamradio)
@@ -542,6 +581,9 @@ CONFIG_KEYBOARD_ATKBD=y
542CONFIG_INPUT_MOUSE=y 581CONFIG_INPUT_MOUSE=y
543CONFIG_MOUSE_PS2=y 582CONFIG_MOUSE_PS2=y
544# CONFIG_MOUSE_SERIAL is not set 583# CONFIG_MOUSE_SERIAL is not set
584# CONFIG_MOUSE_INPORT is not set
585# CONFIG_MOUSE_LOGIBM is not set
586# CONFIG_MOUSE_PC110PAD is not set
545# CONFIG_MOUSE_VSXXXAA is not set 587# CONFIG_MOUSE_VSXXXAA is not set
546# CONFIG_INPUT_JOYSTICK is not set 588# CONFIG_INPUT_JOYSTICK is not set
547# CONFIG_INPUT_TOUCHSCREEN is not set 589# CONFIG_INPUT_TOUCHSCREEN is not set
@@ -568,6 +610,7 @@ CONFIG_SERIAL_NONSTANDARD=y
568# CONFIG_ROCKETPORT is not set 610# CONFIG_ROCKETPORT is not set
569# CONFIG_CYCLADES is not set 611# CONFIG_CYCLADES is not set
570# CONFIG_DIGIEPCA is not set 612# CONFIG_DIGIEPCA is not set
613# CONFIG_ESPSERIAL is not set
571# CONFIG_MOXA_INTELLIO is not set 614# CONFIG_MOXA_INTELLIO is not set
572# CONFIG_MOXA_SMARTIO is not set 615# CONFIG_MOXA_SMARTIO is not set
573# CONFIG_ISI is not set 616# CONFIG_ISI is not set
@@ -590,6 +633,10 @@ CONFIG_SERIAL_8250_MANY_PORTS=y
590CONFIG_SERIAL_8250_SHARE_IRQ=y 633CONFIG_SERIAL_8250_SHARE_IRQ=y
591# CONFIG_SERIAL_8250_DETECT_IRQ is not set 634# CONFIG_SERIAL_8250_DETECT_IRQ is not set
592# CONFIG_SERIAL_8250_RSA is not set 635# CONFIG_SERIAL_8250_RSA is not set
636# CONFIG_SERIAL_8250_FOURPORT is not set
637# CONFIG_SERIAL_8250_ACCENT is not set
638# CONFIG_SERIAL_8250_BOCA is not set
639# CONFIG_SERIAL_8250_HUB6 is not set
593 640
594# 641#
595# Non-8250 serial port support 642# Non-8250 serial port support
@@ -622,6 +669,13 @@ CONFIG_WATCHDOG=y
622# 669#
623# CONFIG_SOFT_WATCHDOG is not set 670# CONFIG_SOFT_WATCHDOG is not set
624CONFIG_S3C2410_WATCHDOG=y 671CONFIG_S3C2410_WATCHDOG=y
672
673#
674# ISA-based Watchdog Cards
675#
676# CONFIG_PCWATCHDOG is not set
677# CONFIG_MIXCOMWD is not set
678# CONFIG_WDT is not set
625# CONFIG_NVRAM is not set 679# CONFIG_NVRAM is not set
626# CONFIG_RTC is not set 680# CONFIG_RTC is not set
627CONFIG_S3C2410_RTC=y 681CONFIG_S3C2410_RTC=y
@@ -636,6 +690,7 @@ CONFIG_S3C2410_RTC=y
636# 690#
637# TPM devices 691# TPM devices
638# 692#
693# CONFIG_TELCLOCK is not set
639 694
640# 695#
641# I2C support 696# I2C support
@@ -653,6 +708,7 @@ CONFIG_I2C_ALGOBIT=m
653# 708#
654# I2C Hardware Bus support 709# I2C Hardware Bus support
655# 710#
711# CONFIG_I2C_ELEKTOR is not set
656CONFIG_I2C_ISA=m 712CONFIG_I2C_ISA=m
657# CONFIG_I2C_PARPORT is not set 713# CONFIG_I2C_PARPORT is not set
658# CONFIG_I2C_PARPORT_LIGHT is not set 714# CONFIG_I2C_PARPORT_LIGHT is not set
@@ -671,6 +727,7 @@ CONFIG_SENSORS_EEPROM=m
671# CONFIG_SENSORS_PCF8591 is not set 727# CONFIG_SENSORS_PCF8591 is not set
672# CONFIG_SENSORS_RTC8564 is not set 728# CONFIG_SENSORS_RTC8564 is not set
673# CONFIG_SENSORS_MAX6875 is not set 729# CONFIG_SENSORS_MAX6875 is not set
730# CONFIG_RTC_X1205_I2C is not set
674# CONFIG_I2C_DEBUG_CORE is not set 731# CONFIG_I2C_DEBUG_CORE is not set
675# CONFIG_I2C_DEBUG_ALGO is not set 732# CONFIG_I2C_DEBUG_ALGO is not set
676# CONFIG_I2C_DEBUG_BUS is not set 733# CONFIG_I2C_DEBUG_BUS is not set
@@ -737,22 +794,28 @@ CONFIG_SENSORS_LM85=m
737# Graphics support 794# Graphics support
738# 795#
739CONFIG_FB=y 796CONFIG_FB=y
740# CONFIG_FB_CFB_FILLRECT is not set 797CONFIG_FB_CFB_FILLRECT=y
741# CONFIG_FB_CFB_COPYAREA is not set 798CONFIG_FB_CFB_COPYAREA=y
742# CONFIG_FB_CFB_IMAGEBLIT is not set 799CONFIG_FB_CFB_IMAGEBLIT=y
743# CONFIG_FB_SOFT_CURSOR is not set
744# CONFIG_FB_MACMODES is not set 800# CONFIG_FB_MACMODES is not set
745CONFIG_FB_MODE_HELPERS=y 801CONFIG_FB_MODE_HELPERS=y
746# CONFIG_FB_TILEBLITTING is not set 802# CONFIG_FB_TILEBLITTING is not set
747# CONFIG_FB_S1D13XXX is not set 803# CONFIG_FB_S1D13XXX is not set
804CONFIG_FB_S3C2410=y
805# CONFIG_FB_S3C2410_DEBUG is not set
748# CONFIG_FB_VIRTUAL is not set 806# CONFIG_FB_VIRTUAL is not set
749 807
750# 808#
751# Console display driver support 809# Console display driver support
752# 810#
753# CONFIG_VGA_CONSOLE is not set 811# CONFIG_VGA_CONSOLE is not set
812# CONFIG_MDA_CONSOLE is not set
754CONFIG_DUMMY_CONSOLE=y 813CONFIG_DUMMY_CONSOLE=y
755# CONFIG_FRAMEBUFFER_CONSOLE is not set 814CONFIG_FRAMEBUFFER_CONSOLE=y
815# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
816# CONFIG_FONTS is not set
817CONFIG_FONT_8x8=y
818CONFIG_FONT_8x16=y
756 819
757# 820#
758# Logo configuration 821# Logo configuration
@@ -773,6 +836,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
773# CONFIG_USB is not set 836# CONFIG_USB is not set
774 837
775# 838#
839# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
840#
841
842#
776# USB Gadget Support 843# USB Gadget Support
777# 844#
778# CONFIG_USB_GADGET is not set 845# CONFIG_USB_GADGET is not set
@@ -798,10 +865,6 @@ CONFIG_FS_MBCACHE=y
798# CONFIG_REISERFS_FS is not set 865# CONFIG_REISERFS_FS is not set
799# CONFIG_JFS_FS is not set 866# CONFIG_JFS_FS is not set
800# CONFIG_FS_POSIX_ACL is not set 867# CONFIG_FS_POSIX_ACL is not set
801
802#
803# XFS support
804#
805# CONFIG_XFS_FS is not set 868# CONFIG_XFS_FS is not set
806# CONFIG_MINIX_FS is not set 869# CONFIG_MINIX_FS is not set
807CONFIG_ROMFS_FS=y 870CONFIG_ROMFS_FS=y
@@ -810,6 +873,7 @@ CONFIG_INOTIFY=y
810CONFIG_DNOTIFY=y 873CONFIG_DNOTIFY=y
811# CONFIG_AUTOFS_FS is not set 874# CONFIG_AUTOFS_FS is not set
812# CONFIG_AUTOFS4_FS is not set 875# CONFIG_AUTOFS4_FS is not set
876# CONFIG_FUSE_FS is not set
813 877
814# 878#
815# CD-ROM/DVD Filesystems 879# CD-ROM/DVD Filesystems
@@ -854,6 +918,7 @@ CONFIG_JFFS_FS_VERBOSE=0
854CONFIG_JFFS2_FS=y 918CONFIG_JFFS2_FS=y
855CONFIG_JFFS2_FS_DEBUG=0 919CONFIG_JFFS2_FS_DEBUG=0
856CONFIG_JFFS2_FS_WRITEBUFFER=y 920CONFIG_JFFS2_FS_WRITEBUFFER=y
921# CONFIG_JFFS2_SUMMARY is not set
857# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set 922# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
858CONFIG_JFFS2_ZLIB=y 923CONFIG_JFFS2_ZLIB=y
859CONFIG_JFFS2_RTIME=y 924CONFIG_JFFS2_RTIME=y
@@ -884,6 +949,7 @@ CONFIG_SUNRPC=y
884# CONFIG_NCP_FS is not set 949# CONFIG_NCP_FS is not set
885# CONFIG_CODA_FS is not set 950# CONFIG_CODA_FS is not set
886# CONFIG_AFS_FS is not set 951# CONFIG_AFS_FS is not set
952# CONFIG_9P_FS is not set
887 953
888# 954#
889# Partition Types 955# Partition Types
@@ -959,7 +1025,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
959# 1025#
960# CONFIG_PRINTK_TIME is not set 1026# CONFIG_PRINTK_TIME is not set
961CONFIG_DEBUG_KERNEL=y 1027CONFIG_DEBUG_KERNEL=y
962# CONFIG_MAGIC_SYSRQ is not set 1028CONFIG_MAGIC_SYSRQ=y
963CONFIG_LOG_BUF_SHIFT=16 1029CONFIG_LOG_BUF_SHIFT=16
964CONFIG_DETECT_SOFTLOCKUP=y 1030CONFIG_DETECT_SOFTLOCKUP=y
965# CONFIG_SCHEDSTATS is not set 1031# CONFIG_SCHEDSTATS is not set
@@ -970,7 +1036,9 @@ CONFIG_DETECT_SOFTLOCKUP=y
970CONFIG_DEBUG_BUGVERBOSE=y 1036CONFIG_DEBUG_BUGVERBOSE=y
971CONFIG_DEBUG_INFO=y 1037CONFIG_DEBUG_INFO=y
972# CONFIG_DEBUG_FS is not set 1038# CONFIG_DEBUG_FS is not set
1039# CONFIG_DEBUG_VM is not set
973CONFIG_FRAME_POINTER=y 1040CONFIG_FRAME_POINTER=y
1041# CONFIG_RCU_TORTURE_TEST is not set
974CONFIG_DEBUG_USER=y 1042CONFIG_DEBUG_USER=y
975# CONFIG_DEBUG_WAITQ is not set 1043# CONFIG_DEBUG_WAITQ is not set
976# CONFIG_DEBUG_ERRORS is not set 1044# CONFIG_DEBUG_ERRORS is not set
@@ -998,6 +1066,7 @@ CONFIG_DEBUG_S3C2410_UART=0
998# Library routines 1066# Library routines
999# 1067#
1000# CONFIG_CRC_CCITT is not set 1068# CONFIG_CRC_CCITT is not set
1069# CONFIG_CRC16 is not set
1001CONFIG_CRC32=y 1070CONFIG_CRC32=y
1002# CONFIG_LIBCRC32C is not set 1071# CONFIG_LIBCRC32C is not set
1003CONFIG_ZLIB_INFLATE=y 1072CONFIG_ZLIB_INFLATE=y
diff --git a/arch/arm/mach-pxa/corgi_lcd.c b/arch/arm/mach-pxa/corgi_lcd.c
index 698eb06545c4..6dbcaf114ad7 100644
--- a/arch/arm/mach-pxa/corgi_lcd.c
+++ b/arch/arm/mach-pxa/corgi_lcd.c
@@ -22,7 +22,7 @@
22#include <linux/string.h> 22#include <linux/string.h>
23#include <asm/arch/akita.h> 23#include <asm/arch/akita.h>
24#include <asm/arch/corgi.h> 24#include <asm/arch/corgi.h>
25#include <asm/arch/hardware.h> 25#include <asm/hardware.h>
26#include <asm/arch/pxa-regs.h> 26#include <asm/arch/pxa-regs.h>
27#include <asm/arch/sharpsl.h> 27#include <asm/arch/sharpsl.h>
28#include <asm/arch/spitz.h> 28#include <asm/arch/spitz.h>
diff --git a/arch/arm/mach-realview/core.h b/arch/arm/mach-realview/core.h
index d83e8bad2038..c06e6041df41 100644
--- a/arch/arm/mach-realview/core.h
+++ b/arch/arm/mach-realview/core.h
@@ -26,8 +26,6 @@
26#include <asm/leds.h> 26#include <asm/leds.h>
27#include <asm/io.h> 27#include <asm/io.h>
28 28
29#define __io_address(n) __io(IO_ADDRESS(n))
30
31extern struct sys_timer realview_timer; 29extern struct sys_timer realview_timer;
32 30
33#define AMBA_DEVICE(name,busid,base,plat) \ 31#define AMBA_DEVICE(name,busid,base,plat) \
diff --git a/arch/arm/mach-realview/localtimer.c b/arch/arm/mach-realview/localtimer.c
index 5e917e37d095..c9d7c596b200 100644
--- a/arch/arm/mach-realview/localtimer.c
+++ b/arch/arm/mach-realview/localtimer.c
@@ -21,8 +21,6 @@
21#include <asm/io.h> 21#include <asm/io.h>
22#include <asm/irq.h> 22#include <asm/irq.h>
23 23
24#include "core.h"
25
26#define TWD_BASE(cpu) (__io_address(REALVIEW_TWD_BASE) + \ 24#define TWD_BASE(cpu) (__io_address(REALVIEW_TWD_BASE) + \
27 ((cpu) * REALVIEW_TWD_SIZE)) 25 ((cpu) * REALVIEW_TWD_SIZE))
28 26
diff --git a/arch/arm/mach-realview/platsmp.c b/arch/arm/mach-realview/platsmp.c
index 0c7d4ac9a7b3..a8fbd76d8be5 100644
--- a/arch/arm/mach-realview/platsmp.c
+++ b/arch/arm/mach-realview/platsmp.c
@@ -17,8 +17,7 @@
17#include <asm/cacheflush.h> 17#include <asm/cacheflush.h>
18#include <asm/hardware/arm_scu.h> 18#include <asm/hardware/arm_scu.h>
19#include <asm/hardware.h> 19#include <asm/hardware.h>
20 20#include <asm/io.h>
21#include "core.h"
22 21
23extern void realview_secondary_startup(void); 22extern void realview_secondary_startup(void);
24 23
diff --git a/arch/arm/mach-s3c2410/mach-bast.c b/arch/arm/mach-s3c2410/mach-bast.c
index 1be2567a7486..4d962717fdf7 100644
--- a/arch/arm/mach-s3c2410/mach-bast.c
+++ b/arch/arm/mach-s3c2410/mach-bast.c
@@ -203,7 +203,7 @@ static struct s3c24xx_uart_clksrc bast_serial_clocks[] = {
203 .name = "pclk", 203 .name = "pclk",
204 .divisor = 1, 204 .divisor = 1,
205 .min_baud = 0, 205 .min_baud = 0,
206 .max_baud = 0. 206 .max_baud = 0,
207 } 207 }
208}; 208};
209 209
@@ -216,7 +216,7 @@ static struct s3c2410_uartcfg bast_uartcfgs[] = {
216 .ulcon = ULCON, 216 .ulcon = ULCON,
217 .ufcon = UFCON, 217 .ufcon = UFCON,
218 .clocks = bast_serial_clocks, 218 .clocks = bast_serial_clocks,
219 .clocks_size = ARRAY_SIZE(bast_serial_clocks) 219 .clocks_size = ARRAY_SIZE(bast_serial_clocks),
220 }, 220 },
221 [1] = { 221 [1] = {
222 .hwport = 1, 222 .hwport = 1,
@@ -225,7 +225,7 @@ static struct s3c2410_uartcfg bast_uartcfgs[] = {
225 .ulcon = ULCON, 225 .ulcon = ULCON,
226 .ufcon = UFCON, 226 .ufcon = UFCON,
227 .clocks = bast_serial_clocks, 227 .clocks = bast_serial_clocks,
228 .clocks_size = ARRAY_SIZE(bast_serial_clocks) 228 .clocks_size = ARRAY_SIZE(bast_serial_clocks),
229 }, 229 },
230 /* port 2 is not actually used */ 230 /* port 2 is not actually used */
231 [2] = { 231 [2] = {
@@ -235,7 +235,7 @@ static struct s3c2410_uartcfg bast_uartcfgs[] = {
235 .ulcon = ULCON, 235 .ulcon = ULCON,
236 .ufcon = UFCON, 236 .ufcon = UFCON,
237 .clocks = bast_serial_clocks, 237 .clocks = bast_serial_clocks,
238 .clocks_size = ARRAY_SIZE(bast_serial_clocks) 238 .clocks_size = ARRAY_SIZE(bast_serial_clocks),
239 } 239 }
240}; 240};
241 241
@@ -268,7 +268,7 @@ static struct mtd_partition bast_default_nand_part[] = {
268 [0] = { 268 [0] = {
269 .name = "Boot Agent", 269 .name = "Boot Agent",
270 .size = SZ_16K, 270 .size = SZ_16K,
271 .offset = 0 271 .offset = 0,
272 }, 272 },
273 [1] = { 273 [1] = {
274 .name = "/boot", 274 .name = "/boot",
@@ -296,28 +296,28 @@ static struct s3c2410_nand_set bast_nand_sets[] = {
296 .nr_chips = 1, 296 .nr_chips = 1,
297 .nr_map = smartmedia_map, 297 .nr_map = smartmedia_map,
298 .nr_partitions = ARRAY_SIZE(bast_default_nand_part), 298 .nr_partitions = ARRAY_SIZE(bast_default_nand_part),
299 .partitions = bast_default_nand_part 299 .partitions = bast_default_nand_part,
300 }, 300 },
301 [1] = { 301 [1] = {
302 .name = "chip0", 302 .name = "chip0",
303 .nr_chips = 1, 303 .nr_chips = 1,
304 .nr_map = chip0_map, 304 .nr_map = chip0_map,
305 .nr_partitions = ARRAY_SIZE(bast_default_nand_part), 305 .nr_partitions = ARRAY_SIZE(bast_default_nand_part),
306 .partitions = bast_default_nand_part 306 .partitions = bast_default_nand_part,
307 }, 307 },
308 [2] = { 308 [2] = {
309 .name = "chip1", 309 .name = "chip1",
310 .nr_chips = 1, 310 .nr_chips = 1,
311 .nr_map = chip1_map, 311 .nr_map = chip1_map,
312 .nr_partitions = ARRAY_SIZE(bast_default_nand_part), 312 .nr_partitions = ARRAY_SIZE(bast_default_nand_part),
313 .partitions = bast_default_nand_part 313 .partitions = bast_default_nand_part,
314 }, 314 },
315 [3] = { 315 [3] = {
316 .name = "chip2", 316 .name = "chip2",
317 .nr_chips = 1, 317 .nr_chips = 1,
318 .nr_map = chip2_map, 318 .nr_map = chip2_map,
319 .nr_partitions = ARRAY_SIZE(bast_default_nand_part), 319 .nr_partitions = ARRAY_SIZE(bast_default_nand_part),
320 .partitions = bast_default_nand_part 320 .partitions = bast_default_nand_part,
321 } 321 }
322}; 322};
323 323
@@ -355,17 +355,17 @@ static struct resource bast_dm9k_resource[] = {
355 [0] = { 355 [0] = {
356 .start = S3C2410_CS5 + BAST_PA_DM9000, 356 .start = S3C2410_CS5 + BAST_PA_DM9000,
357 .end = S3C2410_CS5 + BAST_PA_DM9000 + 3, 357 .end = S3C2410_CS5 + BAST_PA_DM9000 + 3,
358 .flags = IORESOURCE_MEM 358 .flags = IORESOURCE_MEM,
359 }, 359 },
360 [1] = { 360 [1] = {
361 .start = S3C2410_CS5 + BAST_PA_DM9000 + 0x40, 361 .start = S3C2410_CS5 + BAST_PA_DM9000 + 0x40,
362 .end = S3C2410_CS5 + BAST_PA_DM9000 + 0x40 + 0x3f, 362 .end = S3C2410_CS5 + BAST_PA_DM9000 + 0x40 + 0x3f,
363 .flags = IORESOURCE_MEM 363 .flags = IORESOURCE_MEM,
364 }, 364 },
365 [2] = { 365 [2] = {
366 .start = IRQ_DM9000, 366 .start = IRQ_DM9000,
367 .end = IRQ_DM9000, 367 .end = IRQ_DM9000,
368 .flags = IORESOURCE_IRQ 368 .flags = IORESOURCE_IRQ,
369 } 369 }
370 370
371}; 371};
@@ -375,7 +375,7 @@ static struct resource bast_dm9k_resource[] = {
375*/ 375*/
376 376
377static struct dm9000_plat_data bast_dm9k_platdata = { 377static struct dm9000_plat_data bast_dm9k_platdata = {
378 .flags = DM9000_PLATF_16BITONLY 378 .flags = DM9000_PLATF_16BITONLY,
379}; 379};
380 380
381static struct platform_device bast_device_dm9k = { 381static struct platform_device bast_device_dm9k = {
@@ -492,7 +492,7 @@ static struct s3c24xx_board bast_board __initdata = {
492 .devices = bast_devices, 492 .devices = bast_devices,
493 .devices_count = ARRAY_SIZE(bast_devices), 493 .devices_count = ARRAY_SIZE(bast_devices),
494 .clocks = bast_clocks, 494 .clocks = bast_clocks,
495 .clocks_count = ARRAY_SIZE(bast_clocks) 495 .clocks_count = ARRAY_SIZE(bast_clocks),
496}; 496};
497 497
498static void __init bast_map_io(void) 498static void __init bast_map_io(void)
diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c
index a1468d7326eb..38d7ebf87920 100644
--- a/arch/arm/plat-omap/dmtimer.c
+++ b/arch/arm/plat-omap/dmtimer.c
@@ -26,7 +26,7 @@
26 */ 26 */
27 27
28#include <linux/init.h> 28#include <linux/init.h>
29#include <asm/arch/hardware.h> 29#include <asm/hardware.h>
30#include <asm/arch/dmtimer.h> 30#include <asm/arch/dmtimer.h>
31#include <asm/io.h> 31#include <asm/io.h>
32#include <asm/arch/irqs.h> 32#include <asm/arch/irqs.h>
diff --git a/arch/arm/plat-omap/ocpi.c b/arch/arm/plat-omap/ocpi.c
index 2ede2ee8cae4..b86148227480 100644
--- a/arch/arm/plat-omap/ocpi.c
+++ b/arch/arm/plat-omap/ocpi.c
@@ -34,7 +34,7 @@
34 34
35#include <asm/io.h> 35#include <asm/io.h>
36#include <asm/hardware/clock.h> 36#include <asm/hardware/clock.h>
37#include <asm/arch/hardware.h> 37#include <asm/hardware.h>
38 38
39#define OCPI_BASE 0xfffec320 39#define OCPI_BASE 0xfffec320
40#define OCPI_FAULT (OCPI_BASE + 0x00) 40#define OCPI_FAULT (OCPI_BASE + 0x00)
diff --git a/arch/arm/plat-omap/pm.c b/arch/arm/plat-omap/pm.c
index 966cca031ca7..1a24e2c10714 100644
--- a/arch/arm/plat-omap/pm.c
+++ b/arch/arm/plat-omap/pm.c
@@ -509,7 +509,7 @@ static void omap_pm_init_proc(void)
509 * @state: suspend state we're entering. 509 * @state: suspend state we're entering.
510 * 510 *
511 */ 511 */
512//#include <asm/arch/hardware.h> 512//#include <asm/hardware.h>
513 513
514static int omap_pm_prepare(suspend_state_t state) 514static int omap_pm_prepare(suspend_state_t state)
515{ 515{
diff --git a/arch/arm/plat-omap/sram-fn.S b/arch/arm/plat-omap/sram-fn.S
index 4bea36964a00..66414cc8e6e3 100644
--- a/arch/arm/plat-omap/sram-fn.S
+++ b/arch/arm/plat-omap/sram-fn.S
@@ -12,7 +12,7 @@
12#include <linux/linkage.h> 12#include <linux/linkage.h>
13#include <asm/assembler.h> 13#include <asm/assembler.h>
14#include <asm/arch/io.h> 14#include <asm/arch/io.h>
15#include <asm/arch/hardware.h> 15#include <asm/hardware.h>
16 16
17 .text 17 .text
18 18
diff --git a/include/asm-arm/arch-clps711x/uncompress.h b/include/asm-arm/arch-clps711x/uncompress.h
index 7d0ab791b16c..9fc4bcfa1681 100644
--- a/include/asm-arm/arch-clps711x/uncompress.h
+++ b/include/asm-arm/arch-clps711x/uncompress.h
@@ -19,7 +19,7 @@
19 */ 19 */
20#include <linux/config.h> 20#include <linux/config.h>
21#include <asm/arch/io.h> 21#include <asm/arch/io.h>
22#include <asm/arch/hardware.h> 22#include <asm/hardware.h>
23#include <asm/hardware/clps7111.h> 23#include <asm/hardware/clps7111.h>
24 24
25#undef CLPS7111_BASE 25#undef CLPS7111_BASE
diff --git a/include/asm-arm/arch-epxa10db/uncompress.h b/include/asm-arm/arch-epxa10db/uncompress.h
index d33ad6a93749..fdfe0e6848f8 100644
--- a/include/asm-arm/arch-epxa10db/uncompress.h
+++ b/include/asm-arm/arch-epxa10db/uncompress.h
@@ -19,7 +19,7 @@
19 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
20 */ 20 */
21#include "asm/arch/platform.h" 21#include "asm/arch/platform.h"
22#include "asm/arch/hardware.h" 22#include "asm/hardware.h"
23#define UART00_TYPE (volatile unsigned int*) 23#define UART00_TYPE (volatile unsigned int*)
24#include "asm/arch/uart00.h" 24#include "asm/arch/uart00.h"
25 25
diff --git a/include/asm-arm/arch-h720x/uncompress.h b/include/asm-arm/arch-h720x/uncompress.h
index 2fffacf85a01..9535764bcc71 100644
--- a/include/asm-arm/arch-h720x/uncompress.h
+++ b/include/asm-arm/arch-h720x/uncompress.h
@@ -7,7 +7,7 @@
7#ifndef __ASM_ARCH_UNCOMPRESS_H 7#ifndef __ASM_ARCH_UNCOMPRESS_H
8#define __ASM_ARCH_UNCOMPRESS_H 8#define __ASM_ARCH_UNCOMPRESS_H
9 9
10#include <asm/arch/hardware.h> 10#include <asm/hardware.h>
11 11
12#define LSR 0x14 12#define LSR 0x14
13#define TEMPTY 0x40 13#define TEMPTY 0x40
diff --git a/include/asm-arm/arch-imx/irqs.h b/include/asm-arm/arch-imx/irqs.h
index 238197cfb9d9..f195542898e0 100644
--- a/include/asm-arm/arch-imx/irqs.h
+++ b/include/asm-arm/arch-imx/irqs.h
@@ -23,7 +23,7 @@
23#define __ARM_IRQS_H__ 23#define __ARM_IRQS_H__
24 24
25/* Use the imx definitions */ 25/* Use the imx definitions */
26#include <asm/arch/hardware.h> 26#include <asm/hardware.h>
27 27
28/* 28/*
29 * IMX Interrupt numbers 29 * IMX Interrupt numbers
diff --git a/include/asm-arm/arch-imx/timex.h b/include/asm-arm/arch-imx/timex.h
index d65ab3cd5d5d..8c91674706b1 100644
--- a/include/asm-arm/arch-imx/timex.h
+++ b/include/asm-arm/arch-imx/timex.h
@@ -21,7 +21,7 @@
21#ifndef __ASM_ARCH_TIMEX_H 21#ifndef __ASM_ARCH_TIMEX_H
22#define __ASM_ARCH_TIMEX_H 22#define __ASM_ARCH_TIMEX_H
23 23
24#include <asm/arch/hardware.h> 24#include <asm/hardware.h>
25#define CLOCK_TICK_RATE (CLK32) 25#define CLOCK_TICK_RATE (CLK32)
26 26
27#endif 27#endif
diff --git a/include/asm-arm/arch-integrator/smp.h b/include/asm-arm/arch-integrator/smp.h
index 0ec7093f7c37..da6981efdc39 100644
--- a/include/asm-arm/arch-integrator/smp.h
+++ b/include/asm-arm/arch-integrator/smp.h
@@ -3,7 +3,7 @@
3 3
4#include <linux/config.h> 4#include <linux/config.h>
5 5
6#include <asm/arch/hardware.h> 6#include <asm/hardware.h>
7#include <asm/io.h> 7#include <asm/io.h>
8 8
9#define hard_smp_processor_id() \ 9#define hard_smp_processor_id() \
diff --git a/include/asm-arm/arch-l7200/aux_reg.h b/include/asm-arm/arch-l7200/aux_reg.h
index 762cbc76c501..5b4396de16a0 100644
--- a/include/asm-arm/arch-l7200/aux_reg.h
+++ b/include/asm-arm/arch-l7200/aux_reg.h
@@ -9,7 +9,7 @@
9#ifndef _ASM_ARCH_AUXREG_H 9#ifndef _ASM_ARCH_AUXREG_H
10#define _ASM_ARCH_AUXREG_H 10#define _ASM_ARCH_AUXREG_H
11 11
12#include <asm/arch/hardware.h> 12#include <asm/hardware.h>
13 13
14#define l7200aux_reg *((volatile unsigned int *) (AUX_BASE)) 14#define l7200aux_reg *((volatile unsigned int *) (AUX_BASE))
15 15
diff --git a/include/asm-arm/arch-l7200/gp_timers.h b/include/asm-arm/arch-l7200/gp_timers.h
index 6f20962df248..9c4804d13578 100644
--- a/include/asm-arm/arch-l7200/gp_timers.h
+++ b/include/asm-arm/arch-l7200/gp_timers.h
@@ -10,7 +10,7 @@
10#ifndef _ASM_ARCH_GPTIMERS_H 10#ifndef _ASM_ARCH_GPTIMERS_H
11#define _ASM_ARCH_GPTIMERS_H 11#define _ASM_ARCH_GPTIMERS_H
12 12
13#include <asm/arch/hardware.h> 13#include <asm/hardware.h>
14 14
15/* 15/*
16 * Layout of L7200 general purpose timer registers 16 * Layout of L7200 general purpose timer registers
diff --git a/include/asm-arm/arch-omap/gpio.h b/include/asm-arm/arch-omap/gpio.h
index 1b3885741ac1..f486b72070ea 100644
--- a/include/asm-arm/arch-omap/gpio.h
+++ b/include/asm-arm/arch-omap/gpio.h
@@ -26,7 +26,7 @@
26#ifndef __ASM_ARCH_OMAP_GPIO_H 26#ifndef __ASM_ARCH_OMAP_GPIO_H
27#define __ASM_ARCH_OMAP_GPIO_H 27#define __ASM_ARCH_OMAP_GPIO_H
28 28
29#include <asm/arch/hardware.h> 29#include <asm/hardware.h>
30#include <asm/arch/irqs.h> 30#include <asm/arch/irqs.h>
31#include <asm/io.h> 31#include <asm/io.h>
32 32
diff --git a/include/asm-arm/arch-omap/irqs.h b/include/asm-arm/arch-omap/irqs.h
index 9779686bdceb..4ffce1d77759 100644
--- a/include/asm-arm/arch-omap/irqs.h
+++ b/include/asm-arm/arch-omap/irqs.h
@@ -260,7 +260,7 @@ extern void omap_init_irq(void);
260 * The definition of NR_IRQS is in board-specific header file, which is 260 * The definition of NR_IRQS is in board-specific header file, which is
261 * included via hardware.h 261 * included via hardware.h
262 */ 262 */
263#include <asm/arch/hardware.h> 263#include <asm/hardware.h>
264 264
265#ifndef NR_IRQS 265#ifndef NR_IRQS
266#define NR_IRQS IH_BOARD_BASE 266#define NR_IRQS IH_BOARD_BASE
diff --git a/include/asm-arm/arch-omap/mcbsp.h b/include/asm-arm/arch-omap/mcbsp.h
index 305bdeb16ab8..e79d98ab2ab6 100644
--- a/include/asm-arm/arch-omap/mcbsp.h
+++ b/include/asm-arm/arch-omap/mcbsp.h
@@ -24,7 +24,7 @@
24#ifndef __ASM_ARCH_OMAP_MCBSP_H 24#ifndef __ASM_ARCH_OMAP_MCBSP_H
25#define __ASM_ARCH_OMAP_MCBSP_H 25#define __ASM_ARCH_OMAP_MCBSP_H
26 26
27#include <asm/arch/hardware.h> 27#include <asm/hardware.h>
28 28
29#define OMAP730_MCBSP1_BASE 0xfffb1000 29#define OMAP730_MCBSP1_BASE 0xfffb1000
30#define OMAP730_MCBSP2_BASE 0xfffb1800 30#define OMAP730_MCBSP2_BASE 0xfffb1800
diff --git a/include/asm-arm/arch-omap/system.h b/include/asm-arm/arch-omap/system.h
index b43cdd2a3874..9af415d2944a 100644
--- a/include/asm-arm/arch-omap/system.h
+++ b/include/asm-arm/arch-omap/system.h
@@ -7,7 +7,7 @@
7#include <linux/config.h> 7#include <linux/config.h>
8#include <asm/mach-types.h> 8#include <asm/mach-types.h>
9#include <asm/hardware/clock.h> 9#include <asm/hardware/clock.h>
10#include <asm/arch/hardware.h> 10#include <asm/hardware.h>
11#include <asm/arch/prcm.h> 11#include <asm/arch/prcm.h>
12 12
13#ifndef CONFIG_MACH_VOICEBLUE 13#ifndef CONFIG_MACH_VOICEBLUE
diff --git a/include/asm-arm/arch-realview/hardware.h b/include/asm-arm/arch-realview/hardware.h
index 67879cdb6ef2..9ca76dc3a7af 100644
--- a/include/asm-arm/arch-realview/hardware.h
+++ b/include/asm-arm/arch-realview/hardware.h
@@ -27,5 +27,6 @@
27 27
28/* macro to get at IO space when running virtually */ 28/* macro to get at IO space when running virtually */
29#define IO_ADDRESS(x) (((x) & 0x0fffffff) + (((x) >> 4) & 0x0f000000) + 0xf0000000) 29#define IO_ADDRESS(x) (((x) & 0x0fffffff) + (((x) >> 4) & 0x0f000000) + 0xf0000000)
30#define __io_address(n) __io(IO_ADDRESS(n))
30 31
31#endif 32#endif
diff --git a/include/asm-arm/arch-realview/system.h b/include/asm-arm/arch-realview/system.h
index 9f8fcbca0869..6f3d0ce0ca1e 100644
--- a/include/asm-arm/arch-realview/system.h
+++ b/include/asm-arm/arch-realview/system.h
@@ -36,7 +36,7 @@ static inline void arch_idle(void)
36 36
37static inline void arch_reset(char mode) 37static inline void arch_reset(char mode)
38{ 38{
39 unsigned int hdr_ctrl = (IO_ADDRESS(REALVIEW_SYS_BASE) + REALVIEW_SYS_RESETCTL_OFFSET); 39 void __iomem *hdr_ctrl = __io_address(REALVIEW_SYS_BASE) + REALVIEW_SYS_RESETCTL_OFFSET;
40 unsigned int val; 40 unsigned int val;
41 41
42 /* 42 /*
diff --git a/include/asm-arm/arch-rpc/system.h b/include/asm-arm/arch-rpc/system.h
index ca3277d1d5ea..729c2ae4b513 100644
--- a/include/asm-arm/arch-rpc/system.h
+++ b/include/asm-arm/arch-rpc/system.h
@@ -7,7 +7,7 @@
7 * it under the terms of the GNU General Public License version 2 as 7 * it under the terms of the GNU General Public License version 2 as
8 * published by the Free Software Foundation. 8 * published by the Free Software Foundation.
9 */ 9 */
10#include <asm/arch/hardware.h> 10#include <asm/hardware.h>
11#include <asm/hardware/iomd.h> 11#include <asm/hardware/iomd.h>
12#include <asm/io.h> 12#include <asm/io.h>
13 13
diff --git a/include/asm-arm/arch-sa1100/memory.h b/include/asm-arm/arch-sa1100/memory.h
index 0fc555b4c912..018a9f0e3986 100644
--- a/include/asm-arm/arch-sa1100/memory.h
+++ b/include/asm-arm/arch-sa1100/memory.h
@@ -18,20 +18,10 @@
18#ifndef __ASSEMBLY__ 18#ifndef __ASSEMBLY__
19 19
20#ifdef CONFIG_SA1111 20#ifdef CONFIG_SA1111
21static inline void 21void sa1111_adjust_zones(int node, unsigned long *size, unsigned long *holes);
22__arch_adjust_zones(int node, unsigned long *size, unsigned long *holes)
23{
24 unsigned int sz = SZ_1M >> PAGE_SHIFT;
25
26 if (node != 0)
27 sz = 0;
28
29 size[1] = size[0] - sz;
30 size[0] = sz;
31}
32 22
33#define arch_adjust_zones(node, size, holes) \ 23#define arch_adjust_zones(node, size, holes) \
34 __arch_adjust_zones(node, size, holes) 24 sa1111_adjust_zones(node, size, holes)
35 25
36#define ISA_DMA_THRESHOLD (PHYS_OFFSET + SZ_1M - 1) 26#define ISA_DMA_THRESHOLD (PHYS_OFFSET + SZ_1M - 1)
37 27
diff --git a/include/asm-arm/atomic.h b/include/asm-arm/atomic.h
index 75b802719723..d586f65c8228 100644
--- a/include/asm-arm/atomic.h
+++ b/include/asm-arm/atomic.h
@@ -12,6 +12,7 @@
12#define __ASM_ARM_ATOMIC_H 12#define __ASM_ARM_ATOMIC_H
13 13
14#include <linux/config.h> 14#include <linux/config.h>
15#include <linux/compiler.h>
15 16
16typedef struct { volatile int counter; } atomic_t; 17typedef struct { volatile int counter; } atomic_t;
17 18
@@ -82,11 +83,12 @@ static inline int atomic_sub_return(int i, atomic_t *v)
82 83
83static inline int atomic_cmpxchg(atomic_t *ptr, int old, int new) 84static inline int atomic_cmpxchg(atomic_t *ptr, int old, int new)
84{ 85{
85 u32 oldval, res; 86 unsigned long oldval, res;
86 87
87 do { 88 do {
88 __asm__ __volatile__("@ atomic_cmpxchg\n" 89 __asm__ __volatile__("@ atomic_cmpxchg\n"
89 "ldrex %1, [%2]\n" 90 "ldrex %1, [%2]\n"
91 "mov %0, #0\n"
90 "teq %1, %3\n" 92 "teq %1, %3\n"
91 "strexeq %0, %4, [%2]\n" 93 "strexeq %0, %4, [%2]\n"
92 : "=&r" (res), "=&r" (oldval) 94 : "=&r" (res), "=&r" (oldval)
diff --git a/include/asm-arm/bitops.h b/include/asm-arm/bitops.h
index e007dd990da5..7399d431edfe 100644
--- a/include/asm-arm/bitops.h
+++ b/include/asm-arm/bitops.h
@@ -19,6 +19,7 @@
19 19
20#ifdef __KERNEL__ 20#ifdef __KERNEL__
21 21
22#include <linux/compiler.h>
22#include <asm/system.h> 23#include <asm/system.h>
23 24
24#define smp_mb__before_clear_bit() mb() 25#define smp_mb__before_clear_bit() mb()
diff --git a/include/asm-arm/hardware/dec21285.h b/include/asm-arm/hardware/dec21285.h
index 9049f0ddaecf..6685e3fb97b1 100644
--- a/include/asm-arm/hardware/dec21285.h
+++ b/include/asm-arm/hardware/dec21285.h
@@ -20,7 +20,7 @@
20 20
21#include <linux/config.h> 21#include <linux/config.h>
22#ifndef __ASSEMBLY__ 22#ifndef __ASSEMBLY__
23#include <asm/arch/hardware.h> 23#include <asm/hardware.h>
24#define DC21285_IO(x) ((volatile unsigned long *)(ARMCSR_BASE+(x))) 24#define DC21285_IO(x) ((volatile unsigned long *)(ARMCSR_BASE+(x)))
25#else 25#else
26#define DC21285_IO(x) (x) 26#define DC21285_IO(x) (x)
diff --git a/include/asm-arm/mmu_context.h b/include/asm-arm/mmu_context.h
index 3d4b810d8c38..81c59facea3b 100644
--- a/include/asm-arm/mmu_context.h
+++ b/include/asm-arm/mmu_context.h
@@ -13,6 +13,7 @@
13#ifndef __ASM_ARM_MMU_CONTEXT_H 13#ifndef __ASM_ARM_MMU_CONTEXT_H
14#define __ASM_ARM_MMU_CONTEXT_H 14#define __ASM_ARM_MMU_CONTEXT_H
15 15
16#include <linux/compiler.h>
16#include <asm/cacheflush.h> 17#include <asm/cacheflush.h>
17#include <asm/proc-fns.h> 18#include <asm/proc-fns.h>
18 19
diff --git a/include/asm-arm/system.h b/include/asm-arm/system.h
index 8efa4ebdcacb..5621d61ebc07 100644
--- a/include/asm-arm/system.h
+++ b/include/asm-arm/system.h
@@ -93,8 +93,6 @@ void hook_fault_code(int nr, int (*fn)(unsigned long, unsigned int,
93 struct pt_regs *), 93 struct pt_regs *),
94 int sig, const char *name); 94 int sig, const char *name);
95 95
96#include <asm/proc-fns.h>
97
98#define xchg(ptr,x) \ 96#define xchg(ptr,x) \
99 ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr)))) 97 ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
100 98
@@ -102,6 +100,8 @@ void hook_fault_code(int nr, int (*fn)(unsigned long, unsigned int,
102 100
103extern asmlinkage void __backtrace(void); 101extern asmlinkage void __backtrace(void);
104extern asmlinkage void c_backtrace(unsigned long fp, int pmode); 102extern asmlinkage void c_backtrace(unsigned long fp, int pmode);
103
104struct mm_struct;
105extern void show_pte(struct mm_struct *mm, unsigned long addr); 105extern void show_pte(struct mm_struct *mm, unsigned long addr);
106extern void __show_regs(struct pt_regs *); 106extern void __show_regs(struct pt_regs *);
107 107
diff --git a/include/asm-arm/thread_info.h b/include/asm-arm/thread_info.h
index 8252a4cd860f..7c98557b717f 100644
--- a/include/asm-arm/thread_info.h
+++ b/include/asm-arm/thread_info.h
@@ -12,6 +12,7 @@
12 12
13#ifdef __KERNEL__ 13#ifdef __KERNEL__
14 14
15#include <linux/compiler.h>
15#include <asm/fpstate.h> 16#include <asm/fpstate.h>
16 17
17#define THREAD_SIZE_ORDER 1 18#define THREAD_SIZE_ORDER 1
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-01 18:42:50 -0500