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

8 files changed, 8 insertions, 296 deletions

diff --git a/qcom/kona-cdp.dtsi b/qcom/kona-cdp.dtsi
index 52036a91..7e64f185 100644
--- a/qcom/kona-cdp.dtsi
+++ b/qcom/kona-cdp.dtsi
@@ -83,46 +83,6 @@
 	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 {
 	gpio_keys {
 		compatible = "gpio-keys";
@@ -845,10 +805,10 @@
 	qcom,vdd-io-current-level = <200 22000>;
 
 	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>;
+	pinctrl-0 = <&sdc2_clk_on  &sdc2_cmd_on &sdc2_data_on &storage_cd>;
+	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";
 };
diff --git a/qcom/kona-hdk.dtsi b/qcom/kona-hdk.dtsi
index 54082b3b..179b4636 100644
--- a/qcom/kona-hdk.dtsi
+++ b/qcom/kona-hdk.dtsi
@@ -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>;
-};
diff --git a/qcom/kona-mtp.dtsi b/qcom/kona-mtp.dtsi
index 11d6c5ab..eb062ec4 100644
--- a/qcom/kona-mtp.dtsi
+++ b/qcom/kona-mtp.dtsi
@@ -83,46 +83,6 @@
 	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 {
 	gpio_keys {
 		compatible = "gpio-keys";
@@ -692,10 +652,10 @@
 	qcom,vdd-io-current-level = <200 22000>;
 
 	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>;
+	pinctrl-0 = <&sdc2_clk_on  &sdc2_cmd_on &sdc2_data_on &storage_cd>;
+	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";
 };
diff --git a/qcom/kona-qrd-overlay.dts b/qcom/kona-qrd-overlay.dts
index 9cbaa850..68b9dca9 100644
--- a/qcom/kona-qrd-overlay.dts
+++ b/qcom/kona-qrd-overlay.dts
@@ -13,7 +13,3 @@
 	compatible = "qcom,kona-qrd", "qcom,kona", "qcom,qrd";
 	qcom,board-id = <11 0>;
 };
-
-&sdhc_2 {
-	cd-gpios = <&tlmm 77 GPIO_ACTIVE_LOW>;
-};
diff --git a/qcom/kona-qrd.dts b/qcom/kona-qrd.dts
index ea8841e7..cc9a4a61 100644
--- a/qcom/kona-qrd.dts
+++ b/qcom/kona-qrd.dts
@@ -8,7 +8,3 @@
 	compatible = "qcom,kona-qrd", "qcom,kona", "qcom,qrd";
 	qcom,board-id = <11 0>;
 };
-
-&sdhc_2 {
-	cd-gpios = <&tlmm 77 GPIO_ACTIVE_LOW>;
-};
diff --git a/qcom/kona-qrd.dtsi b/qcom/kona-qrd.dtsi
index c3b57ac3..13532814 100644
--- a/qcom/kona-qrd.dtsi
+++ b/qcom/kona-qrd.dtsi
@@ -747,6 +747,8 @@
 	pinctrl-0 = <&sdc2_clk_on  &sdc2_cmd_on &sdc2_data_on &storage_cd>;
 	pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &storage_cd>;
 
+	cd-gpios = <&tlmm 77 GPIO_ACTIVE_LOW>;
+
 	status = "ok";
 };
 
diff --git a/qcom/kona-rumi.dtsi b/qcom/kona-rumi.dtsi
index 8958e213..87b03007 100644
--- a/qcom/kona-rumi.dtsi
+++ b/qcom/kona-rumi.dtsi
@@ -42,32 +42,6 @@
 	status = "ok";
 };
 
