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

Commit 141906f9 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: msm8974: Add TLMM pinctrl node"

parents 4b0fbae0 1b320073

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

+9 −10
Original line number Diff line number Diff line
@@ -370,10 +370,9 @@ 
	qcom,vdd-io-voltage-level = <1800000 1800000>;

	qcom,vdd-io-current-level = <250 154000>;



	qcom,pad-pull-on = <0x0 0x3 0x3>; /* no-pull, pull-up, pull-up */

	qcom,pad-pull-off = <0x0 0x3 0x3>; /* no-pull, pull-up, pull-up */

	qcom,pad-drv-on = <0x4 0x4 0x4>; /* 10mA, 10mA, 10mA */

	qcom,pad-drv-off = <0x0 0x0 0x0>; /* 2mA, 2mA, 2mA */

	pinctrl-names = "active", "sleep";

	pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>;

	pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>;



	qcom,nonremovable;

	status = "ok";
@@ -400,10 +399,10 @@ 
	qcom,vdd-io-voltage-level = <1800000 2950000>;

	qcom,vdd-io-current-level = <6 22000>;



	qcom,pad-pull-on = <0x0 0x3 0x3>; /* no-pull, pull-up, pull-up */

	qcom,pad-pull-off = <0x0 0x3 0x3>; /* no-pull, pull-up, pull-up */

	qcom,pad-drv-on = <0x4 0x4 0x4>; /* 10mA, 10mA, 10mA */

	qcom,pad-drv-off = <0x0 0x0 0x0>; /* 2mA, 2mA, 2mA */

	pinctrl-names = "active", "sleep";

	pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on>;

	pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off>;



	status = "ok";

};
@@ -420,11 +419,11 @@ 
};



&sdhc_1 {

	qcom,pad-drv-on = <0x7 0x4 0x4>; /* 16mA, 10mA, 10mA */

	pinctrl-0 = <&sdc1_clk_on_16 &sdc2_cmd_on &sdc2_data_on>;

};



&sdhc_2 {

	qcom,pad-drv-on = <0x7 0x4 0x4>; /* 16mA, 10mA, 10mA */

	pinctrl-0 = <&sdc2_clk_on_16 &sdc2_cmd_on &sdc2_data_on>;

};



&uart7 {

arch/arm/boot/dts/qcom/msm8974-fluid.dtsi

+9 −10
Original line number Diff line number Diff line
@@ -381,10 +381,9 @@ 
	qcom,vdd-io-voltage-level = <1800000 1800000>;

	qcom,vdd-io-current-level = <250 154000>;



	qcom,pad-pull-on = <0x0 0x3 0x3>; /* no-pull, pull-up, pull-up */

	qcom,pad-pull-off = <0x0 0x3 0x3>; /* no-pull, pull-up, pull-up */

	qcom,pad-drv-on = <0x4 0x4 0x4>; /* 10mA, 10mA, 10mA */

	qcom,pad-drv-off = <0x0 0x0 0x0>; /* 2mA, 2mA, 2mA */

	pinctrl-names = "active", "sleep";

	pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>;

	pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>;



	qcom,nonremovable;

	status = "ok";
@@ -411,10 +410,10 @@ 
	qcom,vdd-io-voltage-level = <1800000 2950000>;

	qcom,vdd-io-current-level = <6 22000>;



	qcom,pad-pull-on = <0x0 0x3 0x3>; /* no-pull, pull-up, pull-up */

	qcom,pad-pull-off = <0x0 0x3 0x3>; /* no-pull, pull-up, pull-up */

	qcom,pad-drv-on = <0x4 0x4 0x4>; /* 10mA, 10mA, 10mA */

	qcom,pad-drv-off = <0x0 0x0 0x0>; /* 2mA, 2mA, 2mA */

	pinctrl-names = "active", "sleep";

	pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on>;

	pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off>;



	status = "ok";

};
@@ -431,11 +430,11 @@ 
};



&sdhc_1 {

	qcom,pad-drv-on = <0x7 0x4 0x4>; /* 16mA, 10mA, 10mA */

	pinctrl-0 = <&sdc1_clk_on_16 &sdc1_cmd_on &sdc1_data_on>;

};



