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

Commit b5e36592 authored by Hangtian Zhu's avatar Hangtian Zhu
Browse files

ARM: dts: msm: Change second radio WLAN_EN gpio 



There is conflict on the gpio 116 with USB part. Change to 109 for sku1
boards, change to 47 for sku4 boards. Revert SD card settings in main dtsi
for sdhc_2 slot.

Change-Id: I7c165f274244150404a371047602ab3d47567283
CRs-Fixed: 2555123
Signed-off-by: default avatarHangtian Zhu <hangtian@codeaurora.org>
parent 6b835cdb

arch/arm64/boot/dts/qcom/qcs405-iot-sku1.dts

+23 −0
Original line number Diff line number Diff line
@@ -85,3 +85,26 @@ 
		};

	};

};



&sdhc_2 {

	/delete-property/ qcom,devfreq,freq-table;

	/delete-property/ cd-gpios;



	qcom,clk-rates = <400000 20000000 25000000

				50000000 100000000>;

	/* VDD is an external regulator eLDO5 */

	vdd-io-supply = <&pms405_l6>;

	qcom,vdd-io-voltage-level = <1800000 1800000>;

	post-power-on-delay-ms = <100>;



	qcom,core_3_0v_support;

	qcom,nonremovable;



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

	pinctrl-0 = <&sdc2_clk_on  &sdc2_cmd_on &sdc2_data_on

		&sdc2_wlan_on1>;

	pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off

		&sdc2_wlan_off1>;



	status = "ok";

};

arch/arm64/boot/dts/qcom/qcs405-iot-sku2.dts

+10 −0
Original line number Diff line number Diff line
@@ -180,3 +180,13 @@ 
		};

	};

};



&sdhc_2 {

	/delete-property/ qcom,nonhotplug;



	pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on

			&sdc2_cd_on>;

	pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off

			&sdc2_cd_off>;

	cd-gpios = <&tlmm 21 GPIO_ACTIVE_LOW>;

};

arch/arm64/boot/dts/qcom/qcs405-iot-sku4.dts

+23 −0
Original line number Diff line number Diff line
@@ -83,3 +83,26 @@ 
		};

	};

};



&sdhc_2 {

	/delete-property/ qcom,devfreq,freq-table;

	/delete-property/ cd-gpios;



	qcom,clk-rates = <400000 20000000 25000000

				50000000 100000000>;

	/* VDD is an external regulator eLDO5 */

	vdd-io-supply = <&pms405_l6>;

	qcom,vdd-io-voltage-level = <1800000 1800000>;

	post-power-on-delay-ms = <100>;



	qcom,core_3_0v_support;

	qcom,nonremovable;



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

	pinctrl-0 = <&sdc2_clk_on  &sdc2_cmd_on &sdc2_data_on

		&sdc2_wlan_on4>;

	pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off

		&sdc2_wlan_off4>;



	status = "ok";

};

arch/arm64/boot/dts/qcom/qcs405-pinctrl.dtsi

+34 −6
Original line number Diff line number Diff line
@@ -1542,28 +1542,56 @@ 
			};

		};



		sdc2_wlan_on: sdc2_wlan_on {

		sdc2_wlan_on1: sdc2_wlan_on1 {

			mux {

				pins = "gpio116";

				pins = "gpio109";

				function = "gpio";

			};



			config {

				pins = "gpio116";

				pins = "gpio109";

				drive-strength = <10>;

				bias-pull-up;

				output-high;

			};

		};



		sdc2_wlan_off: sdc2_wlan_off {

		sdc2_wlan_off1: sdc2_wlan_off1 {

			mux {

				pins = "gpio116";

				pins = "gpio109";

				function = "gpio";

			};



			config {

				pins = "gpio116";

				pins = "gpio109";

				drive-strength = <2>;

				bias-pull-down;

				output-low;

			};

		};



		sdc2_wlan_on4: sdc2_wlan_on4 {

			mux {

				pins = "gpio47";

				function = "gpio";

			};



			config {

				pins = "gpio47";

				drive-strength = <10>;

				bias-pull-up;

				output-high;

			};

		};



		sdc2_wlan_off4: sdc2_wlan_off4 {

			mux {

				pins = "gpio47";

				function = "gpio";

			};



			config {

				pins = "gpio47";

				drive-strength = <2>;

				bias-pull-down;

				output-low;

arch/arm64/boot/dts/qcom/qcs405.dtsi

+7 −14
Original line number Diff line number Diff line
@@ -1298,7 +1298,7 @@ 
			100000000 200000000 4294967295>;



		qcom,clk-rates = <400000 20000000 25000000

					50000000 100000000>;

					50000000 100000000 200000000>;

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

				      "SDR104";
@@ -1308,23 +1308,16 @@ 
			<&clock_gcc GCC_SDCC2_APPS_CLK>;

		clock-names = "iface_clk", "core_clk";



		qcom,nonhotplug;



		/* VDD is an external regulator eLDO5 */

		vdd-io-supply = <&pms405_l6>;

		qcom,vdd-io-voltage-level = <1800000 1800000>;

		vdd-io-supply = <&pms405_l11>;

		qcom,vdd-io-voltage-level = <1800000 2950000>;

		qcom,vdd-io-current-level = <0 24200>;

		post-power-on-delay-ms = <100>;



		qcom,core_3_0v_support;

		qcom,nonremovable;



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

		pinctrl-0 = <&sdc2_clk_on  &sdc2_cmd_on &sdc2_data_on

			&sdc2_wlan_on>;

		pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off

			&sdc2_wlan_off>;



		/delete-property/ qcom,devfreq,freq-table;

		/delete-property/ cd-gpios;

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

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



		status = "ok";

	};