Merge "esoc: Avoid setting up soft reset gpio if using SPMI" (8ccaf8c2) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/esoc/esoc-mdm-4x.c

+14 −13

Original line number	Diff line number	Diff line
		@@ -1081,7 +1081,7 @@ static int sdx55m_setup_hw(struct mdm_ctrl *mdm,
		dev_err(mdm->dev, "Failed to parse DT gpios\n");
		goto err_destroy_wrkq;
		}

		if (!of_property_read_bool(node, "qcom,esoc-spmi-soft-reset")) {
		ret = mdm_pon_dt_init(mdm);
		if (ret) {
		esoc_mdm_log("Failed to parse PON DT gpios\n");
		@@ -1089,19 +1089,20 @@ static int sdx55m_setup_hw(struct mdm_ctrl *mdm,
		goto err_destroy_wrkq;
		}

		ret = mdm_pinctrl_init(mdm);
		if (ret) {
		esoc_mdm_log("Failed to init pinctrl\n");
		dev_err(mdm->dev, "Failed to init pinctrl\n");
		goto err_destroy_wrkq;
		}

		ret = mdm_pon_setup(mdm);
		if (ret) {
		esoc_mdm_log("Failed to setup PON\n");
		dev_err(mdm->dev, "Failed to setup PON\n");
		goto err_destroy_wrkq;
		}
		}

		ret = mdm_pinctrl_init(mdm);
		if (ret) {
		esoc_mdm_log("Failed to init pinctrl\n");
		dev_err(mdm->dev, "Failed to init pinctrl\n");
		goto err_release_ipc;
		}

		ret = mdm_configure_ipc(mdm, pdev);
		if (ret) {