&sdhc_2 {

	qcom,pad-drv-on = <0x7 0x4 0x4>; /* 16mA, 10mA, 10mA */

	pinctrl-0 = <&sdc2_clk_on_16 &sdc2_cmd_on &sdc2_data_on>;

};



&usb3 {

arch/arm/boot/dts/qcom/msm8974-liquid.dtsi

+9 −10
Original line number Diff line number Diff line
@@ -902,10 +902,9 @@ 
	qcom,vdd-io-voltage-level = <1800000 1800000>;

	qcom,vdd-io-current-level = <250 154000>;



	qcom,pad-pull-on = <0x0 0x3 0x3>; /* no-pull, pull-up, pull-up */

	qcom,pad-pull-off = <0x0 0x3 0x3>; /* no-pull, pull-up, pull-up */

	qcom,pad-drv-on = <0x4 0x4 0x4>; /* 10mA, 10mA, 10mA */

	qcom,pad-drv-off = <0x0 0x0 0x0>; /* 2mA, 2mA, 2mA */

	pinctrl-names = "active", "sleep";

	pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>;

	pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>;



	qcom,nonremovable;

	status = "ok";
@@ -921,10 +920,10 @@ 
	qcom,vdd-io-voltage-level = <1800000 2950000>;

	qcom,vdd-io-current-level = <6 22000>;



	qcom,pad-pull-on = <0x0 0x3 0x3>; /* no-pull, pull-up, pull-up */

	qcom,pad-pull-off = <0x0 0x3 0x3>; /* no-pull, pull-up, pull-up */

	qcom,pad-drv-on = <0x4 0x4 0x4>; /* 10mA, 10mA, 10mA */

	qcom,pad-drv-off = <0x0 0x0 0x0>; /* 2mA, 2mA, 2mA */

	pinctrl-names = "active", "sleep";

	pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on>;

	pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off>;



	status = "ok";

};
@@ -941,9 +940,9 @@ 
};



&sdhc_1 {

	qcom,pad-drv-on = <0x7 0x4 0x4>; /* 16mA, 10mA, 10mA */

	pinctrl-0 = <&sdc1_clk_on_16 &sdc1_cmd_on &sdc1_data_on>;

};



&sdhc_2 {

	qcom,pad-drv-on = <0x7 0x4 0x4>; /* 16mA, 10mA, 10mA */

	pinctrl-0 = <&sdc2_clk_on_16 &sdc2_cmd_on &sdc2_data_on>;

};

arch/arm/boot/dts/qcom/msm8974-mtp.dtsi

+9 −10
Original line number Diff line number Diff line
@@ -308,10 +308,9 @@ 
	qcom,vdd-io-voltage-level = <1800000 1800000>;

	qcom,vdd-io-current-level = <250 154000>;



	qcom,pad-pull-on = <0x0 0x3 0x3>; /* no-pull, pull-up, pull-up */

	qcom,pad-pull-off = <0x0 0x3 0x3>; /* no-pull, pull-up, pull-up */

	qcom,pad-drv-on = <0x4 0x4 0x4>; /* 10mA, 10mA, 10mA */

	qcom,pad-drv-off = <0x0 0x0 0x0>; /* 2mA, 2mA, 2mA */

	pinctrl-names = "active", "sleep";

	pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>;

	pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>;



	qcom,nonremovable;

	status = "ok";
@@ -338,10 +337,10 @@ 
	qcom,vdd-io-voltage-level = <1800000 2950000>;

	qcom,vdd-io-current-level = <6 22000>;



	qcom,pad-pull-on = <0x0 0x3 0x3>; /* no-pull, pull-up, pull-up */

	qcom,pad-pull-off = <0x0 0x3 0x3>; /* no-pull, pull-up, pull-up */

	qcom,pad-drv-on = <0x4 0x4 0x4>; /* 10mA, 10mA, 10mA */

	qcom,pad-drv-off = <0x0 0x0 0x0>; /* 2mA, 2mA, 2mA */

	pinctrl-names = "active", "sleep";

	pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on>;

	pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off>;



	status = "ok";

};
@@ -358,11 +357,11 @@ 
};



&sdhc_1 {

	qcom,pad-drv-on = <0x7 0x4 0x4>; /* 16mA, 10mA, 10mA */

	pinctrl-0 = <&sdc1_clk_on_16 &sdc1_cmd_on &sdc1_data_on>;

};



