FROMLIST: arm64: dts: qcom: shikra: Add gpio-hog for VBUS boost 5V enable

Add a gpio-hog for GPIO 79 (BOOST_5V) on the Shikra CQM/CQS/IQS EVK
boards. This line enables the level translator that is otherwise
left disabled by default, which is required in the industrial
configuration.

Also fix the Shikra USB3-DP combo PHY (qcom,shikra-qmp-usb3-dp-phy)
which had no matching driver entry, causing the DWC3 USB controller
to fail probing with a deferred-probe cascade (typec, USB, and
several sync_state() consumers). Add the missing of_device_id entry
and a Shikra-specific PHY config that also deasserts the third GCC
reset line present on Shikra's PHY node but absent from the shared
QCS615 config, which was leaving part of the PHY held in reset and
causing PHY init to time out (-ETIMEDOUT).

CRs-Fixed: 4652998
CRs-Fixed: 4635219
Signed-off-by: Akash Kumar <akash.kumar@oss.qualcomm.com>
Signed-off-by: Akash Kumar <akakum@qti.qualcomm.com>

Author: akakum-qualcomm

Documentation/devicetree/bindings/phy/qcom,qcs615-qmp-usb3dp-phy.yaml

@@ -18,6 +18,7 @@ properties:
   compatible:
     enum:
       - qcom,qcs615-qmp-usb3-dp-phy
+      - qcom,shikra-qmp-usb3-dp-phy
 
   reg:
     maxItems: 1

arch/arm64/boot/dts/qcom/shikra-cqm-evk.dts

@@ -684,6 +684,13 @@
 		line-name = "emac0-phy-en";
 	};
 
+	vbus_boost_5v: vbus-boost-5v {
+		gpio-hog;
+		gpios = <79 GPIO_ACTIVE_HIGH>;
+		output-high;
+		line-name = "vbus-boost-5v";
+	};
+
 	i2s2_default: i2s2-default-active-state {
 		pins = "gpio100", "gpio101", "gpio102", "gpio103";
 		function = "i2s2";

arch/arm64/boot/dts/qcom/shikra-cqs-evk.dts

@@ -607,6 +607,13 @@
 		line-name = "emac0-phy-en";
 	};
 
+	vbus_boost_5v: vbus-boost-5v {
+		gpio-hog;
+		gpios = <79 GPIO_ACTIVE_HIGH>;
+		output-high;
+		line-name = "vbus-boost-5v";
+	};
+
 	i2s2_default: i2s2-default-active-state {
 		pins = "gpio100", "gpio101", "gpio102", "gpio103";
 		function = "i2s2";

arch/arm64/boot/dts/qcom/shikra-iqs-evk.dts

@@ -784,6 +784,13 @@
 		line-name = "emac1-phy-en";
 	};
 
+	vbus_boost_5v: vbus-boost-5v {
+		gpio-hog;
+		gpios = <79 GPIO_ACTIVE_HIGH>;
+		output-high;
+		line-name = "vbus-boost-5v";
+	};
+
 	ext_mclk2_active: ext-mclk2-state {
 		pins = "gpio110";
 		function = "ext_mclk";

drivers/phy/qualcomm/phy-qcom-qmp-usbc.c

@@ -516,6 +516,10 @@ static const char * const usb3dpphy_reset_l[] = {
 	"phy_phy", "dp_phy",
 };
 
+static const char * const usb3dpphy_reset_shikra_l[] = {
+	"phy_phy", "dp_phy", "phy",
+};
+
 static const struct regulator_bulk_data qmp_phy_msm8998_vreg_l[] = {
 	{ .supply = "vdda-phy", .init_load_uA = 68600 },
 	{ .supply = "vdda-pll", .init_load_uA = 14200 },
@@ -686,6 +690,46 @@ static const struct qmp_phy_cfg qcs615_usb3dp_phy_cfg = {
 	.num_vregs		= ARRAY_SIZE(qmp_phy_qcs615_vreg_l),
 };
 
+static const struct qmp_phy_cfg shikra_usb3dp_phy_cfg = {
+	.offsets		= &qmp_usbc_usb3dp_offsets_qcs615,
+
+	.serdes_tbl		= qcm2290_usb3_serdes_tbl,
+	.serdes_tbl_num		= ARRAY_SIZE(qcm2290_usb3_serdes_tbl),
+	.tx_tbl			= qcm2290_usb3_tx_tbl,
+	.tx_tbl_num		= ARRAY_SIZE(qcm2290_usb3_tx_tbl),
+	.rx_tbl			= qcm2290_usb3_rx_tbl,
+	.rx_tbl_num		= ARRAY_SIZE(qcm2290_usb3_rx_tbl),
+	.pcs_tbl		= qcm2290_usb3_pcs_tbl,
+	.pcs_tbl_num		= ARRAY_SIZE(qcm2290_usb3_pcs_tbl),
+
+	.regs			= qmp_v3_usb3phy_regs_layout_qcm2290,
+
+	.dp_serdes_tbl		= qmp_v2_dp_serdes_tbl,
+	.dp_serdes_tbl_num	= ARRAY_SIZE(qmp_v2_dp_serdes_tbl),
+	.dp_tx_tbl		= qmp_v2_dp_tx_tbl,
+	.dp_tx_tbl_num		= ARRAY_SIZE(qmp_v2_dp_tx_tbl),
+
+	.serdes_tbl_rbr		= qmp_v2_dp_serdes_tbl_rbr,
+	.serdes_tbl_rbr_num	= ARRAY_SIZE(qmp_v2_dp_serdes_tbl_rbr),
+	.serdes_tbl_hbr		= qmp_v2_dp_serdes_tbl_hbr,
+	.serdes_tbl_hbr_num	= ARRAY_SIZE(qmp_v2_dp_serdes_tbl_hbr),
+	.serdes_tbl_hbr2	= qmp_v2_dp_serdes_tbl_hbr2,
+	.serdes_tbl_hbr2_num	= ARRAY_SIZE(qmp_v2_dp_serdes_tbl_hbr2),
+
+	.swing_tbl		= &qmp_v2_dp_voltage_swing_hbr2_rbr,
+	.pre_emphasis_tbl	= &qmp_v2_dp_pre_emphasis_hbr2_rbr,
+
+	.dp_aux_init		= qmp_v2_dp_aux_init,
+	.configure_dp_tx	= qmp_v2_configure_dp_tx,
+	.configure_dp_phy	= qmp_v2_configure_dp_phy,
+	.calibrate_dp_phy	= qmp_v2_calibrate_dp_phy,
+
+	.reset_list		= usb3dpphy_reset_shikra_l,
+	.num_resets		= ARRAY_SIZE(usb3dpphy_reset_shikra_l),
+	.vreg_list		= qmp_phy_qcs615_vreg_l,
+	.num_vregs		= ARRAY_SIZE(qmp_phy_qcs615_vreg_l),
+};
+
 static void qmp_usbc_set_phy_mode(struct qmp_usbc *qmp, bool is_dp)
 {
 	if (qmp->tcsr_map && qmp->dp_phy_mode_reg)
@@ -2020,6 +2064,9 @@ static const struct of_device_id qmp_usbc_of_match_table[] = {
 	}, {
 		.compatible = "qcom,sdm660-qmp-usb3-phy",
 		.data = &sdm660_usb3phy_cfg,
+	}, {
+		.compatible = "qcom,shikra-qmp-usb3-dp-phy",
+		.data = &shikra_usb3dp_phy_cfg,
 	}, {
 		.compatible = "qcom,shikra-qmp-usb3-phy",
 		.data = &qcs615_usb3phy_cfg,