Merge branch 'omap-for-v4.6/dt-gpmc' into omap-for-v4.6/dt

2016-02-26 10:42:54 -08:00
parent b9d3ec1d98 44e4716499
commit 26c23ee657
33 changed files with 142 additions and 56 deletions
--- a/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts
+++ b/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts
@@ -102,7 +102,8 @@
 };

 &gpmc {
-	ranges = <1 0 0x08000000 0x1000000>;	/* CS1: 16MB for LAN9221 */
+	ranges = <0 0 0x30000000 0x1000000	/* CS0: 16MB for NAND */
+		  1 0 0x2c000000 0x1000000>;	/* CS1: 16MB for LAN9221 */

 	ethernet@gpmc {
 		pinctrl-names = "default";