&sdhc_2 {

	qcom,pad-drv-on = <0x7 0x4 0x4>; /* 16mA, 10mA, 10mA */

	pinctrl-0 = <&sdc2_clk_on_16 &sdc2_cmd_on &sdc2_data_on>;

};



&usb_otg {

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

0 → 100644
+153 −0
Original line number Diff line number Diff line 
/* Copyright (c) 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

 * 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>;



			/* Add GPIO controller node */

			msm_gpio: msm_gpio {

				compatible = "qcom,msm-tlmmv3-gp-intc";

				gpio-controller;

				#gpio-cells = <2>;

				interrupt-controller;

				interrupt-cells = <2>;

				num_irqs = <146>;

			};

		};



		sdhc2_cd_pin {

			/* check that this is indeed gpio 38 */

			qcom,pins = <&gp 62>;

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

			label = "cd-gpio";

			sdhc2_cd_on: cd_on {

				drive-strength = <10>;

				bias-pull-up;

			};

			sdhc2_cd_off: cd_off {

				drive-strength = <2>;

				bias-disable;

			};

		};

		/* SDC pin type */

		sdc: sdc {

			qcom,pin-type-sdc;

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

			qcom,num-pins = <7>;

			/* Order of pins */

			/* SDC1: CLK -> 0, CMD -> 1, DATA -> 2 */

			/* SDC2: CLK -> 4, CMD -> 5, DATA -> 6 */

			#qcom,pin-cells = <1>;

		};



		pmx_sdc1_clk {

			qcom,pins = <&sdc 0>;

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

			label = "sdc1-clk";

			sdc1_clk_on: clk_on {

				bias-disable; /* NO pull */

				drive-strength = <10>; /* 10 MA */

			};

			sdc1_clk_on_16: clk_16_on {

				bias-disable; /* NO pull */

				drive-strength = <16>; /* 16 MA */

			};

			sdc1_clk_off: clk_off {

				bias-disable; /* NO pull */

				drive-strength = <2>; /* 2 MA */

			};

		};



		pmx_sdc1_cmd {

			qcom,pins = <&sdc 1>;

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

			label = "sdc1-cmd";

			sdc1_cmd_on: cmd_on {

				bias-pull-up; /* pull up */

				drive-strength = <10>; /* 10 MA */

			};

			sdc1_cmd_off: cmd_off {

				bias-pull-up; /* pull up */

				drive-strength = <2>; /* 2 MA */

			};

		};



		pmx_sdc1_data {

			qcom,pins = <&sdc 2>;

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

			label = "sdc1-data";

			sdc1_data_on: data_on {

				bias-pull-up; /* pull up */

				drive-strength = <10>; /* 10 MA */

			};

			sdc1_data_off: data_off {

				bias-pull-up; /* pull up */

				drive-strength = <2>; /* 2 MA */

			};

		};



		pmx_sdc2_clk {

			qcom,pins = <&sdc 4>;

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

			label = "sdc2-clk";

			sdc2_clk_on: clk_on {

				bias-disable; /* NO pull */

				drive-strength = <10>; /* 10 MA */

			};

			sdc2_clk_on_16: clk_16_on {

				bias-disable; /* NO pull */

				drive-strength = <16>; /* 16 MA */

			};

			sdc2_clk_off: clk_off {

				bias-disable; /* NO pull */

				drive-strength = <2>; /* 2 MA */

			};

		};



		pmx_sdc2_cmd {

			qcom,pins = <&sdc 5>;

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

			label = "sdc2-cmd";

			sdc2_cmd_on: cmd_on {

				bias-pull-up; /* pull up */

				drive-strength = <10>; /* 10 MA */

			};

			sdc2_cmd_off: cmd_off {

				bias-pull-up; /* pull up */

				drive-strength = <2>; /* 2 MA */

			};

		};



		pmx_sdc2_data {

			qcom,pins = <&sdc 6>;

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

			label = "sdc2-data";

			sdc2_data_on: data_on {

				bias-pull-up; /* pull up */

				drive-strength = <10>; /* 10 MA */

			};

			sdc2_data_off: data_off {

				bias-pull-up; /* pull up */

				drive-strength = <2>; /* 2 MA */

			};

		};



	};

};