summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* powermac: Use a spinlock in swim3.c (floppy driver) instead of cliPaul Mackerras2005-11-081-10/+10
| | | | Signed-off-by: Paul Mackerras <paulus@samba.org>
* macintosh: Always export pmu_[un]register_sleep_notifier if CONFIG_PM setPaul Mackerras2005-11-081-2/+2
| | | | | | | This fixes a build error when building the pmac sound driver as a module for 64-bit powermacs. Signed-off-by: Paul Mackerras <paulus@samba.org>
* powerpc: Fix typo in pmac_cpufreq_resumePaul Mackerras2005-11-081-1/+1
| | | | Signed-off-by: Paul Mackerras <paulus@samba.org>
* [PATCH] Memory Add Fixes for ppc64Mike Kravetz2005-11-082-0/+2
| | | | | | | | | | | | | On Tue, Nov 08, 2005 at 08:12:56AM +1100, Benjamin Herrenschmidt wrote: > Yes, the MAX_ORDER should be different indeed. But can Kconfig do that ? > That is have the default value be different based on a Kconfig option ? > I don't see that ... We may have to do things differently here... This seems to be done in other parts of the Kconfig file. Using those as an example, this should keep the MAX_ORDER block size at 16MB. Signed-off-by: Mike Kravetz <kravetz@us.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [PATCH] ppc64: remove some direct xmon callsAnton Blanchard2005-11-082-12/+0
| | | | | | | | | | | | Even though we can enable and disable xmon at runtime now, there are a few places in the merge tree that call xmon and xmon_printf directly. In the case below we call die() which will call xmon if it is enabled. Also remove an unnecessary include of xmon.h in smp.c. Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [PATCH] ppc64: fix oprofile sample bit handlingAnton Blanchard2005-11-081-1/+23
| | | | | | | | | | Oprofile was hardwiring the MMCRA sample bit to 1 but on newer cpus (eg POWER5) we want to vary it based on the group being sampled. Add a temporary workaround until people update their oprofile userspace. Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [PATCH] ppc64: fix Memory: summary lineAnton Blanchard2005-11-081-1/+1
| | | | | | | | | | | | | | | On ppc64 we end up with a negative value for the data size in the memory boot message: Memory: 2035560k/2097152k available (5792k kernel code, 89564k reserved, 18014398509481632k data, 870k bss, 352k init) It turns out the section ordering of the linker script is different on ppc32 and ppc64, so just count data as _edata - _sdata which should work on both. Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [PATCH] ppc: Fix PowerBook HD led on ARCH=powerpcBenjamin Herrenschmidt2005-11-081-3/+6
| | | | | | | | The PowerBook HD led code uses obsoletes device-tree accessors which do not work anymore for getting the root of the tree. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [PATCH] ppc: Fix ARCH=ppc build with xmonBenjamin Herrenschmidt2005-11-083-5/+6
| | | | | | | | xmon() prototype is inconsistent between ARCH=ppc and ARCH=powerpc, thus causing ARCH=ppc build breakage. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [PATCH] ppc: fix a bunch of warningsBenjamin Herrenschmidt2005-11-085-19/+22
| | | | | | | | Building a PowerMac kernel with ARCH=powerpc causes a bunch of warnings, this fixes some of them Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [PATCH] ppc64: Thermal control for SMU based machinesBenjamin Herrenschmidt2005-11-0813-0/+3638
| | | | | | | | | | This adds a new thermal control framework for PowerMac, along with the implementation for PowerMac8,1, PowerMac8,2 (iMac G5 rev 1 and 2), and PowerMac9,1 (latest single CPU desktop). In the future, I expect to move the older G5 thermal control to the new framework as well. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [PATCH] ppc64: More U3 device-tree fixesBenjamin Herrenschmidt2005-11-082-2/+2
| | | | | | | | Some more U3 revisions have the missing "interrupts" property in U3, this adds them to the fixup code in prom_init.c Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [PATCH] ppc64: Update g5_defconfig for ARCH=powerpcBenjamin Herrenschmidt2005-11-081-55/+206
| | | | | | | | | | This patch updates g5_defconfig for ARCH=powerpc in order to add the SMU support & thermal drivers to it, the pmac sound driver (works on some G5s) and replaces rivafb with nvidiafb which works better for the cards found in G5 based machines. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [PATCH] ppc64: SMU partition recoveryBenjamin Herrenschmidt2005-11-0810-57/+381
| | | | | | | | | | This patch adds the ability to the SMU driver to recover missing calibration partitions from the SMU chip itself. It also adds some dynamic mecanism to /proc/device-tree so that new properties are visible to userland. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [PATCH] ppc64: SMU based macs cpufreq supportBenjamin Herrenschmidt2005-11-0811-25/+572
| | | | | | | | CPU freq support using 970FX powertune facility for iMac G5 and SMU based single CPU desktop. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [PATCH] powerpc: Fix ppc32 initrdDavid Woodhouse2005-11-083-37/+41
| | | | | | | | | | | | | OK, the Fedora ppc32 and ppc64 kernels should both be arch/powerpc by tomorrow. They're booting on G5, POWER5, and my powerbook. I'll test pmac SMP and Pegasos later -- but pmac smp is known broken in arch/ppc anyway, and I'll live with a potential Pegasos regression for now; it wasn't supported officially in FC4 either. I needed to fix ppc32 initrd -- we were never setting initrd_start. Signed-off-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
* Merge ../linux-2.6Paul Mackerras2005-11-081265-20025/+40841
|\
| * Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linusLinus Torvalds2005-11-0738-917/+1896
| |\
| | * VINO driver version 0.0.5.Ladislav Michl2005-11-075-680/+1545
| | | | | | | | | | | | | | | Second cut of the VINO / Indycam driver for the Silicon Graphics Indy, much more feature complete and bug free.
| | * Redefine outs[wl] for ide_outs[wl].Atsushi Nemoto2005-11-071-0/+4
| | | | | | | | | | | | | | | | | | | | | Add missing bits to fix D-cache aliasing problem in the PIO IDE driver. Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * Delete duplicate definitions.Ralf Baechle2005-11-071-4/+0
| | | | | | | | | | | | | | | | | | This reverts 8f91ed6c2fec8cb746e4dc86a79247162b4c5a7a. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * Fix return type of setup_frame variantsAtsushi Nemoto2005-11-072-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | Since 2.6.13-rc1 setup_frame and its variants return int. But some bits were missed in the conversion. Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * IRIX: Use schedule_timeout_interruptible.Ralf Baechle2005-11-071-2/+1
| | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * Define MAX_UDELAY_MSAtsushi Nemoto2005-11-071-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | If HZ was 1000, mdelay(2) cause overflow on multiplication in __udelay. We should define MAX_UDELAY_MS properly to prevent this. Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * Use rtc_lock to protect RTC operationsAtsushi Nemoto2005-11-0713-4/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | Many RTC routines were not protected against each other, so there are potential races, for example, ntp-update against /dev/rtc. This patch fixes them using rtc_lock. Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * Remove mips_rtc_lockAtsushi Nemoto2005-11-071-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mips_rtc_lock is no longer needed because RTC operations should be protected already by other mechanism. (rtc_lock, local_irq_save, etc.) Also, locking whole rtc_get_time/rtc_set_time should be avoided while some RTC routines might take very long time (a few seconds). Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * Add .gitignore files for TurbochannelRalf Baechle2005-11-071-0/+1
| | |
| | * Add .gitignore files for MIPS.Ralf Baechle2005-11-072-0/+5
| | |
| | * VPE loader janitoringRalf Baechle2005-11-071-56/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | o Switch to dynamic major o Remove duplicate SHN_MIPS_SCOMMON definition o Coding style: remove typedefs. o Coding style: reorder to avoid the need for forward declarations o Use kzalloc. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * PNX8550 uses a MIPS32-like processor core, not R4xx0.Ralf Baechle2005-11-073-10/+13
| | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * O2 parport definitionsIlya A. Volynets-Evenbakh2005-11-071-1/+25
| | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * OSS MIPS drivers: "extern inline" -> "static inline"Adrian Bunk2005-11-072-6/+6
| | | | | | | | | | | | | | | | | | | | | "extern inline" doesn't make much sense. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * Add spaces to MODULE_PROC_FAMILY values.Ralf Baechle2005-11-071-19/+19
| | | | | | | | | | | | | | | | | | Only a cosmetic fix to make the output of modinfo look readable. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * Turn rtlx upside down.Ralf Baechle2005-11-072-120/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | o Coding style o Race condition on open o Switch to dynamic major o Header file cleanup Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * | Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/inputLinus Torvalds2005-11-076-98/+129
| |\ \
| | * | Input: lkkbd - miscellaneous fixesJan-Benedict Glaw2005-11-021-42/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Hide debugging code into #ifdef, which allows to simplify the large switch statement * Update macros to not reference variables not given as arguments Signed-off-by: Jan-Benedict Glaw <jbglaw@lug-owl.de> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| | * | Input: logips2pp - add support for MX3100Mirco Macrelli2005-11-021-0/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| | * | Input: locomokbd - fix wrong bustypePavel Machek2005-11-021-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Pavel Machek <pavel@suse.cz> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| | * | Input: fix input device deregistrationDmitry Torokhov2005-11-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove main attribute group (name, phys, uniq) when unregistering input devices. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| | * | Input: do not register statically allocated devicesDmitry Torokhov2005-11-022-12/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not register statically allocated input devices to prevent OOPS when attaching input interfaces since it requires class device to be properly initialized. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| | * | Input: locomokbd - convert to dynamic input allocationDmitry Torokhov2005-11-021-32/+31
| | | | | | | | | | | | | | | | Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| | * | Input: convert dmasound_awacs (OSS) to dynamic input allocationIan Wienand2005-11-021-12/+19
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ian Wienand <ianw@gelato.unsw.edu.au> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | Merge master.kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6Linus Torvalds2005-11-07192-4890/+11317
| |\ \ \ | | | | | | | | | | | | | | | Some manual fixups for clashing kfree() cleanups etc.
| | * | | [MTD] chips: Clean up trailing white spacesThomas Gleixner2005-11-071-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| | * | | [MTD] OneNAND: Clean up trailing white spacesThomas Gleixner2005-11-071-12/+12
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| | * | | [MTD] NAND: Clean up trailing white spacesThomas Gleixner2005-11-0717-695/+695
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| | * | | [MTD] devices: Clean up trailing white spacesThomas Gleixner2005-11-0712-156/+156
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| | * | | [MTD] maps: Clean up trailing white spacesThomas Gleixner2005-11-0761-470/+470
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| | * | | [MTD] chips: Clean up trailing white spacesThomas Gleixner2005-11-0715-493/+493
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| | * | | [MTD] user-abi: Clean up trailing white spacesThomas Gleixner2005-11-073-7/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
OpenPOWER on IntegriCloud