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

Commit 9171087b authored by Can Guo's avatar Can Guo
Browse files

ARM: dts: msm: Remove UFS card support on Kona platforms 

UFS card will not be supported on Kona, remove it from device tree.
In addition, remove the storage card detect GPIO based ExtCon used by
UFS card and SD card. Meanwhile, change the card detect GPIO used by
ExtCon back as SD card's detect GPIO.

Change-Id: I5a3f56b0a01c0be503de59e841864fe958db81cd
parent b82acd49

qcom/kona-cdp.dtsi

+3 −43
Original line number Original line Diff line number Diff line
@@ -83,46 +83,6 @@ 
	status = "ok";

	status = "ok";

};

};





&extcon_storage_cd {

	extcon-gpio = <&tlmm 77 GPIO_ACTIVE_LOW>;

	debounce-ms = <200>;

	irq-flags = <IRQ_TYPE_EDGE_BOTH>;



	pinctrl-names = "default";

	pinctrl-0 = <&storage_cd>;



	status = "ok";

};



&ufsphy_card {

	compatible = "qcom,ufs-phy-qmp-v4-card";



	vdda-phy-supply = <&pm8150_l5>; /* 0.88v */

	vdda-phy-always-on;

	vdda-pll-supply = <&pm8150_l9>; /* 1.2v */

	vdda-phy-max-microamp = <87100>;

	vdda-pll-max-microamp = <18300>;



	status = "ok";

};



&ufshc_card {

	vdd-hba-supply = <&ufs_card_gdsc>;

	vdd-hba-fixed-regulator;

	vcc-supply = <&pm8150a_l9>;

	vcc-voltage-level = <2950000 2960000>;

	vccq2-supply = <&pm8150_s4>;

	vcc-max-microamp = <500000>;

	vccq2-max-microamp = <400000>;



	qcom,vddp-ref-clk-supply = <&pm8150_l6>;

	qcom,vddp-ref-clk-max-microamp = <100>;



	extcon = <&extcon_storage_cd>;



	status = "ok";

};



&soc {

&soc {

	gpio_keys {

	gpio_keys {

		compatible = "gpio-keys";

		compatible = "gpio-keys";
@@ -845,10 +805,10 @@ 
	qcom,vdd-io-current-level = <200 22000>;

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





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

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

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

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

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

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





	extcon = <&extcon_storage_cd>;

	cd-gpios = <&tlmm 77 GPIO_ACTIVE_LOW>;





	status = "ok";

	status = "ok";

};

};

qcom/kona-hdk.dtsi

+0 −47
Original line number Original line Diff line number Diff line
@@ -96,50 +96,3 @@ 
		};

		};

	};

	};

};
 
};
 


&extcon_storage_cd {

	extcon-gpio = <&tlmm 77 GPIO_ACTIVE_LOW>;

	debounce-ms = <200>;

	irq-flags = <IRQ_TYPE_EDGE_BOTH>;



	pinctrl-names = "default";

	pinctrl-0 = <&storage_cd>;



	status = "ok";

};



&ufsphy_card {

	compatible = "qcom,ufs-phy-qmp-v4-card";



	vdda-phy-supply = <&pm8150_l5>; /* 0.88v */

	vdda-phy-always-on;

	vdda-pll-supply = <&pm8150_l9>; /* 1.2v */

	vdda-phy-max-microamp = <87100>;

	vdda-pll-max-microamp = <18300>;



	status = "ok";

};



&ufshc_card {

	vdd-hba-supply = <&ufs_card_gdsc>;

	vdd-hba-fixed-regulator;

	vcc-supply = <&pm8150a_l9>;

	vcc-voltage-level = <2950000 2960000>;

	vccq2-supply = <&pm8150_s4>;

	vcc-max-microamp = <500000>;

	vccq2-max-microamp = <400000>;



	qcom,vddp-ref-clk-supply = <&pm8150_l6>;

	qcom,vddp-ref-clk-max-microamp = <100>;



	extcon = <&extcon_storage_cd>;



	status = "ok";

};



&sdhc_2 {

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

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



	extcon = <&extcon_storage_cd>;

};

qcom/kona-mtp.dtsi

+3 −43
Original line number Original line Diff line number Diff line
@@ -83,46 +83,6 @@ 
	status = "ok";

	status = "ok";

};

};





&extcon_storage_cd {

	extcon-gpio = <&tlmm 77 GPIO_ACTIVE_LOW>;

	debounce-ms = <200>;

	irq-flags = <IRQ_TYPE_EDGE_BOTH>;



	pinctrl-names = "default";

	pinctrl-0 = <&storage_cd>;



	status = "ok";

};



&ufsphy_card {

	compatible = "qcom,ufs-phy-qmp-v4-card";



	vdda-phy-supply = <&pm8150_l5>; /* 0.88v */

	vdda-phy-always-on;

	vdda-pll-supply = <&pm8150_l9>; /* 1.2v */

	vdda-phy-max-microamp = <87100>;

	vdda-pll-max-microamp = <18300>;



	status = "ok";

};



&ufshc_card {

	vdd-hba-supply = <&ufs_card_gdsc>;

	vdd-hba-fixed-regulator;

	vcc-supply = <&pm8150a_l9>;

	vcc-voltage-level = <2950000 2960000>;

	vccq2-supply = <&pm8150_s4>;

	vcc-max-microamp = <500000>;

	vccq2-max-microamp = <400000>;



	qcom,vddp-ref-clk-supply = <&pm8150_l6>;

	qcom,vddp-ref-clk-max-microamp = <100>;



	extcon = <&extcon_storage_cd>;



	status = "ok";

};



&soc {

&soc {

	gpio_keys {

	gpio_keys {

		compatible = "gpio-keys";

		compatible = "gpio-keys";
@@ -692,10 +652,10 @@ 
	qcom,vdd-io-current-level = <200 22000>;

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





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

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

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

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

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

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





	extcon = <&extcon_storage_cd>;

	cd-gpios = <&tlmm 77 GPIO_ACTIVE_LOW>;





	status = "ok";

	status = "ok";

};

};

qcom/kona-qrd-overlay.dts

+0 −4
Original line number Original line Diff line number Diff line
@@ -13,7 +13,3 @@ 
	compatible = "qcom,kona-qrd", "qcom,kona", "qcom,qrd";

	compatible = "qcom,kona-qrd", "qcom,kona", "qcom,qrd";

	qcom,board-id = <11 0>;

	qcom,board-id = <11 0>;

};
 
};
 


&sdhc_2 {

	cd-gpios = <&tlmm 77 GPIO_ACTIVE_LOW>;

};

qcom/kona-qrd.dts

+0 −4
Original line number Original line Diff line number Diff line
@@ -8,7 +8,3 @@ 
	compatible = "qcom,kona-qrd", "qcom,kona", "qcom,qrd";

	compatible = "qcom,kona-qrd", "qcom,kona", "qcom,qrd";

	qcom,board-id = <11 0>;

	qcom,board-id = <11 0>;

};
 
};
 


&sdhc_2 {

	cd-gpios = <&tlmm 77 GPIO_ACTIVE_LOW>;

};