diff options
| author | Tony Lindgren <tony@atomide.com> | 2018-07-20 22:22:08 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2018-07-20 22:22:08 -0700 |
| commit | ab8b1fdd012f41b27f85a6bb271389fd7ff349ea (patch) | |
| tree | 8e125dd969a60ec6aa53ceebd9b0212bd791f02f /arch/arm/boot/dts/omap4-panda-es.dts | |
| parent | 91f6278bfa3966529c61808bd3cb8f05d7ed5dc6 (diff) | |
| parent | 770368961767aa8116ca44a9bd3f90c11ca4c30b (diff) | |
| download | blackbird-obmc-linux-ab8b1fdd012f41b27f85a6bb271389fd7ff349ea.tar.gz blackbird-obmc-linux-ab8b1fdd012f41b27f85a6bb271389fd7ff349ea.zip | |
Merge branch 'omap-for-v4.19/dt-sysc-v2' into omap-for-v4.19/dt
Diffstat (limited to 'arch/arm/boot/dts/omap4-panda-es.dts')
| -rw-r--r-- | arch/arm/boot/dts/omap4-panda-es.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/omap4-panda-es.dts b/arch/arm/boot/dts/omap4-panda-es.dts index 984f642639fa..19d02df8d8a5 100644 --- a/arch/arm/boot/dts/omap4-panda-es.dts +++ b/arch/arm/boot/dts/omap4-panda-es.dts @@ -80,6 +80,6 @@ }; }; -&gpio1 { +&gpio1_target { ti,no-reset-on-init; }; |
