Skip to content

Commit 8b06f75

Browse files
torvaldstorvalds
committed
Merge tag 'mmc-v6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc
Pull MMC updates from Ulf Hansson: "MMC core: - Increase the timeout period of the ACMD41 command - Add card entry for quirks to debugfs - Add mmc_gpiod_set_cd_config() function - Store owner from SDIO modules with sdio_register_driver() MMC host: - atmel-mci: Some cleanups and a switch to use dev_err_probe() - renesas_sdhi: - Add support for RZ/G2L, RZ/G3S and RZ/V2M variants - Set the SDBUF after reset - sdhci: Add support for "Tuning Error" interrupts - sdhci-acpi: - Add quirk to enable pull-up on the card-detect GPIO on Asus T100TA - Disable write protect detection on Toshiba WT10-A - Fix Lenovo Yoga Tablet 2 Pro 1380 sdcard slot not working - sdhci_am654: - Re-work and fix the tuning support for multiple speed-modes - Add tuning algorithm for delay chain - sdhci-esdhc-imx: Add NXP S32G3 support - sdhci-of-dwcmshc: - Add tuning support for Sophgo CV1800B and SG200X - Implement SDHCI CQE support - sdhci-pci-gli: Use the proper pci_set_power_state() instead of PMCSR writes" MEMSTICK: - Convert a couple of drivers to use the ->remove_new() callback" * tag 'mmc-v6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc: (59 commits) mmc: renesas_sdhi: Add compatible string for RZ/G2L family, RZ/G3S, and RZ/V2M SoCs dt-bindings: mmc: renesas,sdhi: Document RZ/G2L family compatibility dt-bindings: mmc: renesas,sdhi: Group single const value items into an enum list mmc: renesas_sdhi: Set the SDBUF after reset mmc: core: Increase the timeout period of the ACMD41 command mmc: core: Convert to use __mmc_poll_for_busy() SD_APP_OP_COND too mmc: atmel-mci: Switch to use dev_err_probe() mmc: atmel-mci: Incapsulate used to be a platform data into host structure mmc: atmel-mci: Replace platform device pointer by generic one mmc: atmel-mci: Use temporary variable for struct device mmc: atmel-mci: Get rid of platform data leftovers mmc: sdhci-of-dwcmshc: Add tuning support for Sophgo CV1800B and SG200X mmc: sdhci-of-dwcmshc: Remove useless "&" of th1520_execute_tuning mmc: sdhci-s3c: Choose sdhci_ops based on variant mmc: sdhci_am654: Constify struct sdhci_ops mmc: sdhci-sprd: Constify struct sdhci_ops mmc: sdhci-omap: Constify struct sdhci_ops mmc: sdhci-esdhc-mcf: Constify struct sdhci_ops mmc: slot-gpio: Use irq_handler_t type mmc: sdhci-acpi: Add quirk to enable pull-up on the card-detect GPIO on Asus T100TA ...
2 parents 8b35a3b + 35eea0d commit 8b06f75

39 files changed

+826
-396
lines changed

‎Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,9 @@ properties:
9191
- enum:
9292
- fsl,imxrt1170-usdhc
9393
- const: fsl,imxrt1050-usdhc
94+
- items:
95+
- const: nxp,s32g3-usdhc
96+
- const: nxp,s32g2-usdhc
9497

9598
reg:
9699
maxItems: 1

