diff options
| author | Tony Lindgren <tony@atomide.com> | 2019-08-13 03:40:10 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2019-08-13 03:40:10 -0700 |
| commit | 58e16d792a6a8c6b750f637a4649967fcac853dc (patch) | |
| tree | 778a940499ecfc6fb2d811dbfef735913d30618a /arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi | |
| parent | fa8397e45c64e60c80373bc19ee56e42a6bed9b6 (diff) | |
| parent | a304f483b6b00d42bde41c45ca52c670945348e2 (diff) | |
| download | linux-58e16d792a6a8c6b750f637a4649967fcac853dc.tar.bz2 | |
Merge branch 'ti-sysc-fixes' into fixes
Diffstat (limited to 'arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi b/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi index 0cdfd2853ba8..bc76f1705c0f 100644 --- a/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi +++ b/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi @@ -1,9 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) 2014-2016 Texas Instruments Incorporated - http://www.ti.com/ - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. */ /dts-v1/; @@ -382,7 +379,7 @@ }; }; -&gpio7 { +&gpio7_target { ti,no-reset-on-init; ti,no-idle-on-init; }; |