Merge "ARM: dts: msm: disable secondary adv7533 on msm8996 lite board"

This commit is contained in:
Linux Build Service Account 2017-09-26 21:49:54 -07:00 committed by Gerrit - the friendly Code Review server
commit 6696828627

View file

@ -1,4 +1,4 @@
/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
/* Copyright (c) 2015-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
@ -42,9 +42,6 @@
i2c@75b6000 { /* BLSP8 */
/* ADV7533 HDMI Bridge Chip removed on ADP Lite */
adv7533@3d {
status = "disabled";
};
adv7533@39 {
status = "disabled";
};
@ -59,6 +56,14 @@
};
};
&dsi_adv_7533_2 {
/delete-property/ qcom,dsi-display-active;
};
&sde_kms {
connectors = <&sde_hdmi_tx &sde_hdmi &dsi_adv_7533_1>;
};
&pil_modem {
pinctrl-names = "default";
pinctrl-0 = <&modem_mux>;