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

Commit 1335b737 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 apq8084"

parents e6cb9cb4 eb8881e9

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

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

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



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

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

	qcom,pad-drv-on = <0x7 0x4 0x4>; /* 16mA, 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 &sdc1_rclk_on>;

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



	qcom,clk-rates = <400000 20000000 25000000 50000000 100000000 192000000 384000000>;

	qcom,nonremovable;
@@ -224,10 +223,9 @@ 
	qcom,vdd-io-voltage-level = <1800000 2950000>;

	qcom,vdd-io-current-level = <200 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 = <0x7 0x4 0x4>; /* 16mA, 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 &sdhc2_cd_on &sdhc2_wp_on>;

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



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

	qcom,bus-speed-mode = "SDR12", "SDR25", "SDR50", "DDR50", "SDR104";

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

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

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



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

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

	qcom,pad-drv-on = <0x7 0x4 0x4>; /* 16mA, 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 &sdc1_rclk_on>;

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



	qcom,clk-rates = <400000 20000000 25000000 50000000 100000000 192000000 384000000>;

	qcom,nonremovable;
@@ -290,10 +289,9 @@ 
	qcom,vdd-io-voltage-level = <1800000 2950000>;

	qcom,vdd-io-current-level = <200 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 = <0x7 0x4 0x4>; /* 16mA, 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 &sdhc2_cd_on>;

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



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

	qcom,bus-speed-mode = "SDR12", "SDR25", "SDR50", "DDR50", "SDR104";

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

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

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



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

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

	qcom,pad-drv-on = <0x7 0x4 0x4>; /* 16mA, 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 &sdc1_rclk_on >;

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



	qcom,clk-rates = <400000 20000000 25000000 50000000 100000000 192000000 384000000>;

	qcom,nonremovable;
@@ -231,10 +230,9 @@ 
	qcom,vdd-io-voltage-level = <1800000 2950000>;

	qcom,vdd-io-current-level = <200 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 = <0x7 0x4 0x4>; /* 16mA, 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 &sdhc2_cd_on>;

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



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

	qcom,bus-speed-mode = "SDR12", "SDR25", "SDR50", "DDR50", "SDR104";

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

+135 −5
Original line number Diff line number Diff line
@@ -21,20 +21,150 @@ 
			qcom,num-pins = <146>;

			#qcom,pin-cells = <1>;

			msm_gpio: msm_gpio {

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

				gpio-controller;

				#gpio-cells = <2>;

				interrupt-controller;

				interrupt-cells = <2>;

				num_irqs = <146>;

				apps_id = <3>;

			};

		};



		sdhc2_cd_pin {

			qcom,pins = <&gp 122>;

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

			qcom,pin-func = <1>;

			label = "cd-gpio";

			sdhc2_cd_on: cd_on {

				drive-strength = <16>;

				bias-pull-up;

			};

			sdhc2_cd_off: cd_off {

				drive-strength = <2>;

				bias-disable;

			};

		};



		sdhc2_wp_pin {

			qcom,pins = <&gp 75>;

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

			qcom,pin-func = <2>;

			label = "wp-gpio";

			sdhc2_wp_on: wp_on {

				drive-strength = <16>;

				bias-pull-up;

			};

			sdhc2_wp_off: wp_off {

				drive-strength = <2>;

				bias-disable;

			};

		};



		/* SDC pin type */

		sdc: sdc {

			qcom,pin-type-sdc;

			/* 0-2 for sdc1 3-5 for sdc2 */

			qcom,num-pins = <6>;

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

			qcom,num-pins = <7>;

			/* Order of pins */

			/* CLK -> 0 */

			/* CMD -> 1 */

			/* DATA -> 2 */

			/* CLK -> 0, CMD -> 1, DATA -> 2, RCLK -> 3*/

			#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 = <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 = <0x3>; /* 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_sdc1_rclk {

			qcom,pins = <&sdc 3>;

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

			label = "sdc1-rclk";

			sdc1_rclk_on: rclk_on {

				bias-pull-down; /* pull down */

			};

			sdc1_rclk_off: rclk_off {

				bias-pull-down; /* pull down */

			};

		};



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

			};

		};

	};

};

arch/arm/boot/dts/qcom/apq8084-sbc.dtsi

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

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



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

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

	qcom,pad-drv-on = <0x7 0x4 0x4>; /* 16mA, 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 &sdc1_rclk_on>;

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



	qcom,clk-rates = <400000 20000000 25000000 50000000 100000000 192000000 384000000>;

	qcom,nonremovable;
@@ -246,10 +245,9 @@ 
	qcom,vdd-io-voltage-level = <1800000 2950000>;

	qcom,vdd-io-current-level = <200 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 = <0x7 0x4 0x4>; /* 16mA, 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 &sdhc2_cd_on>;

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



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

	qcom,bus-speed-mode = "SDR12", "SDR25", "SDR50", "DDR50", "SDR104";