Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier...

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin: (96 commits)
  Blackfin: stop cleaning include/asm/asm-offsets.h
  Blackfin: scale calibration when cpu freq changes
  Blackfin: eat spurious space in asm/dpmc.h
  Blackfin: fix anomaly 283 handling with exact hardware error
  Blackfin: bf537-stamp: add example ADXL346 orientation resources
  Blackfin: bf537-stamp: add example AD2S1210 IIO resources
  Blackfin: don't support keypad wakeup from hibernate
  Blackfin: bf537-stamp: add example AD7416 IIO resources
  Blackfin: bf537-stamp: add example ADP8860 backlight/led resources
  Blackfin: bf537-stamp: add example AD7414 temp sensor resources
  Blackfin: rename AD1836 to AD183X in board files
  Blackfin: bf537-stamp: add example AD2S120x resources
  Blackfin: add support for the on-chip MAC status interrupts
  Blackfin: asm/page.h: pull in asm-generic headers
  Blackfin: mark gpio lib functions static
  Blackfin: bf537-stamp: add example ADAU1361 resources
  Blackfin: GPIO: implement to_irq handler
  Blackfin: bf537-stamp: add example ADP122/ADP150 power regulator resources
  Blackfin: bf537-stamp: add example AD2S90 resources
  Blackfin: bf537-stamp: add example AD5398 power regulator resources
  ...

diff --combined arch/blackfin/include/asm/dma-mapping.h
index 413a30314a6f6db4bfad27153077c304ec6d11e0,e63f6d9fdab88de6d2c6cac1777f25cd37b5eeb0..212cb80fd74b61ee1c8422c07522683a9eab47ea
--- 1/arch/blackfin/include/asm/dma-mapping.h
--- 2/arch/blackfin/include/asm/dma-mapping.h
+++ b/arch/blackfin/include/asm/dma-mapping.h
@@@ -44,13 -44,8 +44,8 @@@ dma_mapping_error(struct device *dev, d
  extern void
  __dma_sync(dma_addr_t addr, size_t size, enum dma_data_direction dir);
  static inline void
- _dma_sync(dma_addr_t addr, size_t size, enum dma_data_direction dir)
+ __dma_sync_inline(dma_addr_t addr, size_t size, enum dma_data_direction dir)
  {
-       if (!__builtin_constant_p(dir)) {
-               __dma_sync(addr, size, dir);
-               return;
-       }
- 
        switch (dir) {
        case DMA_NONE:
                BUG();
@@@ -64,7 -59,22 +59,15 @@@
                break;
        }
  }
+ static inline void
+ _dma_sync(dma_addr_t addr, size_t size, enum dma_data_direction dir)
+ {
+       if (__builtin_constant_p(dir))
+               __dma_sync_inline(addr, size, dir);
+       else
+               __dma_sync(addr, size, dir);
+ }
  
 -/*
 - * Map a single buffer of the indicated size for DMA in streaming mode.
 - * The 32-bit bus address to use is returned.
 - *
 - * Once the device is given the dma address, the device owns this memory
 - * until either pci_unmap_single or pci_dma_sync_single is performed.
 - */
  static inline dma_addr_t
  dma_map_single(struct device *dev, void *ptr, size_t size,
               enum dma_data_direction dir)
@@@ -81,6 -91,14 +84,6 @@@ dma_map_page(struct device *dev, struc
        return dma_map_single(dev, page_address(page) + offset, size, dir);
  }
  
 -/*
 - * Unmap a single streaming mode DMA translation.  The dma_addr and size
 - * must match what was provided for in a previous pci_map_single call.  All
 - * other usages are undefined.
 - *
 - * After this call, reads by the cpu to the buffer are guarenteed to see
 - * whatever the device wrote there.
 - */
  static inline void
  dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size,
                 enum dma_data_direction dir)
@@@ -95,9 -113,30 +98,9 @@@ dma_unmap_page(struct device *dev, dma_
        dma_unmap_single(dev, dma_addr, size, dir);
  }
  
 -/*
 - * Map a set of buffers described by scatterlist in streaming
 - * mode for DMA.  This is the scather-gather version of the
 - * above pci_map_single interface.  Here the scatter gather list
 - * elements are each tagged with the appropriate dma address
 - * and length.  They are obtained via sg_dma_{address,length}(SG).
 - *
 - * NOTE: An implementation may be able to use a smaller number of
 - *       DMA address/length pairs than there are SG table elements.
 - *       (for example via virtual mapping capabilities)
 - *       The routine returns the number of addr/length pairs actually
 - *       used, at most nents.
 - *
 - * Device ownership issues as mentioned above for pci_map_single are
 - * the same here.
 - */
  extern int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,
                      enum dma_data_direction dir);
  
 -/*
 - * Unmap a set of streaming mode DMA translations.
 - * Again, cpu read rules concerning calls here are the same as for
 - * pci_unmap_single() above.
 - */
  static inline void
  dma_unmap_sg(struct device *dev, struct scatterlist *sg,
             int nhwentries, enum dma_data_direction dir)