Merge branch 'omap-for-v4.19/dt-sysc-v2' into omap-for-v4.19/dt
authorTony Lindgren <tony@atomide.com>
Sat, 21 Jul 2018 05:22:08 +0000 (22:22 -0700)
committerTony Lindgren <tony@atomide.com>
Sat, 21 Jul 2018 05:22:08 +0000 (22:22 -0700)
1  2 
arch/arm/boot/dts/omap4-panda-es.dts

index 984f642639fab9bb3899be862274268d5ab9d9ae,ee9bca8d3e9610c1ff341757b087cb5437972669..19d02df8d8a5921156fb3c1a6948e0e34e8a85d4
        };
  };
  
- &gpio1 {
 +&gpio_keys {
 +      buttonS2 {
 +              gpios = <&gpio4 17 GPIO_ACTIVE_LOW>; /* gpio_113 */
 +      };
 +};
 +
+ &gpio1_target {
         ti,no-reset-on-init;
  };