aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* [POWERPC] Add QE device tree node definitionLi Yang2006-10-04
| | | | | | | | | | OF device tree node spec used in QE/8360 support patches. Signed-off-by: Li Yang <leoli@freescale.com> Signed-off-by: Jiang Bo <Tanya.jiang@freescale.com> Signed-off-by: Kim Phillips <kim.phillips@freescale.com> Signed-off-by: Vitaly Bordug <vbordug@ru.mvista.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
* Merge branch 'upstream' of ↵Paul Mackerras2006-10-04
|\ | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/vitb/linux-2.6-PQ
| * POWERPC: mpc82xx merge: board-specific/platform stuff(resend)Vitaly Bordug2006-10-03
| | | | | | | | | | | | | | | | | | This intruduces 82xx family in arch/powerpc/platforms, and has all the board-specific code to represent regression-less transaction from ppc. The functionality is apparently the same, including PCI controller. Signed-off-by: Vitaly Bordug <vbordug@ru.mvista.com>
| * POWERPC: 8272ads merge to powerpc: common stuffVitaly Bordug2006-10-03
| | | | | | | | | | | | | | | | | | This has modules of common directories related to the mpc8272ADS board, mainly common cpm2 changes and fsl_soc.c portions related to the bitbang MDIO and other mechanisms specific for this family. Signed-off-by: Vitaly Bordug <vbordug@ru.mvista.com>
| * POWERPC: Added devicetree for mpc8272ads boardVitaly Bordug2006-10-03
| | | | | | | | | | | | | | | | This adds current dts file used with MPC8272ADS, introducing new mdio bitbang defines, as well as fully-CPM2-SoC board design. Signed-off-by: Vitaly Bordug <vbordug@ru.mvista.com>
* | Merge branch 'master' of git://oak/home/sfr/kernels/iseries/workPaul Mackerras2006-10-04
|\ \
| * | [POWERPC] iSeries has no legacy I/OStephen Rothwell2006-10-03
| | | | | | | | | | | | Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| * | [POWERPC] implement BEGIN/END_FW_FTR_SECTIONStephen Rothwell2006-10-03
| | | | | | | | | | | | | | | | | | and use it an all the obvious places in assembler code. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| * | [POWERPC] iSeries does not need pcibios_fixup_resourcesStephen Rothwell2006-10-03
| | | | | | | | | | | | Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| * | [POWERPC] Allow combined iSeries and MULTIPLATFORM buildStephen Rothwell2006-10-03
| | | | | | | | | | | | | | | | | | | | | This will build with ISERIES, PSERIES and PMAC64 selected, but will only boot on iSeries so far. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| * | [POWERPC] fix ioremap for a combined kernelStephen Rothwell2006-09-24
| | | | | | | | | | | | Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| * | [POWERPC] modify PCI code for a merged kernelStephen Rothwell2006-09-24
| | | | | | | | | | | | Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| * | [POWERPC] The two vio HVC backends clashStephen Rothwell2006-09-24
| | | | | | | | | | | | | | | | | | | | | | | | Make sure only one of them actually registers as a driver. Also, remove cast from get_property(). Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| * | [POWERPC] iSeries: set FW_FEATURE_ISERIES earlierStephen Rothwell2006-09-24
| | | | | | | | | | | | | | | | | | | | | This will help in the combined kernel as some really early things depend on being able to check this. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
* | | [POWERPC] Don't try to just continue if xmon has no input devicePaul Mackerras2006-10-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, if xmon has no input device (as is generally the case on G5 powermacs), and we drop into xmon as a result of a fatal exception, it will return 1, which die() interprets as "continue without causing an oops". This fixes it by making xmon() return 0 in the case where it has no input device. Signed-off-by: Paul Mackerras <paulus@samba.org>
* | | [POWERPC] Fix a printk in pseries_mpic_init_IRQMichael Ellerman2006-10-04
| | | | | | | | | | | | | | | | | | | | | | | | This should probably say "mpic" to save confusion. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
* | | [POWERPC] Get default baud rate in udbg_sccBenjamin Herrenschmidt2006-10-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On powermac, when open firmware is set to use the SCC for console, this causes the low level udbg early console to read back the speed and re-use it instead of hard coding 57600 bps. This doesn't (yet) pass the detected speed all the way to pmac_zilog though. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
* | | [POWERPC] Fix zImage.coff on oldworld PowerMacBenjamin Herrenschmidt2006-10-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recent changes to the PowerPC zImage wrapper broke zImage.coff due to the addition of new ELF sections that aren't very well converted to xcoff and not supported by old OpenFirmware. This fixes it by putting those sections in the xcoff .data. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
* | | [POWERPC] Fix xmon=off and cleanup xmon initialisationMichael Ellerman2006-10-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | My patch to make the early xmon logic work with earlier early param parsing (480f6f35a149802a94ad5c1a2673ed6ec8d2c158) breaks xmon=off. No one does this obviously as xmon rocks, but it should really work as documented. While fixing that it struck me that we could move the xmon param handling into xmon.c, and also consolidate the xmon_init()/do_early_xmon logic into xmon_setup(). This means xmon=early drops into xmon a little earlier on 32-bit, but it seems to work just fine. Tested on PSERIES and CLASSIC32. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
* | | [POWERPC] Cleanup include/asm-powerpc/xmon.hMichael Ellerman2006-10-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For some reason we have two prototypes for xmon_init(), remove the one in system.h. No one calls xmon() anymore, debugger() is preferable, so we don't need the prototype. And similarly no one calls xmon_printf(). Also update the include guards on xmon.h to match the standard format, add copyright and license, and add comments to #endifs. Built for pseries_defconfig and pmac32_defconfig. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
* | | [POWERPC] Update swim3 printk after blkdev.h changeOlaf Hering2006-10-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | drivers/block/swim3.c: In function 'swim3_interrupt': drivers/block/swim3.c:640: warning: format '%lx' expects type 'long unsigned int', but argument 3 has type 'unsigned int' drivers/block/swim3.c:746: warning: format '%lx' expects type 'long unsigned int', but argument 3 has type 'unsigned int' Update printk format string after blkdev.h change: Split struct request ->flags into two parts Signed-off-by: Olaf Hering <olaf@aepfle.de> Signed-off-by: Paul Mackerras <paulus@samba.org>
* | | [POWERPC] Cell interrupt reworkBenjamin Herrenschmidt2006-10-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch reworks the cell iic interrupt handling so that: - Node ID is back in the interrupt number (only one IRQ host is created for all nodes). This allows interrupts from sources on another node to be routed non-locally. This will allow possibly one day to fix maxcpus=1 or 2 and still get interrupts from devices on BE 1. (A bit more fixing is needed for that) and it will allow us to implement actual affinity control of external interrupts. - Added handling of the IO exceptions interrupts (badly named, but I re-used the name initially used by STI). Those are the interrupts exposed by IIC_ISR and IIC_IRR, such as the IOC translation exception, performance monitor, etc... Those get their special numbers in the IRQ number space and are internally implemented as a cascade on unit 0xe, class 1 of each node. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Acked-by: Arnd Bergmann <arnd.bergmann@de.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
* | | Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdogLinus Torvalds2006-10-03
|\ \ \ | | | | | | | | | | | | | | | | * master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: [WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl()
| * | | [WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl()Wim Van Sebroeck2006-10-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return ENOTTY instead of ENOIOCTLCMD in user-visible ioctl() results The watchdog drivers used to return ENOIOCTLCMD for bad ioctl() commands. ENOIOCTLCMD should not be visible by the user, so use ENOTTY instead. Signed-off-by: Samuel Tardieu <sam@rfc1149.net> Signed-off-by: Wim Van Sebroeck <wim@iguana.be> Acked-by: Alan Cox <alan@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org>
* | | | Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdogLinus Torvalds2006-10-03
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: [WATCHDOG] iTCO_wdt.c shutdown patch [WATCHDOG] iTCO_wdt.c - pci_dev_put fix [WATCHDOG] iTCO_wdt (Intel TCO Timer) driver [WATCHDOG] iTCO_wdt (Intel TCO Timer) driver
| * | | [WATCHDOG] iTCO_wdt.c shutdown patchWim Van Sebroeck2006-10-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we are using the device driver model, we don't need to arrange the shutdown via a reboot_notifier. Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| * | | [WATCHDOG] iTCO_wdt.c - pci_dev_put fixWim Van Sebroeck2006-10-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for_each_pci_dev calls pci_get_device (and thus it calls pci_dev_get). So we need to do a pci_dev_put to keep the refcounting correct. (Thanks to Jiri Slaby <jirislaby@gmail.com>) Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| * | | [WATCHDOG] iTCO_wdt (Intel TCO Timer) driverWim Van Sebroeck2006-10-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert the iTCO_wdt driver to a platform device driver. Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| * | | [WATCHDOG] iTCO_wdt (Intel TCO Timer) driverWim Van Sebroeck2006-10-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hardware driver for the intel TCO timer based watchdog devices. These drivers are included in the Intel 82801 I/O Controller Hub family (from ICH0 up to ICH7) and in the Intel 6300ESB controller hub. This driver will replace the i8xx_tco.c driver. Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
* | | | [PATCH] Remove me from maintainers for serial and mmcRussell King2006-10-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As advertised earlier. I invite interested parties to take over and add their own entries as they see fit. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linusLinus Torvalds2006-10-03
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: [MIPS] Fix wreckage after removal of tickadj; convert to GENERIC_TIME. [MIPS] DECstation defconfig update [MIPS] Fix size of zones_size and zholes_size array [MIPS] BCM1480: Mask pending interrupts against c0_status.im. [MIPS] SB1250: Interrupt handler fixes [MIPS] Remove IT8172-based platforms, ITE 8172G and Globespan IVR support. [MIPS] Remove Atlas and SEAD from feature-removal-schedule. [MIPS] Remove Jaguar and Ocelot family from feature list. [MIPS] BCM1250: TRDY timeout tweaks for Broadcom SiByte systems [MIPS] Remove dead DECstation boot code [MIPS] Let gcc align 'struct pt_regs' on 8 bytes boundary
| * | | | [MIPS] Fix wreckage after removal of tickadj; convert to GENERIC_TIME.Ralf Baechle2006-10-03
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * | | | [MIPS] DECstation defconfig updateMaciej W. Rozycki2006-10-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sanitise a number of settings for the DECstation. Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * | | | [MIPS] Fix size of zones_size and zholes_size arrayAtsushi Nemoto2006-10-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit f06a96844a577c43249fce25809a4fae07407f46 broke MIPS. Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * | | | [MIPS] BCM1480: Mask pending interrupts against c0_status.im.Ralf Baechle2006-10-03
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * | | | [MIPS] SB1250: Interrupt handler fixesMaciej W. Rozycki2006-10-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mask cp0.status against cp0.cause. Additionally, spurious interrupts are not recorded. Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * | | | [MIPS] Remove IT8172-based platforms, ITE 8172G and Globespan IVR support.Yoichi Yuasa2006-10-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As per feature-removal-schedule.txt. Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> Acked-by: Alan Cox <alan@redhat.com> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * | | | [MIPS] Remove Atlas and SEAD from feature-removal-schedule.Ralf Baechle2006-10-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Maciej has started fixing the code for these platforms. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * | | | [MIPS] Remove Jaguar and Ocelot family from feature list.Ralf Baechle2006-10-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are remaining users with interest in the platform after all. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * | | | [MIPS] BCM1250: TRDY timeout tweaks for Broadcom SiByte systemsMaciej W. Rozycki2006-10-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was obesrved that at least one older PCI card predating the requirement for the TRDY signal to respond within 16 clock ticks actually does not meet this rule nor even the power-on defaults of the PCI bridges found in development systems built around the Broadcom SiByte SOCs. Here is a patch that bumps up the timeout to the highest finite value supported by these chips, which is 255 clock ticks. The bridges affected are the SiByte SOC itself and the SP1011. This change does not effectively affect systems only having PCI option cards installed that meet the TRDY requirement of the current PCI spec. The rule was introduced with PCI 2.1, so any older card may make the system affected. If this is the case, performance of the system will suffer in return for the card working at all. If this is a concern, then the solution is not to use such cards. Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org> Signed-off-by: Ralf Baechle <ralf@linux-mips.org> ---
| * | | | [MIPS] Remove dead DECstation boot codeMaciej W. Rozycki2006-10-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code in arch/mips/dec/boot/ has been dead for long. Let's get rid of it before some epidemic spreads. Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * | | | [MIPS] Let gcc align 'struct pt_regs' on 8 bytes boundaryFranck Bui-Huu2006-10-03
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The stack pointer in MIPS/gcc should always 8 bytes aligned on entry to any routines. Therefore pt_regs structure must be aligned to 8-byte boundary too. Instead of creating dummy fields to achieve this alignment, this patch let gcc doing it. Therefore 'smtc_pad' field can be safely removed. Signed-off-by: Franck Bui-Huu <fbuihuu@gmail.com> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
* | | | V4L/DVB (4699): CX24109 patch to eliminate the weird mis-tuningsSteven Toth2006-10-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A number of people have been reporting wierd tuning problems with various cards. Yeasah tracked down the problem to a miss-read datasheet. This resolves the problems. Signed-off-by: Yeasah Pell <yeasah@schwide.net> Signed-off-by: Steven Toth <stoth@hauppauge.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
* | | | V4L/DVB (4698): Fix S-Video configuration for Pinnacle PCTV-SatMauro Carvalho Chehab2006-10-03
| | | | | | | | | | | | | | | | | | | | | | | | Thanks to Edgar Toernig <froese@gmx.de> for pointing this. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
* | | | V4L/DVB (4689): Adding support for Nova-T-PCI PCI ID 0070:9000Steven Toth2006-10-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding support for Nova-T-PCI PCI ID 0070:9000 Signed-off-by: Steven Toth <stoth@hauppauge.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
* | | | V4L/DVB (4688): Fix msp343xG handling (regression from 2.6.16)Hans Verkuil2006-10-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The msp3430G and msp3435G models cannot do Automatic Standard Detection. So these should be forced to BTSC. These chips are early production versions for the msp34xxG series and are quite rare. The workaround for kernel 2.6.18 is to use 'standard=32' as msp3400 module option. Due to broken handling of the 'standard' option in 2.6.17 there is no workaround possible for that kernel. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
* | | | V4L/DVB (4686): Cxusb: add support for DViCO FusionHDTV DVB-T Dual Digital 2Michael Krufky2006-10-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for DViCO FusionHDTV DVB-T Dual Digital 2 USB, which is identical to the usb portion of DViCO FusionHDTV DVB-T Dual Digital 1. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
* | | | V4L/DVB (4685): Fix compiler warning in drivers/media/video/video-buf.cSujoy Gupta2006-10-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using a double cast to avoid compiler warnings when building for PAE. Compiler doesn't like direct casting of a 32 bit ptr to 64 bit integer. Signed-off-by: Martin J. Bligh <mbligh@google.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
* | | | V4L/DVB (4684): Drivers/media/video/cx88: Remove unused defined FALSE/TRUERichard Knutsson2006-10-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove defines of FALSE/TRUE because they are not used. Signed-off-by: Richard Knutsson <ricknu-0@student.ltu.se> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
* | | | V4L/DVB (4683): Norm_notchfilter is used on just one point and argument is bogusMauro Carvalho Chehab2006-10-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed norm_notchfilter function. All the code is bound to 4 x FSC, so, any other filter won't work fine. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>