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

Commit 2bafc859 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: add pinctrl details for MSM8226"

parents 72a9cd39 493d93c2

arch/arm/boot/dts/qcom/msm8226-1080p-cdp.dtsi

+0 −10
Original line number Diff line number Diff line
@@ -186,11 +186,6 @@ 
	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 */



	qcom,clk-rates = <400000 25000000 50000000 100000000 200000000>;

	qcom,bus-speed-mode = "HS200_1p8v", "DDR_1p8v";

	qcom,nonremovable;
@@ -242,11 +237,6 @@ 
	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 */



	qcom,clk-rates = <400000 25000000 50000000 100000000 200000000>;



	#address-cells = <0>;

arch/arm/boot/dts/qcom/msm8226-1080p-mtp.dtsi

+0 −9
Original line number Diff line number Diff line
@@ -191,10 +191,6 @@ 
	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 */



	qcom,clk-rates = <400000 25000000 50000000 100000000 200000000>;

	qcom,bus-speed-mode = "HS200_1p8v", "DDR_1p8v";
@@ -244,11 +240,6 @@ 
	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 */



	qcom,clk-rates = <400000 25000000 50000000 100000000 200000000>;



	#address-cells = <0>;

arch/arm/boot/dts/qcom/msm8226-720p-cdp.dtsi

+0 −8
Original line number Diff line number Diff line
@@ -176,10 +176,6 @@ 
	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 */



	qcom,clk-rates = <400000 25000000 50000000 100000000 200000000>;

	qcom,bus-speed-mode = "HS200_1p8v", "DDR_1p8v";
@@ -232,10 +228,6 @@ 
	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 */



	qcom,clk-rates = <400000 25000000 50000000 100000000 200000000>;

arch/arm/boot/dts/qcom/msm8226-720p-mtp.dtsi

+0 −8
Original line number Diff line number Diff line
@@ -181,10 +181,6 @@ 
	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 */



	qcom,clk-rates = <400000 25000000 50000000 100000000 200000000>;

	qcom,bus-speed-mode = "HS200_1p8v", "DDR_1p8v";
@@ -234,10 +230,6 @@ 
	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 */



	qcom,clk-rates = <400000 25000000 50000000 100000000 200000000>;

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

+104 −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
@@ -20,9 +20,28 @@ 
			qcom,pin-type-gp;

			qcom,num-pins = <117>;

			#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 = <117>;

			};

		};

		sdhc2_cd_pin {

			qcom,pins = <&gp 38>;

			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 */
@@ -36,6 +55,90 @@ 
			/* DATA -> 2 */

			#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_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 3>;

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

			label = "sdc2-clk";

			sdc2_clk_on: clk_on {

				bias-disable; /* NO pull */

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

			};

			sdc2_clk_off: clk_off {

				bias-disable; /* NO pull */

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

			};

		};



		pmx_sdc2_cmd {

			qcom,pins = <&sdc 4>;

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

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

			};

		};

	};

};