Merge remote-tracking branch 'origin/develop-3.10' into develop-3.10-next

Conflicts:
	drivers/staging/android/ion/ion.c
	include/linux/rockchip/sysmmu.h

diff --combined arch/arm/mach-rockchip/Makefile
index 5f47f27804b62f0cc95c761916a4ea2a9da9e318,6ac8c76fc4e70c46c1c15cbe4d3c4119303fc3d1..feb29aa42b7bd3747a01bf0b04317eff0a146346
--- 1/arch/arm/mach-rockchip/Makefile
--- 2/arch/arm/mach-rockchip/Makefile
+++ b/arch/arm/mach-rockchip/Makefile
@@@ -1,10 -1,9 +1,11 @@@
  obj-y += common.o
  obj-y += cpu.o
 +obj-y += rk3036.o
 +obj-y += rk312x.o
  obj-y += rk3188.o
  obj-y += rk3288.o
  obj-y += ddr_freq.o
+ obj-y += efuse.o
  obj-y += rk_system_status.o
  obj-$(CONFIG_PM) += rockchip_pm.o sleep.o
  obj-$(CONFIG_RK_FPGA) += fpga.o

diff --combined include/linux/rockchip/sysmmu.h
index ab3e0414b2e4bf4f295e85c01e512a08186a2ce8,41e06dfef4062141610c9cfd34a299bb7ae336ec..cba6c8f50593abde415f4f67ad539103a7342b0e
--- 1/include/linux/rockchip/sysmmu.h
--- 2/include/linux/rockchip/sysmmu.h
+++ b/include/linux/rockchip/sysmmu.h
@@@ -22,8 -22,6 +22,8 @@@
  #define VOPB_SYSMMU_COMPATIBLE_NAME "iommu,vopb_mmu"
  #define VOPL_SYSMMU_COMPATIBLE_NAME "iommu,vopl_mmu"
  
 +#define VOP_SYSMMU_COMPATIBLE_NAME "iommu,vop_mmu"
 +
  #define HEVC_SYSMMU_COMPATIBLE_NAME "iommu,hevc_mmu"
  #define VPU_SYSMMU_COMPATIBLE_NAME "iommu,vpu_mmu"
  
@@@ -44,11 -42,10 +44,10 @@@ struct sysmmu_drvdata
   *                       translated. This is 0 if @itype is SYSMMU_BUSERROR.
   */
  typedef int (*sysmmu_fault_handler_t)(struct device *dev,
-                                         enum rk_sysmmu_inttype itype,
-                                         unsigned long pgtable_base,
-                                         unsigned long fault_addr,
-                                         unsigned int statu
-                                         );
+                                     enum rk_sysmmu_inttype itype,
+                                     unsigned long pgtable_base,
+                                     unsigned long fault_addr,
+                                     unsigned int statu);
        
  #ifdef CONFIG_ROCKCHIP_IOMMU
  /**
@@@ -90,6 -87,23 +89,6 @@@ void rockchip_sysmmu_tlb_invalidate(str
   */
  void rockchip_sysmmu_set_fault_handler(struct device *dev,sysmmu_fault_handler_t handler);
  
 -/** rockchip_sysmmu_set_prefbuf() - Initialize prefetch buffers of System MMU v3
 - *    @owner: The device which need to set the prefetch buffers
 - *    @base0: The start virtual address of the area of the @owner device that the
 - *                    first prefetch buffer loads translation descriptors
 - *    @size0: The last virtual address of the area of the @owner device that the
 - *                    first prefetch buffer loads translation descriptors.
 - *    @base1: The start virtual address of the area of the @owner device that the
 - *                    second prefetch buffer loads translation descriptors. This will be
 - *                    ignored if @size1 is 0 and this function assigns the 2 prefetch
 - *                    buffers with each half of the area specified by @base0 and @size0
 - *    @size1: The last virtual address of the area of the @owner device that the
 - *                    prefetch buffer loads translation descriptors. This can be 0. See
 - *                    the description of @base1 for more information with @size1 = 0
 - */
 -void rockchip_sysmmu_set_prefbuf(struct device *owner,
 -                              unsigned long base0, unsigned long size0,
 -                              unsigned long base1, unsigned long size1);
  #else /* CONFIG_ROCKCHIP_IOMMU */
  static inline int rockchip_sysmmu_enable(struct device *owner, unsigned long pgd)
  {
@@@ -106,8 -120,8 +105,8 @@@ static inline void rockchip_sysmmu_set_
  {
  }
  static inline void rockchip_sysmmu_set_prefbuf(struct device *owner,
 -                                             unsigned long base0, unsigned long size0,
 -                                             unsigned long base1, unsigned long size1)
 +                                             unsigned long base0, unsigned long size0,
 +                                             unsigned long base1, unsigned long size1)
  {
  }
  #endif