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

Commit 31c8d790 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: msm8610: Add pinctrl device for TLMM"

parents fd3fd9c7 9525a874
Loading
Loading
Loading
Loading
+37 −0
Original line number Diff line number Diff line
/* Copyright (c) 2013, 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
 * only version 2 as published by the Free Software Foundation.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 */

&soc {
	tlmm_pinmux: pinctrl@fd510000 {
		compatible = "qcom,msm-tlmm-v3";
		reg = <0xfd510000 0x4000>;

		/*General purpose pins*/
		gp: gp {
			qcom,pin-type-gp;
			qcom,num-pins = <102>;
			#qcom,pin-cells = <1>;
		};
		/* SDC pin type */
		sdc: sdc {
			qcom,pin-type-sdc;
			/* 0-2 for sdc1 3-5 for sdc2 */
			qcom,num-pins = <6>;
			/* Order of pins */
			/* CLK -> 0 */
			/* CMD -> 1 */
			/* DATA -> 2 */
			#qcom,pin-cells = <1>;
		};
	};
};
+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@
/include/ "msm8610-coresight.dtsi"
/include/ "msm8610-smp2p.dtsi"
/include/ "msm8610-bus.dtsi"
/include/ "msm8610-pinctrl.dtsi"
/include/ "msm8610-mdss.dtsi"

&soc {
+2 −0
Original line number Diff line number Diff line
@@ -496,6 +496,8 @@ config ARCH_MSM8610
	select MSM_CPR_REGULATOR
	select MSM_RPM_LOG
	select MSM_RPM_STATS_LOG
	select PINCTRL
	select PINCTRL_MSM_TLMM_V3

config ARCH_MSM8226
	bool "MSM8226"