Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9fcdc194 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: display: 8092: Enable ddc mux"

parents 6cee2a80 c00ead02

arch/arm/boot/dts/qcom/mpq8092-cdp.dtsi

+7 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2013, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2014, 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
@@ -139,6 +139,12 @@ 
	};



	gpio@c500 { /* GPIO 6 */

		qcom,mode = <1>;		/* Digital output */

		qcom,pull = <1>;		/* QPNP_PIN_GPIO_PULL_UP_1P5 */

		qcom,vin-sel = <2>;		/* VIN2 */

		qcom,src_sel = <0>;		/* GPIO */

		qcom,out-strength = <1>;	/* Low */

		qcom,master-en = <1>;		/* Enable GPIO */

	};



	gpio@c600 { /* GPIO 7 */

arch/arm/boot/dts/qcom/mpq8092-mdss.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ 
		qcom,enable-load = <0 0 300000 0>;

		qcom,disable-load = <0 0 0 0>;



		qcom,hdmi-tx-ddc-mux-sel = <&pma8084_gpios 6 0>;

		qcom,hdmi-tx-cec = <&msmgpio 26 0>;

		qcom,hdmi-tx-ddc-clk = <&msmgpio 24 0>;

		qcom,hdmi-tx-ddc-data = <&msmgpio 27 0>;