From: Tony Lindgren <tony@atomide.com>
Date: Sat, 21 Jul 2018 05:22:08 +0000 (-0700)
Subject: Merge branch 'omap-for-v4.19/dt-sysc-v2' into omap-for-v4.19/dt
X-Git-Tag: v4.19-rc1~44^2~11^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ab8b1fdd012f41b27f85a6bb271389fd7ff349ea;p=linux.git

Merge branch 'omap-for-v4.19/dt-sysc-v2' into omap-for-v4.19/dt
---

ab8b1fdd012f41b27f85a6bb271389fd7ff349ea
diff --cc arch/arm/boot/dts/omap4-panda-es.dts
index 984f642639fa,ee9bca8d3e96..19d02df8d8a5
--- a/arch/arm/boot/dts/omap4-panda-es.dts
+++ b/arch/arm/boot/dts/omap4-panda-es.dts
@@@ -74,12 -68,6 +74,12 @@@
  	};
  };
  
 +&gpio_keys {
 +	buttonS2 {
 +		gpios = <&gpio4 17 GPIO_ACTIVE_LOW>; /* gpio_113 */
 +	};
 +};
 +
- &gpio1 {
+ &gpio1_target {
  	 ti,no-reset-on-init;
  };