‎Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,13 @@ maintainers:
1212
properties:
1313
compatible:
1414
oneOf:
15-
- items:
16-
- const: renesas,sdhi-sh73a0 # R-Mobile APE6
17-
- items:
18-
- const: renesas,sdhi-r7s72100 # RZ/A1H
19-
- items:
20-
- const: renesas,sdhi-r7s9210 # SH-Mobile AG5
21-
- items:
22-
- const: renesas,sdhi-r8a73a4 # R-Mobile APE6
23-
- items:
24-
- const: renesas,sdhi-r8a7740 # R-Mobile A1
15+
- enum:
16+
- renesas,sdhi-mmc-r8a77470 # RZ/G1C
17+
- renesas,sdhi-r7s72100 # RZ/A1H
18+
- renesas,sdhi-r7s9210 # SH-Mobile AG5
19+
- renesas,sdhi-r8a73a4 # R-Mobile APE6
20+
- renesas,sdhi-r8a7740 # R-Mobile A1
21+
- renesas,sdhi-sh73a0 # R-Mobile APE6
2522
- items:
2623
- enum:
2724
- renesas,sdhi-r8a7778 # R-Car M1
@@ -40,8 +37,6 @@ properties:
4037
- renesas,sdhi-r8a7793 # R-Car M2-N
4138
- renesas,sdhi-r8a7794 # R-Car E2
4239
- const: renesas,rcar-gen2-sdhi # R-Car Gen2 and RZ/G1
43-
- items:
44-
- const: renesas,sdhi-mmc-r8a77470 # RZ/G1C (SDHI/MMC IP)
4540
- items:
4641
- enum:
4742
- renesas,sdhi-r8a774a1 # RZ/G2M
@@ -56,11 +51,6 @@ properties:
5651
- renesas,sdhi-r8a77980 # R-Car V3H
5752
- renesas,sdhi-r8a77990 # R-Car E3
5853
- renesas,sdhi-r8a77995 # R-Car D3
59-
- renesas,sdhi-r9a07g043 # RZ/G2UL and RZ/Five
60-
- renesas,sdhi-r9a07g044 # RZ/G2{L,LC}
61-
- renesas,sdhi-r9a07g054 # RZ/V2L
62-
- renesas,sdhi-r9a08g045 # RZ/G3S
63-
- renesas,sdhi-r9a09g011 # RZ/V2M
6454
- const: renesas,rcar-gen3-sdhi # R-Car Gen3 or RZ/G2
6555
- items:
6656
- enum:
@@ -69,6 +59,14 @@ properties:
6959
- renesas,sdhi-r8a779g0 # R-Car V4H
7060
- renesas,sdhi-r8a779h0 # R-Car V4M
7161
- const: renesas,rcar-gen4-sdhi # R-Car Gen4
62+
- items:
63+
- enum:
64+
- renesas,sdhi-r9a07g043 # RZ/G2UL and RZ/Five
65+
- renesas,sdhi-r9a07g044 # RZ/G2{L,LC}
66+
- renesas,sdhi-r9a07g054 # RZ/V2L
67+
- renesas,sdhi-r9a08g045 # RZ/G3S
68+
- renesas,sdhi-r9a09g011 # RZ/V2M
69+
- const: renesas,rzg2l-sdhi
7270

7371
reg:
7472
maxItems: 1
@@ -120,12 +118,7 @@ allOf:
120118
properties:
121119
compatible:
122120
contains:
123-
enum:
124-
- renesas,sdhi-r9a07g043
125-
- renesas,sdhi-r9a07g044
126-
- renesas,sdhi-r9a07g054
127-
- renesas,sdhi-r9a08g045
128-
- renesas,sdhi-r9a09g011
121+
const: renesas,rzg2l-sdhi
129122
then:
130123
properties:
131124
clocks:

‎MAINTAINERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8616,7 +8616,7 @@ F: Documentation/devicetree/bindings/crypto/fsl,sec-v4.0*
86168616
F: drivers/crypto/caam/
86178617

86188618
FREESCALE COLDFIRE M5441X MMC DRIVER
8619-
M: Angelo Dureghello <angelo.dureghello@timesys.com>
8619+
M: Angelo Dureghello <adureghello@baylibre.com>
86208620
L: [email protected]
86218621
S: Maintained
86228622
F: drivers/mmc/host/sdhci-esdhc-mcf.c

‎drivers/bluetooth/btmrvl_sdio.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1736,7 +1736,6 @@ static struct sdio_driver bt_mrvl_sdio = {
17361736
.probe = btmrvl_sdio_probe,
17371737
.remove = btmrvl_sdio_remove,
17381738
.drv = {
1739-
.owner = THIS_MODULE,
17401739
.coredump = btmrvl_sdio_coredump,
17411740
.pm = &btmrvl_sdio_pm_ops,
17421741
}

‎drivers/bluetooth/btmtksdio.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1519,7 +1519,6 @@ static struct sdio_driver btmtksdio_driver = {
15191519
.remove = btmtksdio_remove,
15201520
.id_table = btmtksdio_table,
15211521
.drv = {
1522-
.owner = THIS_MODULE,
15231522
.pm = BTMTKSDIO_PM_OPS,
15241523
}
15251524
};

‎drivers/memstick/host/rtsx_pci_ms.c

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -574,16 +574,13 @@ static int rtsx_pci_ms_drv_probe(struct platform_device *pdev)
574574
return 0;
575575
}
576576

577-
static int rtsx_pci_ms_drv_remove(struct platform_device *pdev)
577+
static void rtsx_pci_ms_drv_remove(struct platform_device *pdev)
578578
{
579579
struct realtek_pci_ms *host = platform_get_drvdata(pdev);
580580
struct rtsx_pcr *pcr;
581581
struct memstick_host *msh;
582582
int rc;
583583

584-
if (!host)
585-
return 0;
586-
587584
pcr = host->pcr;
588585
pcr->slots[RTSX_MS_CARD].p_dev = NULL;
589586
pcr->slots[RTSX_MS_CARD].card_event = NULL;
@@ -613,8 +610,6 @@ static int rtsx_pci_ms_drv_remove(struct platform_device *pdev)
613610

614611
dev_dbg(&(pdev->dev),
615612
": Realtek PCI-E Memstick controller has been removed\n");
616-
617-
return 0;
618613
}
619614

