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

Commit 35d6aac4 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: configure gpio on cti map and unmap on 8909"

parents aef9e934 bf4d6a45

arch/arm/boot/dts/qcom/msm8909-coresight.dtsi

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

/* Copyright (c) 2014-2015, 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
@@ -237,6 +237,10 @@ 
		clocks = <&clock_rpm clk_qdss_clk>,

			 <&clock_rpm clk_qdss_a_clk>;

		clock-names = "core_clk", "core_a_clk";



		qcom,cti-gpio-trigout = <2>;

		pinctrl-names = "cti-trigout-pctrl";

		pinctrl-0 = <&trigout_a0>;

	};



	cti7: cti@817000 {

arch/arm/boot/dts/qcom/msm8909-pinctrl.dtsi

+11 −0
Original line number Diff line number Diff line
@@ -846,6 +846,17 @@ 
			};

		};



		cti_trigout_a0 {

			qcom,pins = <&gp 23>;

			qcom,num-grp-pins = <1>;

			qcom,pin-func = <2>;

			label = "cti-trigout-a0";

			trigout_a0: trigout_a0 {

				drive-strength = <2>;

				bias-disable;

			};

		};



		/* SDC pin type */

		sdc: sdc {

			/* 0-2 for sdc1 4-6 for sdc2 */