# This is a BitKeeper generated patch for the following project: # Project Name: Linux 2.2 # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet v2.2.19 -> 1.119 # drivers/usb/audio.c 1.1.1.4 -> 1.6 # arch/ppc/kernel/Makefile 1.2.1.3 -> 1.8 # drivers/video/fbmem.c 1.2.1.2 -> 1.5 # arch/ppc/kernel/apus_setup.c 1.1.1.2 -> 1.5 # include/asm-ppc/ucontext.h 1.1.1.1 -> 1.3 # drivers/char/drm/r128_drv.h 1.1 -> 1.2 # arch/ppc/kernel/prep_time.c 1.1.1.1 -> 1.3 # arch/ppc/kernel/mk_defs.c 1.1.1.1 -> 1.3 # Documentation/powerpc/smp.txt 1.1.1.1 -> 1.3 # BitKeeper/etc/config 1.1.2.2 -> 1.11 # drivers/char/console.c 1.7.1.2 -> 1.10 # arch/ppc/mm/fault.c 1.2.1.1 -> 1.4 # drivers/char/Config.in 1.11.1.3 -> 1.15 # drivers/video/Config.in 1.2.1.7 -> 1.12 # drivers/sound/maestro.c 1.1.1.9 -> 1.12 # include/asm-ppc/backlight.h 1.1 -> (deleted) # include/asm-ppc/types.h 1.1.1.1 -> 1.3 # net/ipv4/tcp.c 1.4.1.10 -> 1.16 # include/asm-ppc/bitops.h 1.1.1.2 -> 1.5 # include/asm-ppc/mman.h 1.1.1.1 -> 1.3 # include/asm-ppc/pmu.h 1.1.1.3 -> 1.6 # arch/ppc/kernel/pmac_pci.c 1.1.1.2 -> 1.6 # arch/ppc/kernel/ppc_htab.c 1.1.1.2 -> 1.5 # include/asm-ppc/uninorth.h 1.1 -> (deleted) # drivers/scsi/scsi.c 1.4.1.8 -> 1.13 # drivers/net/sk_mca.h 1.1 -> 1.2 # ipc/shm.c 1.3.1.5 -> 1.9 # arch/ppc/kernel/chrp_setup.c 1.2.1.5 -> 1.13 # drivers/net/de4x5.c 1.1.1.3 -> 1.6 # include/asm-ppc/pci-bridge.h 1.1.1.1 -> 1.3 # arch/ppc/coffboot/crt0.S 1.1.1.1 -> 1.3 # drivers/block/ide-pmac.c 1.1.1.4 -> 1.12 # arch/ppc/kernel/mbx_pci.c 1.1.1.1 -> 1.3 # drivers/macintosh/nvram.c 1.1.1.1 -> 1.3 # arch/ppc/kernel/gemini_pci.c 1.1.1.1 -> 1.3 # drivers/macintosh/via-pmu.c 1.2.1.4 -> 1.14 # include/linux/openpic.h 1.2.1.2 -> 1.6 # drivers/net/Config.in 1.3.1.14 -> 1.18 # arch/ppc/kernel/misc.S 1.1.1.6 -> 1.12 # arch/ppc/kernel/pci.c 1.1.1.2 -> 1.5 # arch/ppc/kernel/pmac_pic.c 1.2.1.2 -> 1.7 # drivers/block/ide-floppy.c 1.2.1.3 -> 1.6 # drivers/macintosh/macio-adb.c 1.1.1.1 -> 1.3 # drivers/video/Makefile 1.1.1.4 -> 1.6 # arch/ppc/kernel/setup.c 1.2.1.3 -> 1.11 # drivers/macintosh/macserial.c 1.2.1.4 -> 1.11 # include/asm-ppc/nvram.h 1.1.1.2 -> 1.5 # drivers/net/mace.c 1.1.1.3 -> 1.6 # drivers/nubus/nubus.c 1.1.1.4 -> 1.8 # net/ipv4/tcp_output.c 1.3.1.6 -> 1.11 # arch/ppc/kernel/time.c 1.2.1.2 -> 1.6 # include/asm-ppc/pci.h 1.1 -> (deleted) # Documentation/powerpc/sound.txt 1.1.1.1 -> 1.3 # arch/ppc/kernel/chrp_pci.c 1.2.1.1 -> 1.4 # arch/ppc/xmon/start.c 1.1.1.2 -> 1.7 # drivers/char/tty_io.c 1.8.1.1 -> 1.10 # drivers/char/drm/vm.c 1.1.1.1 -> 1.3 # drivers/net/arlan.h 1.1.1.1 -> 1.3 # drivers/isdn/hisax/netjet.c 1.3.1.2 -> 1.6 # arch/ppc/xmon/xmon.c 1.2.1.1 -> 1.4 # Documentation/sound/Maestro 1.1.1.2 -> 1.5 # drivers/net/Makefile 1.3.1.11 -> 1.17 # kernel/ksyms.c 1.2.1.11 -> 1.16 # arch/ppc/kernel/pmac_setup.c 1.3.1.7 -> 1.22 # include/asm-ppc/keylargo.h 1.1 -> (deleted) # include/linux/input.h 1.1.1.1 -> 1.3 # arch/ppc/kernel/ppc_asm.tmpl 1.1.1.1 -> 1.3 # arch/ppc/kernel/openpic.c 1.2.1.3 -> 1.8 # arch/ppc/kernel/chrp_time.c 1.1.1.2 -> 1.5 # drivers/char/mem.c 1.2.1.3 -> 1.7 # drivers/usb/hub.h 1.1.1.2 -> 1.4 # include/linux/pci.h 1.5.1.9 -> 1.16 # include/asm-ppc/system.h 1.1.1.3 -> 1.8 # drivers/char/drm/r128_drv.c 1.2.1.2 -> 1.5 # arch/ppc/common_defconfig 1.2.1.2 -> 1.6 # drivers/macintosh/Makefile 1.2.1.1 -> 1.4 # arch/ppc/defconfig 1.2.1.1 -> 1.5 # include/asm-ppc/page.h 1.1.1.3 -> 1.5 # net/ax25/af_ax25.c 1.2.1.3 -> 1.7 # arch/ppc/kernel/pmac_time.c 1.3.1.3 -> 1.8 # drivers/Makefile 1.4.1.1 -> 1.7 # MAINTAINERS 1.6.1.22 -> 1.30 # drivers/char/serial.c 1.5.1.1 -> 1.7 # arch/ppc/kernel/traps.c 1.1.1.2 -> 1.6 # drivers/sound/dmasound.c 1.2.1.2 -> 1.9 # drivers/usb/usb-ohci.c 1.2.1.1 -> 1.4 # Makefile 1.8.1.41 -> 1.50 # arch/ppc/config.in 1.2.1.5 -> 1.12 # drivers/block/ll_rw_blk.c 1.2.1.6 -> 1.11 # drivers/char/adbmouse.c 1.1.1.1 -> 1.4 # Documentation/powerpc/ppc_htab.txt 1.1.1.1 -> 1.3 # drivers/block/genhd.c 1.2.1.9 -> 1.14 # include/asm-ppc/feature.h 1.1.1.2 -> 1.6 # arch/ppc/kernel/irq.c 1.3.1.1 -> 1.5 # drivers/block/swim3.c 1.1.1.1 -> 1.3 # include/asm-ppc/prom.h 1.2.1.1 -> 1.4 # drivers/char/drm/r128_dma.c 1.1.1.1 -> 1.3 # arch/ppc/mm/init.c 1.2.1.4 -> 1.13 # include/asm-ppc/processor.h 1.2.1.3 -> 1.9 # drivers/block/ide.h 1.2.1.2 -> 1.5 # drivers/block/Config.in 1.5.1.1 -> 1.7 # include/asm-ppc/bootx.h 1.1.1.2 -> 1.5 # include/asm-ppc/residual.h 1.1.1.1 -> 1.3 # include/linux/sysctl.h 1.6.1.4 -> 1.11 # include/asm-ppc/unistd.h 1.1.1.2 -> 1.6 # mm/page_alloc.c 1.4.1.7 -> 1.13 # drivers/char/drm/drmP.h 1.1.1.1 -> 1.4 # arch/ppc/lib/string.S 1.1.1.1 -> 1.3 # include/asm-ppc/ohare.h 1.1.1.1 -> 1.3 # drivers/video/controlfb.c 1.1.1.1 -> 1.5 # include/asm-ppc/elf.h 1.1.1.1 -> 1.3 # drivers/scsi/megaraid.c 1.10 -> 1.11 # arch/ppc/kernel/pmac_support.c 1.1.1.4 -> 1.9 # drivers/usb/usb-ohci.h 1.1.1.1 -> 1.3 # arch/ppc/kernel/ppc-stub.c 1.1.1.1 -> 1.3 # include/asm-ppc/atomic.h 1.1.1.1 -> 1.3 # drivers/video/aty.h 1.1.1.2 -> 1.6 # include/asm-ppc/init.h 1.2.1.1 -> 1.4 # arch/ppc/kernel/feature.c 1.1.1.4 -> 1.10 # drivers/sound/awacs_defs.h 1.1.1.1 -> 1.3 # drivers/video/chipsfb.c 1.2.1.2 -> 1.6 # arch/i386/kernel/io_apic.c 1.2.1.3 -> 1.7 # drivers/usb/usb.c 1.1.1.5 -> 1.8 # BitKeeper/etc/logging_ok 1.1.1.4 -> (deleted) # Documentation/powerpc/zImage_layout.txt 1.1.1.1 -> 1.3 # drivers/macintosh/mac_hid.c 1.1.1.1 -> (deleted) # arch/ppc/chrpboot/main.c 1.3.1.2 -> 1.6 # drivers/video/aty128fb.c 1.1.1.3 -> 1.8 # include/asm-ppc/heathrow.h 1.1.1.1 -> 1.3 # include/asm-ppc/irq.h 1.1.1.1 -> 1.3 # include/asm-i386/setup.h 1.1 -> 1.2 # drivers/net/3c527.h 1.1.1.3 -> 1.6 # drivers/net/gmac.c 1.1.1.4 -> 1.10 # drivers/video/offb.c 1.1.1.2 -> 1.7 # arch/ppc/kernel/ppc_ksyms.c 1.2.1.5 -> 1.13 # drivers/net/bmac.c 1.1.1.3 -> 1.6 # drivers/macintosh/rtc.c 1.1.1.2 -> 1.4 # arch/ppc/kernel/bitops.c 1.1.1.1 -> 1.3 # drivers/usb/hub.c 1.1.1.2 -> 1.4 # drivers/net/gmac.h 1.1.1.3 -> 1.8 # drivers/block/ide-probe.c 1.3.1.6 -> 1.11 # mm/slab.c 1.1.1.1 -> 1.3 # include/asm-ppc/posix_types.h 1.1.1.1 -> 1.3 # Documentation/sound/ChangeLog.multisound 1.1 -> 1.2 # Documentation/Configure.help 1.12.1.19 -> 1.30 # drivers/char/misc.c 1.6.1.3 -> 1.10 # drivers/usb/uhci.c 1.1.1.2 -> 1.4 # include/linux/fb.h 1.2.1.1 -> 1.4 # CREDITS 1.6.1.22 -> 1.31 # arch/ppc/kernel/open_pic.h 1.2.1.1 -> 1.4 # arch/ppc/kernel/syscalls.c 1.1.1.3 -> 1.7 # arch/i386/kernel/setup.c 1.4.1.19 -> 1.25 # arch/ppc/kernel/sleep.S 1.2.1.2 -> 1.5 # arch/ppc/coffboot/chrpmain.c 1.1.1.1 -> 1.3 # include/asm-ppc/mediabay.h 1.1.1.1 -> 1.4 # drivers/video/macmodes.c 1.1.1.1 -> 1.3 # arch/ppc/kernel/smp.c 1.2.1.5 -> 1.13 # drivers/video/aty128.h 1.1.1.1 -> 1.3 # include/asm-ppc/delay.h 1.1.1.2 -> 1.5 # include/asm-ppc/keyboard.h 1.2.1.3 -> 1.7 # drivers/macintosh/mac_keyb.c 1.1.1.2 -> 1.5 # drivers/block/cmd646.c 1.2.1.1 -> 1.4 # include/asm-ppc/ide.h 1.1.1.2 -> 1.5 # arch/ppc/kernel/process.c 1.2.1.2 -> 1.7 # arch/ppc/pmac_defconfig 1.1.1.1 -> 1.3 # arch/ppc/coffboot/start.c 1.1.1.1 -> 1.3 # include/asm-ppc/uaccess.h 1.1.1.2 -> 1.4 # drivers/macintosh/adbhid.c 1.1 -> (deleted) # arch/ppc/kernel/checks.c 1.1.1.1 -> 1.3 # Documentation/powerpc/00-INDEX 1.1.1.1 -> 1.3 # arch/ppc/kernel/prom.c 1.3.1.6 -> 1.16 # arch/ppc/boot/vreset.c 1.1.1.1 -> 1.3 # arch/ppc/kernel/signal.c 1.2.1.2 -> 1.6 # arch/ppc/kernel/prep_pci.c 1.2.1.2 -> 1.9 # include/linux/slab.h 1.1.1.1 -> 1.3 # drivers/sound/sscape.c 1.2 -> 1.3 # drivers/block/rd.c 1.2.1.5 -> 1.9 # drivers/macintosh/mediabay.c 1.2.1.2 -> 1.8 # include/asm-ppc/smp.h 1.2.1.1 -> 1.4 # include/asm-ppc/termbits.h 1.1.1.1 -> 1.3 # arch/ppc/boot/Makefile 1.2.1.3 -> 1.7 # arch/ppc/kernel/mbx_setup.c 1.1.1.4 -> 1.9 # arch/ppc/mm/extable.c 1.1.1.1 -> 1.3 # drivers/sound/lowlevel/aci.c 1.1 -> 1.2 # drivers/usb/keybdev.c 1.1.1.2 -> 1.5 # arch/ppc/kernel/head.S 1.2.1.5 -> 1.13 # arch/ppc/kernel/gemini_setup.c 1.1.1.4 -> 1.10 # drivers/usb/Makefile 1.1.1.1 -> 1.4 # include/asm-ppc/time.h 1.1.1.1 -> (deleted) # arch/ppc/kernel/open_pic.c 1.2.1.1 -> 1.4 # drivers/usb/uhci.h 1.1.1.1 -> 1.3 # include/asm-ppc/io.h 1.1.1.1 -> 1.3 # drivers/usb/usb-debug.c 1.1.1.1 -> 1.3 # drivers/macintosh/via-cuda.c 1.1.1.1 -> 1.3 # drivers/net/Space.c 1.3.1.11 -> 1.15 # fs/select.c 1.1.1.1 -> 1.4 # arch/ppc/coffboot/Makefile 1.1.1.5 -> 1.13 # drivers/macintosh/adb.c 1.1.1.2 -> 1.6 # include/asm-ppc/dma.h 1.1.1.1 -> 1.3 # include/asm-ppc/machdep.h 1.1.1.2 -> 1.6 # arch/ppc/coffboot/misc.S 1.1.1.1 -> 1.3 # drivers/usb/Config.in 1.1.1.6 -> 1.8 # drivers/scsi/st.c 1.1.1.5 -> 1.8 # drivers/macintosh/macserial.h 1.2.1.2 -> 1.6 # arch/ppc/kernel/prep_setup.c 1.2.1.4 -> 1.12 # arch/ppc/kernel/local_irq.h 1.1.1.1 -> 1.3 # include/asm-ppc/gemini_serial.h 1.1.1.1 -> 1.3 # drivers/video/atyfb.c 1.3.1.6 -> 1.17 # drivers/char/keyboard.c 1.2.1.1 -> 1.4 # drivers/block/ide-proc.c 1.2.1.2 -> 1.5 # (new) -> 1.3 drivers/macintosh/mac_hid.c # (new) -> 1.2 include/asm-ppc/backlight.h # (new) -> 1.1 include/asm-ppc/keylargo.h # (new) -> 1.1 include/asm-ppc/uninorth.h # (new) -> 1.3 BitKeeper/etc/ignore # (new) -> 1.1 include/asm-ppc/time.h # (new) -> 1.2 include/asm-ppc/pci.h # (new) -> 1.11 BitKeeper/triggers/post-incoming # (new) -> 1.1 drivers/macintosh/adbhid.c # (new) -> 1.34 BitKeeper/etc/logging_ok # # The following is the BitKeeper ChangeSet Log # -------------------------------------------- # 01/04/01 paulus@argo.linuxcare.com.au 1.2.1.55 # bk-work-patch-2219.1016.new # -------------------------------------------- # 01/04/01 paulus@argo.linuxcare.com.au 1.118 # merge to 2.2.19 # -------------------------------------------- # 01/04/05 geert@tux.of.borg 1.117.1.1 # # Fixes for LongTrail (from 2.4.x). # # -------------------------------------------- # 01/04/05 geert@tux.of.borg 1.119 # Merge hq.fsmlabs.com:/home/bk/linuxppc_2_2 # into tux.of.borg:/export/home0/geert/linux/linuxppc_2_2 # -------------------------------------------- # diff -Nru a/BitKeeper/etc/ignore b/BitKeeper/etc/ignore --- /dev/null Wed Dec 31 16:00:00 1969 +++ b/BitKeeper/etc/ignore Sat Jun 16 06:00:43 2001 @@ -0,0 +1,60 @@ +*.a +*.o +*.stamp +*.ver +.*.a.flags +.*.o.flags +.config +.config.old +.depend +.hdepend +.version +BitKeeper/etc/.cached_proxy +BitKeeper/etc/pushed +BitKeeper/etc/csets-in +BitKeeper/etc/csets-out +PENDING/* +System.map +arch/ppc/boot/mkprep +arch/ppc/boot/sImage +arch/ppc/boot/zvmlinux +arch/ppc/boot/zImage +arch/ppc/chrpboot/zImage.rs6k +arch/ppc/chrpboot/piggyback +arch/ppc/chrpboot/addnote +arch/ppc/chrpboot/zImage +arch/ppc/coffboot/piggyback +arch/ppc/coffboot/coffboot +arch/ppc/coffboot/hack-coff +arch/ppc/coffboot/vmlinux.coff +arch/ppc/coffboot/zImage +arch/ppc/coffboot/mknote +arch/ppc/coffboot/vmlinux.elf +arch/ppc/coffboot/note +arch/ppc/coffboot/miboot.image +arch/ppc/coffboot/vmlinux.gz +arch/ppc/kernel/checks +arch/ppc/kernel/ppc_defs.h +drivers/char/conmakehash +drivers/char/consolemap_deftbl.c +drivers/net/hamradio/soundmodem/gentbl +drivers/net/hamradio/soundmodem/sm_tbl_afsk1200.h +drivers/net/hamradio/soundmodem/sm_tbl_afsk2666.h +drivers/net/hamradio/soundmodem/sm_tbl_psk4800.h +drivers/net/hamradio/soundmodem/sm_tbl_hapn4800.h +drivers/net/hamradio/soundmodem/sm_tbl_fsk9600.h +drivers/net/hamradio/soundmodem/sm_tbl_afsk2400_8.h +drivers/net/hamradio/soundmodem/sm_tbl_afsk2400_7.h +drivers/pci/gen-devlist +drivers/pci/devlist.h +drivers/pci/classlist.h +include/asm +include/config/* +include/linux/autoconf.h +include/linux/compile.h +include/linux/modversions.h +include/linux/version.h +scripts/lxdialog/lxdialog +scripts/mkdep +scripts/split-include +vmlinux diff -Nru a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok --- a/BitKeeper/etc/logging_ok Sat Jun 16 06:00:41 2001 +++ b/BitKeeper/etc/logging_ok Sat Jun 16 06:00:43 2001 @@ -1,5 +1,15 @@ -cort@medea.fsmlabs.com -paulus@tangoh.linuxcare.com.au -paulus@diego.linuxcare.com.au +benh@sawtooth.wanadoo.fr +benh@streumon.mipsys.com +cort@ares.fsmlabs.com +cort@artemis.fsmlabs.com cort@ftsoj.fsmlabs.com +cort@hq.fsmlabs.com +cort@medea.fsmlabs.com +geert@tux.of.borg +hozer@narn.drgw.net +paulus@argo.linux.conf.au paulus@argo.linuxcare.com.au +paulus@diego.linuxcare.com.au +paulus@iwhack.linuxcare.com.au +paulus@tangoh.linuxcare.com.au +trini@entropy.crashing.org diff -Nru a/BitKeeper/triggers/post-incoming b/BitKeeper/triggers/post-incoming --- /dev/null Wed Dec 31 16:00:00 1969 +++ b/BitKeeper/triggers/post-incoming Sat Jun 16 06:00:43 2001 @@ -0,0 +1,12 @@ +#!/bin/sh + +REPO=`bk gethost`:`pwd` +if [ "$BK_STATUS" = OK -a -f BitKeeper/etc/csets-in -a `hostname` = "hq.fsmlabs.com" ] +then ( + echo ${USER}@"$@" + echo "" + bk changes -r`cat BitKeeper/etc/csets-in` -v + bk prs -d ":KEY:\n" -r+ ChangeSet + ) | mail -s "Incoming to $REPO" linuxppc-commit@fsmlabs.com +fi + diff -Nru a/Documentation/sound/ChangeLog.multisound b/Documentation/sound/ChangeLog.multisound --- a/Documentation/sound/ChangeLog.multisound Sat Jun 16 06:00:41 2001 +++ b/Documentation/sound/ChangeLog.multisound Sat Jun 16 06:00:41 2001 @@ -210,4 +210,4 @@ * Add preliminary playback support - * Use new Turtle Beach DSP code + * Use new Turtle Beach DSP code \ No newline at end of file diff -Nru a/Makefile b/Makefile --- a/Makefile Sat Jun 16 06:00:40 2001 +++ b/Makefile Sat Jun 16 06:00:40 2001 @@ -200,6 +200,10 @@ ifeq ($(CONFIG_USB),y) DRIVERS := $(DRIVERS) drivers/usb/usbdrv.o +else + ifdef CONFIG_INPUT_ADBHID + DRIVERS := $(DRIVERS) drivers/usb/usbdrv.o + endif endif ifeq ($(CONFIG_I2O),y) diff -Nru a/arch/ppc/config.in b/arch/ppc/config.in --- a/arch/ppc/config.in Sat Jun 16 06:00:40 2001 +++ b/arch/ppc/config.in Sat Jun 16 06:00:40 2001 @@ -179,12 +179,10 @@ mainmenu_option next_comment comment 'Mac device drivers' -if [ "$CONFIG_INPUT_KEYBDEV" = "y" -o "$CONFIG_INPUT_MOUSEDEV" = "y" ]; then - bool 'Use input layer for ADB keyboard and mouse' CONFIG_INPUT_ADBHID -fi +bool 'Use input layer for ADB keyboard and mouse' CONFIG_INPUT_ADBHID if [ "$CONFIG_INPUT_ADBHID" = "y" ]; then - define_bool CONFIG_INPUT_KEYBDEV $CONFIG_VT - define_bool CONFIG_INPUT_MOUSEDEV y + define_bool CONFIG_INPUT_KEYBDEV $CONFIG_INPUT_ADBHID $CONFIG_VT + define_bool CONFIG_INPUT_MOUSEDEV $CONFIG_INPUT_ADBHID define_bool CONFIG_MAC_HID y bool ' Support for ADB raw keycodes' CONFIG_MAC_ADBKEYCODES bool ' Support for mouse button 2+3 emulation' CONFIG_MAC_EMUMOUSEBTN diff -Nru a/arch/ppc/kernel/chrp_setup.c b/arch/ppc/kernel/chrp_setup.c --- a/arch/ppc/kernel/chrp_setup.c Sat Jun 16 06:00:38 2001 +++ b/arch/ppc/kernel/chrp_setup.c Sat Jun 16 06:00:38 2001 @@ -183,7 +183,6 @@ return len; } -#if 0 /* * Fixes for the National Semiconductor PC78308VUL SuperI/O * @@ -228,12 +227,15 @@ __initfunc(static void sio_init(void)) { - /* logical device 0 (KBC/Keyboard) */ - sio_fixup_irq("keyboard", 0, 1, 2); - /* select logical device 1 (KBC/Mouse) */ - sio_fixup_irq("mouse", 1, 12, 2); + struct device_node *root; + if ((root = find_path_device("/")) && + !strncmp(get_property(root, "model", NULL), "IBM,LongTrail", 13)) { + /* logical device 0 (KBC/Keyboard) */ + sio_fixup_irq("keyboard", 0, 1, 2); + /* select logical device 1 (KBC/Mouse) */ + sio_fixup_irq("mouse", 1, 12, 2); + } } -#endif __initfunc(void chrp_setup_arch(unsigned long * memory_start_p, unsigned long * memory_end_p)) @@ -283,7 +285,8 @@ /* * Fix the Super I/O configuration */ - /*sio_init();*/ + sio_init(); + #ifdef CONFIG_DUMMY_CONSOLE conswitchp = &dummy_con; #endif diff -Nru a/arch/ppc/mm/init.c b/arch/ppc/mm/init.c --- a/arch/ppc/mm/init.c Sat Jun 16 06:00:41 2001 +++ b/arch/ppc/mm/init.c Sat Jun 16 06:00:41 2001 @@ -355,6 +355,13 @@ size = PAGE_ALIGN(addr + size) - p; /* + * If the address lies within the first 16 MB, assume it's in ISA + * memory space + */ + if ( p < 16*1024*1024 ) + p += _ISA_MEM_BASE; + + /* * Don't allow anybody to remap normal RAM that we're using. * mem_init() sets high_memory so only do the check after that. */ diff -Nru a/drivers/Makefile b/drivers/Makefile --- a/drivers/Makefile Sat Jun 16 06:00:40 2001 +++ b/drivers/Makefile Sat Jun 16 06:00:40 2001 @@ -54,6 +54,10 @@ else ifeq ($(CONFIG_USB),m) MOD_SUB_DIRS += usb + else + ifdef CONFIG_INPUT_ADBHID + SUB_DIRS += usb + endif endif endif diff -Nru a/drivers/block/ide-pmac.c b/drivers/block/ide-pmac.c --- a/drivers/block/ide-pmac.c Sat Jun 16 06:00:38 2001 +++ b/drivers/block/ide-pmac.c Sat Jun 16 06:00:38 2001 @@ -905,7 +905,7 @@ * Problem: This can schedule. I moved the block device * wakeup almost late by priority because of that. */ - if (DRIVER(drive)) + if (DRIVER(drive) && DRIVER(drive)->media_change) DRIVER(drive)->media_change(drive); /* We kick the VFS too (see fix in ide.c revalidate) */ diff -Nru a/drivers/char/drm/r128_drv.h b/drivers/char/drm/r128_drv.h --- a/drivers/char/drm/r128_drv.h Sat Jun 16 06:00:37 2001 +++ b/drivers/char/drm/r128_drv.h Sat Jun 16 06:00:37 2001 @@ -197,6 +197,43 @@ #define R128_MAX_USEC_TIMEOUT 100000 /* 100 ms */ +#ifdef __powerpc__ + +static __inline__ void +WriteMmio32Le(u32 base, const u32 offset, + const unsigned long val) +{ + __asm__ __volatile__( + "stwbrx %1,%2,%3\n\t" + : "=m" (*(volatile unsigned char *)(base+offset)) + : "r" (val), "b" (base), "r" (offset)); +} + +static __inline__ unsigned int +ReadMmio32Le(u32 base, const u32 offset) +{ + register unsigned int val; + __asm__ __volatile__( + "lwbrx %0,%1,%2\n\t" + "eieio" + : "=r" (val) + : "b" (base), "r" (offset), + "m" (*(volatile unsigned char *)(base+offset))); + return(val); +} + +#define R128_BASE(reg) ((u32)(dev_priv->mmio->handle)) +#define R128_ADDR(reg) (R128_BASE(reg) + reg) + +#define R128_READ(reg) ReadMmio32Le(R128_BASE(reg),reg) +#define R128_WRITE(reg,val) WriteMmio32Le(R128_BASE(reg),reg,val) + +#define R128_DEREF8(reg) *(__volatile__ char *)R128_ADDR(reg) +#define R128_READ8(reg) R128_DEREF8(reg) +#define R128_WRITE8(reg,val) do { R128_DEREF8(reg) = val; } while (0) + +#else /* ! __powerpc__ */ + #define R128_BASE(reg) ((u32)(dev_priv->mmio->handle)) #define R128_ADDR(reg) (R128_BASE(reg) + reg) @@ -207,6 +244,8 @@ #define R128_DEREF8(reg) *(__volatile__ char *)R128_ADDR(reg) #define R128_READ8(reg) R128_DEREF8(reg) #define R128_WRITE8(reg,val) do { R128_DEREF8(reg) = val; } while (0) + +#endif /* __powerpc__ */ #define R128_WRITE_PLL(addr,val) \ do { \ diff -Nru a/drivers/char/drm/vm.c b/drivers/char/drm/vm.c --- a/drivers/char/drm/vm.c Sat Jun 16 06:00:40 2001 +++ b/drivers/char/drm/vm.c Sat Jun 16 06:00:40 2001 @@ -323,6 +323,8 @@ pgprot_val(vma->vm_page_prot) |= _PAGE_PCD; pgprot_val(vma->vm_page_prot) &= ~_PAGE_PWT; } +#elif defined(__powerpc__) + pgprot_val(vma->vm_page_prot) |= _PAGE_NO_CACHE|_PAGE_GUARDED; #elif defined(__ia64__) if (map->type != _DRM_AGP) vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot); diff -Nru a/drivers/net/arlan.h b/drivers/net/arlan.h --- a/drivers/net/arlan.h Sat Jun 16 06:00:40 2001 +++ b/drivers/net/arlan.h Sat Jun 16 06:00:40 2001 @@ -574,4 +574,4 @@ #define ARLAN_DEBUG_INTERRUPT 0x00080 #define ARLAN_DEBUG_STARTUP 0x00100 #define ARLAN_DEBUG_SHUTDOWN 0x00200 - + \ No newline at end of file diff -Nru a/drivers/net/sk_mca.h b/drivers/net/sk_mca.h --- a/drivers/net/sk_mca.h Sat Jun 16 06:00:38 2001 +++ b/drivers/net/sk_mca.h Sat Jun 16 06:00:38 2001 @@ -171,4 +171,4 @@ extern int skmca_probe(struct device *); -#endif /* _SK_MCA_INCLUDE_ */ +#endif /* _SK_MCA_INCLUDE_ */ \ No newline at end of file diff -Nru a/drivers/nubus/nubus.c b/drivers/nubus/nubus.c --- a/drivers/nubus/nubus.c Sat Jun 16 06:00:39 2001 +++ b/drivers/nubus/nubus.c Sat Jun 16 06:00:39 2001 @@ -894,46 +894,42 @@ return len; } -static struct proc_dir_entry proc_nubus = { +static struct proc_dir_entry proc_old_nubus = { PROC_NUBUS, 5, "nubus", S_IFREG | S_IRUGO, 1, 0, 0, 0, &proc_array_inode_operations }; -#endif +#endif /* CONFIG_PROC_FS */ -void nubus_init(void) +void __init nubus_scan_bus(void) { - /* - * Register cards - */ -#ifdef CONFIG_DAYNAPORT - extern struct nubus_device_specifier nubus_8390; -#endif + int slot; + for(slot = 9; slot < 15; slot++) + { + nubus_probe_slot(slot); + } +} +void __init nubus_init(void) +{ if (!MACH_IS_MAC) return; -#ifdef LCIII_WEIRDNESS - if (macintosh_config->ident == MAC_MODEL_LCIII) { - printk("nubus init: LCIII has no nubus!\n"); - return; + /* Initialize the NuBus interrupts */ + if (oss_present) { + oss_nubus_init(); + } else { + via_nubus_init(); } -#endif -#ifdef CONFIG_DAYNAPORT - register_nubus_device(&nubus_8390); -#endif + /* And probe */ + printk("NuBus: Scanning NuBus slots.\n"); + nubus_devices = NULL; + nubus_boards = NULL; + nubus_scan_bus(); - /* - * And probe - */ - - nubus_init_via(); - printk("Scanning nubus slots.\n"); - nubus_probe_bus(); #ifdef CONFIG_PROC_FS - proc_register(&proc_root, &proc_nubus); + proc_register(&proc_root, &proc_old_nubus); + nubus_proc_init(); #endif } - - diff -Nru a/drivers/sound/lowlevel/aci.c b/drivers/sound/lowlevel/aci.c --- a/drivers/sound/lowlevel/aci.c Sat Jun 16 06:00:42 2001 +++ b/drivers/sound/lowlevel/aci.c Sat Jun 16 06:00:42 2001 @@ -676,4 +676,4 @@ } #endif /* MODULE */ - + \ No newline at end of file diff -Nru a/drivers/video/aty128fb.c b/drivers/video/aty128fb.c --- a/drivers/video/aty128fb.c Sat Jun 16 06:00:41 2001 +++ b/drivers/video/aty128fb.c Sat Jun 16 06:00:41 2001 @@ -2488,16 +2488,60 @@ #ifdef CONFIG_PMAC_PBOOK +#if 0 +static u16 save_pci_command; +static u32 save_pci_bar[6]; +static u32 save_pci_rom; +static u8 save_pci_latency; +static u8 save_pci_cacheline; +#endif + static void aty128_set_suspend(struct fb_info_aty128 *info, int suspend) { u32 pmgt; +#if 0 + u8 cap_ptr; + u32 cap_id; + u16 pwr; + int timeout = 5000; + int i; + + + /* Lookup Power Management capability register */ + pci_read_config_byte(info->pdev, 0x34, &cap_ptr); + if (cap_ptr != 0x00) { + do { + pci_read_config_dword(info->pdev, cap_ptr, &cap_id); + if ((cap_id & 0xff) != PCI_CAP_ID_PM) + cap_ptr = (cap_id >> 8) & 0xff; + } + while (((cap_id & 0xff) != PCI_CAP_ID_PM) && (cap_ptr != 0x00)); + } + if (cap_ptr == 0x00) + return; +#endif /* Set the chip into the appropriate suspend mode (we use D2, * D3 would require a complete re-initialisation of the chip, * including PCI config registers, clocks, AGP configuration, ...) */ if (suspend) { +#if 0 + /* Make sure CRTC2 is reset. Remove that the day we decide to + * actually use CRTC2 + */ + aty_st_le32(CRTC2_GEN_CNTL, aty_ld_le32(CRTC2_GEN_CNTL) & + ~(CRTC2_EN)); + + /* Save some state */ + pci_read_config_word(info->pdev, PCI_COMMAND, &save_pci_command); + for (i=0;i<5; i++) + pci_read_config_dword(info->pdev, PCI_BASE_ADDRESS_0 + i*4, &save_pci_bar[i]); + pci_read_config_word(info->pdev, PCI_ROM_ADDRESS, &save_pci_rom); + pci_read_config_byte(info->pdev, PCI_LATENCY_TIMER, &save_pci_latency); + pci_read_config_byte(info->pdev, PCI_CACHE_LINE_SIZE, &save_pci_cacheline); +#endif /* Set the power management mode to be PCI based */ pmgt = aty_ld_pll(POWER_MANAGEMENT); pmgt &= ~PWR_MGT_MODE_MASK; @@ -2505,15 +2549,48 @@ aty_st_pll(POWER_MANAGEMENT, pmgt); /* Switch PCI power management to D2 */ +#if 0 + pci_read_config_word(info->pdev, cap_ptr + PCI_PM_CTRL, &pwr); + pci_write_config_word(info->pdev, cap_ptr + PCI_PM_CTRL, + (pwr & ~PCI_PM_CTRL_STATE_MASK) | suspend); + do { + pci_read_config_word(info->pdev, cap_ptr + PCI_PM_CTRL, &pwr); + } while(((pwr & PCI_PM_CTRL_STATE_MASK) != suspend) && ((--timeout) > 0)); +#endif pci_write_config_word(info->pdev, 0x60, 2); //mdelay(10); } else { /* Switch back PCI power management to D0 */ +#if 0 + pci_read_config_word(info->pdev, cap_ptr + PCI_PM_CTRL, &pwr); + pci_write_config_word(info->pdev, cap_ptr + PCI_PM_CTRL, + (pwr & ~PCI_PM_CTRL_STATE_MASK) | state); + do { + pci_read_config_word(info->pdev, cap_ptr + PCI_PM_CTRL, &pwr); + } while(((pwr & PCI_PM_CTRL_STATE_MASK) != state) && ((--timeout) > 0)); +#endif mdelay(100); pci_write_config_word(info->pdev, 0x60, 0); mdelay(100); //aty128_set_backlight_enable(1,10,info); +#if 0 + /* Restore some state */ + for (i=0;i<5; i++) + pci_write_config_dword(info->pdev, PCI_BASE_ADDRESS_0 + i*4, save_pci_bar[i]); + pci_write_config_word(info->pdev, PCI_COMMAND, save_pci_command); + pci_write_config_word(info->pdev, PCI_ROM_ADDRESS, save_pci_rom); + pci_write_config_byte(info->pdev, PCI_LATENCY_TIMER, save_pci_latency); + pci_write_config_byte(info->pdev, PCI_CACHE_LINE_SIZE, save_pci_cacheline); + + aty_st_le32(CRTC2_GEN_CNTL, aty_ld_le32(CRTC2_GEN_CNTL) & + ~(CRTC2_EN)); + + /* Switch OFF chip power management for now */ + pmgt = aty_ld_pll(POWER_MANAGEMENT); + pmgt &= ~PWR_MGT_ON; + aty_st_pll(POWER_MANAGEMENT, pmgt); +#endif } } diff -Nru a/include/asm-i386/setup.h b/include/asm-i386/setup.h --- a/include/asm-i386/setup.h Sat Jun 16 06:00:41 2001 +++ b/include/asm-i386/setup.h Sat Jun 16 06:00:41 2001 @@ -1,4 +1,4 @@ /* * Just a place holder. We don't want to have to test x86 before * we include stuff - */ + */ \ No newline at end of file diff -Nru a/include/asm-ppc/bootx.h b/include/asm-ppc/bootx.h --- a/include/asm-ppc/bootx.h Sat Jun 16 06:00:41 2001 +++ b/include/asm-ppc/bootx.h Sat Jun 16 06:00:41 2001 @@ -133,4 +133,3 @@ #endif #endif - diff -Nru a/include/asm-ppc/system.h b/include/asm-ppc/system.h --- a/include/asm-ppc/system.h Sat Jun 16 06:00:40 2001 +++ b/include/asm-ppc/system.h Sat Jun 16 06:00:40 2001 @@ -1,6 +1,7 @@ #ifndef __PPC_SYSTEM_H #define __PPC_SYSTEM_H +#include #include #include #include @@ -151,5 +152,47 @@ { return (void *) xchg_u32(m, (unsigned long) val); } + +/* + * Atomic compare and exchange. + */ +#define __HAVE_ARCH_CMPXCHG 1 + +/* this doesn't exist, so you'll get a linker error if you use + cmpxchg on anything other than a 4-byte quantity */ +extern void __cmpxchg_called_with_bad_pointer(void); + +static inline unsigned long __cmpxchg(volatile void *ptr, unsigned long old, + unsigned long new, int size) +{ + unsigned long prev; + + switch (size) { + case 4: + __asm__ __volatile__( +#ifdef CONFIG_SMP + " eieio\n" +#endif + "0: lwarx %0,0,%1\n" + " cmpw 0,%0,%3\n" + " bne 1f\n" + " stwcx. %2,0,%1\n" + " bne- 0b\n" +#ifdef CONFIG_SMP + " sync\n" +#endif + "1:" + : "=&r"(prev) + : "r"(ptr), "r"(new), "r"(old) + : "cr0", "memory"); + return prev; + } + __cmpxchg_called_with_bad_pointer(); + return old; +} + +#define cmpxchg(ptr,o,n) \ + ((__typeof__(*(ptr)))__cmpxchg((ptr),(unsigned long)(o), \ + (unsigned long)(n),sizeof(*(ptr)))) #endif