From: Olof Johansson <olof@lixom.net>
Date: Tue, 28 May 2013 04:20:17 +0000 (-0700)
Subject: Merge tag 'nomadik-dt-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ff753f43dab762db2d177e0b0be029e4b111289d;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge tag 'nomadik-dt-for-arm-soc' of git://git./linux/kernel/git/linusw/linux-nomadik into next/dt

From Linus Walleij:
Device tree patches for the Nomadik machine:
- Move clock registration to the device tree
- Support probing the MTU timer from the device tree
- Register user LED and user key in the device tree
- Update defconfig to account for user LED and user key
- Move pin control mappings to the device tree

* tag 'nomadik-dt-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
  ARM: nomadik: move the pin configuration to DT
  ARM: nomadik: add led and key for S8815
  ARM: nomadik: register clocksource from device tree
  ARM: nomadik: convert all clocks except timer to dt
  clocksource: nomadik-mtu: support of probe

Signed-off-by: Olof Johansson <olof@lixom.net>
---

ff753f43dab762db2d177e0b0be029e4b111289d
diff --cc arch/arm/boot/dts/ste-nomadik-s8815.dts
index 6f82d9368948,638ec8df5802..f4dfda7db366
--- a/arch/arm/boot/dts/ste-nomadik-s8815.dts
+++ b/arch/arm/boot/dts/ste-nomadik-s8815.dts
@@@ -14,14 -14,43 +14,51 @@@
  		bootargs = "root=/dev/ram0 console=ttyAMA1,115200n8 earlyprintk";
  	};
  
 +	/* This is where the interrupt is routed on the S8815 board */
 +	external-bus@34000000 {
 +		ethernet@300 {
 +			interrupt-parent = <&gpio3>;
 +			interrupts = <8 0x1>;
 +		};
 +	};
 +
+ 	pinctrl {
+ 		/* Hog CD pins */
+ 		pinctrl-names = "default";
+ 		pinctrl-0 = <&cd_default_mode>;
+ 
+ 		mmcsd-cd {
+ 			cd_default_mode: cd_default {
+ 				cd_default_cfg1 {
+ 					/* CD input GPIO */
+ 					ste,pins = "GPIO111_H21";
+ 					ste,input = <0>;
+ 				};
+ 				cd_default_cfg2 {
+ 					/* CD GPIO biasing */
+ 					ste,pins = "GPIO112_J21";
+ 					ste,output = <0>;
+ 				};
+ 			};
+ 		};
+ 		user-led {
+ 			user_led_default_mode: user_led_default {
+ 				user_led_default_cfg {
+ 					ste,pins = "GPIO2_C5";
+ 					ste,output = <1>;
+ 				};
+ 			};
+ 		};
+ 		user-button {
+ 			user_button_default_mode: user_button_default {
+ 				user_button_default_cfg {
+ 					ste,pins = "GPIO3_A4";
+ 					ste,input = <0>;
+ 				};
+ 			};
+ 		};
+ 	};
+ 
  	/* Custom board node with GPIO pins to active etc */
  	usb-s8815 {
  		/* The S8815 is using this very GPIO pin for the SMSC91x IRQs */