aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2009-12-07Revert "pata_sis: Implement MWDMA for the UDMA 133 capable chips"Jeff Garzik1-69/+22
This reverts commit f20941f334d8fdb6b598658979709b4e94cd034b. Sergei Shtylyov notes "You call min() on uncomparables [in mwdma_clip_to_pio()], i.e. mwdma_to_pio[] contains XFER_PIO_* and adev->pio_mode - XFER_PIO_0 yields you a mode number. Thus the second argument will always "win" as a minimal one" Bartlomiej Zolnierkiewicz adds "There are more issues with the patch related to mwdma_clip_to_pio(). The function can return values between 0 and 4 which obviously won't work well for the new code below for values >2 (i.e. resulting in out-of-bounds array access for the common-case of dev->pio_mode == XFER_PIO_4)." Bartlomiej Zolnierkiewicz also notes the patch is incomplete, failing to update MWDMA mode masks. Signed-off-by: Jeff Garzik <[email protected]>
2009-12-07block: include linux/err.h to use ERR_PTRStephen Rothwell1-0/+1
Signed-off-by: Stephen Rothwell <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
2009-12-06Merge branch 'sa1100' into develRussell King733-18105/+34006
2009-12-06Fix soc_common PCMCIA configurationRussell King1-1/+1
Jonathan Cameron reports that building PCMCIA as modules doesn't work: As module get a load of undefined symbols: ERROR: "soc_pcmcia_request_irqs" [drivers/pcmcia/pxa2xx_stargate2.ko] undefined! ERROR: "soc_pcmcia_free_irqs" [drivers/pcmcia/pxa2xx_stargate2.ko] undefined! ERROR: "soc_pcmcia_enable_irqs" [drivers/pcmcia/pxa2xx_stargate2.ko] undefined! ERROR: "soc_pcmcia_disable_irqs" [drivers/pcmcia/pxa2xx_stargate2.ko] undefined! ERROR: "soc_pcmcia_add_one" [drivers/pcmcia/pxa2xx_base.ko] undefined! ERROR: "soc_common_pcmcia_get_timing" [drivers/pcmcia/pxa2xx_base.ko] undefined! ERROR: "soc_pcmcia_remove_one" [drivers/pcmcia/pxa2xx_base.ko] undefined! make[1]: *** [__modpost] Error 1 make: *** [modules] Error 2 This is because soc_common tries to be built-in, but it should be a module. Allow soc_common to be a module. Reported-by: Jonathan Cameron <[email protected]> Signed-off-by: Russell King <[email protected]>
2009-12-06Merge branch 'for-lak' of git://git.linuxtogo.org/home/thesing/collie into ↵Russell King15-63/+649
sa1100
2009-12-06ARM: 5827/1: SA1100: h3100/h3600: emit messages on failed gpio_requestDmitry Artamonow3-6/+22
Signed-off-by: Dmitry Artamonow <[email protected]> Signed-off-by: Russell King <[email protected]>
2009-12-06ARM: 5826/1: SA1100: h3100/h3600: always build htc-egpio driverDmitry Artamonow1-0/+2
Many features of h3100/h3600 (LCD, PCMCIA, Flash write, etc.) depend on correct functioning of GPIO expander handled by htc-egpio driver, so force its building in Kconfig. Signed-off-by: Dmitry Artamonow <[email protected]> Signed-off-by: Russell King <[email protected]>
2009-12-06ARM: 5825/1: SA1100: h3600: update defconfigDmitry Artamonow1-364/+612
Update defconfig to current kernel, enable support for iPAQ H3100 and following drivers: gpio-keys, htc-egpio, ide_cs. Signed-off-by: Dmitry Artamonow <[email protected]> Signed-off-by: Russell King <[email protected]>
2009-12-06ARM: 5824/1: SA1100: reuse h3600 PCMCIA driver on h3100Dmitry Artamonow2-2/+2
Both iPAQs h3600 and h3100 share the same control GPIOs for PCMCIA, so driver can be reused. Signed-off-by: Dmitry Artamonow <[email protected]> Signed-off-by: Russell King <[email protected]>
2009-12-06ARM: 5823/1: SA1100: h3100/h3600: add support for gpio-keysDmitry Artamonow1-1/+38
Add support for "Power" and "Action" (joystick center) buttons - the only buttons on iPaq h3100/h3600 connected to GPIOs (other buttons are controlled by microcontroller) Also remove setting PWER for wakeup on Power button press - gpio-keys driver will handle it. Signed-off-by: Dmitry Artamonow <[email protected]> Signed-off-by: Russell King <[email protected]>
2009-12-06ARM: 5822/1: SA1100: h3100/h3600: clean up #includesDmitry Artamonow3-49/+2
After a code reorganization and following split, there's some #includes now unused. Clean them up and sort remaining alphabetticaly where possible. Compile tested. Signed-off-by: Dmitry Artamonow <[email protected]> Signed-off-by: Russell King <[email protected]>
2009-12-06ARM: 5821/1: SA1100: h3100/h3600: revise copyright boilerplatesDmitry Artamonow4-64/+27
Correct boilerplates after files split. Also shorten them a bit - use standart GPL wording (as per http://lkml.org/lkml/2007/5/1/220) and drop changelog, which only entry about h3800 support and abstracted EGPIOs is just confusing now, as both of these features are gone. Signed-off-by: Dmitry Artamonow <[email protected]> Signed-off-by: Russell King <[email protected]>
2009-12-06ARM: 5820/1: SA1100: h3100/h3600: split h3600.cDmitry Artamonow5-335/+427
Split common h3600.c into three separate files: h3100.c, h3600.c and h3xxx.c (the latter contains common code for h3100/h3600) Copyright boilerplates and #includes are copied intact and will be cleaned up later. Signed-off-by: Dmitry Artamonow <[email protected]> Signed-off-by: Russell King <[email protected]>
2009-12-06ARM: 5819/1: SA1100: h3100/h3600: merge h3600.h and h3600_gpio.h into h3xxx.hDmitry Artamonow4-43/+15
Combine both headers into one, rename to h3xxx.h and change all users accordingly. Signed-off-by: Dmitry Artamonow <[email protected]> Signed-off-by: Russell King <[email protected]>
2009-12-06ARM: 5818/1: SA1100: h3100/h3600: drop old GPIO definitionsDmitry Artamonow2-48/+7
As all existing code was converted to gpiolib, drop no more used pre-gpiolib (bit-shifted) GPIO definintions. Supply new gpiolib-friendly definitions for GPIOs which don't have them yet. Signed-off-by: Dmitry Artamonow <[email protected]> Signed-off-by: Russell King <[email protected]>
2009-12-06ARM: 5817/1: SA1100: h3100/h3600: configure all unused gpios as inputsDmitry Artamonow1-23/+3
After conversion to gpiolib there's still some GPIOs left, that get configured in *_mach_init() as outputs (using direct operations on GPCR/GPDR registers), but otherwise unused. These GPIOs are mainly sound related and should be configured by corresponding driver once it is written. Drop this initialisation and configure all GPIOs as input. Signed-off-by: Dmitry Artamonow <[email protected]> Signed-off-by: Russell King <[email protected]>
2009-12-06ARM: 5816/1: SA1100: h3600: remove IRQ_GPIO_* definitionsDmitry Artamonow2-14/+0
As all the remaining users of these definitions (in pcmcia/sa1100_h3600 driver) were converted to gpio_to_irq(), they can be safely removed. Signed-off-by: Dmitry Artamonow <[email protected]> Signed-off-by: Russell King <[email protected]>
2009-12-06ARM: 5815/1: SA1100: h3100/h3600: remove now unused assign_h3600_egpio handlersDmitry Artamonow3-184/+0
As all users of assign_h3600_egpio now converted to gpiolib, we can safely remove all assign_h3600_egpio handling code and definitions. Signed-off-by: Dmitry Artamonow <[email protected]> Signed-off-by: Russell King <[email protected]>
2009-12-06ARM: 5814/1: SA1100: h3100/h3600: convert all users of assign_h3600_egpio to ↵Dmitry Artamonow2-18/+126
gpiolib Use of gpio_request/gpio_free in some callbacks may look ugly, but corresponding drivers (sa1100_serial and sa1100_fb) don't provide (yet) init/exit hooks and registering these gpios in *_mach_init is also not possible, because htc-gpio driver starts a bit later... Signed-off-by: Dmitry Artamonow <[email protected]> Signed-off-by: Russell King <[email protected]>
2009-12-06ARM: 5813/1: SA1100: h3100/h3600: add htc-egpio driverDmitry Artamonow2-0/+69
It will be used for future conversion of assign_h3600_egpio calls to gpiolib. Signed-off-by: Dmitry Artamonow <[email protected]> Signed-off-by: Russell King <[email protected]>
2009-12-06ARM: 5812/1: SA1100: h3100/h3600: separate machine-specific LCD helpersDmitry Artamonow1-9/+20
h3100 and h3600 have different sets of LCD-controlling gpios, which mapped to the same "abstracted" EGPIO. As we plan to get rid of those abstracted egpios completely, we need to separate these helper functions. Signed-off-by: Dmitry Artamonow <[email protected]> Signed-off-by: Russell King <[email protected]>
2009-12-06ARM: 5811/2: pcmcia: convert sa1100_h3600 driver to gpiolibDmitry Artamonow1-11/+71
Convert all operations with GPLR/GPCR/GPSR to gpiolibs calls. Also change all IRQ_GPIO* to gpio_to_irq(*GPIO*) Signed-off-by: Dmitry Artamonow <[email protected]> Signed-off-by: Russell King <[email protected]>
2009-12-06ARM: 5799/1: SA1100: h3600: stop setting direction for LCD pinsDmitry Artamonow1-3/+1
sa1100_fb driver handles this Signed-off-by: Dmitry Artamonow <[email protected]> Signed-off-by: Russell King <[email protected]>
2009-12-06ARM: 5798/1: SA1100: h3600: remove unused cruft from h3600.hDmitry Artamonow1-8/+0
PM_SUSPEND, PM_RESUME and machine_is_h3xxx() are not used anywhere in kernel (checked with git grep), so it's safe to remove them. Signed-off-by: Dmitry Artamonow <[email protected]> Signed-off-by: Russell King <[email protected]>
2009-12-06ARM: 5796/1: SA1100: h3600: remove IRDA bits from serial PM callbackDmitry Artamonow1-4/+1
IRDA is handled by separate sa1100-ir driver and has nothing to do with sa1100_serial Signed-off-by: Dmitry Artamonow <[email protected]> Signed-off-by: Russell King <[email protected]>
2009-12-06ARM: 5797/1: SA1100: h3100/h3600: remove dead links from Kconfig help textDmitry Artamonow1-2/+0
Signed-off-by: Dmitry Artamonow <[email protected]> Signed-off-by: Russell King <[email protected]>
2009-12-06ARM: 5795/1: SA1100: h3100/h3600: mark *_mach_init functions as __initDmitry Artamonow1-3/+3
Signed-off-by: Dmitry Artamonow <[email protected]> Signed-off-by: Russell King <[email protected]>
2009-12-06ARM: iPAQ: no need to set PWER_RTCRussell King1-1/+1
The rtc-sa1100 driver takes care of this. Signed-off-by: Russell King <[email protected]>
2009-12-06ARM: iPAQ: move serial port support functionsRussell King2-26/+52
No point calling sa1100_register_uart_fns early - these aren't used until late in the boot sequence. Also convert to gpiolib support. Signed-off-by: Russell King <[email protected]>
2009-12-06ARM: iPAQ: convert H3100 IrDA to use generic gpio supportRussell King2-3/+17
Signed-off-by: Russell King <[email protected]>
2009-12-06ARM: iPAQ: provide a way to setup platform-controlled GPIOsRussell King1-0/+42
Signed-off-by: Russell King <[email protected]>
2009-12-06ARM: iPAQ: separate IrDA machine specificsRussell King1-21/+41
Signed-off-by: Russell King <[email protected]>
2009-12-06ARM: h3600: provide each iPAQ machine type with own init functionRussell King1-2/+12
Signed-off-by: Russell King <[email protected]>
2009-12-06ARM: sa11x0: convert set_xxx_data() to register_xxx()Russell King13-40/+42
Only register devices if we have platform data for those which require platform data. Signed-off-by: Russell King <[email protected]>
2009-12-06i2c-stub: Documentation updateJean Delvare1-2/+2
There is nothing sensors-specific to i2c-stub. Signed-off-by: Jean Delvare <[email protected]>
2009-12-06i2c-stub: Allow user to disable some commandsJean Delvare2-2/+12
Add a module parameter to override the functionality bitfield. This lets the user disable some commands. This can be used to force a chip driver to take different code paths. Signed-off-by: Jean Delvare <[email protected]>
2009-12-06i2c-stub: Implement I2C block supportJean Delvare2-5/+29
This is required to test some drivers, for example at24. Signed-off-by: Jean Delvare <[email protected]>
2009-12-06i2c: Refactor for_each callbacksJean Delvare1-48/+22
Functions i2c_do_add_adapter() and __attach_adapter() do essentially the same thing, differing only in how the parameters are passed. Same for i2c_do_add_adapter() and __detach_adapter(). Introduce wrappers to normalize the parameters, so that we do not have to duplicate the code. Signed-off-by: Jean Delvare <[email protected]> Cc: David Brownell <[email protected]>
2009-12-06i2c-i801: Retry on lost arbitrationJean Delvare1-0/+3
The Intel 82801 is sometimes used on systems with a BMC connected. The BMC can access the SMBus, resulting in lost arbitration for the 82801. We should let i2c-core retry transactions for us in this case. Signed-off-by: Jean Delvare <[email protected]>
2009-12-06i2c: Remove big kernel lock from i2cdev_openVincent Sanders1-16/+6
The BKL is held over a kmalloc so cannot protect anything beyond that. The two calls before the kmalloc have their own locking. Improve device open function by removing the now unnecessary ret variable Signed-off-by: Vincent Sanders <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Signed-off-by: Jean Delvare <[email protected]>
2009-12-06ics932s401: Clean up detect functionJean Delvare1-22/+15
As kind is now hard-coded to -1, there is room for code clean-ups. Signed-off-by: Jean Delvare <[email protected]> Acked-by: "Darrick J. Wong" <[email protected]>
2009-12-06i2c: Simplify i2c_detect_addressJean Delvare1-13/+9
The kind parameter of i2c_detect_address() always has value -1, so we can get rid of it. Next step is to update all i2c detect callback functions to get rid of this now useless parameter. Signed-off-by: Jean Delvare <[email protected]>
2009-12-06i2c: Drop probe, ignore and force module parametersJean Delvare3-154/+46
The legacy probe and force module parameters are obsolete now, the same can be achieved using the new_device sysfs interface, which is both more flexible and cheaper (it is implemented by i2c-core rather than replicated in every driver module.) The legacy ignore module parameters can be dropped as well. Ignoring can be done by instantiating a "dummy" device at the problematic address. This is the first step of a huge cleanup to i2c-core's i2c_detect function, i2c.h's I2C_CLIENT_INSMOD* macros, and all drivers that made use of them. Signed-off-by: Jean Delvare <[email protected]>
2009-12-06i2c: Add missing __devinit markers to old i2c adapter driversJean Delvare4-4/+4
These _setup functions are called from _probe so they can be marked __devinit. Signed-off-by: Jean Delvare <[email protected]>
2009-12-06i2c: Bus drivers don't have to support I2C_M_REV_DIR_ADDRJean Delvare3-11/+0
I2C bus drivers don't have to support I2C_M_REV_DIR_ADDR. It is a deviation from the I2C specification, which only makes sense to implement when really needed. Signed-off-by: Jean Delvare <[email protected]> Cc: Ben Dooks <[email protected]>
2009-12-06i2c: Prevent priority inversion on top of bus lockMika Kuoppala3-10/+10
Low priority thread holding the i2c bus mutex could block higher priority threads to access the bus resulting in unacceptable latencies. Change the mutex type to rt_mutex preventing priority inversion. Tested-by: Peter Ujfalusi <[email protected]> Signed-off-by: Mika Kuoppala <[email protected]> Signed-off-by: Jean Delvare <[email protected]>
2009-12-06i2c-voodoo3: DeleteJean Delvare5-338/+0
Superseded by tdfxfb. I2C/DDC support used to live in a separate driver but this caused driver conflicts. Signed-off-by: Jean Delvare <[email protected]> Cc: Krzysztof Helt <[email protected]>
2009-12-06i2c-powermac: Drop temporary name bufferJean Delvare1-6/+5
We no longer need to write the adapter name to a temporary buffer. We can write it directly to the i2c_adapter's name field. This is more efficient. Signed-off-by: Jean Delvare <[email protected]> Tested-by: Michel Daenzer <[email protected]> Cc: Benjamin Herrenschmidt <[email protected]>
2009-12-06i2c-powermac: Include the i2c_adapter in struct pmac_i2c_busJean Delvare3-37/+9
Include the i2c_adapter in struct pmac_i2c_bus. This avoids memory fragmentation and allows for several code cleanups. Signed-off-by: Jean Delvare <[email protected]> Tested-by: Michel Daenzer <[email protected]> Cc: Benjamin Herrenschmidt <[email protected]>
2009-12-06i2c-powermac: Log errorsJean Delvare1-5/+23
Log errors when they happen, otherwise we have no idea what went wrong. Signed-off-by: Jean Delvare <[email protected]> Tested-by: Michel Daenzer <[email protected]> Cc: Benjamin Herrenschmidt <[email protected]> Cc: Paul Mackerras <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.