diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2021-10-02 15:29:16 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-10-02 16:05:34 +0200 |
commit | 8cc7ac54b6cfbccf61f31c51313e6480811b5f44 (patch) | |
tree | 4a0f1d2c650d837e1fd6a0156827c4a1ac958bf8 /target/linux/bcm27xx/patches-5.4/950-0043-MMC-added-alternative-MMC-driver.patch | |
parent | 1c95d78f087c9cd78caf17181525c8853d78bf1c (diff) | |
download | upstream-8cc7ac54b6cfbccf61f31c51313e6480811b5f44.tar.gz upstream-8cc7ac54b6cfbccf61f31c51313e6480811b5f44.tar.bz2 upstream-8cc7ac54b6cfbccf61f31c51313e6480811b5f44.zip |
kernel: bump 5.4 to 5.4.150
Manually rebased:
generic/backport-5.4/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch
generic/pending-5.4/800-bcma-get-SoC-device-struct-copy-its-DMA-params-to-th.patch
mvebu/patches-5.4/021-arm64-dts-marvell-armada-37xx-Move-PCIe-comphy-handl.patch
Removed upstreamed:
generic/backport-5.4/040-ARM-8918-2-only-build-return_address-if-needed.patch
layerscape/patches-5.4/819-uart-0004-MLK-18137-fsl_lpuart-Fix-loopback-mode.patch
All others updated automatically.
Compile-tested on: lantiq/xrx200, armvirt/64
Runtime-tested on: lantiq/xrx200, armvirt/64
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.4/950-0043-MMC-added-alternative-MMC-driver.patch')
-rw-r--r-- | target/linux/bcm27xx/patches-5.4/950-0043-MMC-added-alternative-MMC-driver.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/bcm27xx/patches-5.4/950-0043-MMC-added-alternative-MMC-driver.patch b/target/linux/bcm27xx/patches-5.4/950-0043-MMC-added-alternative-MMC-driver.patch index 16db439b89..378c605d35 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0043-MMC-added-alternative-MMC-driver.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0043-MMC-added-alternative-MMC-driver.patch @@ -222,7 +222,7 @@ Signed-off-by: Yaroslav Rosomakho <yaroslavros@gmail.com> static inline int mmc_blk_part_switch(struct mmc_card *card, unsigned int part_type); -@@ -2892,6 +2899,7 @@ static int mmc_blk_probe(struct mmc_card +@@ -2891,6 +2898,7 @@ static int mmc_blk_probe(struct mmc_card { struct mmc_blk_data *md, *part_md; char cap_str[10]; @@ -230,7 +230,7 @@ Signed-off-by: Yaroslav Rosomakho <yaroslavros@gmail.com> /* * Check that the card supports the command class(es) we need. -@@ -2899,7 +2907,16 @@ static int mmc_blk_probe(struct mmc_card +@@ -2898,7 +2906,16 @@ static int mmc_blk_probe(struct mmc_card if (!(card->csd.cmdclass & CCC_BLOCK_READ)) return -ENODEV; @@ -248,7 +248,7 @@ Signed-off-by: Yaroslav Rosomakho <yaroslavros@gmail.com> card->complete_wq = alloc_workqueue("mmc_complete", WQ_MEM_RECLAIM | WQ_HIGHPRI, 0); -@@ -2914,9 +2931,14 @@ static int mmc_blk_probe(struct mmc_card +@@ -2913,9 +2930,14 @@ static int mmc_blk_probe(struct mmc_card string_get_size((u64)get_capacity(md->disk), 512, STRING_UNITS_2, cap_str, sizeof(cap_str)); |