-&ufsphy_card {
-	compatible = "qcom,ufs-phy-qrbtc-sdm845";
-
-	vdda-phy-supply = <&pm8150_l5>; /* 0.88v */
-	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>;
-
-	status = "ok";
-};
-
 &soc {
 	#address-cells = <1>;
 	#size-cells = <1>;
diff --git a/qcom/kona.dtsi b/qcom/kona.dtsi
index 1a857686..b270fbed 100644
--- a/qcom/kona.dtsi
+++ b/qcom/kona.dtsi
@@ -47,7 +47,6 @@
 
 	aliases {
 		ufshc1 = &ufshc_mem; /* Embedded UFS slot */
-		ufshc2 = &ufshc_card; /* Removable UFS slot */
 		sdhc2 = &sdhc_2; /* SDC2 SD card slot */
 		pci-domain0 = &pcie0; /* PCIe0 domain */
 		pci-domain1 = &pcie1; /* PCIe1 domain */
@@ -2550,13 +2549,6 @@
 		qcom,retain-regs;
 	};
 
-	ufs_card_gdsc: qcom,gdsc@175004 {
-		compatible = "qcom,gdsc";
-		reg = <0x175004 0x4>;
-		regulator-name = "ufs_card_gdsc";
-		qcom,retain-regs;
-	};
-
 	ufs_phy_gdsc: qcom,gdsc@177004 {
 		compatible = "qcom,gdsc";
 		reg = <0x177004 0x4>;
@@ -3209,127 +3201,6 @@
 		status = "disabled";
 	};
 
-	ufscard_ice: ufscardice@1db0000 {
-		compatible = "qcom,ice";
-		reg = <0x1db0000 0x8000>;
-		qcom,enable-ice-clk;
-		clock-names = "ufs_core_clk", "bus_clk",
-				"iface_clk", "ice_core_clk";
-		clocks = <&clock_gcc GCC_UFS_CARD_AXI_HW_CTL_CLK>,
-			<&clock_gcc GCC_UFS_1X_CLKREF_EN>,
-			<&clock_gcc GCC_UFS_CARD_AHB_CLK>,
-			<&clock_gcc GCC_UFS_CARD_ICE_CORE_CLK>;
-		qcom,op-freq-hz = <0>, <0>, <0>, <300000000>;
-		vdd-hba-supply = <&ufs_card_gdsc>;
-		qcom,msm-bus,name = "ufs_card_ice_noc";
-		qcom,msm-bus,num-cases = <2>;
-		qcom,msm-bus,num-paths = <1>;
-		qcom,msm-bus,vectors-KBps =
-				<1 650 0 0>,    /* No vote */
-				<1 650 1000 0>; /* Max. bandwidth */
-		qcom,bus-vector-names = "MIN",
-					"MAX";
-		qcom,instance-type = "ufscard";
-	};
-
-	ufsphy_card: ufsphy_card@1da7000 {
-		reg = <0x1da7000 0xe00>; /* PHY regs */
-		reg-names = "phy_mem";
-		#phy-cells = <0>;
-		ufs-qcom-crypto = <&ufscard_ice>;
-
-		lanes-per-direction = <1>;
-
-		clock-names = "ref_clk_src",
-			"ref_clk",
-			"ref_aux_clk";
-		clocks = <&clock_rpmh RPMH_CXO_CLK>,
-			<&clock_gcc GCC_UFS_1X_CLKREF_EN>,
-			<&clock_gcc GCC_UFS_CARD_PHY_AUX_HW_CTL_CLK>;
-
-		status = "disabled";
-	};
-
-	ufshc_card: ufshc_card@1da4000 {
-		compatible = "qcom,ufshc";
-		reg = <0x1da4000 0x3000>;
-		interrupts = <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>;
-		phys = <&ufsphy_card>;
-		phy-names = "ufsphy";
-		ufs-qcom-crypto = <&ufscard_ice>;
-
-		lanes-per-direction = <1>;
-		dev-ref-clk-freq = <0>; /* 19.2 MHz */
-
-		clock-names =
-			"core_clk",
-			"bus_aggr_clk",
-			"iface_clk",
-			"core_clk_unipro",
-			"core_clk_ice",
-			"ref_clk",
-			"tx_lane0_sync_clk",
-			"rx_lane0_sync_clk";
-		clocks =
-			<&clock_gcc GCC_UFS_CARD_AXI_HW_CTL_CLK>,
-			<&clock_gcc GCC_AGGRE_UFS_CARD_AXI_HW_CTL_CLK>,
-			<&clock_gcc GCC_UFS_CARD_AHB_CLK>,
-			<&clock_gcc GCC_UFS_CARD_UNIPRO_CORE_HW_CTL_CLK>,
-			<&clock_gcc GCC_UFS_CARD_ICE_CORE_CLK>,
-			<&clock_rpmh RPMH_CXO_CLK>,
-			<&clock_gcc GCC_UFS_CARD_TX_SYMBOL_0_CLK>,
-			<&clock_gcc GCC_UFS_CARD_RX_SYMBOL_0_CLK>;
-		freq-table-hz =
-			<50000000 200000000>,
-			<0 0>,
-			<0 0>,
-			<37500000 150000000>,
-			<37500000 300000000>,
-			<0 0>,
-			<0 0>,
-			<0 0>;
-
-		qcom,msm-bus,name = "ufshc_card";
-		qcom,msm-bus,num-cases = <9>;
-		qcom,msm-bus,num-paths = <2>;
-		qcom,msm-bus,vectors-KBps =
-		<122 512 0 0>, <1 756 0 0>,          /* No vote */
-		<122 512 922 0>, <1 756 1000 0>,     /* PWM G1 */
-		<122 512 127796 0>, <1 756 1000 0>,  /* HS G1 RA */
-		<122 512 255591 0>, <1 756 1000 0>,  /* HS G2 RA */
-		<122 512 2097152 0>, <1 756 102400 0>,  /* HS G3 RA */
-		<122 512 149422 0>, <1 756 1000 0>,  /* HS G1 RB */
-		<122 512 298189 0>, <1 756 1000 0>,  /* HS G2 RB */
-		<122 512 2097152 0>, <1 756 102400 0>,  /* HS G3 RB */
-		<122 512 7643136 0>, <1 756 307200 0>; /* Max. bandwidth */
-		qcom,bus-vector-names = "MIN",
-		"PWM_G1_L1",
-		"HS_RA_G1_L1", "HS_RA_G2_L1", "HS_RA_G3_L1",
-		"HS_RB_G1_L1", "HS_RB_G2_L1", "HS_RB_G3_L1",
-		"MAX";
-
-		/* PM QoS */
-		qcom,pm-qos-cpu-groups = <0x0f 0xf0>;
-		qcom,pm-qos-cpu-group-latency-us = <70 70>;
-		qcom,pm-qos-default-cpu = <0>;
-
-		/*
-		 * Note: this instance doesn't have control over UFS device
-		 * reset
-		 */
-
-		resets = <&clock_gcc GCC_UFS_CARD_BCR>;
-		reset-names = "core_reset";
-
-		status = "disabled";
-	};
-
-	extcon_storage_cd: extcon_storage_cd {
-		compatible = "extcon-storage-cd-gpio";
-		extcon-id = <62>; /* EXTCON_MECHANICAL */
-		status = "disabled";
-	};
-
 	ipcc_mproc: qcom,ipcc@408000 {
 		compatible = "qcom,ipcc";
 		reg = <0x408000 0x1000>;