From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 9 Dec 2014 22:48:22 +0000 (-0800)
Subject: Merge tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm... 
X-Git-Tag: MMI-PSA29.97-13-9~11074
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3a647c1d7ab08145cee4b650f5e797d168846c51;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge tag 'drivers-for-linus' of git://git./linux/kernel/git/arm/arm-soc

Pull ARM SoC driver updates from Arnd Bergmann:
 "These are changes for drivers that are intimately tied to some SoC and
  for some reason could not get merged through the respective subsystem
  maintainer tree.

  The largest single change here this time around is the Tegra
  iommu/memory controller driver, which gets updated to the new iommu DT
  binding.  More drivers like this are likely to follow for the
  following merge window, but we should be able to do those through the
  iommu maintainer.

  Other notable changes are:
   - reset controller drivers from the reset maintainer (socfpga, sti,
     berlin)
   - fixes for the keystone navigator driver merged last time
   - at91 rtc driver changes related to the at91 cleanups
   - ARM perf driver changes from Will Deacon
   - updates for the brcmstb_gisb driver"

* tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (53 commits)
  clocksource: arch_timer: Allow the device tree to specify uninitialized timer registers
  clocksource: arch_timer: Fix code to use physical timers when requested
  memory: Add NVIDIA Tegra memory controller support
  bus: brcmstb_gisb: Add register offset tables for older chips
  bus: brcmstb_gisb: Look up register offsets in a table
  bus: brcmstb_gisb: Introduce wrapper functions for MMIO accesses
  bus: brcmstb_gisb: Make the driver buildable on MIPS
  of: Add NVIDIA Tegra memory controller binding
  ARM: tegra: Move AHB Kconfig to drivers/amba
  amba: Add Kconfig file
  clk: tegra: Implement memory-controller clock
  serial: samsung: Fix serial config dependencies for exynos7
  bus: brcmstb_gisb: resolve section mismatch
  ARM: common: edma: edma_pm_resume may be unused
  ARM: common: edma: add suspend resume hook
  powerpc/iommu: Rename iommu_[un]map_sg functions
  rtc: at91sam9: add DT bindings documentation
  rtc: at91sam9: use clk API instead of relying on AT91_SLOW_CLOCK
  ARM: at91: add clk_lookup entry for RTT devices
  rtc: at91sam9: rework the Kconfig description
  ...
---

3a647c1d7ab08145cee4b650f5e797d168846c51
diff --cc arch/arm/common/edma.c
index 72041f002b7e,e093f2fcee7a..5662a872689b
--- a/arch/arm/common/edma.c
+++ b/arch/arm/common/edma.c
@@@ -1798,10 -1794,8 +1800,11 @@@ static int edma_probe(struct platform_d
  			edma_write_array2(j, EDMA_DRAE, i, 1, 0x0);
  			edma_write_array(j, EDMA_QRAE, i, 0x0);
  		}
+ 		edma_cc[j]->info = info[j];
  		arch_num_cc++;
 +
 +		edma_dev_info.id = j;
 +		platform_device_register_full(&edma_dev_info);
  	}
  
  	return 0;