1. 28 Jan, 2008 40 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog · 8561b089
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
        [WATCHDOG] constify function pointer tables
        [WATCHDOG] TXx9 watchdog driver
        [WATCHDOG] misc_register patch	
        [WATCHDOG] wdt: fix locking
      8561b089
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 · e189f349
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (197 commits)
        sh: add spi header and r2d platform data V3
        sh: update r7780rp interrupt code
        sh: remove consistent alloc stuff from the machine vector
        sh: use declared coherent memory for dreamcast pci ethernet adapter
        sh: declared coherent memory support V2
        sh: Add support for SDK7780 board.
        sh: constify function pointer tables
        sh: Kill off -traditional for linker script.
        cdrom: Add support for Sega Dreamcast GD-ROM.
        sh: Kill off hs7751rvoip reference from arch/sh/Kconfig.
        sh: Drop r7780rp_defconfig, use r7780mp_defconfig as kbuild default.
        sh: Kill off dead HS771RVoIP board support.
        sh: r7785rp: Fix up DECLARE_INTC_DESC() arg mismatch.
        sh: r7785rp: Hook up the rest of the HL7785 FPGA IRQ vectors.
        sh: r2d - enable sm501 usb host function
        sh: remove voyagergx
        sh: r2d - add lcd planel timings to sm501 platform data
        sh: Add OHCI and UDC platform devices for SH7720.
        sh: intc - remove default interrupt priority tables
        sh: Correct pte size mismatch for X2 TLB.
        ...
      e189f349
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · f4798748
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (24 commits)
        HID: ADS/Tech Radio si470x needs blacklist entry
        HID: Logitech Extreme 3D needs NOGET quirk
        HID: Refactor MS Presenter 8K key mapping
        HID: MS Presenter mapping for PID 0x0701
        HID: Support Samsung IR remote
        HID: fix compilation of hidbp drivers without usbhid
        HID: Blacklist the Gretag-Macbeth Huey display colorimeter
        HID: the `bit' in hidinput_mapping_quirks() is an out parameter
        HID: remove redundant WARN_ON()s in order not to scare users
        HID: force hiddev creation for SONY PS3 controller
        HID: Use hid blacklist in usbmouse/usbkbd
        HID: proper handling of MS 4k and 6k devices
        HID: remove unused variable in quirk event handler
        HID: hid-input quirk for BTC 8193
        HID: separate hid-input event quirks from generic code
        HID: refactor mapping to input subsystem for quirky devices
        HID: Microsoft Wireless Optical Desktop 3.0 quirk
        HID: Add support for Logitech Elite keyboards
        HID: add full support for Genius KB-29E
        HID: fix a potential bug in pointer casting
        ...
      f4798748
    • Linus Torvalds's avatar
      Merge branch 'for-2.6.25' of git://git.kernel.dk/linux-2.6-block · 8d01eddf
      Linus Torvalds authored
      * 'for-2.6.25' of git://git.kernel.dk/linux-2.6-block:
        block: implement drain buffers
        __bio_clone: don't calculate hw/phys segment counts
        block: allow queue dma_alignment of zero
        blktrace: Add blktrace ioctls to SCSI generic devices
      8d01eddf
    • Linus Torvalds's avatar
      Merge branch 'blk-end-request' of git://git.kernel.dk/linux-2.6-block · f0f00520
      Linus Torvalds authored
      * 'blk-end-request' of git://git.kernel.dk/linux-2.6-block: (30 commits)
        blk_end_request: changing xsysace (take 4)
        blk_end_request: changing ub (take 4)
        blk_end_request: cleanup of request completion (take 4)
        blk_end_request: cleanup 'uptodate' related code (take 4)
        blk_end_request: remove/unexport end_that_request_* (take 4)
        blk_end_request: changing scsi (take 4)
        blk_end_request: add bidi completion interface (take 4)
        blk_end_request: changing ide-cd (take 4)
        blk_end_request: add callback feature (take 4)
        blk_end_request: changing ide normal caller (take 4)
        blk_end_request: changing cpqarray (take 4)
        blk_end_request: changing cciss (take 4)
        blk_end_request: changing ide-scsi (take 4)
        blk_end_request: changing s390 (take 4)
        blk_end_request: changing mmc (take 4)
        blk_end_request: changing i2o_block (take 4)
        blk_end_request: changing viocd (take 4)
        blk_end_request: changing xen-blkfront (take 4)
        blk_end_request: changing viodasd (take 4)
        blk_end_request: changing sx8 (take 4)
        ...
      f0f00520
    • Linus Torvalds's avatar
      Merge branch 'sg' of git://git.kernel.dk/linux-2.6-block · 68fbda7d
      Linus Torvalds authored
      * 'sg' of git://git.kernel.dk/linux-2.6-block:
        SG: work with the SCSI fixed maximum allocations.
        SG: Convert SCSI to use scatterlist helpers for sg chaining
        SG: Move functions to lib/scatterlist.c and add sg chaining allocator helpers
      68fbda7d
    • Linus Torvalds's avatar
      Merge branch 'cfq-ioc-share' of git://git.kernel.dk/linux-2.6-block · d4928196
      Linus Torvalds authored
      * 'cfq-ioc-share' of git://git.kernel.dk/linux-2.6-block:
        cfq-iosched: kill some big inlines
        cfq-iosched: relax IOPRIO_CLASS_IDLE restrictions
        kernel: add CLONE_IO to specifically request sharing of IO contexts
        io_context sharing - anticipatory changes
        block: cfq: make the io contect sharing lockless
        io_context sharing - cfq changes
        io context sharing: preliminary support
        ioprio: move io priority from task_struct to io_context
      d4928196
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm · bb04af0e
      Linus Torvalds authored
      * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (176 commits)
        [ARM] 4795/1: S3C244X: Add armclk and setparent call
        [ARM] 4794/1: S3C24XX: Comonise S3C2440 and S3C2442 clock code
        [ARM] 4793/1: S3C24XX: Add IRQ->GPIO pin mapping function
        [ARM] 4792/1: S3C24XX: Remove warnings from debug-macro.S
        [ARM] 4791/1: S3C2412: Make fclk a parent of msysclk
        [ARM] 4790/1: S3C2412: Fix parent selection for msysclk.
        [ARM] 4789/1: S3C2412: Add missing CLKDIVN register values
        [ARM] 4788/1: S3C24XX: Fix paramet to s3c2410_dma_ctrl if S3C2410_DMAF_AUTOSTART used.
        [ARM] 4787/1: S3C24XX: s3c2410_dma_request() should return the allocated channel number
        [ARM] 4786/1: S3C2412: Add SPI FIFO controll constants
        [ARM] 4785/1: S3C24XX: Add _SHIFT definitions for S3C2410_BANKCON registers
        [ARM] 4784/1: S3C24XX: Fix GPIO restore glitches
        [ARM] 4783/1: S3C24XX: Add s3c2410_gpio_getpull()
        [ARM] 4782/1: S3C24XX: Define FIQ_START for any FIQ users
        [ARM] 4781/1: S3C24XX: DMA suspend and resume support
        [ARM] 4780/1: S3C2412: Allow for seperate DMA channels for TX and RX
        [ARM] 4779/1: S3C2412: Add s3c2412_gpio_set_sleepcfg() call
        [ARM] 4778/1: S3C2412: Add armclk and init from DVS state
        [ARM] 4777/1: S3C24XX: Ensure clk_set_rate() checks the set_rate method for the clk
        [ARM] 4775/1: s3c2410: fix compilation error if only s3c2442 cpu is selected
        ...
      bb04af0e
    • Linus Nilsson's avatar
      libata: Change "write_data" to "rw" for some function documentations · 0affa456
      Linus Nilsson authored
      The documentation for ata_data_xfer and ata_data_xfer_noirq had the 'rw'
      parameter named 'write_data'.
      Signed-off-by: default avatarLinus Nilsson <lajnold@acc.umu.se>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      0affa456
    • Tobias Lorenz's avatar
      HID: ADS/Tech Radio si470x needs blacklist entry · 3bce6f98
      Tobias Lorenz authored
      This patch adds blacklist entries in hid-quirks.c to let the usbhid driver
      ignore the si470x radio devices. They are now handled by the new radio-si470x
      driver.
      Signed-off-by: default avatarTobias Lorenz <tobias.lorenz@gmx.net>
      Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      3bce6f98
    • Jiri Kosina's avatar
      HID: Logitech Extreme 3D needs NOGET quirk · 7cea465f
      Jiri Kosina authored
      Logitech Extreme 3D needs NOGET quirk, otherwise it times out at
      the time of connect.
      Reported-by: default avatarMike Sharov <msharov@softhome.net>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      7cea465f
    • Jan Kiszka's avatar
      HID: Refactor MS Presenter 8K key mapping · d7d32c81
      Jan Kiszka authored
      Following the suggestion of Jonas, this patch maps the special keys of
      the MS Presenter 8000 to targets that should allow for better re-mapping
      according to individual use cases (i.e. I avoided hard-wiring to
      standard keys). This time I also included the last missing key event
      (switching back from presentation mode).
      
      The optimal Xmodmap customization for using the Presenter with
      OpenOffice now looks like this for me:
      
      keycode 175 = Escape
      keycode 179 = F5
      keysym XF86Forward = Right
      keysym XF86Back = Left
      Signed-off-by: default avatarJan Kiszka <jan.kiszka@siemens.com>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      d7d32c81
    • Jiri Kosina's avatar
      HID: MS Presenter mapping for PID 0x0701 · 85c985f4
      Jiri Kosina authored
      0x045e/0x0701 also needs the hid-input mapping quirk established by
      quirk_microsoft_presenter_8k().
      Reported-by: default avatarJonas Delrue <jonas_delrue@hotmail.com>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      85c985f4
    • Robert Schedel's avatar
      HID: Support Samsung IR remote · fe56caa9
      Robert Schedel authored
      Samsung USB remotes (0419:0001) are rejected by kernel 2.6.23, because the
      report descriptor from the remote contains a 48 bit HID report field. HID 1.11
      states: Fields may span at most 4 bytes.
      
      This patch, based on 2.6.23, fixes this by modifying the internal report
      descriptor in hid-quirks.c. Additional user space support (e.g. LIRC) is
      required to fetch the information from the hiddev interface.
      
      The burden to reconstruct the data is moved into userspace (lirc through hiddev).
      There is no need to set HID_QUIRK_HIDDEV quirk, as the device has also output
      applications, which trigger the creation of hiddev device automatically.
      Signed-off-by: default avatarRobert Schedel <r.schedel@yahoo.de>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      fe56caa9
    • Jiri Kosina's avatar
      HID: fix compilation of hidbp drivers without usbhid · b0e66824
      Jiri Kosina authored
      We can use the blacklist only if usbhid code is compiled.
      Reported-by: default avatarjurriaan <thunder7@xs4all.nl>
      Cc: Pascal Terjan <pterjan@mandriva.com>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      b0e66824
    • Nicolas Mailhot's avatar
      HID: Blacklist the Gretag-Macbeth Huey display colorimeter · 15b55fb8
      Nicolas Mailhot authored
      The Gretag-Macbeth Huey display colorimeter claims to be an HID device but
      isn't. As a result the linux HID device will claim it, preventing FLOSS
      software like Argyll CMS from talking to it.
      Tested-by: default avatarFrederic Crozat <fcrozat@mandriva.com>
      Signed-off-by: default avatarNicolas Mailhot <nicolas.mailhot@laposte.net>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      15b55fb8
    • Fengguang Wu's avatar
      HID: the `bit' in hidinput_mapping_quirks() is an out parameter · 70d215c4
      Fengguang Wu authored
      Fix a panic, by changing
      	hidinput_mapping_quirks(,, unsigned long *bit,)
      to
      	hidinput_mapping_quirks(,, unsigned long **bit,)
      
      The `bit' in this function is an out parameter.
      Signed-off-by: default avatarFengguang Wu <wfg@mail.ustc.edu.cn>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      70d215c4
    • Jiri Kosina's avatar
      HID: remove redundant WARN_ON()s in order not to scare users · c4124c9b
      Jiri Kosina authored
      The WARN_ON() in implement() and extract() spit out stacktraces and
      a lot of other information that might make users think that there is
      something seriously wrong with the system. WARN_ON() should not be
      deliberately triggerable by userspace application, which these can be.
      Usually this WARN_ON() triggers when hid2hci utility is sending the
      data that don't correspond to the device's report descriptor.
      
      Convert these messages to more friendly printk().
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      c4124c9b
    • Bastien Nocera's avatar
      HID: force hiddev creation for SONY PS3 controller · 0887b4cb
      Bastien Nocera authored
      The device is not discoverable, and needs to be poked to set its master, the
      Bluetooth device it will try to connect to when the "Home" button is pressed
      without a cable plugged in.
      
      Using libusb means disconnecting the device from its driver to get the report
      descriptor. Using hiddev, we can poke it without relinquishing control over it,
      so when you plug it in, it would still work as a pad.
      
      This could be then used by sixpair program, after it is rewritten to use
      hiddev instead of libusb.
      Signed-off-by: default avatarBastien Nocera <hadess@hadess.net>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      0887b4cb
    • Pascal Terjan's avatar
      HID: Use hid blacklist in usbmouse/usbkbd · 9f6b3727
      Pascal Terjan authored
      This fixes wacom tablets not working if usbmouse is loaded.
      Signed-off-by: default avatarPascal Terjan <pterjan@mandriva.com>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      9f6b3727
    • Jiri Kosina's avatar
      HID: proper handling of MS 4k and 6k devices · 628edcde
      Jiri Kosina authored
      This removes ugly macros IS_* to distinguish devices that
      need special handling in hid-input, and establish proper
      quirks for them.
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      628edcde
    • Jiri Kosina's avatar
      HID: remove unused variable in quirk event handler · 9a15c997
      Jiri Kosina authored
      Remove unused variable in quirk event handler.
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      9a15c997
    • Jiri Kosina's avatar
      HID: hid-input quirk for BTC 8193 · 36ccaad6
      Jiri Kosina authored
      BTC 8193 keyboard handles its scrollwheel in very non-standard way.
      It produces two non-standard usages for scrolling up and down, in
      both cases with postive value equaling to 1. We handle this by temporary
      mapping, which we then catch in quirk event handler, and remap to
      negative HWHEEL even in order to introduce correct behavior.
      
      Also the button requires special mapping, as it triggers standard-violating
      usage code.
      
      Reported in kernel.org bugzilla #9385
      Reported-by: default avatarKir Kolyshkin <kir@sacred.ru>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      36ccaad6
    • Jiri Kosina's avatar
      HID: separate hid-input event quirks from generic code · 87bc2aa9
      Jiri Kosina authored
      This patch separates also the hid-input quirks that have to be
      applied at the time the event occurs, so that the generic code
      handling HUT-compliant devices is not messed up by them too much.
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      87bc2aa9
    • Jiri Kosina's avatar
      HID: refactor mapping to input subsystem for quirky devices · 10bd065f
      Jiri Kosina authored
      Currently, the handling of mapping between hid and input for devices
      that don't conform to HUT 1.12 specification is very messy -- no per-device
      handling, no blacklists, conditions on idVendor and idProduct placed
      all over the code.
      
      This patch moves all the device-specific input mapping to a separate
      file, and introduces a blacklist-style handling for non-standard
      device-specific mappings.
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      10bd065f
    • Drew Fisher's avatar
      HID: Microsoft Wireless Optical Desktop 3.0 quirk · 8dcd5afa
      Drew Fisher authored
      Make the Microsoft Wireless Optical Desktop 3.0 work as a mouse.
      
      Microsoft Wireless Optical Desktop 3.0 doesn't properly describe its interface
      class.  Specifically, since it doesn't mark the second interface as a mouse
      (bInterfaceSubclass = 0), it doesn't get HID_QUIRK_NOGET applied to the
      interface, and then acts broken when polled.
      Signed-off-by: default avatarDrew Fisher <drew.m.fisher@gmail.com>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      8dcd5afa
    • Carlos Corbacho's avatar
      HID: Add support for Logitech Elite keyboards · bc370733
      Carlos Corbacho authored
      Reuse the quirks from the Cordless Desktop LX500 - stops some of the extra
      keys being reported as mouse buttons.
      Signed-off-by: default avatarCarlos Corbacho <cathectic@gmail.com>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      bc370733
    • Jiri Kosina's avatar
      HID: add full support for Genius KB-29E · af9e0eac
      Jiri Kosina authored
      Genius KB-29E has broken report descriptor, which causes some of the
      Consumer usages to appear incorrectly as Button usages. We fix it by
      fixing the report descriptor before it is being parsed.
      
      Also a few of the keys violate the HUT standard, so they need a special
      handling. They currently fall into "Reserved" range as per HUT 1.12.
      Reported-by: default avatarSzekeres Istvan <szekeres@iii.hu>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      af9e0eac
    • Li Zefan's avatar
      HID: fix a potential bug in pointer casting · 3ba5619f
      Li Zefan authored
      Don't directly cast list_head * to foo *, this works only when list
      is the first member of struct foo, and we should not make the assumption
      how members are ordered in the structure.
      
      i.e. struct *f = (struct *f)pos will work if:
      	struct foo {
      		struct list_head list;
      		int i;
      	};
      
      but will fail if:
      	struct foo {
      		int i;
      		struct list_head list;
      	}
      Signed-off-by: default avatarLi Zefan <lizf@cn.fujitsu.com>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      3ba5619f
    • Pavel Troller's avatar
      HID: Implement horizontal wheel handling for A4 Tech X5-005D · c80e5ffa
      Pavel Troller authored
      This mouse distinguishes horizontal wheel from vertical by a special "pseudo
      event" GenericDesktop.00b8, with values of 0 for vertical and 8 for horizontal
      wheel. Because this event is supplied by the parser too late, we need to delay
      a wheel event, wait for this one and send either REL_WHEEL or REL_HWHEEL to
      input depending on the event value.
      Signed-off-by: default avatarPavel Troller <patrol@sinus.cz>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      c80e5ffa
    • Michel Daenzer's avatar
      HID: Add support for Apple aluminum USB keyboards. · a45d82d1
      Michel Daenzer authored
      Reuse the existing quirks for Apple laptop USB keyboards.
      Signed-off-by: default avatarMichel Daenzer <michel@tungstengraphics.com>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      a45d82d1
    • Michel Daenzer's avatar
      HID: Rename some code identifiers from PowerBook specific to Apple generic · 81e1a875
      Michel Daenzer authored
      Preserve identifiers exposed in build and run time configuration though in
      order not to break existing configurations.
      
      This is in preparation for adding support for Apple aluminum USB keyboards.
      Signed-off-by: default avatarMichel Daenzer <michel@tungstengraphics.com>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      81e1a875
    • Jan Kiszka's avatar
      HID: Map MS Presenter 8000 bottom-side buttons · 3c684c8c
      Jan Kiszka authored
      The MS Presenter 8000 bluetooth mouse is a "dual-use" device: If you
      press a button on the top, you can turn it around and find special keys
      on the other side, useful for presentations. This patch maps those three
      bottom-keys that are not already detected to the intended functions. The
      magic bottom on the top is mapped to F5 when we switch from mouse to
      presenter mode in order to activate the presentation mode in the related
      software (e.g. OpenOffice).
      Signed-off-by: default avatarJan Kiszka <jan.kiszka@siemens.com>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      3c684c8c
    • Russell King's avatar
      Merge branch 'pxa-plat' into devel · 0ff66f0c
      Russell King authored
      * pxa-plat: (53 commits)
        [ARM] 4762/1: Basic support for Toradex Colibri module
        [ARM] pxa: fix mci_init functions returning -1
        [ARM] 4737/1: Refactor corgi_lcd to improve readability + bugfix
        [ARM] 4747/1: pcm027: support for pcm990 baseboard for phyCORE-PXA270
        [ARM] 4746/1: pcm027: network support for phyCORE-PXA270
        [ARM] 4745/1: pcm027: default configuration
        [ARM] 4744/1: pcm027: add support for phyCORE-PXA270 CPU module
        [NET] smc91x: Make smc91x use IRQ resource trigger flags
        [ARM] pxa: add default config for littleton
        [ARM] pxa: add basic support for Littleton (PXA3xx Form Factor Platform)
        [ARM] 4664/1: Add basic support for HTC Magician PDA phones
        [ARM] 4649/1: Base support for pxa-based Toshiba e-series PDAs.
        [ARM] pxa: skip registers saving/restoring if entering standby mode
        [ARM] pxa: fix PXA27x resume
        [ARM] pxa: Avoid fiddling with CKEN register on suspend
        [ARM] pxa: Add PXA3 standby code hooked into the IRQ wake scheme
        [ARM] pxa: Add zylonite MFP wakeup configurations
        [ARM] pxa: program MFPs for low power mode when suspending
        [ARM] pxa: make MFP configuration processor independent
        [ARM] pxa: remove un-used pxa3xx_mfp_set_xxx() functions
        ...
      
      Conflicts:
      
      	arch/arm/mach-pxa/ssp.c
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      0ff66f0c
    • Russell King's avatar
      Merge branch 'orion' into devel · c00d4ffd
      Russell King authored
      * orion: (26 commits)
        [ARM] Orion: implement power-off method for QNAP TS-109/209
        [ARM] Orion: add support for QNAP TS-109/TS-209
        [ARM] Orion: I2C support
        [I2C] i2c-mv64xxx: Don't set i2c_adapter.retries
        [I2C] Split mv643xx I2C platform support
        [ARM] Orion: enable CONFIG_RTC_DRV_M41T80 for D-Link DNS-323
        [ARM] Orion defconfig
        [ARM] Orion: add support for Orion/MV88F5181 based D-Link DNS-323
        [ARM] Orion: MV88F5181 support bits
        [ARM] Orion: Buffalo/Revogear Kurobox Pro support
        [ARM] OrionNAS RD board support
        [ARM] Orion: support for Marvell Orion-2 (88F5281) Development Board
        [ARM] Orion: common platform setup for Gigabit Ethernet port
        [ARM] Orion: platform device registration for UART, USB and NAND
        [ARM] Orion: system timer support
        [ARM] Orion edge GPIO IRQ support
        [ARM] Orion: IRQ support
        [ARM] Orion: provide GPIO method for enabling hardware assisted blinking
        [ARM] Orion: GPIO support
        [ARM] Orion: programable address map support
        ...
      
      Conflicts:
      
      	arch/arm/Kconfig
      	arch/arm/Makefile
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      c00d4ffd
    • Russell King's avatar
      Merge branches 'at91', 'ep93xx', 'iop', 'kprobes', 'ks8695', 'misc', 'msm',... · d0d42df2
      Russell King authored
      Merge branches 'at91', 'ep93xx', 'iop', 'kprobes', 'ks8695', 'misc', 'msm', 's3c2410', 'sa1100' and 'vfp' into devel
      
      * at91: (24 commits)
        [ARM] 4615/4: sam926[13]ek buttons updated
        [ARM] 4765/1: [AT91] AT91CAP9A-DK board support
        [ARM] 4764/1: [AT91] AT91CAP9 core support
        [ARM] 4738/1: at91sam9261: Remove udc pullup enabling in board initialisation
        [ARM] 4761/1: [AT91] Board-support for NEW_LEDs
        [ARM] 4760/1: [AT91] SPI CS0 errata on AT91RM9200
        [ARM] 4759/1: [AT91] Buttons on CSB300
        [ARM] 4758/1: [AT91] LEDs
        [ARM] 4757/1: [AT91] UART initialization
        [ARM] 4756/1: [AT91] Makefile cleanup
        [ARM] 4755/1: [AT91] NAND update
        [ARM] 4754/1: [AT91] SSC library support
        [ARM] 4753/1: [AT91] Use DMA_BIT_MASK
        [ARM] 4752/1: [AT91] RTT, RTC and WDT peripherals on SAM9
        [ARM] 4751/1: [AT91] ISI peripheral on SAM9263
        [ARM] 4750/1: [AT91] STN LCD displays on SAM9261
        [ARM] 4734/1: at91sam9263ek: include IRQ for Ethernet PHY
        [ARM] 4646/1: AT91: configurable HZ, default to 128
        [ARM] 4688/1: at91: speed-up irq processing
        [ARM] 4657/1: AT91: Header definition update
        ...
      
      * ep93xx:
        [ARM] 4671/1: ep93xx: remove obsolete gpio_line_* operations
        [ARM] 4670/1: ep93xx: implement IRQT_BOTHEDGE gpio irq sense type
        [ARM] 4669/1: ep93xx: simplify GPIO code and cleanups
        [ARM] 4668/1: ep93xx: implement new GPIO API
      
      * iop:
        [ARM] 4770/1: GLAN Tank: correct physmap_flash_data width field
        [ARM] 4732/1: GLAN Tank: register rtc-rs5c372 i2c device
        [ARM] 4708/1: iop: update defconfigs for 2.6.24
      
      * kprobes:
        ARM kprobes: let's enable it
        ARM kprobes: special hook for the kprobes breakpoint handler
        ARM kprobes: prevent some functions involved with kprobes from being probed
        ARM kprobes: don't let a single-stepped stmdb corrupt the exception stack
        ARM kprobes: add the kprobes hook to the page fault handler
        ARM kprobes: core code
        ARM kprobes: instruction single-stepping support
      
      * ks8695:
        [ARM] 4603/1: KS8695: debugfs interface to view pin state
        [ARM] 4601/1: KS8695: PCI support
      
      * misc:
        [ARM] remove duplicate includes
        [ARM] CONFIG_DEBUG_STACK_USAGE
        [ARM] 4689/1: small comment wrap fix
        [ARM] 4687/1: Trivial arch/arm/kernel/entry-common.S comment fix
        [ARM] 4666/1: ixp4xx: fix sparse warnings in include/asm-arm/arch-ixp4xx/io.h
        [ARM] remove reference to non-existent MTD_OBSOLETE_CHIPS
        [SERIAL] 21285: Report baud rate back via termios
        [ARM] Remove pointless casts from void pointers,
        [ARM] Misc minor interrupt handler cleanups
        [ARM] Remove at91_lcdc.h
        [ARM] ARRAY_SIZE() cleanup
        [ARM] Update mach-types
      
      * msm:
        [ARM] msm: dma support for MSM7X00A
        [ARM] msm: board file for MACH_HALIBUT (QCT MSM7200A)
        [ARM] msm: irq and timer support for ARCH_MSM7X00A
        [ARM] msm: core platform support for ARCH_MSM7X00A
      
      * s3c2410: (33 commits)
        [ARM] 4795/1: S3C244X: Add armclk and setparent call
        [ARM] 4794/1: S3C24XX: Comonise S3C2440 and S3C2442 clock code
        [ARM] 4793/1: S3C24XX: Add IRQ->GPIO pin mapping function
        [ARM] 4792/1: S3C24XX: Remove warnings from debug-macro.S
        [ARM] 4791/1: S3C2412: Make fclk a parent of msysclk
        [ARM] 4790/1: S3C2412: Fix parent selection for msysclk.
        [ARM] 4789/1: S3C2412: Add missing CLKDIVN register values
        [ARM] 4788/1: S3C24XX: Fix paramet to s3c2410_dma_ctrl if S3C2410_DMAF_AUTOSTART used.
        [ARM] 4787/1: S3C24XX: s3c2410_dma_request() should return the allocated channel number
        [ARM] 4786/1: S3C2412: Add SPI FIFO controll constants
        [ARM] 4785/1: S3C24XX: Add _SHIFT definitions for S3C2410_BANKCON registers
        [ARM] 4784/1: S3C24XX: Fix GPIO restore glitches
        [ARM] 4783/1: S3C24XX: Add s3c2410_gpio_getpull()
        [ARM] 4782/1: S3C24XX: Define FIQ_START for any FIQ users
        [ARM] 4781/1: S3C24XX: DMA suspend and resume support
        [ARM] 4780/1: S3C2412: Allow for seperate DMA channels for TX and RX
        [ARM] 4779/1: S3C2412: Add s3c2412_gpio_set_sleepcfg() call
        [ARM] 4778/1: S3C2412: Add armclk and init from DVS state
        [ARM] 4777/1: S3C24XX: Ensure clk_set_rate() checks the set_rate method for the clk
        [ARM] 4775/1: s3c2410: fix compilation error if only s3c2442 cpu is selected
        ...
      
      * sa1100:
        [ARM] sa1100: add clock source support
      
      * vfp:
        [ARM] 4584/2: ARMv7: Add Advanced SIMD (NEON) extension support
        [ARM] 4583/1: ARMv7: Add VFPv3 support
        [ARM] 4582/2: Add support for the common VFP subarchitecture
      d0d42df2
    • Ben Dooks's avatar
      [ARM] 4795/1: S3C244X: Add armclk and setparent call · 06dbbd69
      Ben Dooks authored
      Add armclk to the supported clocks on the S3C2440 and S3C2442 to
      better represent the DVS state which controls whether FCLK or HCLK
      is fed to the ARM core.
      Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      06dbbd69
    • Ben Dooks's avatar
      [ARM] 4794/1: S3C24XX: Comonise S3C2440 and S3C2442 clock code · 3a38e4be
      Ben Dooks authored
      Merge together the bits of the S3C2440 and S3C2442 clock code
      that can be.
      Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      3a38e4be
    • Ben Dooks's avatar
      [ARM] 4793/1: S3C24XX: Add IRQ->GPIO pin mapping function · c27cb681
      Ben Dooks authored
      Add the reverse of s3c2410_gpio_getirq to convert
      a IRQ  number into a GPIO pin number.
      Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      c27cb681
    • Ben Dooks's avatar
      [ARM] 4792/1: S3C24XX: Remove warnings from debug-macro.S · 9b8c0088
      Ben Dooks authored
      Remove warnings left in include/asm-arm/arch-s3c2410/debug-macro.S
      whilst these where being experimented with.
      Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      9b8c0088