From: Mike Turquette <mturquette@linaro.org>
Date: Thu, 16 Jan 2014 21:13:46 +0000 (-0800)
Subject: Merge remote-tracking branch 'linaro/clk-next' into clk-next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0099d8851681a550065e36fe89719616ab5f63d4;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge remote-tracking branch 'linaro/clk-next' into clk-next
---

0099d8851681a550065e36fe89719616ab5f63d4
diff --cc arch/arm/boot/dts/cros5250-common.dtsi
index 9b186ac06c8b,c33a01eda52a..0c30ca2dd152
--- a/arch/arm/boot/dts/cros5250-common.dtsi
+++ b/arch/arm/boot/dts/cros5250-common.dtsi
@@@ -42,12 -35,8 +42,13 @@@
  
  		max77686@09 {
  			compatible = "maxim,max77686";
 +			interrupt-parent = <&gpx3>;
 +			interrupts = <2 0>;
 +			pinctrl-names = "default";
 +			pinctrl-0 = <&max77686_irq>;
 +			wakeup-source;
  			reg = <0x09>;
+ 			#clock-cells = <1>;
  
  			voltage-regulators {
  				ldo1_reg: LDO1 {