• Linus Torvalds's avatar
    Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6 · b1bf7d4d
    Linus Torvalds authored
    Pull GPIO driver changes from Grant Likely:
     "Lots of gpio changes, both to core code and drivers.
    
      Changes do touch architecture code to remove the need for separate
      arm/gpio.h includes in most architectures.
    
      Some new drivers are added, and a number of gpio drivers are converted
      to use irq_domains for gpio inputs used as interrupts.  Device tree
      support has been amended to allow multiple gpio_chips to use the same
      device tree node.
    
      Remaining changes are primarily bug fixes."
    
    * tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6: (33 commits)
      gpio/generic: initialize basic_mmio_gpio shadow variables properly
      gpiolib: Remove 'const' from data argument of gpiochip_find()
      gpio/rc5t583: add gpio driver for RICOH PMIC RC5T583
      gpiolib: quiet gpiochip_add boot message noise
      gpio: mpc8xxx: Prevent NULL pointer deref in demux handler
      gpio/lpc32xx: Add device tree support
      gpio: Adjust of_xlate API to support multiple GPIO chips
      gpiolib: Implement devm_gpio_request_one()
      gpio-mcp23s08: dbg_show: fix pullup configuration display
      Add support for TCA6424A
      gpio/omap: (re)fix wakeups on level-triggered GPIOs
      gpio/omap: fix broken context restore for non-OFF mode transitions
      gpio/omap: fix missing check in *_runtime_suspend()
      gpio/omap: remove cpu_is_omapxxxx() checks from *_runtime_resume()
      gpio/omap: remove suspend/resume callbacks
      gpio/omap: remove retrigger variable in gpio_irq_handler
      gpio/omap: remove saved_wakeup field from struct gpio_bank
      gpio/omap: remove suspend_wakeup field from struct gpio_bank
      gpio/omap: remove saved_fallingdetect, saved_risingdetect
      gpio/omap: remove virtual_irq_start variable
      ...
    
    Conflicts:
    	drivers/gpio/gpio-samsung.c
    b1bf7d4d
mach-mx35_3ds.c 15.2 KB