forked from ~ljy/RK356X_SDK_RELEASE

blame | history | patch | commit | commitdiff
hc
2024-10-22 8ac6c7a54ed1b98d142dce24b11c6de6a1e239a5 
 kernel/drivers/mmc/host/dw_mmc-k3.c
....@@ -1,11 +1,7 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
12 /*
23  * Copyright (c) 2013 Linaro Ltd.
34  * Copyright (c) 2013 Hisilicon Limited.
4
- *
5
- * This program is free software; you can redistribute it and/or modify
6
- * it under the terms of the GNU General Public License as published by
7
- * the Free Software Foundation; either version 2 of the License, or
8
- * (at your option) any later version.
95  */
106 
117 #include <linux/bitops.h>
....@@ -242,7 +238,7 @@
242238 		if (smpl_phase >= USE_DLY_MIN_SMPL &&
243239 				smpl_phase <= USE_DLY_MAX_SMPL)
244240 			use_smpl_dly = 1;
245
-			/* fallthrough */
241
+		fallthrough;
246242 	case MMC_TIMING_UHS_SDR50:
247243 		if (smpl_phase >= ENABLE_SHIFT_MIN_SMPL &&
248244 				smpl_phase <= ENABLE_SHIFT_MAX_SMPL)
....@@ -428,7 +424,7 @@
428424 
429425 	if (!IS_ERR(mmc->supply.vqmmc)) {
430426 		ret = mmc_regulator_set_vqmmc(mmc, ios);
431
-		if (ret) {
427
+		if (ret < 0) {
432428 			dev_err(host->dev, "Regulator set error %d\n", ret);
433429 			return ret;
434430 		}
....@@ -477,6 +473,7 @@
477473 	.remove		= dw_mci_pltfm_remove,
478474 	.driver		= {
479475 		.name		= "dwmmc_k3",
476
+		.probe_type	= PROBE_PREFER_ASYNCHRONOUS,
480477 		.of_match_table	= dw_mci_k3_match,
481478 		.pm		= &dw_mci_k3_dev_pm_ops,
482479 	},