summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6Linus Torvalds2007-02-1355-116/+764
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6: i2c: Stop using i2c_adapter.class_dev i2c: Remove the warning on missing adapter device i2c: Declare more i2c_adapter parent devices i2c: PA Semi SMBus driver i2c-amd8111: Proposed cleanups i2c-parport: Add support for One For All remote JP1 interface i2c-viapro: Add support for the VIA CX700 south bridge i2c: Add IDs to adapters i2c: Update the list of bus IDs i2c: Add driver suspend/resume/shutdown support i2c: completion header cleanups i2c-i801: Document the SMBus unhiding quirk i2c-i801: Spelling fix i2c: Fix typo in SMBus Write Word Data description i2c-piix4: Add support for the ATI SB600 i2c-nforce2: Drop unused reference to pci_dev i2c/vt8231: Remove superfluous initialization i2c-ali1563: Fix device initialization i2c-ali1563: Improve the status messages
| * i2c: Stop using i2c_adapter.class_devJean Delvare2007-02-134-4/+4
| | | | | | | | | | | | | | | | Stop using i2c_adapter.class_dev, as it is going to be removed soon. Luckily, there are only 4 RTC drivers affected. Signed-off-by: Jean Delvare <khali@linux-fr.org> Cc: Alessandro Zummo <a.zummo@towertech.it>
| * i2c: Remove the warning on missing adapter deviceJean Delvare2007-02-131-3/+2
| | | | | | | | | | | | | | | | | | Now that the i2c_adapter migration plan changed and we are going to keep i2c_adapter.dev, it's no longer that urgent to add a proper device to all i2c_adapter drivers. Thus is seems resonable to degrade the warning asking authors to migrate their driver to a debug message. Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * i2c: Declare more i2c_adapter parent devicesJean Delvare2007-02-1315-3/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Declare the parent device of i2c_adapter devices each time we can easily do so. It makes the i2c_adapter appear at the right place in the device tree, rather than as a platform device. Signed-off-by: Jean Delvare <khali@linux-fr.org> Cc: David Brownell <dbrownell@users.sourceforge.net> Cc: Len Brown <len.brown@intel.com> Cc: Jordan Crouse <jordan.crouse@amd.com> Cc: Jody McIntyre <scjody@modernduck.com> Cc: Stefan Richter <stefanr@s5r6.in-berlin.de> Cc: v4l-dvb-maintainer@linuxtv.org Cc: Petr Vandrovec <vandrove@vc.cvut.cz>
| * i2c: PA Semi SMBus driverOlof Johansson2007-02-134-0/+440
| | | | | | | | | | | | | | New driver for the PA Semi SMBus interfaces. Signed-off-by: Olof Johansson <olof@lixom.net> Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * i2c-amd8111: Proposed cleanupsJean Delvare2007-02-131-28/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Proposed cleanups to the i2c-amd8111 SMBus driver: * Fold long lines. * Add an explicit mask when writing the low byte of a word. * Use I2C_SMBUS_BLOCK_MAX instead of hardcoding 32. * Discard extra blank lines. * Use boolean not instead of bitwise not for bit tests, it's clearer. * Return -EBUSY rather than -1 on I/O resource conflict. * Fix a race on device registration, initialization should be done before the bus is registered. Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * i2c-parport: Add support for One For All remote JP1 interfaceJonathan McDowell2007-02-132-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This simple patch adds support to i2c-parport for the One For All remote JP1 parallel port interfaces which can be found detailed at: http://www.hifi-remote.com/jp1/hardware.shtml These allow access to the internal configuration EEPROM on various remote controls and there are a variety of Windows tools that make use of this hardware. I have tested this patch with the "simple" parallel port device and a One For All URC-7562 and confirmed that the data read using the eeprom i2c driver matches that returned by the Windows "IR" JP1 tool. Signed-off-by: Jonathan McDowell <noodles@earth.li> Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * i2c-viapro: Add support for the VIA CX700 south bridgeJean Delvare2007-02-133-3/+15
| | | | | | | | | | | | | | We do not have any documentation for the CX700, but it was reported to work fine. Thanks to Claas Langbehn for testing. Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * i2c: Add IDs to adaptersStephen Hemminger2007-02-1318-0/+20
| | | | | | | | | | | | | | | | | | IDs have been defined but not used by most of the I2C adapters. By having a unique ID, clients can check for correct connection during probe. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * i2c: Update the list of bus IDsJean Delvare2007-02-131-4/+0
| | | | | | | | | | | | | | | | | | | | * The Voodoo3 has no SMBus, it has two bit-banged busses which already have an ID assigned (I2C_HW_B_VOO). * The i2c-ipmi bus driver was a non-sense, it'll never be ported to Linux 2.6. Signed-off-by: Jean Delvare <khali@linux-fr.org> Acked-by: Yani Ioannou <yani.ioannou@gmail.com>
| * i2c: Add driver suspend/resume/shutdown supportDavid Brownell2007-02-134-31/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Driver model updates for the I2C core: - Add new suspend(), resume(), and shutdown() methods. Use them in the standard driver model style; document them. - Minor doc updates to highlight zero-initialized fields in drivers, and the driver model accessors for "clientdata". If any i2c drivers were previously using the old suspend/resume calls in "struct driver", they were getting warning messages ... and will now no longer work. Other than that, this patch changes no behaviors; and it lets I2C drivers use conventional PM and shutdown support. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * i2c: completion header cleanupsJean Delvare2007-02-133-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | i2c-core and i2c-isa use completions without including <linux/completion.h>. Fix it. i2c-powermac includes <linux/completion.h> but doesn't use any completion. Fix it. Signed-off-by: Jean Delvare <khali@linux-fr.org> Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: David Brownell <david-b@pacbell.net>
| * i2c-i801: Document the SMBus unhiding quirkJean Delvare2007-02-131-5/+55
| | | | | | | | | | | | | | This is a frequently asked question so it deserves a paragraph in the driver documentation. Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * i2c-i801: Spelling fixJean Delvare2007-02-131-1/+1
| | | | | | | | Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * i2c: Fix typo in SMBus Write Word Data descriptionMike Frysinger2007-02-131-1/+1
| | | | | | | | | | | | | | Write data, don't read it. Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * i2c-piix4: Add support for the ATI SB600Jean Delvare2007-02-134-1/+6
| | | | | | | | | | | | Add support for the ATI SB600 SMBus controller. Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * i2c-nforce2: Drop unused reference to pci_devJean Delvare2007-02-131-2/+0
| | | | | | | | | | Signed-off-by: Jean Delvare <khali@linux-fr.org> Cc: Hans-Frieder Vogt <hfvogt@gmx.net>
| * i2c/vt8231: Remove superfluous initializationDavid Brownell2007-02-131-1/+0
| | | | | | | | | | | | | | | | Remove a superfluous initialization from the vt8231 hwmon driver; the i2c core does this, and the source field will be vanishing soon. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * i2c-ali1563: Fix device initializationJean Delvare2007-02-131-23/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The i2c-ali1563 initialization looks quite broken to me: * If the I/O space isn't enabled, we forcibly set 3 bits in the PCI configuration space instead of just the one enabling the I/O space. * After that we pretend to check if the write worked, but we don't actually read the new value from the register. * It's probably not a good idea to enable the I/O space if no base address has been set. So I propose the following changes to that part of the driver: * Merge ali1563_enable() into ali1563_setup(). * Check the base address before the I/O space enabled bit. Signed-off-by: Jean Delvare <khali@linux-fr.org> Acked-by: Rudolf Marek <r.marek@assembler.cz>
| * i2c-ali1563: Improve the status messagesJean Delvare2007-02-131-5/+11
| | | | | | | | | | | | | | Improve the status messages printed by the i2c-ali1563 driver. Signed-off-by: Jean Delvare <khali@linux-fr.org> Cc: Rudolf Marek <r.marek@assembler.cz>
* | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linusLinus Torvalds2007-02-1331-1118/+701
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: [MIPS] Fix sigset_t endianess swapping issues in 32-bit compat code. [MIPS] Fix uniprocessor Sibyte builds. [MIPS] Make entry.S a little more readable. [MIPS] Remove stray instruction from __get_user_asm_ll32. [MIPS] 32-bit: Fix warning about cast for fetching pointer from userspace. [MIPS] DECstation: Fix irq handling [MIPS] signals: make common _BLOCKABLE macro [MIPS] signal: Move sigframe definition for native O32/N64 into signal.c [MIPS] signal: Move {restore,setup}_sigcontext prototypes to their user [MIPS] signal: Fix warnings in o32 compat code. [MIPS] IP27: Enable N32 support in defconfig. Revert "[MIPS] Fix warning in get_user when fetching pointer object from userspace." [MIPS] Don't claim we support dma_declare_coherent_memory - we don't. [MIPS] Unify dma-{coherent,noncoherent.ip27,ip32} [MIPS] Improve branch prediction in ll/sc atomic operations.
| * | [MIPS] Fix sigset_t endianess swapping issues in 32-bit compat code.Ralf Baechle2007-02-136-9/+115
| | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * | [MIPS] Fix uniprocessor Sibyte builds.Andrew Sharp2007-02-131-0/+6
| | | | | | | | | | | | | | | Signed-off-by: Andrew Sharp <tigerand@gmail.com> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * | [MIPS] Make entry.S a little more readable.Franck Bui-Huu2007-02-131-11/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When CONFIG_PREEMPT is not set, it also moves one branch instruction from ret_from_irq() to ret_from_exception(). Therefore we favour the return from irq case which should be more common than the other one. Signed-off-by: Franck Bui-Huu <fbuihuu@gmail.com> Acked-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * | [MIPS] Remove stray instruction from __get_user_asm_ll32.Ralf Baechle2007-02-131-1/+0
| | | | | | | | | | | | | | | | | | | | | This did result in double clearing of the error return value on success only but should make a meassurable overhead for sigreturn. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * | [MIPS] 32-bit: Fix warning about cast for fetching pointer from userspace.Ralf Baechle2007-02-131-3/+7
| | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * | [MIPS] DECstation: Fix irq handlingAtsushi Nemoto2007-02-131-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When I post a patch (commit f431baa55abf8adeed0c718b51deacbc151f58f1), I just tried to not change behavior of existing codes, but it seems dec/int-handler.S had been broken since its previous commit 937a801576f954bd030d7c4a5a94571710d87c0b. The caller of plat_irq_dispatch do setup/restore TI_REGS($28), so dec's plat_irq_dispatch should not do it, and there is no need to adjust RA. Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * | [MIPS] signals: make common _BLOCKABLE macroFranck Bui-Huu2007-02-134-6/+2
| | | | | | | | | | | | | | | Signed-off-by: Franck Bui-Huu <fbuihuu@gmail.com> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * | [MIPS] signal: Move sigframe definition for native O32/N64 into signal.cRalf Baechle2007-02-132-26/+20
| | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * | [MIPS] signal: Move {restore,setup}_sigcontext prototypes to their userRalf Baechle2007-02-132-6/+4
| | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * | [MIPS] signal: Fix warnings in o32 compat code.Ralf Baechle2007-02-131-3/+23
| | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * | [MIPS] IP27: Enable N32 support in defconfig.Ralf Baechle2007-02-131-1/+1
| | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * | Revert "[MIPS] Fix warning in get_user when fetching pointer object from ↵Ralf Baechle2007-02-131-1/+4
| | | | | | | | | | | | | | | | | | userspace." This reverts commit 4ed3a77f38c023658784804cb39a7ce18063dc88.
| * | [MIPS] Don't claim we support dma_declare_coherent_memory - we don't.Ralf Baechle2007-02-131-0/+2
| | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * | [MIPS] Unify dma-{coherent,noncoherent.ip27,ip32}Ralf Baechle2007-02-1313-1020/+387
| | | | | | | | | | | | | | | | | | | | | | | | Platforms will now have to supply a function dma_device_is_coherent which returns if a particular device participates in the coherence domain. For most platforms this function will always return 0 or 1. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * | [MIPS] Improve branch prediction in ll/sc atomic operations.Ralf Baechle2007-02-134-32/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that finally all supported versions of binutils have functioning support for .subsection use .subsection to tweak the branch prediction I did not modify the R10000 errata variants because it seems unclear if this will invalidate the workaround which actually relies on the cheesy prediction of branch likely to cause a misspredict if the sc was successful. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
* | | Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdogLinus Torvalds2007-02-1336-350/+489
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: (23 commits) [WATCHDOG] timers cleanup [WATCHDOG] ib700wdt.c - convert to platform_device part 2 [WATCHDOG] ib700wdt.c - convert to platform_device [WATCHDOG] ib700wdt.c spinlock/WDIOC_SETOPTIONS changes [WATCHDOG] ib700wdt.c small clean-up's [WATCHDOG] ib700wdt.c clean-up init and exit routines [WATCHDOG] ib700_wdt.c stop + set_heartbeat operations [WATCHDOG] show default value for nowayout in module parameter [WATCHDOG] advantechwdt.c - convert to platform_device part 2 [WATCHDOG] advantechwdt.c - convert to platform_device [WATCHDOG] advantechwdt.c - move set_heartbeat to a seperate function [WATCHDOG] advantechwdt.c - cleanup before platform_device patches [WATCHDOG] acquirewdt.c - convert to platform_device part 2 [WATCHDOG] acquirewdt.c - convert to platform_device [WATCHDOG] acquirewdt.c - clean before platform_device patches [WATCHDOG] pcwd_usb.c - get heartbeat from dip switches [WATCHDOG] pcwd.c - e-mail adres update [WATCHDOG] pcwd_usb.c - get heartbeat from dip switches [WATCHDOG] pcwd_usb.c - document includes [WATCHDOG] pcwd_pci.c - spinlock fixes ...
| * \ \ Merge ../linux-2.6-watchdog-mmWim Van Sebroeck2007-02-1335-294/+369
| |\ \ \
| | * | | [WATCHDOG] timers cleanupJiri Slaby2007-02-129-73/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use timer macros to set function and data members and to modify expiration time. - Use DEFINE_TIMER for single (platform dependent) watchdog timers and do not init them at run-time in these cases. - del_timer_sync is common in most cases -- we want to wait for timer function if it's still running. Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Cc: Steve Hill <steve@navaho.co.uk> Cc: Heiko Ronsdorf <hero@ihg.uni-duisburg.de> Cc: Fernando Fuganti <fuganti@conectiva.com.br> Cc: Gergely Madarasz <gorgo@itc.hu> Cc: Ken Hollis <khollis@bitgate.com> Cc: Paul Mundt <lethal@linux-sh.org> Signed-off-by: Wim Van Sebroeck <wim@iguana.be> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
| | * | | [WATCHDOG] ib700wdt.c - convert to platform_device part 2Wim Van Sebroeck2007-01-271-35/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert the reboot_notifier into the platform_device's shutdown method Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| | * | | [WATCHDOG] ib700wdt.c - convert to platform_deviceWim Van Sebroeck2007-01-271-6/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert the ib700wdt watchdog into a platform_device Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| | * | | [WATCHDOG] ib700wdt.c spinlock/WDIOC_SETOPTIONS changesWim Van Sebroeck2007-01-271-6/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the WDIOC_SETOPTIONS ioctl call. Because of this we move the spinlocking to the different watchdog operations. Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| | * | | [WATCHDOG] ib700wdt.c small clean-up'sWim Van Sebroeck2007-01-271-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix identation * Add watchdog "mandatory" WDIOC_GETBOOTSTATUS ioctl * On unexpected close -> since this is considered as a write to the watchdog device, make sure we ping a last time. Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| | * | | [WATCHDOG] ib700wdt.c clean-up init and exit routinesWim Van Sebroeck2007-01-271-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clean-up the init and exit routines so that they use the same sequence. Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| | * | | [WATCHDOG] ib700_wdt.c stop + set_heartbeat operationsWim Van Sebroeck2007-01-271-9/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | move the code to stop the watchdog and the code to set the heartbeat of the watchdog to seperate functions. Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| | * | | [WATCHDOG] show default value for nowayout in module parameterWim Van Sebroeck2007-01-2731-36/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | change default=CONFIG_WATCHDOG_NOWAYOUT in the module parameter for nowayout by it's real value (0 or 1) by using: __MODULE_STRING(WATCHDOG_NOWAYOUT) Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| | * | | [WATCHDOG] advantechwdt.c - convert to platform_device part 2Wim Van Sebroeck2007-01-111-37/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert the reboot_notifier into the platform_device's shutdown method Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| | * | | [WATCHDOG] advantechwdt.c - convert to platform_deviceWim Van Sebroeck2007-01-111-6/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert the advantechwdt watchdog into a platform_device Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| | * | | [WATCHDOG] advantechwdt.c - move set_heartbeat to a seperate functionWim Van Sebroeck2007-01-111-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Put the set_heartbeat/timeout code into a seperate function Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| | * | | [WATCHDOG] advantechwdt.c - cleanup before platform_device patchesWim Van Sebroeck2007-01-111-8/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This cleanup consists of: - make sure that the printk's use the module/driver-name - do the exit of the module exactly the opposite of the init of the module Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-23 12:33:31 +0000