620615
static struct platform_device_id rtsx_pci_ms_ids[] = {
@@ -628,7 +623,7 @@ MODULE_DEVICE_TABLE(platform, rtsx_pci_ms_ids);
628623

629624
static struct platform_driver rtsx_pci_ms_driver = {
630625
.probe = rtsx_pci_ms_drv_probe,
631-
.remove = rtsx_pci_ms_drv_remove,
626+
.remove_new = rtsx_pci_ms_drv_remove,
632627
.id_table = rtsx_pci_ms_ids,
633628
.suspend = rtsx_pci_ms_suspend,
634629
.resume = rtsx_pci_ms_resume,

‎drivers/memstick/host/rtsx_usb_ms.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -805,7 +805,7 @@ static int rtsx_usb_ms_drv_probe(struct platform_device *pdev)
805805
return err;
806806
}
807807

808-
static int rtsx_usb_ms_drv_remove(struct platform_device *pdev)
808+
static void rtsx_usb_ms_drv_remove(struct platform_device *pdev)
809809
{
810810
struct rtsx_usb_ms *host = platform_get_drvdata(pdev);
811811
struct memstick_host *msh = host->msh;
@@ -840,8 +840,6 @@ static int rtsx_usb_ms_drv_remove(struct platform_device *pdev)
840840
": Realtek USB Memstick controller has been removed\n");
841841
memstick_free_host(msh);
842842
platform_set_drvdata(pdev, NULL);
843-
844-
return 0;
845843
}
846844

847845
static struct platform_device_id rtsx_usb_ms_ids[] = {
@@ -855,7 +853,7 @@ MODULE_DEVICE_TABLE(platform, rtsx_usb_ms_ids);
855853

856854
static struct platform_driver rtsx_usb_ms_driver = {
857855
.probe = rtsx_usb_ms_drv_probe,
858-
.remove = rtsx_usb_ms_drv_remove,
856+
.remove_new = rtsx_usb_ms_drv_remove,
859857
.id_table = rtsx_usb_ms_ids,
860858
.driver = {
861859
.name = "rtsx_usb_ms",

‎drivers/mmc/core/block.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ static ssize_t power_ro_lock_show(struct device *dev,
234234
else if (card->ext_csd.boot_ro_lock & EXT_CSD_BOOT_WP_B_PWR_WP_EN)
235235
locked = 1;
236236

237-
ret = snprintf(buf, PAGE_SIZE, "%d\n", locked);
237+
ret = sysfs_emit(buf, "%d\n", locked);
238238

239239
mmc_blk_put(md);
240240

@@ -296,9 +296,9 @@ static ssize_t force_ro_show(struct device *dev, struct device_attribute *attr,
296296
int ret;
297297
struct mmc_blk_data *md = mmc_blk_get(dev_to_disk(dev));
298298

299-
ret = snprintf(buf, PAGE_SIZE, "%d\n",
300-
get_disk_ro(dev_to_disk(dev)) ^
301-
md->read_only);
299+
ret = sysfs_emit(buf, "%d\n",
300+
get_disk_ro(dev_to_disk(dev)) ^
301+
md->read_only);
302302
mmc_blk_put(md);
303303
return ret;
304304
}

‎drivers/mmc/core/debugfs.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -351,11 +351,11 @@ void mmc_add_host_debugfs(struct mmc_host *host)
351351
root = debugfs_create_dir(mmc_hostname(host), NULL);
352352
host->debugfs_root = root;
353353

354-
debugfs_create_file("ios", S_IRUSR, root, host, &mmc_ios_fops);
354+
debugfs_create_file("ios", 0400, root, host, &mmc_ios_fops);
355355
debugfs_create_file("caps", 0600, root, &host->caps, &mmc_caps_fops);
356356
debugfs_create_file("caps2", 0600, root, &host->caps2,
357357
&mmc_caps2_fops);
358-
debugfs_create_file_unsafe("clock", S_IRUSR | S_IWUSR, root, host,
358+
debugfs_create_file_unsafe("clock", 0600, root, host,
359359
&mmc_clock_fops);
360360

361361
debugfs_create_file_unsafe("err_state", 0600, root, host,
@@ -388,7 +388,8 @@ void mmc_add_card_debugfs(struct mmc_card *card)
388388
root = debugfs_create_dir(mmc_card_id(card), host->debugfs_root);
389389
card->debugfs_root = root;
390390

391-
debugfs_create_x32("state", S_IRUSR, root, &card->state);
391+
debugfs_create_x32("state", 0400, root, &card->state);
392+
debugfs_create_x32("quirks", 0400, root, &card->quirks);
392393
}
393394

394395
void mmc_remove_card_debugfs(struct mmc_card *card)

‎drivers/mmc/core/host.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#include <linux/err.h>
1414
#include <linux/idr.h>
1515
#include <linux/of.h>
16-
#include <linux/of_gpio.h>
1716
#include <linux/pagemap.h>
1817
#include <linux/pm_wakeup.h>
1918
#include <linux/export.h>

0 commit comments

Comments
 (0)