From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 11 Jun 2014 18:03:24 +0000 (-0700)
Subject: Merge tag 'soc2-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
X-Git-Tag: firefly_0821_release~176^2~3781
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2dc24b0d0636349d403ae803bbad0c84f6c2ea57;p=firefly-linux-kernel-4.4.55.git

Merge tag 'soc2-for-3.16' of git://git./linux/kernel/git/arm/arm-soc

Pull part two of ARM SoC updates from Arnd Bergmann:
 "This is a small follow-up to the larger ARM SoC updates merged last
  week, almost entirely for the keystone platform.

  The main change here is to use the new dma-ranges parsing code that
  came in through Russell's ARM tree.  This allows the keystone platform
  to do cache-coherent DMA and to finally support all the available
  physical memory when LPAE is enabled.

  Aside from this, the keystone reset driver has been rewritten, and
  there is a small bug fix to allow building the orion5x platform again"

* tag 'soc2-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: keystone: Drop use of meminfo since its not available anymore
  ARM: orion5x: fix mvebu_mbus_dt_init call
  ARM: configs: keystone: enable reset driver support
  ARM: dts: keystone: update reset node to work with reset driver
  ARM: keystone: remove redundant reset stuff
  ARM: keystone: Update the dma offset for non-dt platform devices
  ARM: keystone: Switch over to coherent memory address space
  ARM: configs: keystone: add MTD_SPI_NOR (new dependency for M25P80)
  ARM: configs: keystone: drop CONFIG_COMMON_CLK_DEBUG
---

2dc24b0d0636349d403ae803bbad0c84f6c2ea57
diff --cc arch/arm/boot/dts/keystone.dtsi
index d9f99e7deb83,a8052fd657e5..c1414cb81fd4
--- a/arch/arm/boot/dts/keystone.dtsi
+++ b/arch/arm/boot/dts/keystone.dtsi
@@@ -64,11 -66,22 +64,23 @@@
  		compatible = "ti,keystone","simple-bus";
  		interrupt-parent = <&gic>;
  		ranges = <0x0 0x0 0x0 0xc0000000>;
 +		dma-ranges = <0x80000000 0x8 0x00000000 0x80000000>;
  
+ 		pllctrl: pll-controller@02310000 {
+ 			compatible = "ti,keystone-pllctrl", "syscon";
+ 			reg = <0x02310000 0x200>;
+ 		};
+ 
+ 		devctrl: device-state-control@02620000 {
+ 			compatible = "ti,keystone-devctrl", "syscon";
+ 			reg = <0x02620000 0x1000>;
+ 		};
+ 
  		rstctrl: reset-controller {
  			compatible = "ti,keystone-reset";
- 			reg = <0x023100e8 4>;	/* pll reset control reg */
+ 			ti,syscon-pll = <&pllctrl 0xe4>;
+ 			ti,syscon-dev = <&devctrl 0x328>;
+ 			ti,wdt-list = <0>;
  		};
  
  		/include/ "keystone-clocks.dtsi"