diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-01-17 17:18:23 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-01-17 17:18:22 -0800 |
| commit | 062967fbbf2642d85e2589a96968f6ddd4811752 (patch) | |
| tree | 455794eb0d6714c283c0908b314f0ba5d4e29c4a /arch/arm | |
| parent | f8dd8913ddb9726a299314d8f217b6401725b2dd (diff) | |
| parent | 6401cc2155297fcd462d8d718f9d9477a1edb4a3 (diff) | |
Merge "ARM: dts: msm: fix vsync gpio pinctrl functionality for sdm660"
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/dts/qcom/sdm660-pinctrl.dtsi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/qcom/sdm660-pinctrl.dtsi b/arch/arm/boot/dts/qcom/sdm660-pinctrl.dtsi index 172668f7ec0b..0c933807cdd8 100644 --- a/arch/arm/boot/dts/qcom/sdm660-pinctrl.dtsi +++ b/arch/arm/boot/dts/qcom/sdm660-pinctrl.dtsi @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, The Linux Foundation. All rights reserved. +/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -1301,7 +1301,7 @@ mdss_te_active: mdss_te_active { mux { pins = "gpio59"; - function = "mdp_vsync_p"; + function = "mdp_vsync"; }; config { pins = "gpio59"; @@ -1313,7 +1313,7 @@ mdss_te_suspend: mdss_te_suspend { mux { pins = "gpio59"; - function = "mdp_vsync_p"; + function = "mdp_vsync"; }; config { pins = "gpio59"; |