Merge "ARM: dts: msm: Add pinctrl device for TLMM in samarium" (1b8ffc29) · Commits · e / devices / android_kernel_sony_msm8994

arch/arm/boot/dts/msmsamarium-pinctrl.dtsi

0 → 100644

+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 = <146>;
		#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
		@@ -30,6 +30,7 @@
		/include/ "msmsamarium-smp2p.dtsi"
		/include/ "msmsamarium-pm.dtsi"
		/include/ "msmsamarium-coresight.dtsi"
		/include/ "msmsamarium-pinctrl.dtsi"

		&soc {
		#address-cells = <1>;

+2 −0

Original line number	Diff line number	Diff line
		@@ -562,6 +562,8 @@ config ARCH_MSMSAMARIUM
		select MSM_RUN_QUEUE_STATS
		select ARCH_WANT_KMAP_ATOMIC_FLUSH
		select QMI_ENCDEC
		select PINCTRL
		select PINCTRL_MSM_TLMM_V3
		endmenu

		choice