1. 18 3月, 2011 13 次提交
    • T
      gpio/langwell: Clear edge bit before handling · 84bead6c
      Thomas Gleixner 提交于
      I don't have the specs for this beast, but it looks a lot like the PXA
      GPIO block. Though I bet it's the same IP and the driver should have
      reused the PXA code.
      
      Acknowleding the edge detect status after handling one or more gpio
      interrupts looks wrong. We might lose an edge which came in while we
      handled the previous one.
      Signed-off-by: NThomas Gleixner <tglx@linutronix.de>
      Acked-by: NAlek Du <alek.du@intel.com>
      Signed-off-by: NGrant Likely <grant.likely@secretlab.ca>
      84bead6c
    • T
      gpio/langwell: Simplify demux loop · 732063b9
      Thomas Gleixner 提交于
      Use __ffs() to find the pending interrupt source instead of looping 32
      times.
      Signed-off-by: NThomas Gleixner <tglx@linutronix.de>
      Cc: Feng Tang <feng.tang@intel.com>
      Cc: Alek Du <alek.du@intel.com>
      Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
      Signed-off-by: NGrant Likely <grant.likely@secretlab.ca>
      732063b9
    • T
      gpio/langwell: Convert irq name space · 674db906
      Thomas Gleixner 提交于
      Convert to the new irq function names.
      Signed-off-by: NThomas Gleixner <tglx@linutronix.de>
      Cc: Feng Tang <feng.tang@intel.com>
      Cc: Alek Du <alek.du@intel.com>
      Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
      Signed-off-by: NGrant Likely <grant.likely@secretlab.ca>
      674db906
    • T
      gpio/langwell: Fix broken irq_eoi change. · 20e2aa91
      Thomas Gleixner 提交于
      commit 0766d20f (langwell_gpio: modify EOI handling following change
      of kernel irq subsystem)  changes
      
       -   desc->chip->eoi(irq);
       +
       +   if (desc->chip->irq_eoi)
       +           desc->chip->irq_eoi(irq_get_irq_data(irq));
       +   else
       +           dev_warn(pg->chip.dev, "missing EOI handler for irq %d\n", irq);
      
      With the following explanation:
      
       "Latest kernel has many changes in IRQ subsystem and its interfaces,
        like adding irq_eoi" for struct irq_chip, this patch will make it
        support both the new and old interface."
      
      This is completely bogus.
      
       #1) The changelog does not match the patch at all
      
       #2) This driver relies on the assumption that it sits behind an eoi
           capable interrupt line. If the implementation of the underlying
           chip changes from eoi to irq_eoi then this driver has to follow
           that change and not add a total bogosity.
      
       #3) Just mechanically changing eoi to irq_eoi without checking the
           background of that change is sloppy at best.
      
      Remove the sillyness and retrieve the interrupt data from irq_desc
      directly. No need to go through a sparse irq lookup.
      Reported-by: NStephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: NThomas Gleixner <tglx@linutronix.de>
      Cc: Feng Tang <feng.tang@intel.com>
      Cc: Alek Du <alek.du@intel.com>
      Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NGrant Likely <grant.likely@secretlab.ca>
      20e2aa91
    • T
      gpio; Make Intel chipset gpio drivers depend on x86 · 61ab3fe5
      Thomas Gleixner 提交于
      Nothing outside of x86 can use that code.
      Reported-by: NStephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: NThomas Gleixner <tglx@linutronix.de>
      Signed-off-by: NGrant Likely <grant.likely@secretlab.ca>
      61ab3fe5
    • G
      Merge remote-tracking branch 'origin' into spi/next · 2dd22997
      Grant Likely 提交于
      Pull in Linus' tree to pick up changes required for the langwell gpio fixes
      2dd22997
    • N
      gpio/cs5535-gpio: Fix section mismatch · 36885ff0
      Nikanth Karthikesan 提交于
      Fix section mismatch by annotating using variable name suffix.
      Signed-off-by: NNikanth Karthikesan <knikanth@suse.de>
      Signed-off-by: NGrant Likely <grant.likely@secretlab.ca>
      36885ff0
    • L
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32 · 7b7adc4a
      Linus Torvalds 提交于
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32: (40 commits)
        unicore32: rewrite arch-specific tlb.h to use asm-generic version
        unicore32: modify io_p2v and io_v2p macros, and adjust PKUNITY_mmio_BASEs
        unicore32: replace unicore32-specific iomap functions with generic lib implementation
        unicore32 machine related: add frame buffer driver for pkunity-v3 soc
        unicore32 machine related files: add i2c bus drivers for pkunity-v3 soc
        unicore32 io: redefine __REG(x) and re-use readl/writel funcs
        unicore32 i8042 upgrade and bugfix: adjust resource request region type
        unicore32 upgrade to v2.6.38-rc5: add one more paramter for pte_alloc_map call
        unicore32 i8042: adjust io funcs of i8042-unicore32io.h
        unicore32: rename PKUNITY_IOSPACE_BASE to PKUNITY_MMIO_BASE
        unicore32: modify function names and parameters for irq_chips
        unicore32: remove unused lines in arch/unicore32/include/asm/irq.h
        unicore32 time.c: change calculate method for clock_event_device
        unicore32: ADD MAINTAINER for unicore32 architecture
        unicore32 machine related files: ps2 driver
        unicore32 machine related files: pci bus handling
        unicore32 machine related files: hardware registers
        unicore32 machine related files: core files
        unicore32 additional architecture files: boot process
        unicore32 additional architecture files: low-level lib: misc
        ...
      Acked-by: NArnd Bergmann <arnd@arndb.de>
      7b7adc4a
    • L
      Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 · 31598e87
      Linus Torvalds 提交于
      * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
        [S390] kexec: Disable ftrace during kexec
        [S390] support XZ compressed kernel
        [S390] css_bus_type: make it static
        [S390] css_driver: remove duplicate members
        [S390] css: remove subchannel private
        [S390] css: move chsc_private to drv_data
        [S390] css: move io_private to drv_data
        [S390] cio: move cdev pointer to io_subchannel_private
        [S390] cio: move options to io_sch_private
        [S390] cio: move asms to generic header
        [S390] cio: move orb definitions to separate header
        [S390] Write protect module text and RO data
        [S390] dasd: get rid of compile warning
        [S390] remove superfluous check from do_IRQ
        [S390] remove redundant stack check option
      31598e87
    • L
      Merge branch 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 · 241eb956
      Linus Torvalds 提交于
      * 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (34 commits)
        sh: Convert to generic show_interrupts.
        sh: Wire up new fhandle and clock_adjtime syscalls.
        sh: modify platform_device for sh_eth driver
        sh: add GETHER's platform_device in board-sh7757lcr
        sh: update sh7757lcr_defconfig
        sh: add platform_device of tmio_mmc and sh_mmcif to sh7757lcr
        sh: dmaengine support for SH7757
        sh: add mmc clock in clock-sh7757
        sh: add spi_board_info in sh7757lcr
        sh: add platform_device for SPI
        sh: add USB_ARCH_HAS_EHCI and OHCI for SH7757
        sh: Rename cpuidle states to fit general conventions
        serial: sh-sci: fix deadlock when resuming from S3 sleep
        sh: Enable CONFIG_GCOV_PROFILE_ALL for sh
        sh: Fix up async PCIe probing on SMP.
        serial: sh-sci: Kill off the special earlyprintk device.
        serial: sh-sci: Use dev_name() for region reservations.
        serial: sh-sci: Fix up earlyprintk port mapping.
        serial: sh-sci: Limit early console to one device.
        serial: sh-sci: Fix up break timer scheduling race.
        ...
      241eb956
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6 · fd34b0de
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6:
        fbdev: sh_mobile_lcdc: Add YUV framebuffer support
        viafb: split pll configs up
        viafb: remove duplicated clock storage
        viafb: always return the best possible clock
        viafb: remove duplicated clock information
        fbdev: sh_mobile_lcdcfb: add backlight support
        viafb: factor lcd scaling parameters out
        viafb: strip some structures
        viafb: remove unused data_mode and device_type
        viafb: kill lcd_panel_id
        video via: make local variables static
        video via: fix iomem access
        video/via: drop deprecated (and unused) i2c_adapter.id
      fd34b0de
    • G
      spi/rtc-{ds1390,ds3234,m41t94}: Use spi_get_drvdata() for SPI devices · 42fea15d
      Geert Uytterhoeven 提交于
      The recently increased type checking in platform_get_drvdata() reveals a few
      offenders:
      
      drivers/rtc/rtc-ds1390.c:161: warning: passing argument 1 of ‘platform_get_drvdata’ from incompatible pointer type
      drivers/rtc/rtc-ds3234.c:161: warning: passing argument 1 of ‘platform_get_drvdata’ from incompatible pointer type
      drivers/rtc/rtc-m41t94.c:139: warning: passing argument 1 of ‘platform_get_drvdata’ from incompatible pointer type
      
      Use spi_get_drvdata() instead of platform_get_drvdata().
      Signed-off-by: NGeert Uytterhoeven <geert@linux-m68k.org>
      Signed-off-by: NGrant Likely <grant.likely@secretlab.ca>
      42fea15d
    • L
      Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 · 40c7f211
      Linus Torvalds 提交于
      * 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (177 commits)
        drm/radeon: fixup refcounts in radeon dumb create ioctl.
        drm: radeon: *_cs_packet_parse_vline() cleanup
        radeon: merge list_del()/list_add_tail() to list_move_tail()
        drm: Retry i2c transfer of EDID block after failure
        drm/radeon/kms: fix typo in atom overscan setup
        drm: Hold the mode mutex whilst probing for sysfs status
        drm/nouveau: fix __nouveau_fence_wait performance
        drm/nv40: attempt to reserve just enough vram for all 32 channels
        drm/nv50: check for vm traps on every gr irq
        drm/nv50: decode vm faults some more
        drm/nouveau: add nouveau_enum_find() util function
        drm/nouveau: properly handle pushbuffer check failures
        drm/nvc0: remove vm hack forcing large/small pages to not share a PDE
        drm/i915: disable opregion lid detection for now.
        drm/i915: Only wait on a pending flip if we intend to write to the buffer
        drm/i915/dp: Sanity check eDP existence
        drm: add cap bit to denote if dumb ioctl is available or not.
        drm/core: add ioctl to query device/driver capabilities
        drm/radeon/kms: allow max clock of 340 Mhz on hdmi 1.3+
        drm/radeon/kms: add cayman pci ids
        ...
      40c7f211
  2. 17 3月, 2011 27 次提交