Prechádzať zdrojové kódy

Merge beff0c7ec3546583f48fa827eebc4ab99bfdf246 on remote branch

Change-Id: Ia7bcd52c6c1bdf7e803aa7f0a3504dbb43c5db76
Linux Build Service Account 7 mesiacov pred
rodič
commit
d80aa7123d

+ 2 - 2
asoc/codecs/wcd9378/wcd9378.c

@@ -4122,7 +4122,7 @@ static int wcd9378_reset(struct device *dev)
 		return -EPROBE_DEFER;
 	}
 	/* 20us sleep required after pulling the reset gpio to LOW */
-	usleep_range(20, 30);
+	usleep_range(80, 85);
 
 	rc = msm_cdc_pinctrl_select_active_state(wcd9378->rst_np);
 	if (rc) {
@@ -4131,7 +4131,7 @@ static int wcd9378_reset(struct device *dev)
 		return -EPROBE_DEFER;
 	}
 	/* 20us sleep required after pulling the reset gpio to HIGH */
-	usleep_range(20, 30);
+	usleep_range(80, 85);
 
 	return rc;
 }

+ 2 - 2
asoc/gvm_auto_spf_dummy.c

@@ -890,7 +890,7 @@ static int msm_asoc_machine_probe(struct platform_device *pdev)
 	struct msm_asoc_mach_data *pdata;
 	int ret;
 
-	pr_debug("%s: DRIVER Audio Init\n",  __func__);
+	dev_info(&pdev->dev, "M - DRIVER Audio Init\n");
 
 	if (!pdev->dev.of_node) {
 		dev_err(&pdev->dev, "No platform supplied from device tree\n");
@@ -941,7 +941,7 @@ static int msm_asoc_machine_probe(struct platform_device *pdev)
 	dev_info(&pdev->dev, "Sound card %s registered\n", card->name);
 	pr_err("Sound card %s registered\n", card->name);
 
-	pr_debug("%s: DRIVER Audio Ready\n", __func__);
+	dev_info(&pdev->dev, "M - DRIVER Audio Ready\n");
 
 	ret = msm_get_hwparams(pdev);
 	if (ret) {