Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
6a48e1ca
Commit
6a48e1ca
authored
Jan 16, 2003
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge
bk://bk.arm.linux.org.uk
into home.transmeta.com:/home/torvalds/v2.5/linux
parents
7f5ea7bc
5c157415
Changes
9
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
195 additions
and
470 deletions
+195
-470
arch/arm/kernel/bios32.c
arch/arm/kernel/bios32.c
+1
-1
arch/arm/kernel/process.c
arch/arm/kernel/process.c
+2
-1
arch/arm/tools/mach-types
arch/arm/tools/mach-types
+10
-2
drivers/acorn/block/fd1772.c
drivers/acorn/block/fd1772.c
+26
-12
drivers/ide/Kconfig
drivers/ide/Kconfig
+1
-1
drivers/video/Makefile
drivers/video/Makefile
+2
-2
drivers/video/acornfb.c
drivers/video/acornfb.c
+148
-446
drivers/video/sa1100fb.h
drivers/video/sa1100fb.h
+1
-3
include/asm-arm/arch-integrator/memory.h
include/asm-arm/arch-integrator/memory.h
+4
-2
No files found.
arch/arm/kernel/bios32.c
View file @
6a48e1ca
...
...
@@ -11,7 +11,7 @@
#include <linux/slab.h>
#include <linux/init.h>
#include <asm/
page.h>
/* for BUG() */
#include <asm/
bug.h>
#include <asm/io.h>
#include <asm/irq.h>
#include <asm/mach-types.h>
...
...
arch/arm/kernel/process.c
View file @
6a48e1ca
...
...
@@ -91,15 +91,16 @@ void default_idle(void)
void
cpu_idle
(
void
)
{
/* endless idle loop with no priority at all */
preempt_disable
();
while
(
1
)
{
void
(
*
idle
)(
void
)
=
pm_idle
;
if
(
!
idle
)
idle
=
default_idle
;
preempt_disable
();
leds_event
(
led_idle_start
);
while
(
!
need_resched
())
idle
();
leds_event
(
led_idle_end
);
preempt_enable
();
schedule
();
}
}
...
...
arch/arm/tools/mach-types
View file @
6a48e1ca
...
...
@@ -6,7 +6,7 @@
# To add an entry into this database, please see Documentation/arm/README,
# or contact rmk@arm.linux.org.uk
#
# Last update: Mon
Dec 23 18:49:04 2002
# Last update: Mon
Jan 13 22:55:16 2003
#
# machine_is_xxx CONFIG_xxxx MACH_TYPE_xxx number
#
...
...
@@ -198,7 +198,7 @@ omaha ARCH_OMAHA OMAHA 186
ta7 ARCH_TA7 TA7 187
nova SA1100_NOVA NOVA 188
hmk ARCH_HMK HMK 189
inphinity ARCH_INPHINITY INPHINITY
190
karo ARCH_KARO KARO
190
fester SA1100_FESTER FESTER 191
gpi ARCH_GPI GPI 192
smdk2410 ARCH_SMDK2410 SMDK2410 193
...
...
@@ -273,3 +273,11 @@ prpmc1100 ARCH_PRPMC1100 PRPMC1100 261
at91rm9200dk ARCH_AT91RM9200DK AT91RM9200DK 262
armstick ARCH_ARMSTICK ARMSTICK 263
armonie ARCH_ARMONIE ARMONIE 264
mport1 ARCH_MPORT1 MPORT1 265
s3c5410 ARCH_S3C5410 S3C5410 266
zcp320a ARCH_ZCP320A ZCP320A 267
i_box ARCH_I_BOX I_BOX 268
stlc1502 ARCH_STLC1502 STLC1502 269
siren ARCH_SIREN SIREN 270
greenlake ARCH_GREENLAKE GREENLAKE 271
argus ARCH_ARGUS ARGUS 272
drivers/acorn/block/fd1772.c
View file @
6a48e1ca
...
...
@@ -1528,7 +1528,7 @@ static struct gendisk *floppy_find(dev_t dev, int *part, void *data)
int
fd1772_init
(
void
)
{
static
spinlock_t
lock
=
SPIN_LOCK_UNLOCKED
;
int
i
;
int
i
,
err
=
-
ENOMEM
;
if
(
!
machine_is_archimedes
())
return
0
;
...
...
@@ -1536,27 +1536,25 @@ int fd1772_init(void)
for
(
i
=
0
;
i
<
FD_MAX_UNITS
;
i
++
)
{
disks
[
i
]
=
alloc_disk
(
1
);
if
(
!
disks
[
i
])
goto
out
;
goto
err_disk
;
}
if
(
register_blkdev
(
MAJOR_NR
,
"fd"
,
&
floppy_fops
))
{
err
=
register_blkdev
(
MAJOR_NR
,
"fd"
,
&
floppy_fops
);
if
(
err
)
{
printk
(
"Unable to get major %d for floppy
\n
"
,
MAJOR_NR
);
goto
out
;
goto
err_disk
;
}
err
=
-
EBUSY
;
if
(
request_dma
(
FLOPPY_DMA
,
"fd1772"
))
{
printk
(
"Unable to grab DMA%d for the floppy (1772) driver
\n
"
,
FLOPPY_DMA
);
unregister_blkdev
(
MAJOR_NR
,
"fd"
);
goto
out
;
goto
err_blkdev
;
};
if
(
request_dma
(
FIQ_FD1772
,
"fd1772 end"
))
{
printk
(
"Unable to grab DMA%d for the floppy (1772) driver
\n
"
,
FIQ_FD1772
);
unregister_blkdev
(
MAJOR_NR
,
"fd"
);
free_dma
(
FLOPPY_DMA
);
goto
out
;
goto
err_dma1
;
};
enable_dma
(
FIQ_FD1772
);
/* This inserts a call to our command end routine */
/* initialize variables */
SelectedDrive
=
-
1
;
...
...
@@ -1570,6 +1568,12 @@ int fd1772_init(void)
out of some special memory... */
DMABuffer
=
(
char
*
)
kmalloc
(
2048
);
/* Copes with pretty large sectors */
#endif
err
=
-
ENOMEM
;
if
(
!
DMAbuffer
)
goto
err_dma2
;
enable_dma
(
FIQ_FD1772
);
/* This inserts a call to our command end routine */
blk_init_queue
(
&
floppy_queue
,
do_fd_request
,
&
lock
);
for
(
i
=
0
;
i
<
FD_MAX_UNITS
;
i
++
)
{
unit
[
i
].
track
=
-
1
;
...
...
@@ -1590,8 +1594,18 @@ int fd1772_init(void)
config_types
();
return
0
;
out:
err_dma2:
free_dma
(
FIQ_FD1772
);
err_dma1:
free_dma
(
FLOPPY_DMA
);
err_blkdev:
unregister_blkdev
(
MAJOR_NR
,
"fd"
);
err_disk:
while
(
i
--
)
put_disk
(
disks
[
i
]);
return
1
;
return
err
;
}
drivers/ide/Kconfig
View file @
6a48e1ca
...
...
@@ -376,7 +376,7 @@ config IDEDMA_ONLYDISK
config BLK_DEV_IDEDMA
bool
depends on BLK_DEV_IDE
default BLK_DEV_IDEDMA_ICS if AR
M
default BLK_DEV_IDEDMA_ICS if AR
CH_ACORN
default BLK_DEV_IDEDMA_PMAC if ALL_PPC && BLK_DEV_IDE_PMAC
default BLK_DEV_IDEDMA_PCI if PCI && BLK_DEV_IDEPCI
...
...
drivers/video/Makefile
View file @
6a48e1ca
...
...
@@ -18,7 +18,7 @@ ifeq ($(CONFIG_FB),y)
obj-$(CONFIG_PPC)
+=
macmodes.o
endif
obj-$(CONFIG_FB_ACORN)
+=
acornfb.o
obj-$(CONFIG_FB_ACORN)
+=
acornfb.o
cfbfillrect.o cfbcopyarea.o cfbimgblt.o
obj-$(CONFIG_FB_AMIGA)
+=
amifb.o
obj-$(CONFIG_FB_PM2)
+=
pm2fb.o
obj-$(CONFIG_FB_PM3)
+=
pm3fb.o
...
...
@@ -77,7 +77,7 @@ obj-$(CONFIG_FB_I810) += i810/ cfbfillrect.o cfbcopyarea.o \
obj-$(CONFIG_FB_SUN3)
+=
sun3fb.o
obj-$(CONFIG_FB_HGA)
+=
hgafb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
obj-$(CONFIG_FB_SA1100)
+=
sa1100fb.o
obj-$(CONFIG_FB_SA1100)
+=
sa1100fb.o
cfbfillrect.o cfbcopyarea.o cfbimgblt.o
obj-$(CONFIG_FB_VIRTUAL)
+=
vfb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
obj-$(CONFIG_FB_HIT)
+=
hitfb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
obj-$(CONFIG_FB_E1355)
+=
epson1355fb.o
...
...
drivers/video/acornfb.c
View file @
6a48e1ca
This diff is collapsed.
Click to expand it.
drivers/video/sa1100fb.h
View file @
6a48e1ca
...
...
@@ -103,9 +103,6 @@ struct sa1100fb_info {
wait_queue_head_t
ctrlr_wait
;
struct
work_struct
task
;
#ifdef CONFIG_PM
struct
pm_dev
*
pm
;
#endif
#ifdef CONFIG_CPU_FREQ
struct
notifier_block
freq_transition
;
struct
notifier_block
freq_policy
;
...
...
@@ -128,6 +125,7 @@ struct sa1100fb_info {
#define C_REENABLE (4)
#define C_DISABLE_PM (5)
#define C_ENABLE_PM (6)
#define C_STARTUP (7)
#define SA1100_NAME "SA1100"
...
...
include/asm-arm/arch-integrator/memory.h
View file @
6a48e1ca
...
...
@@ -46,6 +46,8 @@
#define __phys_to_virt__is_a_macro
#define __phys_to_virt(ppage) ((ppage) + PAGE_OFFSET)
#define BUS_OFFSET (0x80000000UL)
/*
* Virtual view <-> DMA view memory address translations
* virt_to_bus: Used to translate the virtual address to an
...
...
@@ -54,8 +56,8 @@
* to an address that the kernel can use.
*/
#define __virt_to_bus__is_a_macro
#define __virt_to_bus(x) (x - PAGE_OFFSET +
INTEGRATOR_HDR0_SDRAM_BASE
)
#define __virt_to_bus(x) (x - PAGE_OFFSET +
BUS_OFFSET
)
#define __bus_to_virt__is_a_macro
#define __bus_to_virt(x) (x -
INTEGRATOR_HDR0_SDRAM_BASE
+ PAGE_OFFSET)
#define __bus_to_virt(x) (x -
BUS_OFFSET
+ PAGE_OFFSET)
#endif
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment