Menu
▾
▴
linux-apus-devel
You can subscribe to this list here.
| 2000 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(210) |
Jun
(169) |
Jul
(167) |
Aug
(128) |
Sep
(218) |
Oct
(120) |
Nov
(86) |
Dec
(71) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2001 |
Jan
(91) |
Feb
(179) |
Mar
(52) |
Apr
(56) |
May
(183) |
Jun
(62) |
Jul
(63) |
Aug
(49) |
Sep
(36) |
Oct
(35) |
Nov
(72) |
Dec
(30) |
| 2002 |
Jan
(53) |
Feb
(61) |
Mar
(56) |
Apr
(13) |
May
(1) |
Jun
(7) |
Jul
(80) |
Aug
(73) |
Sep
(30) |
Oct
(29) |
Nov
(8) |
Dec
(40) |
| 2003 |
Jan
(10) |
Feb
(2) |
Mar
(4) |
Apr
(9) |
May
(3) |
Jun
(19) |
Jul
(64) |
Aug
(53) |
Sep
(28) |
Oct
(7) |
Nov
(3) |
Dec
(21) |
| 2004 |
Jan
(11) |
Feb
(30) |
Mar
(18) |
Apr
(1) |
May
(13) |
Jun
(18) |
Jul
(13) |
Aug
|
Sep
(9) |
Oct
(5) |
Nov
|
Dec
|
| 2005 |
Jan
(1) |
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(10) |
Aug
(21) |
Sep
(7) |
Oct
(10) |
Nov
(6) |
Dec
|
| 2006 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
(2) |
Aug
(2) |
Sep
(6) |
Oct
(10) |
Nov
(8) |
Dec
(3) |
| 2007 |
Jan
(3) |
Feb
(6) |
Mar
(1) |
Apr
(6) |
May
(10) |
Jun
(7) |
Jul
(13) |
Aug
(8) |
Sep
|
Oct
(2) |
Nov
|
Dec
|
|
From: Tom R. <tr...@ke...> - 2004-09-26 21:03:07
|
On Sun, Sep 26, 2004 at 08:42:38PM +0200, Geert Uytterhoeven wrote: > On Sat, 25 Sep 2004, GOTO Masanori wrote: > > At Sat, 25 Sep 2004 11:58:56 +1000, > > Benjamin Herrenschmidt wrote: > > > On Sat, 2004-09-25 at 11:44, GOTO Masanori wrote: > > > > At Wed, 15 Sep 2004 14:51:00 -0500, > > > > Stephen R. Marenka <sma...@de...> wrote: > > > > > asm/setup.h contains #include <asm-m68k/setup.h>, > > > > > which is non-existent on ppc. > > > > > > > > Then what's the problem? I guess you didn't get any problems; if so I > > > > close this bug. > > > > > > > > BTW, PPC guys, is it intentional to include asm-m68k/setup.h in > > > > /usr/include/asm-ppc/setup.h ? At a glance, we have no need to > > > > include this header in setup.h. > > > > > > This is historically used by the APUS platform, which I think is an m68k > > > amiga with a ppc CPU stucked in it, but then, ask Geert, he'll know > > > better. > > > > Thanks for your reply. Geert, is it APUS still alive? If so, I guess > > asm-m68k/setup.h is necessary for asm-ppc/setup.h. > > Yes, AFAIK APUS is still alive. Hmmm.. How many of these <asm-ppc/foo.h> #includes <asm-m68k/foo.h> (or #else's them in) does glibc (or really, any non-kernel user) need? Would someone have the time to try casing all of these inside of #ifdef __KERNEL__ ? I've finished doing similar for SH recently (asm/cpu/ and asm/mach/ symlinks in this case) and found none of it was really needed. -- Tom Rini http://gate.crashing.org/~trini/ |
|
From: Sven L. <sve...@wa...> - 2004-09-26 19:16:03
|
On Sun, Sep 26, 2004 at 08:42:38PM +0200, Geert Uytterhoeven wrote: > On Sat, 25 Sep 2004, GOTO Masanori wrote: > > At Sat, 25 Sep 2004 11:58:56 +1000, > > Benjamin Herrenschmidt wrote: > > > On Sat, 2004-09-25 at 11:44, GOTO Masanori wrote: > > > > At Wed, 15 Sep 2004 14:51:00 -0500, > > > > Stephen R. Marenka <sma...@de...> wrote: > > > > > asm/setup.h contains #include <asm-m68k/setup.h>, > > > > > which is non-existent on ppc. > > > > > > > > Then what's the problem? I guess you didn't get any problems; if so I > > > > close this bug. > > > > > > > > BTW, PPC guys, is it intentional to include asm-m68k/setup.h in > > > > /usr/include/asm-ppc/setup.h ? At a glance, we have no need to > > > > include this header in setup.h. > > > > > > This is historically used by the APUS platform, which I think is an m68k > > > amiga with a ppc CPU stucked in it, but then, ask Geert, he'll know > > > better. > > > > Thanks for your reply. Geert, is it APUS still alive? If so, I guess > > asm-m68k/setup.h is necessary for asm-ppc/setup.h. > > Yes, AFAIK APUS is still alive. Indeed, and thanks to Roman, we should even ressurect debian support for it for sarge :) Friendly, Sven Luther |
|
From: Geert U. <ge...@li...> - 2004-09-26 18:43:11
|
On Sat, 25 Sep 2004, GOTO Masanori wrote:
> At Sat, 25 Sep 2004 11:58:56 +1000,
> Benjamin Herrenschmidt wrote:
> > On Sat, 2004-09-25 at 11:44, GOTO Masanori wrote:
> > > At Wed, 15 Sep 2004 14:51:00 -0500,
> > > Stephen R. Marenka <sma...@de...> wrote:
> > > > asm/setup.h contains #include <asm-m68k/setup.h>,
> > > > which is non-existent on ppc.
> > >
> > > Then what's the problem? I guess you didn't get any problems; if so I
> > > close this bug.
> > >
> > > BTW, PPC guys, is it intentional to include asm-m68k/setup.h in
> > > /usr/include/asm-ppc/setup.h ? At a glance, we have no need to
> > > include this header in setup.h.
> >
> > This is historically used by the APUS platform, which I think is an m68k
> > amiga with a ppc CPU stucked in it, but then, ask Geert, he'll know
> > better.
>
> Thanks for your reply. Geert, is it APUS still alive? If so, I guess
> asm-m68k/setup.h is necessary for asm-ppc/setup.h.
Yes, AFAIK APUS is still alive.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- ge...@li...
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
|
|
From: Roman Z. <zi...@us...> - 2004-09-25 23:43:42
|
CVSROOT: /cvsroot/linux-apus
Module name: 2.6
Repository: ./
Changes by: zi...@sc....(none) 04/09/25 16:43:35
Log message:
conflict fixes from import of 2.6.8.1
Modified files:
./:
Makefile
Revision Changes Path
1.11 +1 -1 2.6/Makefile
|
|
From: Roman Z. <zi...@us...> - 2004-09-25 22:31:51
|
CVSROOT: /cvsroot/linux-apus Module name: 2.6 Repository: ./ Changes by: zi...@sc....(none) 04/09/25 15:31:44 2.6 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3043 Log Message: import native 2.6.8.1 Status: Vendor Tag: linux Release Tags: linux-2_6_8_1 C 2.6/Makefile 1 conflicts created by this import. cvs checkout -jlinux:yesterday -jlinux 2.6 |
|
From: Roman Z. <zi...@us...> - 2004-09-25 21:10:07
|
CVSROOT: /cvsroot/linux-apus
Module name: 2.6
Repository: 2.6/sound/isa/cs423x/
Changes by: zi...@sc....(none) 04/09/25 14:09:59
Log message:
conflict fixes from import of 2.6.8
Modified files:
./:
Makefile
2.6/arch/ppc/:
Makefile defconfig
2.6/arch/ppc/configs/:
apus_defconfig
2.6/arch/ppc/kernel/:
Makefile entry.S head.S misc.S ppc_ksyms.c setup.c time.c
2.6/arch/ppc/mm/:
Makefile init.c pgtable.c
2.6/include/asm-ppc/:
io.h machdep.h pgtable.h
2.6/include/video/:
vga.h
Added files:
2.6/arch/mips/pmc-sierra/yosemite/:
i2c-yosemite.c
Removed files:
2.6/Documentation/:
as-iosched.txt
2.6/Documentation/i2c/:
i2c-pport i2c-velleman
2.6/arch/arm/boot/compressed/:
head-ftvpci.S
2.6/arch/arm/common/:
platform.c plx90x0.c
2.6/arch/arm/configs/:
adi_evb_defconfig
2.6/arch/arm/kernel/:
time-acorn.c
2.6/arch/arm/mach-adifcc/:
Makefile arch.c irq.c mm.c
2.6/arch/arm/mach-ftvpci/:
Makefile core.c leds.c pci.c
2.6/arch/arm/mach-lh7a40x/:
fiq.S ide-lpd7a40x.c
2.6/arch/arm/mach-tbox/:
Makefile core.c
2.6/arch/i386/boot98/:
Makefile bootsect.S install.sh mtools.conf.in setup.S
video.S
2.6/arch/i386/boot98/compressed/:
Makefile head.S misc.c vmlinux.scr
2.6/arch/i386/boot98/tools/:
build.c
2.6/arch/i386/kernel/:
std_resources.c
2.6/arch/i386/mach-pc9800/:
Makefile setup.c std_resources.c topology.c
2.6/arch/mips/configs/:
eagle_defconfig
2.6/arch/mips/mm/:
tlbex-r3k.S
2.6/arch/mips/mm-32/:
Makefile tlbex-r4k.S
2.6/arch/mips/mm-64/:
Makefile tlb-dbg-r4k.c tlb-glue-r4k.S tlb-glue-sb1.S
tlbex-r4k.S
2.6/arch/mips/momentum/ocelot_c/:
pci-irq.c
2.6/arch/mips/momentum/ocelot_g/:
gt64240.h gt64240_dep.h pci-irq.c
2.6/arch/mips/pci/:
fixup-eagle.c fixup-mv64340.c fixup-tb0229.c
fixup-victor-mpc30x.c ops-mv64340.c ops-vrc4173.c
2.6/arch/mips/vr41xx/nec-eagle/:
Makefile irq.c setup.c
2.6/arch/mips/vr41xx/tanbac-tb0229/:
reboot.c
2.6/arch/ppc/8260_io/:
commproc.c uart.c
2.6/arch/ppc/kernel/:
pci-dma.c
2.6/arch/ppc/platforms/:
error_log.c error_log.h proc_rtas.c rpxsuper.h
2.6/arch/ppc/syslib/:
ppc8260_pic.c ppc8260_pic.h
2.6/arch/sh/boards/systemh/:
Makefile io.c irq.c setup.c
2.6/arch/sparc64/lib/:
blockops.S
2.6/drivers/block/:
carmel.c floppy98.c
2.6/drivers/char/:
h8.c h8.h lp_old98.c sn_serial.c upd4990a.c
2.6/drivers/ide/legacy/:
hd98.c pc9800.c
2.6/drivers/input/keyboard/:
98kbd.c
2.6/drivers/input/misc/:
98spkr.c
2.6/drivers/input/mouse/:
98busmouse.c
2.6/drivers/input/serio/:
98kbd-io.c
2.6/drivers/mtd/nand/:
nand.c
2.6/drivers/net/:
ne2k_cbus.c ne2k_cbus.h
2.6/drivers/s390/cio/:
requestirq.c
2.6/drivers/scsi/:
pc980155.c pc980155.h scsi_pc98.c
2.6/drivers/scsi/qla2xxx/:
qla_os.h
2.6/drivers/serial/:
8250_hcdp.c 8250_hcdp.h serial98.c
2.6/drivers/usb/media/:
w9968cf_externaldef.h
2.6/fs/partitions/:
nec98.c nec98.h
2.6/include/asm-alpha/:
cpumask.h init.h
2.6/include/asm-arm/:
cpumask.h
2.6/include/asm-arm/arch-adifcc/:
adi_evb.h dma.h hardware.h io.h irqs.h memory.h param.h
serial.h system.h time.h timex.h uncompress.h vmalloc.h
2.6/include/asm-arm/arch-cl7500/:
time.h
2.6/include/asm-arm/arch-ebsa110/:
time.h
2.6/include/asm-arm/arch-ebsa285/:
time.h
2.6/include/asm-arm/arch-epxa10db/:
time.h
2.6/include/asm-arm/arch-iop3xx/:
time.h
2.6/include/asm-arm/arch-ixp4xx/:
time.h
2.6/include/asm-arm/arch-lh7a40x/:
ide.h time.h
2.6/include/asm-arm/arch-nexuspci/:
dma.h hardware.h io.h irqs.h memory.h param.h system.h
time.h timex.h uncompress.h vmalloc.h
2.6/include/asm-arm/arch-omap/:
time.h
2.6/include/asm-arm/arch-pxa/:
time.h
2.6/include/asm-arm/arch-rpc/:
time.h
2.6/include/asm-arm/arch-s3c2410/:
time.h
2.6/include/asm-arm/arch-sa1100/:
time.h
2.6/include/asm-arm/arch-shark/:
time.h
2.6/include/asm-arm/arch-tbox/:
dma.h hardware.h io.h irqs.h memory.h param.h serial.h
system.h time.h timex.h uncompress.h vmalloc.h
2.6/include/asm-arm/arch-versatile/:
time.h
2.6/include/asm-arm26/:
cpumask.h
2.6/include/asm-cris/:
cpumask.h
2.6/include/asm-generic/:
cpumask.h cpumask_arith.h cpumask_array.h
cpumask_const_reference.h cpumask_const_value.h
cpumask_up.h
2.6/include/asm-h8300/:
cpumask.h h8300_ne.h init.h
2.6/include/asm-i386/:
cpumask.h init.h pc9800.h pc9800_sca.h std_resources.h
upd4990a.h
2.6/include/asm-i386/mach-pc9800/:
apm.h bios_ebda.h do_timer.h io_ports.h irq_vectors.h
mach_reboot.h mach_time.h mach_timer.h mach_traps.h
mach_wakecpu.h pci-functions.h setup_arch_post.h
setup_arch_pre.h smpboot_hooks.h
2.6/include/asm-ia64/:
cpumask.h
2.6/include/asm-m68k/:
cpumask.h init.h
2.6/include/asm-m68knommu/:
cpumask.h init.h
2.6/include/asm-mips/:
cpumask.h init.h
2.6/include/asm-mips/vr41xx/:
eagle.h tb0229.h
2.6/include/asm-parisc/:
cpumask.h
2.6/include/asm-ppc/:
cpm_8260.h cpumask.h immap_8260.h ppc405_dma.h
2.6/include/asm-ppc64/:
cpumask.h init.h
2.6/include/asm-s390/:
cpumask.h init.h
2.6/include/asm-sh/:
cpumask.h init.h
2.6/include/asm-sparc/:
cpumask.h init.h
2.6/include/asm-sparc64/:
cpumask.h init.h
2.6/include/asm-um/:
cpumask.h init.h
2.6/include/asm-v850/:
cpumask.h
2.6/include/asm-x86_64/:
cpumask.h init.h
2.6/include/linux/:
802_11.h acpi_serial.h adb_mouse.h atapi.h fsfilter.h
in_systm.h isdn_lzscomp.h mpp.h netbeui.h netfilter_ddp.h
netfilter_ipx.h netfilter_x25.h upd4990a.h
2.6/net/irda/:
crc.c
2.6/net/sched/:
sch_csz.c sch_delay.c
2.6/net/xfrm/:
xfrm_output.c
2.6/scripts/:
empty.c file2alias.c mk_elfconfig.c mkconfigs mkspec
modpost.c modpost.h sumversion.c
2.6/sound/isa/cs423x/:
pc98.c pc9801_118_magic.h sound_pc9800.h
Revision Changes Path
1.10 +92 -72 2.6/Makefile
1.4 +37 -10 2.6/arch/ppc/Makefile
1.9 +32 -11 2.6/arch/ppc/defconfig
1.9 +32 -11 2.6/arch/ppc/configs/apus_defconfig
1.6 +1 -7 2.6/arch/ppc/kernel/Makefile
1.6 +24 -12 2.6/arch/ppc/kernel/entry.S
1.8 +3 -3 2.6/arch/ppc/kernel/head.S
1.8 +55 -3 2.6/arch/ppc/kernel/misc.S
1.8 +5 -4 2.6/arch/ppc/kernel/ppc_ksyms.c
1.7 +58 -4 2.6/arch/ppc/kernel/setup.c
1.4 +15 -7 2.6/arch/ppc/kernel/time.c
1.5 +1 -4 2.6/arch/ppc/mm/Makefile
1.5 +7 -1 2.6/arch/ppc/mm/init.c
1.7 +32 -0 2.6/arch/ppc/mm/pgtable.c
1.8 +17 -2 2.6/include/asm-ppc/io.h
1.6 +2 -1 2.6/include/asm-ppc/machdep.h
1.6 +37 -0 2.6/include/asm-ppc/pgtable.h
1.3 +7 -1 2.6/include/video/vga.h
|
|
From: Roman Z. <zi...@us...> - 2004-09-25 16:14:10
|
CVSROOT: /cvsroot/linux-apus Module name: 2.6 Repository: ./ Changes by: zi...@sc....(none) 04/09/25 09:14:02 2.6 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17926 Log Message: import native 2.6.8 Status: Vendor Tag: linux Release Tags: linux-2_6_8 C 2.6/Makefile N 2.6/Documentation/hpet.txt N 2.6/Documentation/arm/VFP/release-notes.txt N 2.6/Documentation/arm/Sharp-LH/SDRAM N 2.6/Documentation/block/as-iosched.txt N 2.6/Documentation/block/deadline-iosched.txt N 2.6/Documentation/fb/sisfb.txt N 2.6/Documentation/filesystems/automount-support.txt N 2.6/Documentation/i2c/i2c-parport N 2.6/Documentation/powerpc/hvcs.txt N 2.6/Documentation/powerpc/mpc52xx.txt N 2.6/Documentation/usb/sn9c102.txt N 2.6/Documentation/device-mapper/dm-io.txt N 2.6/Documentation/device-mapper/kcopyd.txt N 2.6/Documentation/device-mapper/linear.txt N 2.6/Documentation/device-mapper/striped.txt N 2.6/Documentation/device-mapper/zero.txt N 2.6/arch/arm/boot/bootp/initrd.S N 2.6/arch/arm/boot/bootp/kernel.S N 2.6/arch/arm/boot/compressed/piggy.S N 2.6/arch/arm/common/time-acorn.c N 2.6/arch/arm/common/locomo.c N 2.6/arch/arm/vfp/Makefile N 2.6/arch/arm/vfp/entry.S N 2.6/arch/arm/vfp/vfp.h N 2.6/arch/arm/vfp/vfpdouble.c N 2.6/arch/arm/vfp/vfphw.S N 2.6/arch/arm/vfp/vfpinstr.h N 2.6/arch/arm/vfp/vfpmodule.c N 2.6/arch/arm/vfp/vfpsingle.c N 2.6/arch/arm/mach-lh7a40x/time.c N 2.6/arch/arm/mach-footbridge/time.c N 2.6/arch/arm/mach-integrator/clock.c N 2.6/arch/arm/mach-integrator/clock.h N 2.6/arch/arm/mach-pxa/time.c N 2.6/arch/arm/mach-sa1100/collie.c N 2.6/arch/arm/mach-sa1100/time.c N 2.6/arch/arm/mach-omap/time.c N 2.6/arch/arm/mach-s3c2410/gpio.c N 2.6/arch/arm/mach-s3c2410/time.c N 2.6/arch/arm/mach-versatile/clock.c N 2.6/arch/arm/mach-versatile/clock.h N 2.6/arch/i386/crypto/Makefile N 2.6/arch/i386/crypto/aes-i586-asm.S N 2.6/arch/i386/crypto/aes.c N 2.6/arch/i386/lib/bitops.c N 2.6/arch/mips/kernel/module.c N 2.6/arch/mips/mm/tlb-r8k.c N 2.6/arch/mips/mm/tlb64-glue-r4k.S N 2.6/arch/mips/mm/tlb64-glue-sb1.S N 2.6/arch/mips/mm/tlbex32-r3k.S N 2.6/arch/mips/mm/tlbex32-r4k.S N 2.6/arch/mips/mm/tlbex64-r4k.S N 2.6/arch/mips/pci/fixup-jaguar.c N 2.6/arch/mips/pci/ops-marvell.c N 2.6/arch/mips/pci/fixup-ocelot-c.c N 2.6/arch/mips/pci/ops-titan-ht.c N 2.6/arch/mips/pci/ops-vr41xx.c N 2.6/arch/mips/pci/fixup-mpc30x.c N 2.6/arch/mips/pci/fixup-ocelot-g.c N 2.6/arch/mips/pci/fixup-tb0219.c N 2.6/arch/mips/pci/pci-yosemite.c N 2.6/arch/mips/pmc-sierra/yosemite/dbg_io.c C 2.6/arch/mips/pmc-sierra/yosemite/i2c-yosemite.c N 2.6/arch/mips/pmc-sierra/yosemite/py-console.c N 2.6/arch/mips/vr41xx/tanbac-tb0229/tb0219.c N 2.6/arch/mips/configs/ocelot_g_defconfig N 2.6/arch/sh64/Kconfig N 2.6/arch/sh64/Makefile N 2.6/arch/sh64/defconfig N 2.6/arch/sh64/boot/Makefile N 2.6/arch/sh64/boot/compressed/Makefile N 2.6/arch/sh64/boot/compressed/cache.c N 2.6/arch/sh64/boot/compressed/head.S N 2.6/arch/sh64/boot/compressed/install.sh N 2.6/arch/sh64/boot/compressed/misc.c N 2.6/arch/sh64/boot/compressed/vmlinux.lds.S N 2.6/arch/sh64/configs/cayman_defconfig N 2.6/arch/sh64/kernel/Makefile N 2.6/arch/sh64/kernel/alphanum.c N 2.6/arch/sh64/kernel/asm-offsets.c N 2.6/arch/sh64/kernel/dma.c N 2.6/arch/sh64/kernel/early_printk.c N 2.6/arch/sh64/kernel/entry.S N 2.6/arch/sh64/kernel/fpu.c N 2.6/arch/sh64/kernel/head.S N 2.6/arch/sh64/kernel/init_task.c N 2.6/arch/sh64/kernel/irq.c N 2.6/arch/sh64/kernel/irq_intc.c N 2.6/arch/sh64/kernel/led.c N 2.6/arch/sh64/kernel/pci-dma.c N 2.6/arch/sh64/kernel/pci_sh5.c N 2.6/arch/sh64/kernel/pci_sh5.h N 2.6/arch/sh64/kernel/pcibios.c N 2.6/arch/sh64/kernel/process.c N 2.6/arch/sh64/kernel/ptrace.c N 2.6/arch/sh64/kernel/semaphore.c N 2.6/arch/sh64/kernel/setup.c N 2.6/arch/sh64/kernel/sh_ksyms.c N 2.6/arch/sh64/kernel/signal.c N 2.6/arch/sh64/kernel/switchto.S N 2.6/arch/sh64/kernel/sys_sh64.c N 2.6/arch/sh64/kernel/syscalls.S N 2.6/arch/sh64/kernel/time.c N 2.6/arch/sh64/kernel/traps.c N 2.6/arch/sh64/kernel/unwind.c N 2.6/arch/sh64/kernel/vmlinux.lds.S N 2.6/arch/sh64/lib/Makefile N 2.6/arch/sh64/lib/c-checksum.c N 2.6/arch/sh64/lib/copy_user_memcpy.S N 2.6/arch/sh64/lib/dbg.c N 2.6/arch/sh64/lib/io.c N 2.6/arch/sh64/lib/memcpy.c N 2.6/arch/sh64/lib/old-checksum.c N 2.6/arch/sh64/lib/page_clear.S N 2.6/arch/sh64/lib/page_copy.S N 2.6/arch/sh64/lib/panic.c N 2.6/arch/sh64/lib/udelay.c N 2.6/arch/sh64/mach-cayman/Makefile N 2.6/arch/sh64/mach-cayman/irq.c N 2.6/arch/sh64/mach-cayman/led.c N 2.6/arch/sh64/mach-cayman/setup.c N 2.6/arch/sh64/mach-harp/Makefile N 2.6/arch/sh64/mach-harp/setup.c N 2.6/arch/sh64/mach-romram/Makefile N 2.6/arch/sh64/mach-romram/setup.c N 2.6/arch/sh64/mach-sim/Makefile N 2.6/arch/sh64/mach-sim/setup.c N 2.6/arch/sh64/mm/Makefile N 2.6/arch/sh64/mm/cache.c N 2.6/arch/sh64/mm/extable.c N 2.6/arch/sh64/mm/fault.c N 2.6/arch/sh64/mm/hugetlbpage.c N 2.6/arch/sh64/mm/init.c N 2.6/arch/sh64/mm/ioremap.c N 2.6/arch/sh64/mm/tlb.c N 2.6/arch/sh64/mm/tlbmiss.c N 2.6/arch/sh64/oprofile/Kconfig N 2.6/arch/sh64/oprofile/Makefile N 2.6/arch/sh64/oprofile/op_model_null.c N 2.6/arch/parisc/lib/debuglocks.c N 2.6/arch/parisc/configs/n4000_defconfig C 2.6/arch/ppc/Makefile C 2.6/arch/ppc/defconfig N 2.6/arch/ppc/boot/simple/mpc52xx_tty.c C 2.6/arch/ppc/configs/apus_defconfig N 2.6/arch/ppc/configs/ads8272_defconfig N 2.6/arch/ppc/configs/lite5200_defconfig N 2.6/arch/ppc/configs/rpx8260_defconfig C 2.6/arch/ppc/kernel/Makefile C 2.6/arch/ppc/kernel/entry.S C 2.6/arch/ppc/kernel/head.S C 2.6/arch/ppc/kernel/misc.S C 2.6/arch/ppc/kernel/ppc_ksyms.c C 2.6/arch/ppc/kernel/setup.c C 2.6/arch/ppc/kernel/time.c N 2.6/arch/ppc/kernel/head_e500.S N 2.6/arch/ppc/lib/rheap.c C 2.6/arch/ppc/mm/Makefile C 2.6/arch/ppc/mm/init.c C 2.6/arch/ppc/mm/pgtable.c N 2.6/arch/ppc/mm/fsl_booke_mmu.c N 2.6/arch/ppc/platforms/lite5200.c N 2.6/arch/ppc/platforms/lite5200.h N 2.6/arch/ppc/platforms/mpc5200.c N 2.6/arch/ppc/platforms/pq2ads.h N 2.6/arch/ppc/platforms/pq2ads_setup.c N 2.6/arch/ppc/platforms/rpx8260.c N 2.6/arch/ppc/platforms/rpx8260.h N 2.6/arch/ppc/platforms/85xx/Kconfig N 2.6/arch/ppc/platforms/85xx/Makefile N 2.6/arch/ppc/platforms/85xx/mpc8540.c N 2.6/arch/ppc/platforms/85xx/mpc8540_ads.c N 2.6/arch/ppc/platforms/85xx/mpc8540_ads.h N 2.6/arch/ppc/platforms/85xx/mpc8555.c N 2.6/arch/ppc/platforms/85xx/mpc8555_cds.h N 2.6/arch/ppc/platforms/85xx/mpc8560.c N 2.6/arch/ppc/platforms/85xx/mpc8560_ads.c N 2.6/arch/ppc/platforms/85xx/mpc8560_ads.h N 2.6/arch/ppc/platforms/85xx/mpc85xx_ads_common.c N 2.6/arch/ppc/platforms/85xx/mpc85xx_ads_common.h N 2.6/arch/ppc/platforms/85xx/mpc85xx_cds_common.c N 2.6/arch/ppc/platforms/85xx/mpc85xx_cds_common.h N 2.6/arch/ppc/platforms/85xx/sbc8560.c N 2.6/arch/ppc/platforms/85xx/sbc8560.h N 2.6/arch/ppc/platforms/85xx/sbc85xx.c N 2.6/arch/ppc/platforms/85xx/sbc85xx.h N 2.6/arch/ppc/syslib/ppc85xx_common.c N 2.6/arch/ppc/syslib/ppc85xx_common.h N 2.6/arch/ppc/syslib/cpm2_common.c N 2.6/arch/ppc/syslib/cpm2_pic.c N 2.6/arch/ppc/syslib/cpm2_pic.h N 2.6/arch/ppc/syslib/m8260_pci.c N 2.6/arch/ppc/syslib/m8260_pci.h N 2.6/arch/ppc/syslib/m8260_pci_erratum9.c N 2.6/arch/ppc/syslib/mpc52xx_pic.c N 2.6/arch/ppc/syslib/mpc52xx_setup.c N 2.6/arch/ppc/syslib/ppc4xx_sgdma.c N 2.6/arch/ppc/syslib/ppc85xx_setup.c N 2.6/arch/ppc/syslib/ppc85xx_setup.h N 2.6/arch/ppc/oprofile/Kconfig N 2.6/arch/ppc/oprofile/Makefile N 2.6/arch/ppc/oprofile/init.c N 2.6/arch/ppc64/kernel/hvcserver.c N 2.6/arch/ppc64/kernel/vecemu.c N 2.6/arch/ppc64/kernel/vector.S N 2.6/arch/ppc64/lib/e2a.c N 2.6/arch/ppc64/lib/usercopy.c N 2.6/arch/ppc64/mm/slb.c N 2.6/arch/ppc64/mm/slb_low.S N 2.6/arch/s390/kernel/vtime.c N 2.6/arch/sh/boards/se/7300/Makefile N 2.6/arch/sh/boards/se/7300/io.c N 2.6/arch/sh/boards/se/7300/irq.c N 2.6/arch/sh/boards/se/7300/led.c N 2.6/arch/sh/boards/se/7300/setup.c N 2.6/arch/sh/boards/renesas/hs7751rvoip/Makefile N 2.6/arch/sh/boards/renesas/hs7751rvoip/io.c N 2.6/arch/sh/boards/renesas/hs7751rvoip/irq.c N 2.6/arch/sh/boards/renesas/hs7751rvoip/led.c N 2.6/arch/sh/boards/renesas/hs7751rvoip/mach.c N 2.6/arch/sh/boards/renesas/hs7751rvoip/pci.c N 2.6/arch/sh/boards/renesas/hs7751rvoip/setup.c N 2.6/arch/sh/boards/renesas/rts7751r2d/Makefile N 2.6/arch/sh/boards/renesas/rts7751r2d/io.c N 2.6/arch/sh/boards/renesas/rts7751r2d/irq.c N 2.6/arch/sh/boards/renesas/rts7751r2d/led.c N 2.6/arch/sh/boards/renesas/rts7751r2d/mach.c N 2.6/arch/sh/boards/renesas/rts7751r2d/setup.c N 2.6/arch/sh/boards/renesas/systemh/Makefile N 2.6/arch/sh/boards/renesas/systemh/io.c N 2.6/arch/sh/boards/renesas/systemh/irq.c N 2.6/arch/sh/boards/renesas/systemh/setup.c N 2.6/arch/sh/cchips/voyagergx/Makefile N 2.6/arch/sh/cchips/voyagergx/consistent.c N 2.6/arch/sh/cchips/voyagergx/irq.c N 2.6/arch/sh/cchips/voyagergx/setup.c N 2.6/arch/sh/configs/rts7751r2d_defconfig N 2.6/arch/sh/configs/se7300_defconfig N 2.6/arch/sh/kernel/early_printk.c N 2.6/arch/sh/kernel/cpu/adc.c N 2.6/arch/sh/kernel/cpu/bus.c N 2.6/arch/sh/drivers/dma/dma-sysfs.c N 2.6/arch/sh/drivers/pci/fixups-rts7751r2d.c N 2.6/arch/sh/drivers/pci/ops-rts7751r2d.c N 2.6/arch/sh/ramdisk/Makefile N 2.6/arch/sh/ramdisk/ld.script N 2.6/arch/sparc64/lib/clear_page.S N 2.6/arch/sparc64/lib/copy_page.S N 2.6/arch/sparc64/mm/tlb.c N 2.6/crypto/khazad.c N 2.6/crypto/tea.c N 2.6/drivers/block/sx8.c N 2.6/drivers/char/hpet.c N 2.6/drivers/char/ds1286.c N 2.6/drivers/char/hvcs.c N 2.6/drivers/char/ip27-rtc.c N 2.6/drivers/char/lcd.h N 2.6/drivers/char/watchdog/ixp2000_wdt.c N 2.6/drivers/i2c/chips/adm1025.c N 2.6/drivers/i2c/chips/adm1031.c N 2.6/drivers/i2c/chips/lm77.c N 2.6/drivers/md/dm-io.c N 2.6/drivers/md/dm-exception-store.c N 2.6/drivers/md/dm-io.h N 2.6/drivers/md/dm-log.c N 2.6/drivers/md/dm-log.h N 2.6/drivers/md/dm-raid1.c N 2.6/drivers/md/dm-snap.c N 2.6/drivers/md/dm-snap.h N 2.6/drivers/md/dm-zero.c N 2.6/drivers/md/kcopyd.c N 2.6/drivers/md/kcopyd.h N 2.6/drivers/media/video/ovcamchip/Makefile N 2.6/drivers/media/video/ovcamchip/ov6x20.c N 2.6/drivers/media/video/ovcamchip/ov6x30.c N 2.6/drivers/media/video/ovcamchip/ov76be.c N 2.6/drivers/media/video/ovcamchip/ov7x10.c N 2.6/drivers/media/video/ovcamchip/ov7x20.c N 2.6/drivers/media/video/ovcamchip/ovcamchip_core.c N 2.6/drivers/media/video/ovcamchip/ovcamchip_priv.h N 2.6/drivers/mtd/chips/cfi_util.c N 2.6/drivers/mtd/devices/phram.c N 2.6/drivers/mtd/maps/db1550-flash.c N 2.6/drivers/mtd/maps/db1x00-flash.c N 2.6/drivers/mtd/maps/dmv182.c N 2.6/drivers/mtd/maps/ichxrom.c N 2.6/drivers/mtd/maps/integrator-flash-v24.c N 2.6/drivers/mtd/maps/mpc1211.c N 2.6/drivers/mtd/maps/omap-toto-flash.c N 2.6/drivers/mtd/maps/pb1550-flash.c N 2.6/drivers/mtd/maps/sbc8240.c N 2.6/drivers/mtd/nand/toto.c N 2.6/drivers/mtd/nand/au1550nd.c N 2.6/drivers/mtd/nand/diskonchip.c N 2.6/drivers/mtd/nand/nand_base.c N 2.6/drivers/mtd/nand/nand_bbt.c N 2.6/drivers/mtd/nand/ppchameleonevb.c N 2.6/drivers/mtd/nand/tx4925ndfmc.c N 2.6/drivers/mtd/nand/tx4938ndfmc.c N 2.6/drivers/net/smc91x.c N 2.6/drivers/net/smc91x.h N 2.6/drivers/net/via-velocity.c N 2.6/drivers/net/via-velocity.h N 2.6/drivers/net/wireless/prism54/prismcompat.h N 2.6/drivers/net/fec_8xx/Kconfig N 2.6/drivers/net/fec_8xx/Makefile N 2.6/drivers/net/fec_8xx/fec_8xx-netta.c N 2.6/drivers/net/fec_8xx/fec_8xx.h N 2.6/drivers/net/fec_8xx/fec_main.c N 2.6/drivers/net/fec_8xx/fec_mii.c N 2.6/drivers/pcmcia/pd6729.c N 2.6/drivers/pcmcia/pd6729.h N 2.6/drivers/pcmcia/socket_sysfs.c N 2.6/drivers/s390/net/ctcdbug.c N 2.6/drivers/s390/net/ctcdbug.h N 2.6/drivers/scsi/3w-9xxx.c N 2.6/drivers/scsi/3w-9xxx.h N 2.6/drivers/scsi/fdomain.h N 2.6/drivers/scsi/sata_nv.c N 2.6/drivers/serial/sn_console.c N 2.6/drivers/serial/mpc52xx_uart.c N 2.6/drivers/serial/serial_lh7a40x.c N 2.6/drivers/serial/cpm_uart/Makefile N 2.6/drivers/serial/cpm_uart/cpm_uart.h N 2.6/drivers/serial/cpm_uart/cpm_uart_core.c N 2.6/drivers/serial/cpm_uart/cpm_uart_cpm1.c N 2.6/drivers/serial/cpm_uart/cpm_uart_cpm1.h N 2.6/drivers/serial/cpm_uart/cpm_uart_cpm2.c N 2.6/drivers/serial/cpm_uart/cpm_uart_cpm2.h N 2.6/drivers/usb/class/cdc-acm.h N 2.6/drivers/usb/host/ohci-lh7a404.c N 2.6/drivers/usb/media/w9968cf_vpp.h N 2.6/drivers/usb/media/sn9c102.h N 2.6/drivers/usb/media/sn9c102_core.c N 2.6/drivers/usb/media/sn9c102_pas106b.c N 2.6/drivers/usb/media/sn9c102_sensor.h N 2.6/drivers/usb/media/sn9c102_tas5110c1b.c N 2.6/drivers/usb/media/sn9c102_tas5130d1b.c N 2.6/drivers/video/riva/rivafb-i2c.c N 2.6/drivers/firmware/pcdp.c N 2.6/drivers/firmware/pcdp.h N 2.6/drivers/w1/Kconfig N 2.6/drivers/w1/Makefile N 2.6/drivers/w1/matrox_w1.c N 2.6/drivers/w1/w1.c N 2.6/drivers/w1/w1.h N 2.6/drivers/w1/w1_family.c N 2.6/drivers/w1/w1_family.h N 2.6/drivers/w1/w1_int.c N 2.6/drivers/w1/w1_int.h N 2.6/drivers/w1/w1_io.c N 2.6/drivers/w1/w1_io.h N 2.6/drivers/w1/w1_log.h N 2.6/drivers/w1/w1_netlink.c N 2.6/drivers/w1/w1_netlink.h N 2.6/drivers/w1/w1_therm.c N 2.6/fs/isofs/export.c N 2.6/fs/jffs2/compr.h N 2.6/fs/nls/nls_ascii.c N 2.6/fs/ntfs/collate.c N 2.6/fs/ntfs/collate.h N 2.6/fs/ntfs/index.c N 2.6/fs/ntfs/index.h N 2.6/fs/ntfs/quota.c N 2.6/fs/ntfs/quota.h N 2.6/fs/xfs/linux-2.6/kmem.c N 2.6/include/asm-alpha/setup.h N 2.6/include/asm-arm/vfp.h N 2.6/include/asm-arm/vfpmacros.h N 2.6/include/asm-arm/arch-sa1100/collie.h N 2.6/include/asm-arm/hardware/clock.h N 2.6/include/asm-arm/hardware/locomo.h N 2.6/include/asm-arm/mach/time.h N 2.6/include/asm-i386/pgtable-2level-defs.h N 2.6/include/asm-i386/pgtable-3level-defs.h N 2.6/include/asm-ia64/setup.h N 2.6/include/asm-mips/setup.h N 2.6/include/asm-mips/gt64240.h N 2.6/include/asm-mips/marvell.h N 2.6/include/asm-mips/vr41xx/tb0219.h N 2.6/include/asm-mips/mach-yosemite/cpu-feature-overrides.h N 2.6/include/asm-sh64/a.out.h N 2.6/include/asm-sh64/atomic.h N 2.6/include/asm-sh64/bitops.h N 2.6/include/asm-sh64/bug.h N 2.6/include/asm-sh64/bugs.h N 2.6/include/asm-sh64/byteorder.h N 2.6/include/asm-sh64/cache.h N 2.6/include/asm-sh64/cacheflush.h N 2.6/include/asm-sh64/cayman.h N 2.6/include/asm-sh64/checksum.h N 2.6/include/asm-sh64/cpumask.h N 2.6/include/asm-sh64/current.h N 2.6/include/asm-sh64/delay.h N 2.6/include/asm-sh64/div64.h N 2.6/include/asm-sh64/dma-mapping.h N 2.6/include/asm-sh64/dma.h N 2.6/include/asm-sh64/elf.h N 2.6/include/asm-sh64/errno.h N 2.6/include/asm-sh64/fcntl.h N 2.6/include/asm-sh64/hardirq.h N 2.6/include/asm-sh64/hardware.h N 2.6/include/asm-sh64/hdreg.h N 2.6/include/asm-sh64/hw_irq.h N 2.6/include/asm-sh64/ide.h N 2.6/include/asm-sh64/io.h N 2.6/include/asm-sh64/ioctl.h N 2.6/include/asm-sh64/ioctls.h N 2.6/include/asm-sh64/ipc.h N 2.6/include/asm-sh64/ipcbuf.h N 2.6/include/asm-sh64/irq.h N 2.6/include/asm-sh64/keyboard.h N 2.6/include/asm-sh64/kmap_types.h N 2.6/include/asm-sh64/linkage.h N 2.6/include/asm-sh64/local.h N 2.6/include/asm-sh64/mc146818rtc.h N 2.6/include/asm-sh64/mman.h N 2.6/include/asm-sh64/mmu.h N 2.6/include/asm-sh64/mmu_context.h N 2.6/include/asm-sh64/module.h N 2.6/include/asm-sh64/msgbuf.h N 2.6/include/asm-sh64/namei.h N 2.6/include/asm-sh64/page.h N 2.6/include/asm-sh64/param.h N 2.6/include/asm-sh64/pci.h N 2.6/include/asm-sh64/percpu.h N 2.6/include/asm-sh64/pgalloc.h N 2.6/include/asm-sh64/pgtable.h N 2.6/include/asm-sh64/platform.h N 2.6/include/asm-sh64/poll.h N 2.6/include/asm-sh64/posix_types.h N 2.6/include/asm-sh64/processor.h N 2.6/include/asm-sh64/ptrace.h N 2.6/include/asm-sh64/registers.h N 2.6/include/asm-sh64/resource.h N 2.6/include/asm-sh64/scatterlist.h N 2.6/include/asm-sh64/sections.h N 2.6/include/asm-sh64/segment.h N 2.6/include/asm-sh64/semaphore-helper.h N 2.6/include/asm-sh64/semaphore.h N 2.6/include/asm-sh64/sembuf.h N 2.6/include/asm-sh64/serial.h N 2.6/include/asm-sh64/setup.h N 2.6/include/asm-sh64/shmbuf.h N 2.6/include/asm-sh64/shmparam.h N 2.6/include/asm-sh64/sigcontext.h N 2.6/include/asm-sh64/siginfo.h N 2.6/include/asm-sh64/signal.h N 2.6/include/asm-sh64/smp.h N 2.6/include/asm-sh64/smplock.h N 2.6/include/asm-sh64/socket.h N 2.6/include/asm-sh64/sockios.h N 2.6/include/asm-sh64/softirq.h N 2.6/include/asm-sh64/spinlock.h N 2.6/include/asm-sh64/stat.h N 2.6/include/asm-sh64/statfs.h N 2.6/include/asm-sh64/string.h N 2.6/include/asm-sh64/system.h N 2.6/include/asm-sh64/termbits.h N 2.6/include/asm-sh64/termios.h N 2.6/include/asm-sh64/thread_info.h N 2.6/include/asm-sh64/timex.h N 2.6/include/asm-sh64/tlb.h N 2.6/include/asm-sh64/tlbflush.h N 2.6/include/asm-sh64/topology.h N 2.6/include/asm-sh64/types.h N 2.6/include/asm-sh64/uaccess.h N 2.6/include/asm-sh64/ucontext.h N 2.6/include/asm-sh64/unaligned.h N 2.6/include/asm-sh64/unistd.h N 2.6/include/asm-sh64/user.h N 2.6/include/asm-parisc/numnodes.h C 2.6/include/asm-ppc/io.h N 2.6/include/asm-ppc/immap_85xx.h C 2.6/include/asm-ppc/machdep.h C 2.6/include/asm-ppc/pgtable.h N 2.6/include/asm-ppc/ppc4xx_dma.h N 2.6/include/asm-ppc/cpm2.h N 2.6/include/asm-ppc/fsl_ocp.h N 2.6/include/asm-ppc/rheap.h N 2.6/include/asm-ppc/immap_cpm2.h N 2.6/include/asm-ppc/m8260_pci.h N 2.6/include/asm-ppc/mpc52xx.h N 2.6/include/asm-ppc/mpc52xx_psc.h N 2.6/include/asm-ppc/mpc8260_pci9.h N 2.6/include/asm-ppc/mpc85xx.h N 2.6/include/asm-ppc64/hvcserver.h N 2.6/include/asm-sh/adc.h N 2.6/include/asm-sh/bus-sh.h N 2.6/include/asm-sh/fixmap.h N 2.6/include/asm-sh/setup.h N 2.6/include/asm-sh/cpu-sh3/adc.h N 2.6/include/asm-sh/hp6xx/ide.h N 2.6/include/asm-sh/se7300/io.h N 2.6/include/asm-sh/se7300/se7300.h N 2.6/include/asm-sh/hs7751rvoip/hs7751rvoip.h N 2.6/include/asm-sh/hs7751rvoip/ide.h N 2.6/include/asm-sh/hs7751rvoip/io.h N 2.6/include/asm-sh/rts7751r2d/ide.h N 2.6/include/asm-sh/rts7751r2d/io.h N 2.6/include/asm-sh/rts7751r2d/rts7751r2d.h N 2.6/include/asm-sh/rts7751r2d/voyagergx_reg.h N 2.6/include/asm-sparc64/cmt.h N 2.6/include/asm-um/setup.h N 2.6/include/asm-v850/setup.h N 2.6/include/linux/dmi.h N 2.6/include/linux/ds1286.h N 2.6/include/linux/hpet.h N 2.6/include/linux/snmp.h N 2.6/include/linux/crc-ccitt.h N 2.6/include/linux/mtd/physmap.h N 2.6/include/linux/netfilter_ipv4/ipt_addrtype.h N 2.6/include/linux/netfilter_ipv4/ipt_realm.h N 2.6/include/media/ovcamchip.h N 2.6/include/net/ip6_checksum.h N 2.6/include/net/pkt_act.h N 2.6/include/scsi/scsi_dbg.h C 2.6/include/video/vga.h N 2.6/include/mtd/inftl-user.h N 2.6/include/mtd/jffs2-user.h N 2.6/include/mtd/mtd-abi.h N 2.6/include/mtd/mtd-user.h N 2.6/include/mtd/nftl-user.h N 2.6/kernel/power/smp.c N 2.6/lib/crc-ccitt.c N 2.6/net/bluetooth/hidp/Kconfig N 2.6/net/bluetooth/hidp/Makefile N 2.6/net/bluetooth/hidp/core.c N 2.6/net/bluetooth/hidp/hidp.h N 2.6/net/bluetooth/hidp/sock.c N 2.6/net/core/stream.c N 2.6/net/ipv4/datagram.c N 2.6/net/ipv4/xfrm4_output.c N 2.6/net/ipv4/netfilter/ipt_addrtype.c N 2.6/net/ipv4/netfilter/ipt_realm.c N 2.6/net/ipv6/xfrm6_output.c N 2.6/net/ipv6/xfrm6_tunnel.c N 2.6/net/sched/sch_netem.c N 2.6/net/sched/act_api.c N 2.6/scripts/mkmakefile N 2.6/scripts/package/Makefile N 2.6/scripts/package/builddeb N 2.6/scripts/package/mkspec N 2.6/scripts/mod/Makefile N 2.6/scripts/mod/empty.c N 2.6/scripts/mod/file2alias.c N 2.6/scripts/mod/mk_elfconfig.c N 2.6/scripts/mod/modpost.c N 2.6/scripts/mod/modpost.h N 2.6/scripts/mod/sumversion.c N 2.6/security/selinux/nlmsgtab.c 19 conflicts created by this import. cvs checkout -jlinux:yesterday -jlinux 2.6 |
|
From: Roman Z. <zi...@us...> - 2004-09-25 14:26:22
|
CVSROOT: /cvsroot/linux-apus
Module name: 2.3
Repository: 2.3/arch/ppc/
Changes by: zi...@sc....(none) 04/09/25 07:26:15
Log message:
workaround to avoid stack header in vmlinux, which confuses bootloader
Modified files:
2.3/arch/ppc/:
vmlinux.lds
Revision Changes Path
1.3 +22 -20 2.3/arch/ppc/vmlinux.lds
|
|
From: David E. <eg...@ha...> - 2004-07-22 13:12:05
|
Hey Geert,
Thanks for bringing the ZORRO paths up to date for the cirrusfb driver.
The code looks good, and I trust your knowledge of Amiga much more than
my own. It would be nice if someone actually has this hardware and can
test the patch... Anyone? Anyone? Lars? Beuler?
There was a trivial problem applying the patch - one of the whitespace
fixes choked, so I took it out of the patch (below).
-dte
---
Cirrusfb updates:
- Cirrusfb depends on Zorro or PCI
- Revive Zorro support, using new Zorro driver framework
- Merge PCI and Zorro code where possible
- Use C99 initializers
- Kill superfluous whitespace
- #undef I/O ops before redefining them on Amiga
From: Geert Uytterhoeven <ge...@li...>
Signed-off-by: David Eger <eg...@ha...>
--- linux-2.6.8-rc2/drivers/video/Kconfig 2004-07-15 23:14:59.000000000 +0200
+++ linux-m68k-2.6.8-rc2/drivers/video/Kconfig 2004-07-19 21:06:17.000000000 +0200
@@ -40,7 +40,7 @@
config FB_CIRRUS
tristate "Cirrus Logic support"
- depends on FB && (AMIGA || PCI)
+ depends on FB && (ZORRO || PCI)
---help---
This enables support for Cirrus Logic GD542x/543x based boards on
Amiga: SD64, Piccolo, Picasso II/II+, Picasso IV, or EGS Spectrum.
--- linux-2.6.8-rc2/drivers/video/cirrusfb.c 2004-07-18 15:55:33.000000000 +0200
+++ linux-m68k-2.6.8-rc2/drivers/video/cirrusfb.c 2004-07-19 21:14:50.000000000 +0200
@@ -5,8 +5,8 @@
*
* Contributors (thanks, all!)
*
- * David Eger:
- * Overhaul for Linux 2.6
+ * David Eger:
+ * Overhaul for Linux 2.6
*
* Jeff Rugen:
* Major contributions; Motorola PowerStack (PPC and PCI) support,
@@ -145,9 +145,6 @@
* a run-time table?
*/
static const struct cirrusfb_board_info_rec {
- cirrusfb_board_t btype; /* chipset enum, not strictly necessary, as
- * cirrusfb_board_info[] is directly indexed
- * by this value */
char *name; /* ASCII name of chipset */
long maxclock[5]; /* maximum video clock */
/* for 1/4bpp, 8bpp 15/16bpp, 24bpp, 32bpp - numbers from xorg code */
@@ -164,104 +161,115 @@
unsigned char sr1f; /* SR1F VGA initial register value */
} cirrusfb_board_info[] = {
- { BT_NONE, }, /* dummy record */
- { BT_SD64,
- "CL SD64",
- { 140000, 140000, 140000, 140000, 140000, }, /* guess */
- /* the SD64/P4 have a higher max. videoclock */
- TRUE,
- TRUE,
- TRUE,
- 0xF0,
- 0xF0,
- 0, /* unused, does not multiplex */
- 0xF1,
- 0, /* unused, does not multiplex */
- 0x20 },
- { BT_PICCOLO,
- "CL Piccolo",
- { 90000, 90000, 90000, 90000, 90000 }, /* guess */
- TRUE,
- TRUE,
- FALSE,
- 0x80,
- 0x80,
- 0, /* unused, does not multiplex */
- 0x81,
- 0, /* unused, does not multiplex */
- 0x22 },
- { BT_PICASSO,
- "CL Picasso",
- { 90000, 90000, 90000, 90000, 90000, }, /* guess */
- TRUE,
- TRUE,
- FALSE,
- 0x20,
- 0x20,
- 0, /* unused, does not multiplex */
- 0x21,
- 0, /* unused, does not multiplex */
- 0x22 },
- { BT_SPECTRUM,
- "CL Spectrum",
- { 90000, 90000, 90000, 90000, 90000, }, /* guess */
- TRUE,
- TRUE,
- FALSE,
- 0x80,
- 0x80,
- 0, /* unused, does not multiplex */
- 0x81,
- 0, /* unused, does not multiplex */
- 0x22 },
- { BT_PICASSO4,
- "CL Picasso4",
- { 135100, 135100, 85500, 85500, 0 },
- TRUE,
- FALSE,
- TRUE,
- 0x20,
- 0x20,
- 0, /* unused, does not multiplex */
- 0x21,
- 0, /* unused, does not multiplex */
- 0 },
- { BT_ALPINE,
- "CL Alpine",
- { 85500, 85500, 50000, 28500, 0}, /* for the GD5430. GD5446 can do more... */
- TRUE,
- TRUE,
- TRUE,
- 0xA0,
- 0xA1,
- 0xA7,
- 0xA1,
- 0xA7,
- 0x1C },
- { BT_GD5480,
- "CL GD5480",
- { 135100, 200000, 200000, 135100, 135100 },
- TRUE,
- TRUE,
- TRUE,
- 0x10,
- 0x11,
- 0, /* unused, does not multiplex */
- 0x11,
- 0, /* unused, does not multiplex */
- 0x1C },
- { BT_LAGUNA,
- "CL Laguna",
- { 135100, 135100, 135100, 135100, 135100, }, /* guess */
- FALSE,
- FALSE,
- TRUE,
- 0, /* unused */
- 0, /* unused */
- 0, /* unused */
- 0, /* unused */
- 0, /* unused */
- 0 }, /* unused */
+ [BT_SD64] = {
+ .name = "CL SD64",
+ .maxclock = {
+ /* guess */
+ /* the SD64/P4 have a higher max. videoclock */
+ 140000, 140000, 140000, 140000, 140000,
+ },
+ .init_sr07 = TRUE,
+ .init_sr1f = TRUE,
+ .scrn_start_bit19 = TRUE,
+ .sr07 = 0xF0,
+ .sr07_1bpp = 0xF0,
+ .sr07_8bpp = 0xF1,
+ .sr1f = 0x20
+ },
+ [BT_PICCOLO] = {
+ .name = "CL Piccolo",
+ .maxclock = {
+ /* guess */
+ 90000, 90000, 90000, 90000, 90000
+ },
+ .init_sr07 = TRUE,
+ .init_sr1f = TRUE,
+ .scrn_start_bit19 = FALSE,
+ .sr07 = 0x80,
+ .sr07_1bpp = 0x80,
+ .sr07_8bpp = 0x81,
+ .sr1f = 0x22
+ },
+ [BT_PICASSO] = {
+ .name = "CL Picasso",
+ .maxclock = {
+ /* guess */
+ 90000, 90000, 90000, 90000, 90000
+ },
+ .init_sr07 = TRUE,
+ .init_sr1f = TRUE,
+ .scrn_start_bit19 = FALSE,
+ .sr07 = 0x20,
+ .sr07_1bpp = 0x20,
+ .sr07_8bpp = 0x21,
+ .sr1f = 0x22
+ },
+ [BT_SPECTRUM] = {
+ .name = "CL Spectrum",
+ .maxclock = {
+ /* guess */
+ 90000, 90000, 90000, 90000, 90000
+ },
+ .init_sr07 = TRUE,
+ .init_sr1f = TRUE,
+ .scrn_start_bit19 = FALSE,
+ .sr07 = 0x80,
+ .sr07_1bpp = 0x80,
+ .sr07_8bpp = 0x81,
+ .sr1f = 0x22
+ },
+ [BT_PICASSO4] = {
+ .name = "CL Picasso4",
+ .maxclock = {
+ 135100, 135100, 85500, 85500, 0
+ },
+ .init_sr07 = TRUE,
+ .init_sr1f = FALSE,
+ .scrn_start_bit19 = TRUE,
+ .sr07 = 0x20,
+ .sr07_1bpp = 0x20,
+ .sr07_8bpp = 0x21,
+ .sr1f = 0
+ },
+ [BT_ALPINE] = {
+ .name = "CL Alpine",
+ .maxclock = {
+ /* for the GD5430. GD5446 can do more... */
+ 85500, 85500, 50000, 28500, 0
+ },
+ .init_sr07 = TRUE,
+ .init_sr1f = TRUE,
+ .scrn_start_bit19 = TRUE,
+ .sr07 = 0xA0,
+ .sr07_1bpp = 0xA1,
+ .sr07_1bpp_mux = 0xA7,
+ .sr07_8bpp = 0xA1,
+ .sr07_8bpp_mux = 0xA7,
+ .sr1f = 0x1C
+ },
+ [BT_GD5480] = {
+ .name = "CL GD5480",
+ .maxclock = {
+ 135100, 200000, 200000, 135100, 135100
+ },
+ .init_sr07 = TRUE,
+ .init_sr1f = TRUE,
+ .scrn_start_bit19 = TRUE,
+ .sr07 = 0x10,
+ .sr07_1bpp = 0x11,
+ .sr07_8bpp = 0x11,
+ .sr1f = 0x1C
+ },
+ [BT_LAGUNA] = {
+ .name = "CL Laguna",
+ .maxclock = {
+ /* guess */
+ 135100, 135100, 135100, 135100, 135100,
+ },
+ .init_sr07 = FALSE,
+ .init_sr1f = FALSE,
+ .scrn_start_bit19 = TRUE,
+ }
};
@@ -270,12 +278,12 @@
{ PCI_VENDOR_ID_CIRRUS, PCI_DEVICE_ID_##id, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (btype) }
static struct pci_device_id cirrusfb_pci_table[] = {
- CHIP( CIRRUS_5436, BT_ALPINE ),
- CHIP( CIRRUS_5434_8, BT_ALPINE ),
- CHIP( CIRRUS_5434_4, BT_ALPINE ),
- CHIP( CIRRUS_5430, BT_ALPINE ), /* GD-5440 has identical id */
- CHIP( CIRRUS_7543, BT_ALPINE ),
- CHIP( CIRRUS_7548, BT_ALPINE ),
+ CHIP( CIRRUS_5436, BT_ALPINE ),
+ CHIP( CIRRUS_5434_8, BT_ALPINE ),
+ CHIP( CIRRUS_5434_4, BT_ALPINE ),
+ CHIP( CIRRUS_5430, BT_ALPINE ), /* GD-5440 has identical id */
+ CHIP( CIRRUS_7543, BT_ALPINE ),
+ CHIP( CIRRUS_7548, BT_ALPINE ),
CHIP( CIRRUS_5480, BT_GD5480 ), /* MacPicasso probably */
CHIP( CIRRUS_5446, BT_PICASSO4 ), /* Picasso 4 is a GD5446 */
CHIP( CIRRUS_5462, BT_LAGUNA ), /* CL Laguna */
@@ -289,31 +297,50 @@
#ifdef CONFIG_ZORRO
+static const struct zorro_device_id cirrusfb_zorro_table[] = {
+ {
+ .id = ZORRO_PROD_HELFRICH_SD64_RAM,
+ .driver_data = BT_SD64,
+ }, {
+ .id = ZORRO_PROD_HELFRICH_PICCOLO_RAM,
+ .driver_data = BT_PICCOLO,
+ }, {
+ .id = ZORRO_PROD_VILLAGE_TRONIC_PICASSO_II_II_PLUS_RAM,
+ .driver_data = BT_PICASSO,
+ }, {
+ .id = ZORRO_PROD_GVP_EGS_28_24_SPECTRUM_RAM,
+ .driver_data = BT_SPECTRUM,
+ }, {
+ .id = ZORRO_PROD_VILLAGE_TRONIC_PICASSO_IV_Z3,
+ .driver_data = BT_PICASSO4,
+ },
+ { 0 }
+};
+
static const struct {
- cirrusfb_board_t btype;
- zorro_id id, id2;
+ zorro_id id2;
unsigned long size;
-} cirrusfb_zorro_probe_list[] __initdata = {
- { BT_SD64,
- ZORRO_PROD_HELFRICH_SD64_RAM,
- ZORRO_PROD_HELFRICH_SD64_REG,
- 0x400000 },
- { BT_PICCOLO,
- ZORRO_PROD_HELFRICH_PICCOLO_RAM,
- ZORRO_PROD_HELFRICH_PICCOLO_REG,
- 0x200000 },
- { BT_PICASSO,
- ZORRO_PROD_VILLAGE_TRONIC_PICASSO_II_II_PLUS_RAM,
- ZORRO_PROD_VILLAGE_TRONIC_PICASSO_II_II_PLUS_REG,
- 0x200000 },
- { BT_SPECTRUM,
- ZORRO_PROD_GVP_EGS_28_24_SPECTRUM_RAM,
- ZORRO_PROD_GVP_EGS_28_24_SPECTRUM_REG,
- 0x200000 },
- { BT_PICASSO4,
- ZORRO_PROD_VILLAGE_TRONIC_PICASSO_IV_Z3,
- 0,
- 0x400000 },
+} cirrusfb_zorro_table2[] = {
+ [BT_SD64] = {
+ .id2 = ZORRO_PROD_HELFRICH_SD64_REG,
+ .size = 0x400000
+ },
+ [BT_PICCOLO] = {
+ .id2 = ZORRO_PROD_HELFRICH_PICCOLO_REG,
+ .size = 0x200000
+ },
+ [BT_PICASSO] = {
+ .id2 = ZORRO_PROD_VILLAGE_TRONIC_PICASSO_II_II_PLUS_REG,
+ .size = 0x200000
+ },
+ [BT_SPECTRUM] = {
+ .id2 = ZORRO_PROD_GVP_EGS_28_24_SPECTRUM_REG,
+ .size = 0x200000
+ },
+ [BT_PICASSO4] = {
+ .id2 = 0,
+ .size = 0x400000
+ }
};
#endif /* CONFIG_ZORRO */
@@ -381,13 +408,12 @@
struct { u8 red, green, blue, pad; } palette[256];
#ifdef CONFIG_ZORRO
- unsigned long board_addr,
- board_size;
+ struct zorro_dev *zdev;
#endif
-
#ifdef CONFIG_PCI
struct pci_dev *pdev;
#endif
+ void (*unmap)(struct cirrusfb_info *cinfo);
};
@@ -401,50 +427,83 @@
static const struct {
const char *name;
struct fb_var_screeninfo var;
-} cirrusfb_predefined[] =
-
-{
- {"Autodetect", /* autodetect mode */
- {0}
- },
-
- {"640x480", /* 640x480, 31.25 kHz, 60 Hz, 25 MHz PixClock */
- {
- 640, 480, 640, 480, 0, 0, 8, 0,
- {0, 8, 0},
- {0, 8, 0},
- {0, 8, 0},
- {0, 0, 0},
- 0, 0, -1, -1, FB_ACCEL_NONE, 40000, 48, 16, 32, 8, 96, 4,
- FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED
- }
- },
-
- {"800x600", /* 800x600, 48 kHz, 76 Hz, 50 MHz PixClock */
- {
- 800, 600, 800, 600, 0, 0, 8, 0,
- {0, 8, 0},
- {0, 8, 0},
- {0, 8, 0},
- {0, 0, 0},
- 0, 0, -1, -1, FB_ACCEL_NONE, 20000, 128, 16, 24, 2, 96, 6,
- 0, FB_VMODE_NONINTERLACED
- }
- },
-
- /*
- Modeline from XF86Config:
- Mode "1024x768" 80 1024 1136 1340 1432 768 770 774 805
- */
- {"1024x768", /* 1024x768, 55.8 kHz, 70 Hz, 80 MHz PixClock */
- {
- 1024, 768, 1024, 768, 0, 0, 8, 0,
- {0, 8, 0},
- {0, 8, 0},
- {0, 8, 0},
- {0, 0, 0},
- 0, 0, -1, -1, FB_ACCEL_NONE, 12500, 144, 32, 30, 2, 192, 6,
- 0, FB_VMODE_NONINTERLACED
+} cirrusfb_predefined[] = {
+ {
+ /* autodetect mode */
+ .name = "Autodetect",
+ }, {
+ /* 640x480, 31.25 kHz, 60 Hz, 25 MHz PixClock */
+ .name = "640x480",
+ .var = {
+ .xres = 640,
+ .yres = 480,
+ .xres_virtual = 640,
+ .yres_virtual = 480,
+ .bits_per_pixel = 8,
+ .red = { .length = 8 },
+ .green = { .length = 8 },
+ .blue = { .length = 8 },
+ .width = -1,
+ .height = -1,
+ .pixclock = 40000,
+ .left_margin = 48,
+ .right_margin = 16,
+ .upper_margin = 32,
+ .lower_margin = 8,
+ .hsync_len = 96,
+ .vsync_len = 4,
+ .sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+ .vmode = FB_VMODE_NONINTERLACED
+ }
+ }, {
+ /* 800x600, 48 kHz, 76 Hz, 50 MHz PixClock */
+ .name = "800x600",
+ .var = {
+ .xres = 800,
+ .yres = 600,
+ .xres_virtual = 800,
+ .yres_virtual = 600,
+ .bits_per_pixel = 8,
+ .red = { .length = 8 },
+ .green = { .length = 8 },
+ .blue = { .length = 8 },
+ .width = -1,
+ .height = -1,
+ .pixclock = 20000,
+ .left_margin = 128,
+ .right_margin = 16,
+ .upper_margin = 24,
+ .lower_margin = 2,
+ .hsync_len = 96,
+ .vsync_len = 6,
+ .vmode = FB_VMODE_NONINTERLACED
+ }
+ }, {
+ /*
+ * Modeline from XF86Config:
+ * Mode "1024x768" 80 1024 1136 1340 1432 768 770 774 805
+ */
+ /* 1024x768, 55.8 kHz, 70 Hz, 80 MHz PixClock */
+ .name = "1024x768",
+ .var = {
+ .xres = 1024,
+ .yres = 768,
+ .xres_virtual = 1024,
+ .yres_virtual = 768,
+ .bits_per_pixel = 8,
+ .red = { .length = 8 },
+ .green = { .length = 8 },
+ .blue = { .length = 8 },
+ .width = -1,
+ .height = -1,
+ .pixclock = 12500,
+ .left_margin = 144,
+ .right_margin = 32,
+ .upper_margin = 30,
+ .lower_margin = 2,
+ .hsync_len = 192,
+ .vsync_len = 6,
+ .vmode = FB_VMODE_NONINTERLACED
}
}
};
@@ -478,7 +537,7 @@
static struct fb_ops cirrusfb_ops = {
.owner = THIS_MODULE,
.fb_open = cirrusfb_open,
- .fb_release = cirrusfb_release,
+ .fb_release = cirrusfb_release,
.fb_setcolreg = cirrusfb_setcolreg,
.fb_check_var = cirrusfb_check_var,
.fb_set_par = cirrusfb_set_par,
@@ -1132,7 +1191,7 @@
DPRINTK (" (for GD54xx)\n");
vga_wseq (regbase, CL_SEQR7,
regs.multiplexing ?
- bi->sr07_1bpp_mux : bi->sr07_1bpp);
+ bi->sr07_1bpp_mux : bi->sr07_1bpp);
break;
case BT_LAGUNA:
@@ -1216,7 +1275,7 @@
DPRINTK (" (for GD54xx)\n");
vga_wseq (regbase, CL_SEQR7,
regs.multiplexing ?
- bi->sr07_8bpp_mux : bi->sr07_8bpp);
+ bi->sr07_8bpp_mux : bi->sr07_8bpp);
break;
case BT_LAGUNA:
@@ -2156,10 +2215,144 @@
framebuffer_release(cinfo->info);
pci_disable_device(pdev);
}
+#endif /* CONFIG_PCI */
+
+
+#ifdef CONFIG_ZORRO
+static void __devexit cirrusfb_zorro_unmap (struct cirrusfb_info *cinfo)
+{
+ zorro_release_device(cinfo->zdev);
+
+ if (cinfo->btype == BT_PICASSO4) {
+ cinfo->regbase -= 0x600000;
+ iounmap ((void *)cinfo->regbase);
+ iounmap ((void *)cinfo->fbmem);
+ } else {
+ if (zorro_resource_start(cinfo->zdev) > 0x01000000)
+ iounmap ((void *)cinfo->fbmem);
+ }
+ framebuffer_release(cinfo->info);
+}
+#endif /* CONFIG_ZORRO */
+
+static int cirrusfb_set_fbinfo(struct cirrusfb_info *cinfo)
+{
+ struct fb_info *info = cinfo->info;
+ struct fb_var_screeninfo *var = &info->var;
+
+ info->currcon = -1;
+ info->par = cinfo;
+ info->pseudo_palette = cinfo->pseudo_palette;
+ info->flags = FBINFO_DEFAULT
+ | FBINFO_HWACCEL_XPAN
+ | FBINFO_HWACCEL_YPAN
+ | FBINFO_HWACCEL_FILLRECT
+ | FBINFO_HWACCEL_COPYAREA;
+ if (noaccel)
+ info->flags |= FBINFO_HWACCEL_DISABLED;
+ info->fbops = &cirrusfb_ops;
+ info->screen_base = cinfo->fbmem;
+ if (cinfo->btype == BT_GD5480) {
+ if (var->bits_per_pixel == 16)
+ info->screen_base += 1 * MB_;
+ if (var->bits_per_pixel == 24 || var->bits_per_pixel == 32)
+ info->screen_base += 2 * MB_;
+ }
+
+ /* Fill fix common fields */
+ strlcpy(info->fix.id, cirrusfb_board_info[cinfo->btype].name,
+ sizeof(info->fix.id));
+
+ /* monochrome: only 1 memory plane */
+ /* 8 bit and above: Use whole memory area */
+ info->fix.smem_start = cinfo->fbmem_phys;
+ info->fix.smem_len = (var->bits_per_pixel == 1) ? cinfo->size / 4 : cinfo->size;
+ info->fix.type = cinfo->currentmode.type;
+ info->fix.type_aux = 0;
+ info->fix.visual = cinfo->currentmode.visual;
+ info->fix.xpanstep = 1;
+ info->fix.ypanstep = 1;
+ info->fix.ywrapstep = 0;
+ info->fix.line_length = cinfo->currentmode.line_length;
+
+ /* FIXME: map region at 0xB8000 if available, fill in here */
+ info->fix.mmio_start = cinfo->fbregs_phys;
+ info->fix.mmio_len = 0;
+ info->fix.accel = FB_ACCEL_NONE;
+
+ fb_alloc_cmap(&info->cmap, 256, 0);
+
+ return 0;
+}
+static int cirrusfb_register(struct cirrusfb_info *cinfo)
+{
+ struct fb_info *info;
+ int err;
+ cirrusfb_board_t btype;
+
+ DPRINTK ("ENTER\n");
-static struct cirrusfb_info *cirrusfb_pci_setup (struct pci_dev *pdev,
- const struct pci_device_id *ent)
+ printk (KERN_INFO "cirrusfb: Driver for Cirrus Logic based graphic boards, v" CIRRUSFB_VERSION "\n");
+
+ info = cinfo->info;
+ btype = cinfo->btype;
+
+ /* sanity checks */
+ assert (btype != BT_NONE);
+
+ DPRINTK ("cirrusfb: (RAM start set to: 0x%p)\n", cinfo->fbmem);
+
+ /* Make pretend we've set the var so our structures are in a "good" */
+ /* state, even though we haven't written the mode to the hw yet... */
+ info->var = cirrusfb_predefined[cirrusfb_def_mode].var;
+ info->var.activate = FB_ACTIVATE_NOW;
+
+ err = cirrusfb_decode_var(&info->var, &cinfo->currentmode, info);
+ if (err < 0) {
+ /* should never happen */
+ DPRINTK("choking on default var... umm, no good.\n");
+ goto err_unmap_cirrusfb;
+ }
+
+ /* set all the vital stuff */
+ cirrusfb_set_fbinfo(cinfo);
+
+ err = register_framebuffer(info);
+ if (err < 0) {
+ printk (KERN_ERR "cirrusfb: could not register fb device; err = %d!\n", err);
+ goto err_dealloc_cmap;
+ }
+
+ DPRINTK ("EXIT, returning 0\n");
+ return 0;
+
+err_dealloc_cmap:
+ fb_dealloc_cmap(&info->cmap);
+err_unmap_cirrusfb:
+ cinfo->unmap(cinfo);
+ return err;
+}
+
+static void __devexit cirrusfb_cleanup (struct fb_info *info)
+{
+ struct cirrusfb_info *cinfo = info->par;
+ DPRINTK ("ENTER\n");
+
+ switch_monitor (cinfo, 0);
+
+ unregister_framebuffer (info);
+ fb_dealloc_cmap (&info->cmap);
+ printk ("Framebuffer unregistered\n");
+ cinfo->unmap(cinfo);
+
+ DPRINTK ("EXIT\n");
+}
+
+
+#ifdef CONFIG_PCI
+static int cirrusfb_pci_register (struct pci_dev *pdev,
+ const struct pci_device_id *ent)
{
struct cirrusfb_info *cinfo;
struct fb_info *info;
@@ -2233,11 +2426,13 @@
cinfo->fbmem_phys = board_addr;
cinfo->size = board_size;
+ cinfo->unmap = cirrusfb_pci_unmap;
printk (" RAM (%lu kB) at 0xx%lx, ", cinfo->size / KB_, board_addr);
printk ("Cirrus Logic chipset on PCI bus\n");
+ pci_set_drvdata(pdev, info);
- return cinfo;
+ return cirrusfb_register(cinfo);
err_release_legacy:
if (release_io_ports)
@@ -2252,77 +2447,51 @@
err_disable:
pci_disable_device(pdev);
err_out:
- return ERR_PTR(ret);
+ return ret;
}
-#endif /* CONFIG_PCI */
-
-
-
-#ifdef CONFIG_ZORRO
-static int cirrusfb_zorro_find (struct zorro_dev **z_o,
- struct zorro_dev **z2_o,
- cirrusfb_board_t *btype, unsigned long *size)
+void __devexit cirrusfb_pci_unregister (struct pci_dev *pdev)
{
- struct zorro_dev *z = NULL;
- int i;
-
- assert (z_o != NULL);
- assert (btype != NULL);
-
- for (i = 0; i < ARRAY_SIZE(cirrusfb_zorro_probe_list); i++)
- if ((z = zorro_find_device(cirrusfb_zorro_probe_list[i].id, NULL)))
- break;
-
- if (z) {
- *z_o = z;
- if (cirrusfb_zorro_probe_list[i].id2)
- *z2_o = zorro_find_device(cirrusfb_zorro_probe_list[i].id2, NULL);
- else
- *z2_o = NULL;
-
- *btype = cirrusfb_zorro_probe_list[i].btype;
- *size = cirrusfb_zorro_probe_list[i].size;
-
- printk (KERN_INFO "cirrusfb: %s board detected; ",
- cirrusfb_board_info[*btype].name);
+ struct fb_info *info = pci_get_drvdata(pdev);
+ DPRINTK ("ENTER\n");
- return 0;
- }
+ cirrusfb_cleanup (info);
- printk (KERN_NOTICE "cirrusfb: no supported board found.\n");
- return -ENODEV;
+ DPRINTK ("EXIT\n");
}
-
-static void __devexit cirrusfb_zorro_unmap (struct cirrusfb_info *cinfo)
-{
- release_mem_region(cinfo->board_addr, cinfo->board_size);
-
- if (cinfo->btype == BT_PICASSO4) {
- cinfo->regbase -= 0x600000;
- iounmap ((void *)cinfo->regbase);
- iounmap ((void *)cinfo->fbmem);
- } else {
- if (cinfo->board_addr > 0x01000000)
- iounmap ((void *)cinfo->fbmem);
- }
- framebuffer_release(cinfo->info);
-}
+static struct pci_driver cirrusfb_pci_driver = {
+ .name = "cirrusfb",
+ .id_table = cirrusfb_pci_table,
+ .probe = cirrusfb_pci_register,
+ .remove = __devexit_p(cirrusfb_pci_unregister),
+#ifdef CONFIG_PM
+#if 0
+ .suspend = cirrusfb_pci_suspend,
+ .resume = cirrusfb_pci_resume,
+#endif
+#endif
+};
+#endif /* CONFIG_PCI */
-static struct cirrusfb_info *cirrusfb_zorro_setup(void)
+#ifdef CONFIG_ZORRO
+static int cirrusfb_zorro_register(struct zorro_dev *z,
+ const struct zorro_device_id *ent)
{
struct cirrusfb_info *cinfo;
struct fb_info *info;
cirrusfb_board_t btype;
- struct zorro_dev *z = NULL, *z2 = NULL;
+ struct zorro_dev *z2 = NULL;
unsigned long board_addr, board_size, size;
int ret;
- ret = cirrusfb_zorro_find (&z, &z2, &btype, &size);
- if (ret < 0)
- goto err_out;
+ btype = ent->driver_data;
+ if (cirrusfb_zorro_table2[btype].id2)
+ z2 = zorro_find_device(cirrusfb_zorro_table2[btype].id2, NULL);
+ size = cirrusfb_zorro_table2[btype].size;
+ printk(KERN_INFO "cirrusfb: %s board detected; ",
+ cirrusfb_board_info[btype].name);
info = framebuffer_alloc(sizeof(struct cirrusfb_info), &z->dev);
if (!info) {
@@ -2339,11 +2508,12 @@
assert (z2 >= 0);
assert (btype != BT_NONE);
- cinfo->board_addr = board_addr = z->resource.start;
- cinfo->board_size = board_size = z->resource.end-z->resource.start+1;
+ cinfo->zdev = z;
+ board_addr = zorro_resource_start(z);
+ board_size = zorro_resource_len(z);
cinfo->size = size;
- if (!request_mem_region(board_addr, board_size, "cirrusfb")) {
+ if (!zorro_request_device(z, "cirrusfb")) {
printk(KERN_ERR "cirrusfb: cannot reserve region 0x%lx, abort\n",
board_addr);
ret = -EBUSY;
@@ -2370,7 +2540,7 @@
cinfo->fbregs_phys = board_addr + 0x600000;
cinfo->fbmem_phys = board_addr + 16777216;
- cinfo->fbmem = ioremap (info->fbmem_phys, 16777216);
+ cinfo->fbmem = ioremap (cinfo->fbmem_phys, 16777216);
if (!cinfo->fbmem)
goto err_unmap_regbase;
} else {
@@ -2390,10 +2560,12 @@
DPRINTK ("cirrusfb: Virtual address for board set to: $%p\n", cinfo->regbase);
}
+ cinfo->unmap = cirrusfb_zorro_unmap;
printk (KERN_INFO "Cirrus Logic chipset on Zorro bus\n");
+ zorro_set_drvdata(z, info);
- return 0;
+ return cirrusfb_register(cinfo);
err_unmap_regbase:
/* Parental advisory: explicit hack */
@@ -2403,153 +2575,12 @@
err_release_fb:
framebuffer_release(info);
err_out:
- return ERR_PTR(ret);
+ return ret;
}
-#endif /* CONFIG_ZORRO */
-static int cirrusfb_set_fbinfo(struct cirrusfb_info *cinfo)
+void __devexit cirrusfb_zorro_unregister(struct zorro_dev *z)
{
- struct fb_info *info = cinfo->info;
- struct fb_var_screeninfo *var = &info->var;
-
- info->currcon = -1;
- info->par = cinfo;
- info->pseudo_palette = cinfo->pseudo_palette;
- info->flags = FBINFO_DEFAULT
- | FBINFO_HWACCEL_XPAN
- | FBINFO_HWACCEL_YPAN
- | FBINFO_HWACCEL_FILLRECT
- | FBINFO_HWACCEL_COPYAREA;
- if (noaccel)
- info->flags |= FBINFO_HWACCEL_DISABLED;
- info->fbops = &cirrusfb_ops;
- info->screen_base = cinfo->fbmem;
- if (cinfo->btype == BT_GD5480) {
- if (var->bits_per_pixel == 16)
- info->screen_base += 1 * MB_;
- if (var->bits_per_pixel == 24 || var->bits_per_pixel == 32)
- info->screen_base += 2 * MB_;
- }
-
- /* Fill fix common fields */
- strlcpy(info->fix.id, cirrusfb_board_info[cinfo->btype].name,
- sizeof(info->fix.id));
-
- /* monochrome: only 1 memory plane */
- /* 8 bit and above: Use whole memory area */
- info->fix.smem_start = cinfo->fbmem_phys;
- info->fix.smem_len = (var->bits_per_pixel == 1) ? cinfo->size / 4 : cinfo->size;
- info->fix.type = cinfo->currentmode.type;
- info->fix.type_aux = 0;
- info->fix.visual = cinfo->currentmode.visual;
- info->fix.xpanstep = 1;
- info->fix.ypanstep = 1;
- info->fix.ywrapstep = 0;
- info->fix.line_length = cinfo->currentmode.line_length;
-
- /* FIXME: map region at 0xB8000 if available, fill in here */
- info->fix.mmio_start = cinfo->fbregs_phys;
- info->fix.mmio_len = 0;
- info->fix.accel = FB_ACCEL_NONE;
-
- fb_alloc_cmap(&info->cmap, 256, 0);
-
- return 0;
-}
-
-#if defined(CONFIG_PCI)
-#define cirrusfb_unmap cirrusfb_pci_unmap
-#define cirrusfb_bus_setup cirrusfb_pci_setup
-#elif defined(CONFIG_ZORRO)
-#define cirrusfb_unmap cirrusfb_zorro_unmap
-#define cirrusfb_bus_setup cirrusfb_zorro_setup
-#endif
-
-
-static int cirrusfb_pci_register (struct pci_dev *pdev,
- const struct pci_device_id *ent)
-{
- struct fb_info *info;
- struct cirrusfb_info *cinfo = NULL;
- int err;
- cirrusfb_board_t btype;
-
- DPRINTK ("ENTER\n");
-
- printk (KERN_INFO "cirrusfb: Driver for Cirrus Logic based graphic boards, v" CIRRUSFB_VERSION "\n");
-
- cinfo = cirrusfb_bus_setup(pdev, ent);
-
- if (IS_ERR(cinfo)) {
- err = PTR_ERR(cinfo);
- goto err_out;
- }
-
- info = cinfo->info;
- btype = cinfo->btype;
-
- /* sanity checks */
- assert (btype != BT_NONE);
- assert (btype == cirrusfb_board_info[btype].btype);
-
- DPRINTK ("cirrusfb: (RAM start set to: 0x%p)\n", cinfo->fbmem);
-
- /* Make pretend we've set the var so our structures are in a "good" */
- /* state, even though we haven't written the mode to the hw yet... */
- info->var = cirrusfb_predefined[cirrusfb_def_mode].var;
- info->var.activate = FB_ACTIVATE_NOW;
-
- err = cirrusfb_decode_var(&info->var, &cinfo->currentmode, info);
- if (err < 0) {
- /* should never happen */
- DPRINTK("choking on default var... umm, no good.\n");
- goto err_unmap_cirrusfb;
- }
-
- /* set all the vital stuff */
- cirrusfb_set_fbinfo(cinfo);
-
- pci_set_drvdata(pdev, info);
-
- err = register_framebuffer(info);
- if (err < 0) {
- printk (KERN_ERR "cirrusfb: could not register fb device; err = %d!\n", err);
- goto err_dealloc_cmap;
- }
-
- DPRINTK ("EXIT, returning 0\n");
- return 0;
-
-err_dealloc_cmap:
- fb_dealloc_cmap(&info->cmap);
-err_unmap_cirrusfb:
- cirrusfb_unmap(cinfo);
-err_out:
- return err;
-}
-
-
-static void __devexit cirrusfb_cleanup (struct fb_info *info)
-{
- struct cirrusfb_info *cinfo = info->par;
- DPRINTK ("ENTER\n");
-
-#ifdef CONFIG_ZORRO
- switch_monitor (cinfo, 0);
-#endif
-
- unregister_framebuffer (info);
- fb_dealloc_cmap (&info->cmap);
- printk ("Framebuffer unregistered\n");
- cirrusfb_unmap (cinfo);
-
- DPRINTK ("EXIT\n");
-}
-
-
-void __devexit cirrusfb_pci_unregister (struct pci_dev *pdev)
-{
- struct fb_info *info = pci_get_drvdata(pdev);
+ struct fb_info *info = zorro_get_drvdata(z);
DPRINTK ("ENTER\n");
cirrusfb_cleanup (info);
@@ -2557,26 +2588,25 @@
DPRINTK ("EXIT\n");
}
-static struct pci_driver cirrusfb_driver = {
- .name = "cirrusfb",
- .id_table = cirrusfb_pci_table,
- .probe = cirrusfb_pci_register,
- .remove = __devexit_p(cirrusfb_pci_unregister),
-#ifdef CONFIG_PM
-#if 0
- .suspend = cirrusfb_pci_suspend,
- .resume = cirrusfb_pci_resume,
-#endif
-#endif
+static struct zorro_driver cirrusfb_zorro_driver = {
+ .name = "cirrusfb",
+ .id_table = cirrusfb_zorro_table,
+ .probe = cirrusfb_zorro_register,
+ .remove = __devexit_p(cirrusfb_zorro_unregister),
};
+#endif /* CONFIG_ZORRO */
int __init cirrusfb_init(void)
{
+ int error = 0;
+
#ifdef CONFIG_ZORRO
- return cirrusfb_pci_register(NULL, NULL);
-#else
- return pci_module_init(&cirrusfb_driver);
+ error |= zorro_module_init(&cirrusfb_zorro_driver);
#endif
+#ifdef CONFIG_PCI
+ error |= pci_module_init(&cirrusfb_pci_driver);
+#endif
+ return error;
}
@@ -2619,7 +2649,12 @@
void __exit cirrusfb_exit (void)
{
- pci_unregister_driver (&cirrusfb_driver);
+#ifdef CONFIG_PCI
+ pci_unregister_driver(&cirrusfb_pci_driver);
+#endif
+#ifdef CONFIG_ZORRO
+ zorro_unregister_driver(&cirrusfb_zorro_driver);
+#endif
}
#ifdef MODULE
@@ -2830,7 +2865,7 @@
static void cirrusfb_BitBLT (caddr_t regbase, int bits_per_pixel,
u_short curx, u_short cury, u_short destx, u_short desty,
- u_short width, u_short height, u_short line_length)
+ u_short width, u_short height, u_short line_length)
{
u_short nwidth, nheight;
u_long nsrc, ndest;
--- linux-2.6.8-rc2/include/video/vga.h 2003-03-25 10:07:30.000000000 +0100
+++ linux-m68k-2.6.8-rc2/include/video/vga.h 2004-07-19 19:38:47.000000000 +0200
@@ -26,8 +26,15 @@
/*
* FIXME
* Ugh, we don't have PCI space, so map readb() and friends to use Zorro space
- * for MMIO accesses. This should make clgenfb work again on Amiga
+ * for MMIO accesses. This should make cirrusfb work again on Amiga
*/
+#undef inb_p
+#undef inw_p
+#undef outb_p
+#undef outw
+#undef readb
+#undef writeb
+#undef writew
#define inb_p(port) 0
#define inw_p(port) 0
#define outb_p(port, val) do { } while (0)
|
|
From: Sven L. <sve...@wa...> - 2004-07-21 10:27:16
|
On Wed, Jul 21, 2004 at 12:43:09AM +0400, nospamdk8 wrote: > Hello, > > > I tried to get the debian powerpc apus port working on > my a4000T a couple of days ago, I didnt succeed, so I > thought you might want some feedback on the issue(s) > that I noted. Ok, i would be interested in you booting the 2.4.25 kernel, or even one of the 2.6 ones. Simon Richter already did some tentatives at this, but it seems he is facing some dissapearance of apusboot code or something such. > first thing, regarding sarge, is that the new d-i doesnt > seem to allow netinstall using ethernet pppoe. also, it Ah, so you where able to boot the d-i kernel on your box ? Please fill a bug report against debian-installer about the ethernet pppoe thingy. > seems that partitioning from within it is mandatory, at > least as far as the screenshots tell, and that the cd > netinst iso requires some kind of cd boot that doesnt > normally exist on amiga systems. Nope, you go to modify partition table, and can select a pre partitioned partition. > therefore, after finding a totorial on how to do a > pppoe install using the old installer, I found that > sarge doesnt seem to supply support for the old > installer. And good ridance of it. > then I opted for installing woody, which I know works > on my linux 68k box (a4000 desktop 040/40), and then > I knew that I later could do an apt-get dist upgrade. Ok, but this is of little interest to us at this point. > having tried and failed getting any visible boot > sequence on my ppc system, I have noticed the following. > the bootstrap seems to have a generic problem with > compressed kernel images. the kernel files that I tried > all failed the decompression in one way or other. either > crc error, length error or simply a system crash. I found Ok, this seems similar with what Simon mentioned to me, and seems to be a problem of apusboot. > that decompressing manually, and then using the then larger > file then has some other issue, namely that the larger > filesize doesnt seem to fit into the allocated area > that bootstrap seems to allow. either that or bootstrap One more reason to go with 2.6 and its more modular kernels. > tries to load the kernel in, through or from chipram. > the older 2.4.20 image doesnt seem to have this problem, > but it is also considerable smaller that the/your later > 2.4.25-di and 2.4.25 releases. it seems to help if I > set video=amifb:disable. this is why i think/feel that > there may be a chipram/fastram space allocation problem > somehow. Ok. > anyhow, nomatter what I do I have not been able to se > a working kernel boot. trying every possible and impossible Yeah, this was also my impression of the current apus state of debian support. > combination of things, I can either get a completely black > screen from my picasso4 or get a grey/white screen from > the builtin flickerfixer. I'd really would have liked some > access to the debian packages and programs, dualbooting > from a separate harddrive on the internal 4kT scsi, but > asking around, it seems that 99% of those having tried > apus never had it working at all. I noticed that there was > some comments on the low userbase of debian apus, and that > the port is going to be removed eventually. this is Well, only as far as the kernel and debian-installer support goes. Well, mostly the kernel, since apart from the kernel, and nobody trying it, debian-installer should be ok. > a shame ofcourse, but since the port doesnt really work > easily, not as easy as the the 68k port at least, and the > fact that the current maintainer doesnt have a compatible > system in order to test things, this is all just a matter > of nature i guess, the possibility that apus is going away. Well, since you seem to be the first one to even test the apus kernels since i released them month ago, there is not much i can do. There is some hope from Simon Richter, who has both the hardware and the competence, but let's see what this brings. > I am not asking for help to get it to work, I just noted > that feedback was lacking, so here is some. I believe that Thanks. CCed to debian-boot. > many pup/wup/aos users would very much like to have the > dualboot possibility with debian using the faster ppc. > just the fact that it is not on/at a relatively usable > level eventually and naturally holds off any userbase. I > am no programmer either, and I guess that this is actually > what is needed in order to do some problem hunting in > order to figure what exactly is stopping the boot off > the ramdisk images on a system like mine. for me it is > also my production-system and the gateway for the linux-68k > box, the system running 24/7/365 doesnt allow complete > disassembly of the hardware. Hehe, i understand. > ofcourse, should you happen to know anyone having a similar > setup as mine, with working apus installation that is, it > would be nice if you perhaps could forward my email address > in private only please, and ask the person to just send a > working kernel, a working ramdisk boot/root image and the > magic line that needs to go with bootstrap. this way I could > figure if it is really just a hardware compatibility issue > on my part. Not that i know, have you tried the apus mailing lists ? Friendly, Sven Luther |
|
From: Geert U. <ge...@li...> - 2004-07-20 16:00:28
|
On Mon, 28 Jun 2004, David Eger wrote:
> Could you check cirrusfb to see if it compiles for amiga?
> I *think* I got the CONFIG_ZORRO stuff right, but then, I never
> compile for it... the patch is in 2.6.7-{mm2,bk}...
Here are my changes, compile-tested only...
Cirrusfb updates:
- Cirrusfb depends on Zorro or PCI
- Revive Zorro support, using new Zorro driver framework
- Merge PCI and Zorro code where possible
- Use C99 initializers
- Kill superfluous whitespace
- #undef I/O ops before redefining them on Amiga
--- linux-2.6.8-rc2/drivers/video/Kconfig 2004-07-15 23:14:59.000000000 +0200
+++ linux-m68k-2.6.8-rc2/drivers/video/Kconfig 2004-07-19 21:06:17.000000000 +0200
@@ -40,7 +40,7 @@
config FB_CIRRUS
tristate "Cirrus Logic support"
- depends on FB && (AMIGA || PCI)
+ depends on FB && (ZORRO || PCI)
---help---
This enables support for Cirrus Logic GD542x/543x based boards on
Amiga: SD64, Piccolo, Picasso II/II+, Picasso IV, or EGS Spectrum.
--- linux-2.6.8-rc2/drivers/video/cirrusfb.c 2004-07-18 15:55:33.000000000 +0200
+++ linux-m68k-2.6.8-rc2/drivers/video/cirrusfb.c 2004-07-19 21:14:50.000000000 +0200
@@ -5,8 +5,8 @@
*
* Contributors (thanks, all!)
*
- * David Eger:
- * Overhaul for Linux 2.6
+ * David Eger:
+ * Overhaul for Linux 2.6
*
* Jeff Rugen:
* Major contributions; Motorola PowerStack (PPC and PCI) support,
@@ -145,9 +145,6 @@
* a run-time table?
*/
static const struct cirrusfb_board_info_rec {
- cirrusfb_board_t btype; /* chipset enum, not strictly necessary, as
- * cirrusfb_board_info[] is directly indexed
- * by this value */
char *name; /* ASCII name of chipset */
long maxclock[5]; /* maximum video clock */
/* for 1/4bpp, 8bpp 15/16bpp, 24bpp, 32bpp - numbers from xorg code */
@@ -164,104 +161,115 @@
unsigned char sr1f; /* SR1F VGA initial register value */
} cirrusfb_board_info[] = {
- { BT_NONE, }, /* dummy record */
- { BT_SD64,
- "CL SD64",
- { 140000, 140000, 140000, 140000, 140000, }, /* guess */
- /* the SD64/P4 have a higher max. videoclock */
- TRUE,
- TRUE,
- TRUE,
- 0xF0,
- 0xF0,
- 0, /* unused, does not multiplex */
- 0xF1,
- 0, /* unused, does not multiplex */
- 0x20 },
- { BT_PICCOLO,
- "CL Piccolo",
- { 90000, 90000, 90000, 90000, 90000 }, /* guess */
- TRUE,
- TRUE,
- FALSE,
- 0x80,
- 0x80,
- 0, /* unused, does not multiplex */
- 0x81,
- 0, /* unused, does not multiplex */
- 0x22 },
- { BT_PICASSO,
- "CL Picasso",
- { 90000, 90000, 90000, 90000, 90000, }, /* guess */
- TRUE,
- TRUE,
- FALSE,
- 0x20,
- 0x20,
- 0, /* unused, does not multiplex */
- 0x21,
- 0, /* unused, does not multiplex */
- 0x22 },
- { BT_SPECTRUM,
- "CL Spectrum",
- { 90000, 90000, 90000, 90000, 90000, }, /* guess */
- TRUE,
- TRUE,
- FALSE,
- 0x80,
- 0x80,
- 0, /* unused, does not multiplex */
- 0x81,
- 0, /* unused, does not multiplex */
- 0x22 },
- { BT_PICASSO4,
- "CL Picasso4",
- { 135100, 135100, 85500, 85500, 0 },
- TRUE,
- FALSE,
- TRUE,
- 0x20,
- 0x20,
- 0, /* unused, does not multiplex */
- 0x21,
- 0, /* unused, does not multiplex */
- 0 },
- { BT_ALPINE,
- "CL Alpine",
- { 85500, 85500, 50000, 28500, 0}, /* for the GD5430. GD5446 can do more... */
- TRUE,
- TRUE,
- TRUE,
- 0xA0,
- 0xA1,
- 0xA7,
- 0xA1,
- 0xA7,
- 0x1C },
- { BT_GD5480,
- "CL GD5480",
- { 135100, 200000, 200000, 135100, 135100 },
- TRUE,
- TRUE,
- TRUE,
- 0x10,
- 0x11,
- 0, /* unused, does not multiplex */
- 0x11,
- 0, /* unused, does not multiplex */
- 0x1C },
- { BT_LAGUNA,
- "CL Laguna",
- { 135100, 135100, 135100, 135100, 135100, }, /* guess */
- FALSE,
- FALSE,
- TRUE,
- 0, /* unused */
- 0, /* unused */
- 0, /* unused */
- 0, /* unused */
- 0, /* unused */
- 0 }, /* unused */
+ [BT_SD64] = {
+ .name = "CL SD64",
+ .maxclock = {
+ /* guess */
+ /* the SD64/P4 have a higher max. videoclock */
+ 140000, 140000, 140000, 140000, 140000,
+ },
+ .init_sr07 = TRUE,
+ .init_sr1f = TRUE,
+ .scrn_start_bit19 = TRUE,
+ .sr07 = 0xF0,
+ .sr07_1bpp = 0xF0,
+ .sr07_8bpp = 0xF1,
+ .sr1f = 0x20
+ },
+ [BT_PICCOLO] = {
+ .name = "CL Piccolo",
+ .maxclock = {
+ /* guess */
+ 90000, 90000, 90000, 90000, 90000
+ },
+ .init_sr07 = TRUE,
+ .init_sr1f = TRUE,
+ .scrn_start_bit19 = FALSE,
+ .sr07 = 0x80,
+ .sr07_1bpp = 0x80,
+ .sr07_8bpp = 0x81,
+ .sr1f = 0x22
+ },
+ [BT_PICASSO] = {
+ .name = "CL Picasso",
+ .maxclock = {
+ /* guess */
+ 90000, 90000, 90000, 90000, 90000
+ },
+ .init_sr07 = TRUE,
+ .init_sr1f = TRUE,
+ .scrn_start_bit19 = FALSE,
+ .sr07 = 0x20,
+ .sr07_1bpp = 0x20,
+ .sr07_8bpp = 0x21,
+ .sr1f = 0x22
+ },
+ [BT_SPECTRUM] = {
+ .name = "CL Spectrum",
+ .maxclock = {
+ /* guess */
+ 90000, 90000, 90000, 90000, 90000
+ },
+ .init_sr07 = TRUE,
+ .init_sr1f = TRUE,
+ .scrn_start_bit19 = FALSE,
+ .sr07 = 0x80,
+ .sr07_1bpp = 0x80,
+ .sr07_8bpp = 0x81,
+ .sr1f = 0x22
+ },
+ [BT_PICASSO4] = {
+ .name = "CL Picasso4",
+ .maxclock = {
+ 135100, 135100, 85500, 85500, 0
+ },
+ .init_sr07 = TRUE,
+ .init_sr1f = FALSE,
+ .scrn_start_bit19 = TRUE,
+ .sr07 = 0x20,
+ .sr07_1bpp = 0x20,
+ .sr07_8bpp = 0x21,
+ .sr1f = 0
+ },
+ [BT_ALPINE] = {
+ .name = "CL Alpine",
+ .maxclock = {
+ /* for the GD5430. GD5446 can do more... */
+ 85500, 85500, 50000, 28500, 0
+ },
+ .init_sr07 = TRUE,
+ .init_sr1f = TRUE,
+ .scrn_start_bit19 = TRUE,
+ .sr07 = 0xA0,
+ .sr07_1bpp = 0xA1,
+ .sr07_1bpp_mux = 0xA7,
+ .sr07_8bpp = 0xA1,
+ .sr07_8bpp_mux = 0xA7,
+ .sr1f = 0x1C
+ },
+ [BT_GD5480] = {
+ .name = "CL GD5480",
+ .maxclock = {
+ 135100, 200000, 200000, 135100, 135100
+ },
+ .init_sr07 = TRUE,
+ .init_sr1f = TRUE,
+ .scrn_start_bit19 = TRUE,
+ .sr07 = 0x10,
+ .sr07_1bpp = 0x11,
+ .sr07_8bpp = 0x11,
+ .sr1f = 0x1C
+ },
+ [BT_LAGUNA] = {
+ .name = "CL Laguna",
+ .maxclock = {
+ /* guess */
+ 135100, 135100, 135100, 135100, 135100,
+ },
+ .init_sr07 = FALSE,
+ .init_sr1f = FALSE,
+ .scrn_start_bit19 = TRUE,
+ }
};
@@ -270,12 +278,12 @@
{ PCI_VENDOR_ID_CIRRUS, PCI_DEVICE_ID_##id, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (btype) }
static struct pci_device_id cirrusfb_pci_table[] = {
- CHIP( CIRRUS_5436, BT_ALPINE ),
- CHIP( CIRRUS_5434_8, BT_ALPINE ),
- CHIP( CIRRUS_5434_4, BT_ALPINE ),
- CHIP( CIRRUS_5430, BT_ALPINE ), /* GD-5440 has identical id */
- CHIP( CIRRUS_7543, BT_ALPINE ),
- CHIP( CIRRUS_7548, BT_ALPINE ),
+ CHIP( CIRRUS_5436, BT_ALPINE ),
+ CHIP( CIRRUS_5434_8, BT_ALPINE ),
+ CHIP( CIRRUS_5434_4, BT_ALPINE ),
+ CHIP( CIRRUS_5430, BT_ALPINE ), /* GD-5440 has identical id */
+ CHIP( CIRRUS_7543, BT_ALPINE ),
+ CHIP( CIRRUS_7548, BT_ALPINE ),
CHIP( CIRRUS_5480, BT_GD5480 ), /* MacPicasso probably */
CHIP( CIRRUS_5446, BT_PICASSO4 ), /* Picasso 4 is a GD5446 */
CHIP( CIRRUS_5462, BT_LAGUNA ), /* CL Laguna */
@@ -289,31 +297,50 @@
#ifdef CONFIG_ZORRO
+static const struct zorro_device_id cirrusfb_zorro_table[] = {
+ {
+ .id = ZORRO_PROD_HELFRICH_SD64_RAM,
+ .driver_data = BT_SD64,
+ }, {
+ .id = ZORRO_PROD_HELFRICH_PICCOLO_RAM,
+ .driver_data = BT_PICCOLO,
+ }, {
+ .id = ZORRO_PROD_VILLAGE_TRONIC_PICASSO_II_II_PLUS_RAM,
+ .driver_data = BT_PICASSO,
+ }, {
+ .id = ZORRO_PROD_GVP_EGS_28_24_SPECTRUM_RAM,
+ .driver_data = BT_SPECTRUM,
+ }, {
+ .id = ZORRO_PROD_VILLAGE_TRONIC_PICASSO_IV_Z3,
+ .driver_data = BT_PICASSO4,
+ },
+ { 0 }
+};
+
static const struct {
- cirrusfb_board_t btype;
- zorro_id id, id2;
+ zorro_id id2;
unsigned long size;
-} cirrusfb_zorro_probe_list[] __initdata = {
- { BT_SD64,
- ZORRO_PROD_HELFRICH_SD64_RAM,
- ZORRO_PROD_HELFRICH_SD64_REG,
- 0x400000 },
- { BT_PICCOLO,
- ZORRO_PROD_HELFRICH_PICCOLO_RAM,
- ZORRO_PROD_HELFRICH_PICCOLO_REG,
- 0x200000 },
- { BT_PICASSO,
- ZORRO_PROD_VILLAGE_TRONIC_PICASSO_II_II_PLUS_RAM,
- ZORRO_PROD_VILLAGE_TRONIC_PICASSO_II_II_PLUS_REG,
- 0x200000 },
- { BT_SPECTRUM,
- ZORRO_PROD_GVP_EGS_28_24_SPECTRUM_RAM,
- ZORRO_PROD_GVP_EGS_28_24_SPECTRUM_REG,
- 0x200000 },
- { BT_PICASSO4,
- ZORRO_PROD_VILLAGE_TRONIC_PICASSO_IV_Z3,
- 0,
- 0x400000 },
+} cirrusfb_zorro_table2[] = {
+ [BT_SD64] = {
+ .id2 = ZORRO_PROD_HELFRICH_SD64_REG,
+ .size = 0x400000
+ },
+ [BT_PICCOLO] = {
+ .id2 = ZORRO_PROD_HELFRICH_PICCOLO_REG,
+ .size = 0x200000
+ },
+ [BT_PICASSO] = {
+ .id2 = ZORRO_PROD_VILLAGE_TRONIC_PICASSO_II_II_PLUS_REG,
+ .size = 0x200000
+ },
+ [BT_SPECTRUM] = {
+ .id2 = ZORRO_PROD_GVP_EGS_28_24_SPECTRUM_REG,
+ .size = 0x200000
+ },
+ [BT_PICASSO4] = {
+ .id2 = 0,
+ .size = 0x400000
+ }
};
#endif /* CONFIG_ZORRO */
@@ -381,13 +408,12 @@
struct { u8 red, green, blue, pad; } palette[256];
#ifdef CONFIG_ZORRO
- unsigned long board_addr,
- board_size;
+ struct zorro_dev *zdev;
#endif
-
#ifdef CONFIG_PCI
struct pci_dev *pdev;
#endif
+ void (*unmap)(struct cirrusfb_info *cinfo);
};
@@ -401,50 +427,83 @@
static const struct {
const char *name;
struct fb_var_screeninfo var;
-} cirrusfb_predefined[] =
-
-{
- {"Autodetect", /* autodetect mode */
- {0}
- },
-
- {"640x480", /* 640x480, 31.25 kHz, 60 Hz, 25 MHz PixClock */
- {
- 640, 480, 640, 480, 0, 0, 8, 0,
- {0, 8, 0},
- {0, 8, 0},
- {0, 8, 0},
- {0, 0, 0},
- 0, 0, -1, -1, FB_ACCEL_NONE, 40000, 48, 16, 32, 8, 96, 4,
- FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED
- }
- },
-
- {"800x600", /* 800x600, 48 kHz, 76 Hz, 50 MHz PixClock */
- {
- 800, 600, 800, 600, 0, 0, 8, 0,
- {0, 8, 0},
- {0, 8, 0},
- {0, 8, 0},
- {0, 0, 0},
- 0, 0, -1, -1, FB_ACCEL_NONE, 20000, 128, 16, 24, 2, 96, 6,
- 0, FB_VMODE_NONINTERLACED
- }
- },
-
- /*
- Modeline from XF86Config:
- Mode "1024x768" 80 1024 1136 1340 1432 768 770 774 805
- */
- {"1024x768", /* 1024x768, 55.8 kHz, 70 Hz, 80 MHz PixClock */
- {
- 1024, 768, 1024, 768, 0, 0, 8, 0,
- {0, 8, 0},
- {0, 8, 0},
- {0, 8, 0},
- {0, 0, 0},
- 0, 0, -1, -1, FB_ACCEL_NONE, 12500, 144, 32, 30, 2, 192, 6,
- 0, FB_VMODE_NONINTERLACED
+} cirrusfb_predefined[] = {
+ {
+ /* autodetect mode */
+ .name = "Autodetect",
+ }, {
+ /* 640x480, 31.25 kHz, 60 Hz, 25 MHz PixClock */
+ .name = "640x480",
+ .var = {
+ .xres = 640,
+ .yres = 480,
+ .xres_virtual = 640,
+ .yres_virtual = 480,
+ .bits_per_pixel = 8,
+ .red = { .length = 8 },
+ .green = { .length = 8 },
+ .blue = { .length = 8 },
+ .width = -1,
+ .height = -1,
+ .pixclock = 40000,
+ .left_margin = 48,
+ .right_margin = 16,
+ .upper_margin = 32,
+ .lower_margin = 8,
+ .hsync_len = 96,
+ .vsync_len = 4,
+ .sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+ .vmode = FB_VMODE_NONINTERLACED
+ }
+ }, {
+ /* 800x600, 48 kHz, 76 Hz, 50 MHz PixClock */
+ .name = "800x600",
+ .var = {
+ .xres = 800,
+ .yres = 600,
+ .xres_virtual = 800,
+ .yres_virtual = 600,
+ .bits_per_pixel = 8,
+ .red = { .length = 8 },
+ .green = { .length = 8 },
+ .blue = { .length = 8 },
+ .width = -1,
+ .height = -1,
+ .pixclock = 20000,
+ .left_margin = 128,
+ .right_margin = 16,
+ .upper_margin = 24,
+ .lower_margin = 2,
+ .hsync_len = 96,
+ .vsync_len = 6,
+ .vmode = FB_VMODE_NONINTERLACED
+ }
+ }, {
+ /*
+ * Modeline from XF86Config:
+ * Mode "1024x768" 80 1024 1136 1340 1432 768 770 774 805
+ */
+ /* 1024x768, 55.8 kHz, 70 Hz, 80 MHz PixClock */
+ .name = "1024x768",
+ .var = {
+ .xres = 1024,
+ .yres = 768,
+ .xres_virtual = 1024,
+ .yres_virtual = 768,
+ .bits_per_pixel = 8,
+ .red = { .length = 8 },
+ .green = { .length = 8 },
+ .blue = { .length = 8 },
+ .width = -1,
+ .height = -1,
+ .pixclock = 12500,
+ .left_margin = 144,
+ .right_margin = 32,
+ .upper_margin = 30,
+ .lower_margin = 2,
+ .hsync_len = 192,
+ .vsync_len = 6,
+ .vmode = FB_VMODE_NONINTERLACED
}
}
};
@@ -478,7 +537,7 @@
static struct fb_ops cirrusfb_ops = {
.owner = THIS_MODULE,
.fb_open = cirrusfb_open,
- .fb_release = cirrusfb_release,
+ .fb_release = cirrusfb_release,
.fb_setcolreg = cirrusfb_setcolreg,
.fb_check_var = cirrusfb_check_var,
.fb_set_par = cirrusfb_set_par,
@@ -1132,7 +1191,7 @@
DPRINTK (" (for GD54xx)\n");
vga_wseq (regbase, CL_SEQR7,
regs.multiplexing ?
- bi->sr07_1bpp_mux : bi->sr07_1bpp);
+ bi->sr07_1bpp_mux : bi->sr07_1bpp);
break;
case BT_LAGUNA:
@@ -1216,7 +1275,7 @@
DPRINTK (" (for GD54xx)\n");
vga_wseq (regbase, CL_SEQR7,
regs.multiplexing ?
- bi->sr07_8bpp_mux : bi->sr07_8bpp);
+ bi->sr07_8bpp_mux : bi->sr07_8bpp);
break;
case BT_LAGUNA:
@@ -2156,10 +2215,144 @@
framebuffer_release(cinfo->info);
pci_disable_device(pdev);
}
+#endif /* CONFIG_PCI */
+
+
+#ifdef CONFIG_ZORRO
+static void __devexit cirrusfb_zorro_unmap (struct cirrusfb_info *cinfo)
+{
+ zorro_release_device(cinfo->zdev);
+
+ if (cinfo->btype == BT_PICASSO4) {
+ cinfo->regbase -= 0x600000;
+ iounmap ((void *)cinfo->regbase);
+ iounmap ((void *)cinfo->fbmem);
+ } else {
+ if (zorro_resource_start(cinfo->zdev) > 0x01000000)
+ iounmap ((void *)cinfo->fbmem);
+ }
+ framebuffer_release(cinfo->info);
+}
+#endif /* CONFIG_ZORRO */
+
+static int cirrusfb_set_fbinfo(struct cirrusfb_info *cinfo)
+{
+ struct fb_info *info = cinfo->info;
+ struct fb_var_screeninfo *var = &info->var;
+
+ info->currcon = -1;
+ info->par = cinfo;
+ info->pseudo_palette = cinfo->pseudo_palette;
+ info->flags = FBINFO_DEFAULT
+ | FBINFO_HWACCEL_XPAN
+ | FBINFO_HWACCEL_YPAN
+ | FBINFO_HWACCEL_FILLRECT
+ | FBINFO_HWACCEL_COPYAREA;
+ if (noaccel)
+ info->flags |= FBINFO_HWACCEL_DISABLED;
+ info->fbops = &cirrusfb_ops;
+ info->screen_base = cinfo->fbmem;
+ if (cinfo->btype == BT_GD5480) {
+ if (var->bits_per_pixel == 16)
+ info->screen_base += 1 * MB_;
+ if (var->bits_per_pixel == 24 || var->bits_per_pixel == 32)
+ info->screen_base += 2 * MB_;
+ }
+
+ /* Fill fix common fields */
+ strlcpy(info->fix.id, cirrusfb_board_info[cinfo->btype].name,
+ sizeof(info->fix.id));
+
+ /* monochrome: only 1 memory plane */
+ /* 8 bit and above: Use whole memory area */
+ info->fix.smem_start = cinfo->fbmem_phys;
+ info->fix.smem_len = (var->bits_per_pixel == 1) ? cinfo->size / 4 : cinfo->size;
+ info->fix.type = cinfo->currentmode.type;
+ info->fix.type_aux = 0;
+ info->fix.visual = cinfo->currentmode.visual;
+ info->fix.xpanstep = 1;
+ info->fix.ypanstep = 1;
+ info->fix.ywrapstep = 0;
+ info->fix.line_length = cinfo->currentmode.line_length;
+
+ /* FIXME: map region at 0xB8000 if available, fill in here */
+ info->fix.mmio_start = cinfo->fbregs_phys;
+ info->fix.mmio_len = 0;
+ info->fix.accel = FB_ACCEL_NONE;
+
+ fb_alloc_cmap(&info->cmap, 256, 0);
+
+ return 0;
+}
+static int cirrusfb_register(struct cirrusfb_info *cinfo)
+{
+ struct fb_info *info;
+ int err;
+ cirrusfb_board_t btype;
+
+ DPRINTK ("ENTER\n");
-static struct cirrusfb_info *cirrusfb_pci_setup (struct pci_dev *pdev,
- const struct pci_device_id *ent)
+ printk (KERN_INFO "cirrusfb: Driver for Cirrus Logic based graphic boards, v" CIRRUSFB_VERSION "\n");
+
+ info = cinfo->info;
+ btype = cinfo->btype;
+
+ /* sanity checks */
+ assert (btype != BT_NONE);
+
+ DPRINTK ("cirrusfb: (RAM start set to: 0x%p)\n", cinfo->fbmem);
+
+ /* Make pretend we've set the var so our structures are in a "good" */
+ /* state, even though we haven't written the mode to the hw yet... */
+ info->var = cirrusfb_predefined[cirrusfb_def_mode].var;
+ info->var.activate = FB_ACTIVATE_NOW;
+
+ err = cirrusfb_decode_var(&info->var, &cinfo->currentmode, info);
+ if (err < 0) {
+ /* should never happen */
+ DPRINTK("choking on default var... umm, no good.\n");
+ goto err_unmap_cirrusfb;
+ }
+
+ /* set all the vital stuff */
+ cirrusfb_set_fbinfo(cinfo);
+
+ err = register_framebuffer(info);
+ if (err < 0) {
+ printk (KERN_ERR "cirrusfb: could not register fb device; err = %d!\n", err);
+ goto err_dealloc_cmap;
+ }
+
+ DPRINTK ("EXIT, returning 0\n");
+ return 0;
+
+err_dealloc_cmap:
+ fb_dealloc_cmap(&info->cmap);
+err_unmap_cirrusfb:
+ cinfo->unmap(cinfo);
+ return err;
+}
+
+static void __devexit cirrusfb_cleanup (struct fb_info *info)
+{
+ struct cirrusfb_info *cinfo = info->par;
+ DPRINTK ("ENTER\n");
+
+ switch_monitor (cinfo, 0);
+
+ unregister_framebuffer (info);
+ fb_dealloc_cmap (&info->cmap);
+ printk ("Framebuffer unregistered\n");
+ cinfo->unmap(cinfo);
+
+ DPRINTK ("EXIT\n");
+}
+
+
+#ifdef CONFIG_PCI
+static int cirrusfb_pci_register (struct pci_dev *pdev,
+ const struct pci_device_id *ent)
{
struct cirrusfb_info *cinfo;
struct fb_info *info;
@@ -2233,11 +2426,13 @@
cinfo->fbmem_phys = board_addr;
cinfo->size = board_size;
+ cinfo->unmap = cirrusfb_pci_unmap;
printk (" RAM (%lu kB) at 0xx%lx, ", cinfo->size / KB_, board_addr);
printk ("Cirrus Logic chipset on PCI bus\n");
+ pci_set_drvdata(pdev, info);
- return cinfo;
+ return cirrusfb_register(cinfo);
err_release_legacy:
if (release_io_ports)
@@ -2252,77 +2447,51 @@
err_disable:
pci_disable_device(pdev);
err_out:
- return ERR_PTR(ret);
+ return ret;
}
-#endif /* CONFIG_PCI */
-
-
-
-#ifdef CONFIG_ZORRO
-static int cirrusfb_zorro_find (struct zorro_dev **z_o,
- struct zorro_dev **z2_o,
- cirrusfb_board_t *btype, unsigned long *size)
+void __devexit cirrusfb_pci_unregister (struct pci_dev *pdev)
{
- struct zorro_dev *z = NULL;
- int i;
-
- assert (z_o != NULL);
- assert (btype != NULL);
-
- for (i = 0; i < ARRAY_SIZE(cirrusfb_zorro_probe_list); i++)
- if ((z = zorro_find_device(cirrusfb_zorro_probe_list[i].id, NULL)))
- break;
-
- if (z) {
- *z_o = z;
- if (cirrusfb_zorro_probe_list[i].id2)
- *z2_o = zorro_find_device(cirrusfb_zorro_probe_list[i].id2, NULL);
- else
- *z2_o = NULL;
-
- *btype = cirrusfb_zorro_probe_list[i].btype;
- *size = cirrusfb_zorro_probe_list[i].size;
-
- printk (KERN_INFO "cirrusfb: %s board detected; ",
- cirrusfb_board_info[*btype].name);
+ struct fb_info *info = pci_get_drvdata(pdev);
+ DPRINTK ("ENTER\n");
- return 0;
- }
+ cirrusfb_cleanup (info);
- printk (KERN_NOTICE "cirrusfb: no supported board found.\n");
- return -ENODEV;
+ DPRINTK ("EXIT\n");
}
-
-static void __devexit cirrusfb_zorro_unmap (struct cirrusfb_info *cinfo)
-{
- release_mem_region(cinfo->board_addr, cinfo->board_size);
-
- if (cinfo->btype == BT_PICASSO4) {
- cinfo->regbase -= 0x600000;
- iounmap ((void *)cinfo->regbase);
- iounmap ((void *)cinfo->fbmem);
- } else {
- if (cinfo->board_addr > 0x01000000)
- iounmap ((void *)cinfo->fbmem);
- }
- framebuffer_release(cinfo->info);
-}
+static struct pci_driver cirrusfb_pci_driver = {
+ .name = "cirrusfb",
+ .id_table = cirrusfb_pci_table,
+ .probe = cirrusfb_pci_register,
+ .remove = __devexit_p(cirrusfb_pci_unregister),
+#ifdef CONFIG_PM
+#if 0
+ .suspend = cirrusfb_pci_suspend,
+ .resume = cirrusfb_pci_resume,
+#endif
+#endif
+};
+#endif /* CONFIG_PCI */
-static struct cirrusfb_info *cirrusfb_zorro_setup(void)
+#ifdef CONFIG_ZORRO
+static int cirrusfb_zorro_register(struct zorro_dev *z,
+ const struct zorro_device_id *ent)
{
struct cirrusfb_info *cinfo;
struct fb_info *info;
cirrusfb_board_t btype;
- struct zorro_dev *z = NULL, *z2 = NULL;
+ struct zorro_dev *z2 = NULL;
unsigned long board_addr, board_size, size;
int ret;
- ret = cirrusfb_zorro_find (&z, &z2, &btype, &size);
- if (ret < 0)
- goto err_out;
+ btype = ent->driver_data;
+ if (cirrusfb_zorro_table2[btype].id2)
+ z2 = zorro_find_device(cirrusfb_zorro_table2[btype].id2, NULL);
+ size = cirrusfb_zorro_table2[btype].size;
+ printk(KERN_INFO "cirrusfb: %s board detected; ",
+ cirrusfb_board_info[btype].name);
info = framebuffer_alloc(sizeof(struct cirrusfb_info), &z->dev);
if (!info) {
@@ -2339,11 +2508,12 @@
assert (z2 >= 0);
assert (btype != BT_NONE);
- cinfo->board_addr = board_addr = z->resource.start;
- cinfo->board_size = board_size = z->resource.end-z->resource.start+1;
+ cinfo->zdev = z;
+ board_addr = zorro_resource_start(z);
+ board_size = zorro_resource_len(z);
cinfo->size = size;
- if (!request_mem_region(board_addr, board_size, "cirrusfb")) {
+ if (!zorro_request_device(z, "cirrusfb")) {
printk(KERN_ERR "cirrusfb: cannot reserve region 0x%lx, abort\n",
board_addr);
ret = -EBUSY;
@@ -2370,7 +2540,7 @@
cinfo->fbregs_phys = board_addr + 0x600000;
cinfo->fbmem_phys = board_addr + 16777216;
- cinfo->fbmem = ioremap (info->fbmem_phys, 16777216);
+ cinfo->fbmem = ioremap (cinfo->fbmem_phys, 16777216);
if (!cinfo->fbmem)
goto err_unmap_regbase;
} else {
@@ -2390,10 +2560,12 @@
DPRINTK ("cirrusfb: Virtual address for board set to: $%p\n", cinfo->regbase);
}
+ cinfo->unmap = cirrusfb_zorro_unmap;
printk (KERN_INFO "Cirrus Logic chipset on Zorro bus\n");
+ zorro_set_drvdata(z, info);
- return 0;
+ return cirrusfb_register(cinfo);
err_unmap_regbase:
/* Parental advisory: explicit hack */
@@ -2403,153 +2575,12 @@
err_release_fb:
framebuffer_release(info);
err_out:
- return ERR_PTR(ret);
+ return ret;
}
-#endif /* CONFIG_ZORRO */
-static int cirrusfb_set_fbinfo(struct cirrusfb_info *cinfo)
+void __devexit cirrusfb_zorro_unregister(struct zorro_dev *z)
{
- struct fb_info *info = cinfo->info;
- struct fb_var_screeninfo *var = &info->var;
-
- info->currcon = -1;
- info->par = cinfo;
- info->pseudo_palette = cinfo->pseudo_palette;
- info->flags = FBINFO_DEFAULT
- | FBINFO_HWACCEL_XPAN
- | FBINFO_HWACCEL_YPAN
- | FBINFO_HWACCEL_FILLRECT
- | FBINFO_HWACCEL_COPYAREA;
- if (noaccel)
- info->flags |= FBINFO_HWACCEL_DISABLED;
- info->fbops = &cirrusfb_ops;
- info->screen_base = cinfo->fbmem;
- if (cinfo->btype == BT_GD5480) {
- if (var->bits_per_pixel == 16)
- info->screen_base += 1 * MB_;
- if (var->bits_per_pixel == 24 || var->bits_per_pixel == 32)
- info->screen_base += 2 * MB_;
- }
-
- /* Fill fix common fields */
- strlcpy(info->fix.id, cirrusfb_board_info[cinfo->btype].name,
- sizeof(info->fix.id));
-
- /* monochrome: only 1 memory plane */
- /* 8 bit and above: Use whole memory area */
- info->fix.smem_start = cinfo->fbmem_phys;
- info->fix.smem_len = (var->bits_per_pixel == 1) ? cinfo->size / 4 : cinfo->size;
- info->fix.type = cinfo->currentmode.type;
- info->fix.type_aux = 0;
- info->fix.visual = cinfo->currentmode.visual;
- info->fix.xpanstep = 1;
- info->fix.ypanstep = 1;
- info->fix.ywrapstep = 0;
- info->fix.line_length = cinfo->currentmode.line_length;
-
- /* FIXME: map region at 0xB8000 if available, fill in here */
- info->fix.mmio_start = cinfo->fbregs_phys;
- info->fix.mmio_len = 0;
- info->fix.accel = FB_ACCEL_NONE;
-
- fb_alloc_cmap(&info->cmap, 256, 0);
-
- return 0;
-}
-
-#if defined(CONFIG_PCI)
-#define cirrusfb_unmap cirrusfb_pci_unmap
-#define cirrusfb_bus_setup cirrusfb_pci_setup
-#elif defined(CONFIG_ZORRO)
-#define cirrusfb_unmap cirrusfb_zorro_unmap
-#define cirrusfb_bus_setup cirrusfb_zorro_setup
-#endif
-
-
-static int cirrusfb_pci_register (struct pci_dev *pdev,
- const struct pci_device_id *ent)
-{
- struct fb_info *info;
- struct cirrusfb_info *cinfo = NULL;
- int err;
- cirrusfb_board_t btype;
-
- DPRINTK ("ENTER\n");
-
- printk (KERN_INFO "cirrusfb: Driver for Cirrus Logic based graphic boards, v" CIRRUSFB_VERSION "\n");
-
- cinfo = cirrusfb_bus_setup(pdev, ent);
-
- if (IS_ERR(cinfo)) {
- err = PTR_ERR(cinfo);
- goto err_out;
- }
-
- info = cinfo->info;
- btype = cinfo->btype;
-
- /* sanity checks */
- assert (btype != BT_NONE);
- assert (btype == cirrusfb_board_info[btype].btype);
-
- DPRINTK ("cirrusfb: (RAM start set to: 0x%p)\n", cinfo->fbmem);
-
- /* Make pretend we've set the var so our structures are in a "good" */
- /* state, even though we haven't written the mode to the hw yet... */
- info->var = cirrusfb_predefined[cirrusfb_def_mode].var;
- info->var.activate = FB_ACTIVATE_NOW;
-
- err = cirrusfb_decode_var(&info->var, &cinfo->currentmode, info);
- if (err < 0) {
- /* should never happen */
- DPRINTK("choking on default var... umm, no good.\n");
- goto err_unmap_cirrusfb;
- }
-
- /* set all the vital stuff */
- cirrusfb_set_fbinfo(cinfo);
-
- pci_set_drvdata(pdev, info);
-
- err = register_framebuffer(info);
- if (err < 0) {
- printk (KERN_ERR "cirrusfb: could not register fb device; err = %d!\n", err);
- goto err_dealloc_cmap;
- }
-
- DPRINTK ("EXIT, returning 0\n");
- return 0;
-
-err_dealloc_cmap:
- fb_dealloc_cmap(&info->cmap);
-err_unmap_cirrusfb:
- cirrusfb_unmap(cinfo);
-err_out:
- return err;
-}
-
-
-static void __devexit cirrusfb_cleanup (struct fb_info *info)
-{
- struct cirrusfb_info *cinfo = info->par;
- DPRINTK ("ENTER\n");
-
-#ifdef CONFIG_ZORRO
- switch_monitor (cinfo, 0);
-#endif
-
- unregister_framebuffer (info);
- fb_dealloc_cmap (&info->cmap);
- printk ("Framebuffer unregistered\n");
- cirrusfb_unmap (cinfo);
-
- DPRINTK ("EXIT\n");
-}
-
-
-void __devexit cirrusfb_pci_unregister (struct pci_dev *pdev)
-{
- struct fb_info *info = pci_get_drvdata(pdev);
+ struct fb_info *info = zorro_get_drvdata(z);
DPRINTK ("ENTER\n");
cirrusfb_cleanup (info);
@@ -2557,26 +2588,25 @@
DPRINTK ("EXIT\n");
}
-static struct pci_driver cirrusfb_driver = {
- .name = "cirrusfb",
- .id_table = cirrusfb_pci_table,
- .probe = cirrusfb_pci_register,
- .remove = __devexit_p(cirrusfb_pci_unregister),
-#ifdef CONFIG_PM
-#if 0
- .suspend = cirrusfb_pci_suspend,
- .resume = cirrusfb_pci_resume,
-#endif
-#endif
+static struct zorro_driver cirrusfb_zorro_driver = {
+ .name = "cirrusfb",
+ .id_table = cirrusfb_zorro_table,
+ .probe = cirrusfb_zorro_register,
+ .remove = __devexit_p(cirrusfb_zorro_unregister),
};
+#endif /* CONFIG_ZORRO */
int __init cirrusfb_init(void)
{
+ int error = 0;
+
#ifdef CONFIG_ZORRO
- return cirrusfb_pci_register(NULL, NULL);
-#else
- return pci_module_init(&cirrusfb_driver);
+ error |= zorro_module_init(&cirrusfb_zorro_driver);
#endif
+#ifdef CONFIG_PCI
+ error |= pci_module_init(&cirrusfb_pci_driver);
+#endif
+ return error;
}
@@ -2591,7 +2621,7 @@
if (!options || !*options)
return 0;
- while ((this_opt = strsep (&options, ",")) != NULL) {
+ while ((this_opt = strsep (&options, ",")) != NULL) {
if (!*this_opt) continue;
DPRINTK("cirrusfb_setup: option '%s'\n", this_opt);
@@ -2619,7 +2649,12 @@
void __exit cirrusfb_exit (void)
{
- pci_unregister_driver (&cirrusfb_driver);
+#ifdef CONFIG_PCI
+ pci_unregister_driver(&cirrusfb_pci_driver);
+#endif
+#ifdef CONFIG_ZORRO
+ zorro_unregister_driver(&cirrusfb_zorro_driver);
+#endif
}
#ifdef MODULE
@@ -2830,7 +2865,7 @@
static void cirrusfb_BitBLT (caddr_t regbase, int bits_per_pixel,
u_short curx, u_short cury, u_short destx, u_short desty,
- u_short width, u_short height, u_short line_length)
+ u_short width, u_short height, u_short line_length)
{
u_short nwidth, nheight;
u_long nsrc, ndest;
--- linux-2.6.8-rc2/include/video/vga.h 2003-03-25 10:07:30.000000000 +0100
+++ linux-m68k-2.6.8-rc2/include/video/vga.h 2004-07-19 19:38:47.000000000 +0200
@@ -26,8 +26,15 @@
/*
* FIXME
* Ugh, we don't have PCI space, so map readb() and friends to use Zorro space
- * for MMIO accesses. This should make clgenfb work again on Amiga
+ * for MMIO accesses. This should make cirrusfb work again on Amiga
*/
+#undef inb_p
+#undef inw_p
+#undef outb_p
+#undef outw
+#undef readb
+#undef writeb
+#undef writew
#define inb_p(port) 0
#define inw_p(port) 0
#define outb_p(port, val) do { } while (0)
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- ge...@li...
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
|
|
From: Geert U. <ge...@li...> - 2004-07-13 08:08:40
|
On Mon, 12 Jul 2004, Colin LEROY wrote:
> > On Mon, 12 Jul 2004 co...@co... wrote:
> > > this patch fixes a compilation error on 2.6.8-rc1. Here's the error:
> > > drivers/media/common/saa7146_video.c:3: conflicting types for `memory'
> > > include/asm-m68k/setup.h:365: previous declaration of `memory'
> > > make[3]: *** [drivers/media/common/saa7146_video.o] Error 1
> >
> > But there's nothing named plain `memory' in include/asm-m68k/setup.h?!?!?
> > Actually there never has been...
>
> Right, but (i should have specified, sorry), I compiled on ppc32, and there's
>
> #define m68k_num_memory num_memory
> #define m68k_memory memory
> #include <asm-m68k/setup.h
>
> in include/asm-ppc/setup.h.
Ah, didn't think of that (I should have known ;-)
Looks like the APUS code can need some clean up. E.g. arch/ppc/amiga/bootinfo.c
operates on both memory and m68k_memory, while they are identical due to
<asm/setup.h>...
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- ge...@li...
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
--i6CFh4XJ004656.1089646984/witte.sonytel.be--
ReSent-Date: Tue, 13 Jul 2004 10:08:34 +0200 (MEST)
ReSent-From: Geert Uytterhoeven <ge...@so...>
ReSent-To:
Linux/PPC on APUS development <lin...@li...>
ReSent-Subject: Re: [PATCH] fix saa7146 compilation on 2.6.8-rc1
ReSent-Message-ID: <Pin...@wa...>
On Mon, 12 Jul 2004, Colin LEROY wrote:
> > On Mon, 12 Jul 2004 co...@co... wrote:
> > > this patch fixes a compilation error on 2.6.8-rc1. Here's the error:
> > > drivers/media/common/saa7146_video.c:3: conflicting types for `memory'
> > > include/asm-m68k/setup.h:365: previous declaration of `memory'
> > > make[3]: *** [drivers/media/common/saa7146_video.o] Error 1
> >
> > But there's nothing named plain `memory' in include/asm-m68k/setup.h?!?!?
> > Actually there never has been...
>
> Right, but (i should have specified, sorry), I compiled on ppc32, and there's
>
> #define m68k_num_memory num_memory
> #define m68k_memory memory
> #include <asm-m68k/setup.h
>
> in include/asm-ppc/setup.h.
Ah, didn't think of that (I should have known ;-)
Looks like the APUS code can need some clean up. E.g. arch/ppc/amiga/bootinfo.c
operates on both memory and m68k_memory, while they are identical due to
<asm/setup.h>...
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- ge...@li...
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
--i6CFh4XJ004656.1089646984/witte.sonytel.be--
|
|
From: Roman Z. <zi...@us...> - 2004-07-04 00:53:06
|
CVSROOT: /cvsroot/linux-apus
Module name: 2.6
Repository: 2.6/include/asm-ppc/
Changes by: zi...@sc....(none) 04/07/03 17:53:00
Log message:
fix ordering of arguments for z_write
Modified files:
2.6/include/asm-ppc/:
zorro.h
Revision Changes Path
1.3 +3 -3 2.6/include/asm-ppc/zorro.h
|
|
From: Roman Z. <zi...@us...> - 2004-07-04 00:52:24
|
CVSROOT: /cvsroot/linux-apus
Module name: 2.6
Repository: 2.6/arch/ppc/configs/
Changes by: zi...@sc....(none) 04/07/03 17:52:18
Log message:
enable fb console in default config
Modified files:
2.6/arch/ppc/:
defconfig
2.6/arch/ppc/configs/:
apus_defconfig
Revision Changes Path
1.8 +6 -1 2.6/arch/ppc/defconfig
1.8 +6 -1 2.6/arch/ppc/configs/apus_defconfig
|
|
From: Roman Z. <zi...@us...> - 2004-07-03 20:50:55
|
CVSROOT: /cvsroot/linux-apus
Module name: 2.6
Repository: 2.6/sound/pci/ice1712/
Changes by: zi...@sc....(none) 04/07/03 13:50:49
Log message:
conflict fixes from import of 2.6.7
Modified files:
./:
Makefile
2.6/arch/ppc/:
Makefile defconfig
2.6/arch/ppc/configs/:
apus_defconfig
2.6/arch/ppc/kernel/:
Makefile entry.S head.S misc.S ppc_ksyms.c setup.c
2.6/arch/ppc/mm/:
Makefile init.c pgtable.c
2.6/include/asm-m68k/:
bootinfo.h
2.6/include/asm-ppc/:
io.h pgtable.h
Removed files:
2.6/Documentation/arm/SA1100/:
PCMCIA
2.6/Documentation/arm/XScale/:
cache-lock.txt pmu.txt tlb-lock.txt
2.6/Documentation/arm/XScale/ADIFCC/:
80200EVB
2.6/Documentation/arm/XScale/IOP3XX/:
IQ80310 IQ80321 aau.txt dma.txt message.txt pmon.txt
2.6/arch/arm/mach-omap/:
innovator1510.c innovator1610.c irq.h omap-generic.c
omap-perseus2.c
2.6/arch/cris/kernel/:
hexify.c ksyms.c
2.6/arch/i386/mach-es7000/:
es7000.c setup.c topology.c
2.6/arch/ia64/kernel/:
perfmon_hpsim.h
2.6/arch/ppc/mm/:
cachemap.c
2.6/arch/ppc/ocp/:
Makefile ocp-driver.c ocp-probe.c ocp.c
2.6/arch/s390/lib/:
memset.S memset64.S strcmp.S strcmp64.S strcpy.S
strcpy64.S strncpy.S strncpy64.S
2.6/drivers/char/:
dz.c dz.h sh-sci.c sh-sci.h
2.6/drivers/i2c/busses/:
i2c-ixp42x.c
2.6/drivers/ide/:
ide-tcq.c
2.6/drivers/ide/pci/:
alim15x3.h amd74xx.h cmd640.h cs5520.h cs5530.h ns87415.h
rz1000.h sc1200.h siimage.h sis5513.h sl82c105.h
slc90e66.h triflex.h trm290.h via82cxxx.h
2.6/drivers/ide/ppc/:
swarm.c
2.6/drivers/net/:
auto_irq.c rcif.h rclanmtl.c rclanmtl.h rcpci45.c
2.6/drivers/net/wan/:
comx-hw-comx.c comx-hw-locomx.c comx-hw-mixcom.c
comx-hw-munich.c comx-proto-fr.c comx-proto-lapb.c
comx-proto-ppp.c comx.c comx.h comxhw.h falc-lh.h hscx.h
mixcom.h munich32x.h wanxlfw.inc
2.6/drivers/pcmcia/:
sa1100.h sa11xx_core.c sa11xx_core.h
2.6/drivers/scsi/:
qlogicfas.h
2.6/drivers/scsi/pcmcia/:
qlogic_core.c
2.6/drivers/usb/core/:
driverfs.c
2.6/fs/intermezzo/:
Makefile cache.c dcache.c dir.c ext_attr.c file.c
fileset.c inode.c intermezzo_fs.h intermezzo_idl.h
intermezzo_journal.h intermezzo_kml.h intermezzo_lib.h
intermezzo_psdev.h intermezzo_upcall.h journal.c
journal_ext2.c journal_ext3.c journal_obdfs.c
journal_reiserfs.c journal_tmpfs.c journal_xfs.c kml.c
kml_decode.c kml_reint.c kml_setup.c kml_unpack.c
kml_utils.c methods.c presto.c psdev.c replicator.c
super.c sysctl.c upcall.c vfs.c
2.6/fs/xfs/linux/:
kmem.h mrlock.h mutex.h sema.h spin.h sv.h time.h
xfs_aops.c xfs_buf.c xfs_buf.h xfs_cred.h xfs_file.c
xfs_fs_subr.c xfs_fs_subr.h xfs_globals.c xfs_globals.h
xfs_ioctl.c xfs_iops.c xfs_iops.h xfs_linux.h xfs_lrw.c
xfs_lrw.h xfs_stats.c xfs_stats.h xfs_super.c xfs_super.h
xfs_sysctl.c xfs_sysctl.h xfs_version.h xfs_vfs.c
xfs_vfs.h xfs_vnode.c xfs_vnode.h
2.6/include/asm-alpha/:
rmap.h
2.6/include/asm-arm/:
rmap.h
2.6/include/asm-arm/arch-cl7500/:
ide.h keyboard.h
2.6/include/asm-arm/arch-clps711x/:
keyboard.h
2.6/include/asm-arm/arch-ebsa110/:
ide.h
2.6/include/asm-arm/arch-ebsa285/:
ide.h
2.6/include/asm-arm/arch-iop3xx/:
ide.h
2.6/include/asm-arm/arch-l7200/:
ide.h keyboard.h
2.6/include/asm-arm/arch-nexuspci/:
ide.h
2.6/include/asm-arm/arch-omap/:
omap-h2.h omap-innovator.h omap-perseus2.h
2.6/include/asm-arm/arch-pxa/:
ide.h keyboard.h
2.6/include/asm-arm/arch-rpc/:
ide.h
2.6/include/asm-arm/arch-s3c2410/:
ide.h
2.6/include/asm-arm/arch-sa1100/:
keyboard.h
2.6/include/asm-arm/arch-shark/:
ide.h keyboard.h
2.6/include/asm-arm/arch-tbox/:
ide.h
2.6/include/asm-arm26/:
rmap.h
2.6/include/asm-cris/:
rmap.h
2.6/include/asm-generic/:
rmap.h
2.6/include/asm-h8300/:
h8300_smsc.h
2.6/include/asm-h8300/aki3068net/:
machine-depend.h
2.6/include/asm-h8300/edosk2674/:
machine-depend.h
2.6/include/asm-h8300/generic/:
machine-depend.h timer_rate.h
2.6/include/asm-h8300/h8max/:
machine-depend.h
2.6/include/asm-i386/:
rmap.h
2.6/include/asm-ia64/:
rmap.h
2.6/include/asm-m68k/:
rmap.h
2.6/include/asm-m68knommu/:
rmap.h
2.6/include/asm-mips/:
rmap.h
2.6/include/asm-parisc/:
rmap.h
2.6/include/asm-ppc/:
rmap.h
2.6/include/asm-ppc64/:
rmap.h
2.6/include/asm-s390/:
rmap.h
2.6/include/asm-sh/:
rmap.h
2.6/include/asm-sparc/:
rmap.h
2.6/include/asm-sparc64/:
rmap.h
2.6/include/asm-um/:
rmap.h
2.6/include/asm-v850/:
rmap.h
2.6/include/asm-x86_64/:
rmap.h
2.6/net/bluetooth/:
syms.c
2.6/sound/pci/ice1712/:
prodigy.c prodigy.h
Revision Changes Path
1.9 +24 -12 2.6/Makefile
1.3 +2 -3 2.6/arch/ppc/Makefile
1.7 +6 -6 2.6/arch/ppc/defconfig
1.7 +6 -6 2.6/arch/ppc/configs/apus_defconfig
1.5 +2 -1 2.6/arch/ppc/kernel/Makefile
1.5 +139 -13 2.6/arch/ppc/kernel/entry.S
1.7 +11 -11 2.6/arch/ppc/kernel/head.S
1.7 +22 -9 2.6/arch/ppc/kernel/misc.S
1.7 +2 -14 2.6/arch/ppc/kernel/ppc_ksyms.c
1.6 +7 -0 2.6/arch/ppc/kernel/setup.c
1.4 +0 -1 2.6/arch/ppc/mm/Makefile
1.4 +12 -2 2.6/arch/ppc/mm/init.c
1.6 +19 -9 2.6/arch/ppc/mm/pgtable.c
1.3 +5 -5 2.6/include/asm-m68k/bootinfo.h
1.7 +0 -38 2.6/include/asm-ppc/io.h
1.5 +15 -1 2.6/include/asm-ppc/pgtable.h
|
|
From: Roman Z. <zi...@us...> - 2004-07-03 18:54:55
|
CVSROOT: /cvsroot/linux-apus Module name: 2.6 Repository: ./ Changes by: zi...@sc....(none) 04/07/03 11:54:48 2.6 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25409 Log Message: import native 2.6.7 Status: Vendor Tag: linux Release Tags: linux-2_6_7 C 2.6/Makefile N 2.6/Documentation/numastat.txt N 2.6/Documentation/sched-domains.txt N 2.6/Documentation/arm/IXP4xx N 2.6/Documentation/cpu-freq/amd-powernow.txt N 2.6/Documentation/fb/pxafb.txt N 2.6/Documentation/scsi/sym53c500_cs.txt N 2.6/Documentation/sound/alsa/Audigy-mixer.txt N 2.6/arch/arm/mach-pxa/leds-mainstone.c N 2.6/arch/arm/mach-pxa/mainstone.c N 2.6/arch/arm/mach-pxa/pxa25x.c N 2.6/arch/arm/mach-pxa/pxa27x.c N 2.6/arch/arm/configs/ixp4xx_defconfig N 2.6/arch/arm/configs/mainstone_defconfig N 2.6/arch/arm/configs/smdk2410_defconfig N 2.6/arch/arm/mach-s3c2410/mach-smdk2410.c N 2.6/arch/arm/mach-ixp4xx/Kconfig N 2.6/arch/arm/mach-ixp4xx/Makefile N 2.6/arch/arm/mach-ixp4xx/common-pci.c N 2.6/arch/arm/mach-ixp4xx/common.c N 2.6/arch/arm/mach-ixp4xx/coyote-pci.c N 2.6/arch/arm/mach-ixp4xx/coyote-setup.c N 2.6/arch/arm/mach-ixp4xx/ixdp425-pci.c N 2.6/arch/arm/mach-ixp4xx/ixdp425-setup.c N 2.6/arch/arm/mach-ixp4xx/prpmc1100-pci.c N 2.6/arch/arm/mach-ixp4xx/prpmc1100-setup.c N 2.6/arch/cris/kernel/crisksyms.c N 2.6/arch/cris/arch-v10/drivers/ide.c N 2.6/arch/h8300/Kconfig.cpu N 2.6/arch/h8300/kernel/module.c N 2.6/arch/i386/mach-es7000/es7000plat.c N 2.6/arch/i386/mach-generic/es7000.c N 2.6/arch/ia64/dig/topology.c N 2.6/arch/ia64/lib/bitop.c N 2.6/arch/ia64/scripts/check-serialize.S N 2.6/arch/ia64/configs/sim_defconfig N 2.6/arch/mips/au1000/common/cputable.c N 2.6/arch/parisc/kernel/unwind.c C 2.6/arch/ppc/Makefile C 2.6/arch/ppc/defconfig N 2.6/arch/ppc/configs/bubinga_defconfig C 2.6/arch/ppc/kernel/Makefile C 2.6/arch/ppc/kernel/entry.S C 2.6/arch/ppc/kernel/head.S C 2.6/arch/ppc/kernel/misc.S C 2.6/arch/ppc/kernel/ppc_ksyms.c C 2.6/arch/ppc/kernel/setup.c N 2.6/arch/ppc/kernel/dma-mapping.c N 2.6/arch/ppc/kernel/vecemu.c N 2.6/arch/ppc/kernel/vector.S C 2.6/arch/ppc/mm/Makefile C 2.6/arch/ppc/mm/init.c C 2.6/arch/ppc/mm/pgtable.c N 2.6/arch/ppc/platforms/sbc82xx.c N 2.6/arch/ppc/platforms/sbc82xx.h N 2.6/arch/ppc/platforms/4xx/bubinga.c N 2.6/arch/ppc/platforms/4xx/bubinga.h N 2.6/arch/ppc/platforms/4xx/ibm405ep.c N 2.6/arch/ppc/platforms/4xx/ibm405ep.h N 2.6/arch/ppc/syslib/dcr.S N 2.6/arch/ppc/syslib/ibm440gx_common.c N 2.6/arch/ppc/syslib/ibm440gx_common.h N 2.6/arch/ppc/syslib/ibm44x_common.h N 2.6/arch/ppc/syslib/ibm_ocp.c N 2.6/arch/ppc/syslib/ocp.c N 2.6/arch/ppc64/lib/locks.c N 2.6/arch/s390/lib/string.c N 2.6/arch/sparc64/lib/find_bit.c N 2.6/arch/sparc64/lib/splock.S N 2.6/arch/x86_64/kernel/Makefile-HEAD N 2.6/arch/x86_64/kernel/domain.c N 2.6/drivers/char/drm/drm_irq.h N 2.6/drivers/char/drm/drm_pciids.h N 2.6/drivers/char/watchdog/ixp4xx_wdt.c N 2.6/drivers/i2c/busses/i2c-ixp4xx.c N 2.6/drivers/i2c/chips/max1619.c N 2.6/drivers/i2c/chips/rtc8564.c N 2.6/drivers/i2c/chips/rtc8564.h N 2.6/drivers/ide/arm/ide_arm.c N 2.6/drivers/ide/h8300/ide-h8300.c N 2.6/drivers/mtd/maps/ixp4xx.c N 2.6/drivers/mtd/maps/wr_sbc82xx_flash.c N 2.6/drivers/net/ne-h8300.c N 2.6/drivers/net/wan/wanxlfw.inc_shipped N 2.6/drivers/net/ibm_emac/Makefile N 2.6/drivers/net/ibm_emac/ibm_emac.h N 2.6/drivers/net/ibm_emac/ibm_emac_core.c N 2.6/drivers/net/ibm_emac/ibm_emac_core.h N 2.6/drivers/net/ibm_emac/ibm_emac_debug.c N 2.6/drivers/net/ibm_emac/ibm_emac_mal.c N 2.6/drivers/net/ibm_emac/ibm_emac_mal.h N 2.6/drivers/net/ibm_emac/ibm_emac_phy.c N 2.6/drivers/net/ibm_emac/ibm_emac_phy.h N 2.6/drivers/net/ibm_emac/ibm_emac_rgmii.h N 2.6/drivers/net/ibm_emac/ibm_emac_tah.h N 2.6/drivers/net/ibm_emac/ibm_emac_zmii.h N 2.6/drivers/pcmcia/soc_common.c N 2.6/drivers/pcmcia/soc_common.h N 2.6/drivers/pcmcia/pxa2xx_base.c N 2.6/drivers/pcmcia/pxa2xx_base.h N 2.6/drivers/pcmcia/pxa2xx_lubbock.c N 2.6/drivers/pcmcia/pxa2xx_mainstone.c N 2.6/drivers/pcmcia/sa11xx_base.c N 2.6/drivers/pcmcia/sa11xx_base.h N 2.6/drivers/scsi/sata_sx4.c N 2.6/drivers/scsi/ipr.c N 2.6/drivers/scsi/ipr.h N 2.6/drivers/scsi/qlogicfas408.c N 2.6/drivers/scsi/qlogicfas408.h N 2.6/drivers/scsi/sata_promise.h N 2.6/drivers/scsi/pcmcia/sym53c500_cs.c N 2.6/drivers/usb/core/sysfs.c N 2.6/drivers/usb/input/touchkitusb.c N 2.6/drivers/usb/misc/phidgetservo.c N 2.6/drivers/video/asiliantfb.c N 2.6/drivers/video/gbefb.c N 2.6/drivers/video/pxafb.c N 2.6/drivers/video/pxafb.h N 2.6/fs/reiserfs/xattr.c N 2.6/fs/reiserfs/xattr_acl.c N 2.6/fs/reiserfs/xattr_security.c N 2.6/fs/reiserfs/xattr_trusted.c N 2.6/fs/reiserfs/xattr_user.c N 2.6/fs/xfs/linux-2.6/kmem.h N 2.6/fs/xfs/linux-2.6/mrlock.h N 2.6/fs/xfs/linux-2.6/mutex.h N 2.6/fs/xfs/linux-2.6/sema.h N 2.6/fs/xfs/linux-2.6/spin.h N 2.6/fs/xfs/linux-2.6/sv.h N 2.6/fs/xfs/linux-2.6/time.h N 2.6/fs/xfs/linux-2.6/xfs_aops.c N 2.6/fs/xfs/linux-2.6/xfs_buf.c N 2.6/fs/xfs/linux-2.6/xfs_buf.h N 2.6/fs/xfs/linux-2.6/xfs_cred.h N 2.6/fs/xfs/linux-2.6/xfs_file.c N 2.6/fs/xfs/linux-2.6/xfs_fs_subr.c N 2.6/fs/xfs/linux-2.6/xfs_fs_subr.h N 2.6/fs/xfs/linux-2.6/xfs_globals.c N 2.6/fs/xfs/linux-2.6/xfs_globals.h N 2.6/fs/xfs/linux-2.6/xfs_ioctl.c N 2.6/fs/xfs/linux-2.6/xfs_iops.c N 2.6/fs/xfs/linux-2.6/xfs_iops.h N 2.6/fs/xfs/linux-2.6/xfs_linux.h N 2.6/fs/xfs/linux-2.6/xfs_lrw.c N 2.6/fs/xfs/linux-2.6/xfs_lrw.h N 2.6/fs/xfs/linux-2.6/xfs_stats.c N 2.6/fs/xfs/linux-2.6/xfs_stats.h N 2.6/fs/xfs/linux-2.6/xfs_super.c N 2.6/fs/xfs/linux-2.6/xfs_super.h N 2.6/fs/xfs/linux-2.6/xfs_sysctl.c N 2.6/fs/xfs/linux-2.6/xfs_sysctl.h N 2.6/fs/xfs/linux-2.6/xfs_version.h N 2.6/fs/xfs/linux-2.6/xfs_vfs.c N 2.6/fs/xfs/linux-2.6/xfs_vfs.h N 2.6/fs/xfs/linux-2.6/xfs_vnode.c N 2.6/fs/xfs/linux-2.6/xfs_vnode.h N 2.6/include/asm-alpha/8253pit.h N 2.6/include/asm-arm/arch-pxa/mainstone.h N 2.6/include/asm-arm/arch-pxa/pxafb.h N 2.6/include/asm-arm/arch-ixp4xx/coyote.h N 2.6/include/asm-arm/arch-ixp4xx/dma.h N 2.6/include/asm-arm/arch-ixp4xx/hardware.h N 2.6/include/asm-arm/arch-ixp4xx/io.h N 2.6/include/asm-arm/arch-ixp4xx/irq.h N 2.6/include/asm-arm/arch-ixp4xx/irqs.h N 2.6/include/asm-arm/arch-ixp4xx/ixdp425.h N 2.6/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h N 2.6/include/asm-arm/arch-ixp4xx/memory.h N 2.6/include/asm-arm/arch-ixp4xx/param.h N 2.6/include/asm-arm/arch-ixp4xx/platform.h N 2.6/include/asm-arm/arch-ixp4xx/prpmc1100.h N 2.6/include/asm-arm/arch-ixp4xx/serial.h N 2.6/include/asm-arm/arch-ixp4xx/system.h N 2.6/include/asm-arm/arch-ixp4xx/time.h N 2.6/include/asm-arm/arch-ixp4xx/timex.h N 2.6/include/asm-arm/arch-ixp4xx/uncompress.h N 2.6/include/asm-arm/arch-ixp4xx/vmalloc.h N 2.6/include/asm-cris/local.h N 2.6/include/asm-cris/sections.h N 2.6/include/asm-i386/8253pit.h N 2.6/include/asm-ia64/cpu.h C 2.6/include/asm-m68k/bootinfo.h N 2.6/include/asm-mips/pmon.h N 2.6/include/asm-mips/8253pit.h N 2.6/include/asm-parisc/unwind.h C 2.6/include/asm-ppc/io.h C 2.6/include/asm-ppc/pgtable.h N 2.6/include/asm-ppc/ibm_ocp.h N 2.6/include/asm-sparc64/const.h N 2.6/include/asm-x86_64/8253pit.h N 2.6/include/linux/mempolicy.h N 2.6/include/linux/prio_tree.h N 2.6/include/linux/reiserfs_acl.h N 2.6/include/linux/reiserfs_xattr.h N 2.6/include/video/gbe.h N 2.6/mm/mempolicy.c N 2.6/mm/prio_tree.c N 2.6/net/bridge/br_sysfs_br.c N 2.6/net/bridge/br_sysfs_if.c N 2.6/scripts/checkstack.pl N 2.6/scripts/reference_discarded.pl N 2.6/scripts/reference_init.pl 15 conflicts created by this import. cvs checkout -jlinux:yesterday -jlinux 2.6 |
|
From: Roman Z. <zi...@us...> - 2004-07-03 18:02:10
|
CVSROOT: /cvsroot/linux-apus
Module name: 2.6
Repository: 2.6/include/asm-ppc/
Changes by: zi...@sc....(none) 04/07/03 11:02:04
Log message:
Use __pa()/__va() instead of direct calculation.
remove a few CONFIG_APUS ifdefs
Modified files:
2.6/include/asm-ppc/:
io.h
Revision Changes Path
1.6 +2 -18 2.6/include/asm-ppc/io.h
|
|
From: Roman Z. <zi...@us...> - 2004-07-03 18:00:06
|
CVSROOT: /cvsroot/linux-apus
Module name: 2.6
Repository: 2.6/include/asm-ppc/
Changes by: zi...@sc....(none) 04/07/03 11:00:00
Log message:
move a few declarations to amigahw.h
Modified files:
2.6/arch/ppc/platforms/:
apus_setup.c
2.6/include/asm-ppc/:
amigahw.h
Revision Changes Path
1.3 +0 -11 2.6/arch/ppc/platforms/apus_setup.c
1.2 +9 -2 2.6/include/asm-ppc/amigahw.h
|
|
From: Roman Z. <zi...@us...> - 2004-07-03 17:55:28
|
CVSROOT: /cvsroot/linux-apus
Module name: 2.6
Repository: 2.6/arch/ppc/amiga/
Changes by: zi...@sc....(none) 04/07/03 10:55:23
Log message:
remove unneeded include <asm-m68k/machdep.h>
Modified files:
2.6/arch/ppc/amiga/:
config.c
Revision Changes Path
1.3 +0 -2 2.6/arch/ppc/amiga/config.c
|
|
From: Roman Z. <zi...@us...> - 2004-07-03 17:53:58
|
CVSROOT: /cvsroot/linux-apus
Module name: 2.6
Repository: 2.6/arch/ppc/amiga/
Changes by: zi...@sc....(none) 04/07/03 10:53:51
Log message:
remove unneeded time.c
Modified files:
2.6/arch/ppc/amiga/:
Makefile
Removed files:
2.6/arch/ppc/amiga/:
time.c
Revision Changes Path
1.2 +3 -3 2.6/arch/ppc/amiga/Makefile
|
|
From: Krystian <cah...@po...> - 2004-06-14 13:51:44
|
W li=B6cie z pon, 14-06-2004, godz. 06:28, Sven Luther pisze:=20 > On Sun, Jun 13, 2004 at 06:36:04PM +0200, Wilfried Catteau wrote: > > Le Samedi 12 Juin 2004 04:22, Sven Luther a =E9crit : > >=20 > > > > > > I try to use the 2.4.25 kernel but at boot time, i have a p= roblem > > > > > > with the Cyberstorm SCSI controler which works well in 2.4.= 22 (except > > > > > > for the cdrom). Here is the dmesg output: > > > > > > > > > > BTW, are you usingh the debian kernel apckage ? If yes, pleas= e fill a > > > > > bug repor,t if not, well, if you run debian give it a try. > > > > > > > > I use the debian woody but not their kernel package: i take the= sources > > > > from linux-apus cvs repository and compile them. > > > > > > Bah. another one of those.Would you at least give them a try ( th= e one > > > in ssid/sarge though, we care little for woody at this point, alt= ough i > > > pass lot of time building security upgrades nobody uses anyway ),= and > > > fill bug reports if it doesn't work ? I took over maintainership,= but > > > have no apus hardware anymore. > >=20 > > I tried the "kernel-image-2.4.25-apus_2.4.25-2_powerpc.deb" package= but it=20 > > doesn't work: i have this message from the bootstrap program: > > "unable to read exec header from kernel file". >=20 > Well, could you fill a (severe i think) bug report about this ?=20 >=20 > > Has someone already installed it to know if this pb is relative to = my Amiga? >=20 > Well, nobody has even bothered to test it here, despite me asking for > this test. Keep in mind that some effort goes into maintaining the > debian apus kernels, both for unstable and testing (which should move= to > 2.4.26 or some common kernel for all arches) as well as security upda= tes > of stable, so if nobody uses the debian kernel on apus, it may make > sense to remove it. Also, this would mean that there would be no > debian-installer support for apus in sarge. There is code, and i made > sure the installer is built, but nobody ever tested it, so ... I'll try to build it and test it when I get home and I have access to A= PUS hardware. Unfortunately It'll be about the beginning of July. > I somehow have the feeling that there are maybe 10 users left or less= , > and that they don't really care about debian kernel level support, so= i > wonder if the time spent on it (by me mostly) is worth it. If someone > from the apus community would step forward, and work with me to test = and > fix the kernel, this would be great, and at least test the > debian-installer once. I downloaded debian packages kernel-source-2.4.25 and kernel-patch-2.4.25-apus, however I didn't manage to cross compile it. I'll give a second try soon. There was no problem during cross-compiling sources from CVS. Regards Krystian Bac=B3awski |
|
From: Sven L. <sve...@wa...> - 2004-06-14 11:53:16
|
On Mon, Jun 14, 2004 at 09:13:00AM +0200, Krystian Bac?awski wrote: > W li?cie z pon, 14-06-2004, godz. 06:28, Sven Luther pisze: > > On Sun, Jun 13, 2004 at 06:36:04PM +0200, Wilfried Catteau wrote: > > > Le Samedi 12 Juin 2004 04:22, Sven Luther a écrit : > > > > > > > > > > I try to use the 2.4.25 kernel but at boot time, i have a problem > > > > > > > with the Cyberstorm SCSI controler which works well in 2.4.22 (except > > > > > > > for the cdrom). Here is the dmesg output: > > > > > > > > > > > > BTW, are you usingh the debian kernel apckage ? If yes, please fill a > > > > > > bug repor,t if not, well, if you run debian give it a try. > > > > > > > > > > I use the debian woody but not their kernel package: i take the sources > > > > > from linux-apus cvs repository and compile them. > > > > > > > > Bah. another one of those.Would you at least give them a try ( the one > > > > in ssid/sarge though, we care little for woody at this point, altough i > > > > pass lot of time building security upgrades nobody uses anyway ), and > > > > fill bug reports if it doesn't work ? I took over maintainership, but > > > > have no apus hardware anymore. > > > > > > I tried the "kernel-image-2.4.25-apus_2.4.25-2_powerpc.deb" package but it > > > doesn't work: i have this message from the bootstrap program: > > > "unable to read exec header from kernel file". > > > > Well, could you fill a (severe i think) bug report about this ? > > > > > Has someone already installed it to know if this pb is relative to my Amiga? > > > > Well, nobody has even bothered to test it here, despite me asking for > > this test. Keep in mind that some effort goes into maintaining the > > debian apus kernels, both for unstable and testing (which should move to > > 2.4.26 or some common kernel for all arches) as well as security updates > > of stable, so if nobody uses the debian kernel on apus, it may make > > sense to remove it. Also, this would mean that there would be no > > debian-installer support for apus in sarge. There is code, and i made > > sure the installer is built, but nobody ever tested it, so ... > > I'll try to build it and test it when I get home and I have access to APUS hardware. > Unfortunately It'll be about the beginning of July. > > > I downloaded debian packages kernel-source-2.4.25 and > kernel-patch-2.4.25-apus, however I didn't manage to cross compile it. > I'll give a second try soon. > > There was no problem during cross-compiling sources from CVS. Well, we are not running Gentoo, the package don't need compiling, just testing, they are already built. Mmm, maybe the fact that i built them on my pegasos could have some influence. Friendly, Sven Luther |
|
From: Sven L. <sve...@wa...> - 2004-06-14 04:14:49
|
On Sun, Jun 13, 2004 at 06:36:04PM +0200, Wilfried Catteau wrote: > Le Samedi 12 Juin 2004 04:22, Sven Luther a écrit : > > > > > > I try to use the 2.4.25 kernel but at boot time, i have a problem > > > > > with the Cyberstorm SCSI controler which works well in 2.4.22 (except > > > > > for the cdrom). Here is the dmesg output: > > > > > > > > BTW, are you usingh the debian kernel apckage ? If yes, please fill a > > > > bug repor,t if not, well, if you run debian give it a try. > > > > > > I use the debian woody but not their kernel package: i take the sources > > > from linux-apus cvs repository and compile them. > > > > Bah. another one of those.Would you at least give them a try ( the one > > in ssid/sarge though, we care little for woody at this point, altough i > > pass lot of time building security upgrades nobody uses anyway ), and > > fill bug reports if it doesn't work ? I took over maintainership, but > > have no apus hardware anymore. > > I tried the "kernel-image-2.4.25-apus_2.4.25-2_powerpc.deb" package but it > doesn't work: i have this message from the bootstrap program: > "unable to read exec header from kernel file". Well, could you fill a (severe i think) bug report about this ? > Has someone already installed it to know if this pb is relative to my Amiga? Well, nobody has even bothered to test it here, despite me asking for this test. Keep in mind that some effort goes into maintaining the debian apus kernels, both for unstable and testing (which should move to 2.4.26 or some common kernel for all arches) as well as security updates of stable, so if nobody uses the debian kernel on apus, it may make sense to remove it. Also, this would mean that there would be no debian-installer support for apus in sarge. There is code, and i made sure the installer is built, but nobody ever tested it, so ... I somehow have the feeling that there are maybe 10 users left or less, and that they don't really care about debian kernel level support, so i wonder if the time spent on it (by me mostly) is worth it. If someone from the apus community would step forward, and work with me to test and fix the kernel, this would be great, and at least test the debian-installer once. Friendly, Sven Luther |
|
From: Wilfried C. <wca...@no...> - 2004-06-13 16:51:29
|
Le Samedi 12 Juin 2004 04:22, Sven Luther a =E9crit : > > > > I try to use the 2.4.25 kernel but at boot time, i have a problem > > > > with the Cyberstorm SCSI controler which works well in 2.4.22 (ex= cept > > > > for the cdrom). Here is the dmesg output: > > > > > > BTW, are you usingh the debian kernel apckage ? If yes, please fill= a > > > bug repor,t if not, well, if you run debian give it a try. > > > > I use the debian woody but not their kernel package: i take the sourc= es > > from linux-apus cvs repository and compile them. > > Bah. another one of those.Would you at least give them a try ( the one > in ssid/sarge though, we care little for woody at this point, altough i > pass lot of time building security upgrades nobody uses anyway ), and > fill bug reports if it doesn't work ? I took over maintainership, but > have no apus hardware anymore. I tried the "kernel-image-2.4.25-apus_2.4.25-2_powerpc.deb" package but i= t=20 doesn't work: i have this message from the bootstrap program: "unable to read exec header from kernel file". Has someone already installed it to know if this pb is relative to my Ami= ga? Willy |
|
From: Sven L. <sve...@wa...> - 2004-06-12 02:09:53
|
On Fri, Jun 11, 2004 at 07:50:26PM +0200, Wilfried Catteau wrote: > Hi, > > > > > > > I try to use the 2.4.25 kernel but at boot time, i have a problem with > > > the Cyberstorm SCSI controler which works well in 2.4.22 (except for the > > > cdrom). Here is the dmesg output: > > > > BTW, are you usingh the debian kernel apckage ? If yes, please fill a > > bug repor,t if not, well, if you run debian give it a try. > > I use the debian woody but not their kernel package: i take the sources from > linux-apus cvs repository and compile them. Bah. another one of those.Would you at least give them a try ( the one in ssid/sarge though, we care little for woody at this point, altough i pass lot of time building security upgrades nobody uses anyway ), and fill bug reports if it doesn't work ? I took over maintainership, but have no apus hardware anymore. Friendly, Sven Luther |
107 messages has been excluded from this view by a project administrator.
