kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/drivers/mmc/host/sdhci-xenon.c
..
..
@@ -1,3 +1,4 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /*
2
3
  * Driver for Marvell Xenon SDHC as a platform device
3
4
  *
..
..
@@ -5,10 +6,6 @@
5
6
  *
6
7
  * Author:	Hu Ziji <huziji@marvell.com>
7
8
  * Date:	2016-8-24
8
- *
9
- * This program is free software; you can redistribute it and/or
10
- * modify it under the terms of the GNU General Public License as
11
- * published by the Free Software Foundation version 2.
12
9
  *
13
10
  * Inspired by Jisheng Zhang <jszhang@marvell.com>
14
11
  * Special thanks to Video BG4 project team.
..
..
@@ -243,16 +240,6 @@
243
240
 {
244
241
 	/* Wait for 5ms after set 1.8V signal enable bit */
245
242
 	usleep_range(5000, 5500);
246
-
247
-	/*
248
-	 * For some reason the controller's Host Control2 register reports
249
-	 * the bit representing 1.8V signaling as 0 when read after it was
250
-	 * written as 1. Subsequent read reports 1.
251
-	 *
252
-	 * Since this may cause some issues, do an empty read of the Host
253
-	 * Control2 register here to circumvent this.
254
-	 */
255
-	sdhci_readw(host, SDHCI_HOST_CONTROL2);
256
243
 }
257
244
 
258
245
 static const struct sdhci_ops sdhci_xenon_ops = {
..
..
@@ -656,7 +643,7 @@
656
643
 		priv->restore_needed = false;
657
644
 	}
658
645
 
659
-	ret = sdhci_runtime_resume_host(host);
646
+	ret = sdhci_runtime_resume_host(host, 0);
660
647
 	if (ret)
661
648
 		goto out;
662
649
 	return 0;
..
..
@@ -685,6 +672,7 @@
685
672
 static struct platform_driver sdhci_xenon_driver = {
686
673
 	.driver	= {
687
674
 		.name	= "xenon-sdhci",
675
+		.probe_type = PROBE_PREFER_ASYNCHRONOUS,
688
676
 		.of_match_table = sdhci_xenon_dt_ids,
689
677
 		.pm = &sdhci_xenon_dev_pm_ops,
690
678
 	},