mbox series

[GIT,PULL] MMC updates for v5.19

Message ID 20220523121836.27442-1-ulf.hansson@linaro.org
State New
Headers show
Series [GIT,PULL] MMC updates for v5.19 | expand

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git tags/mmc-v5.19

Message

Ulf Hansson May 23, 2022, 12:18 p.m. UTC
Hi Linus,

Here's the PR with updates for MMC v5.19-rc1. Details about the highlights are
as usual found in the signed tag.

Please pull this in!

Kind regards
Ulf Hansson


The following changes since commit 3e5a8e8494a8122fe4eb3f167662f406cab753b9:

  mmc: sdhci-msm: Reset GCC_SDCC_BCR register for SDHC (2022-05-04 12:31:55 +0200)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git tags/mmc-v5.19

for you to fetch changes up to ded2c4c345001a129293db4bc1fa9ae236ceb0d9:

  mmc: sdhci-of-arasan: Add NULL check for data field (2022-05-16 15:49:31 +0200)

----------------------------------------------------------------
MMC core:
 - Support zero-out using TRIM for eMMC
 - Allow to override the busy-timeout for the ioctl-cmds

MMC host:
 - Continued the conversion of DT bindings into the JSON schema
 - jz4740: Apply DMA engine limits to maximum segment size
 - mmci_stm32: Use a buffer for unaligned DMA requests
 - mmc_spi: Enabled high-speed modes via parsing of DT
 - omap: Make clock management to be compliant with CCF
 - renesas_sdhi: Support eMMC HS400 mode for R-Car V3H ES2.0
 - renesas_sdhi: Don't allow support for eMMC HS400 for R-Car V3M/D3
 - sdhci_am654: Fix problem when SD card slot lacks the card detect line
 - sdhci-esdhc-imx: Add support for the imx8dxl variant
 - sdhci-brcmstb: Enable support for clock gating to save power
 - sdhci-msm: Add support for the sdx65 variant
 - sdhci-msm: Add support for the sm8150 variant
 - sdhci-of-dwcmshc: Add support for the Rockchip rk3588 variant
 - sdhci-pci-gli: Add workaround to allow GL9755 to enter ASPM L1.2

----------------------------------------------------------------
Abel Vesa (1):
      dt-bindings: mmc: imx-esdhc: Add i.MX8DXL compatible string

Adam Ford (1):
      dt-bindings: mmc: imx-esdhc: Update compatible fallbacks

Aidan MacDonald (1):
      mmc: jz4740: Apply DMA engine limits to maximum segment size

Al Cooper (2):
      mmc: sdhci-brcmstb: Re-organize flags
      mmc: sdhci-brcmstb: Enable Clock Gating to save power

Aswath Govindraju (1):
      dt-bindings: mmc: sdhci-am654: Add flag to force setting of TESTCD bit

Bean Huo (2):
      mmc: sdhci-omap: Use of_device_get_match_data() helper
      mmc: core: Allows to override the timeout value for ioctl() path

Ben Chuang (1):
      mmc: sdhci-pci-gli: A workaround to allow GL9755 to enter ASPM L1.2

Bhupesh Sharma (4):
      dt-bindings: mmc: sdhci-msm: Convert bindings to yaml
      mmc: sdhci-msm: Add SoC specific compatibles
      dt-bindings: mmc: sdhci-msm: Add compatible string for sm8150
      mmc: sdhci-msm: Add compatible string check for sm8150

Chris Packham (3):
      dt-bindings: mmc: xenon: Convert to JSON schema
      dt-bindings: mmc: convert orion-sdio to JSON schema
      dt-bindings: mmc: convert sdhci-dove to JSON schema

Christian Löhle (1):
      mmc: mmc_spi: parse speed mode options

Geert Uytterhoeven (1):
      mmc: renesas_sdhi: Add missing checks for the presence of quirks

Heiner Kallweit (1):
      mmc: meson-gx: switch to device-managed dmam_alloc_coherent()

Janusz Krzysztofik (1):
      mmc: omap: Make it CCF clk API compatible

Krzysztof Kozlowski (2):
      dt-bindings: mmc: brcm,sdhci-brcmstb: correct number of reg entries
      dt-bindings: mmc: brcm,sdhci-brcmstb: cleanup example

Lad Prabhakar (1):
      MAINTAINERS: Add linux-renesas-soc@vger.kernel.org list for Renesas TMIO/SDHI driver

Linus Walleij (4):
      mmc: mmci: Break IRQ status loop when all zero
      dt-bindings: mmc: Add small binding note on level shifters
      mmc: core: Add CIDs for cards to the entropy pool
      mmc: mmci: Remove custom ios handler

Minghao Chi (1):
      mmc: core: use kobj_to_dev()

Rohit Agarwal (2):
      dt-bindings: mmc: sdhci-msm: Document the SDX65 compatible
      mmc: sdhci-msm: Add compatible string check for sdx65

Sai Krishna Potthuri (1):
      mmc: sdhci-of-arasan: Add NULL check for data field

Sebastian Reichel (1):
      dt-bindings: mmc: sdhci-of-dwcmhsc: Add rk3588

Sergey Shtylyov (1):
      mmc: core: block: fix sloppy typing in mmc_blk_ioctl_multi_cmd()

Tinghan Shen (1):
      dt-bindings: mmc: mtk-sd: increase reg items

Ulf Hansson (4):
      Merge branch 'fixes' into next
      Merge branch 'fixes' into next
      Merge branch 'fixes' into next
      mmc: sdhci-brcmstb: Fix compiler warning

Vignesh Raghavendra (1):
      drivers: mmc: sdhci_am654: Add the quirk to set TESTCD bit

Vincent Whitchurch (1):
      mmc: core: Support zeroout using TRIM for eMMC

Wan Jiabing (1):
      mmc: atmel-mci: Simplify if(chan) and if(!chan)

Wolfram Sang (13):
      mmc: renesas_sdhi: remove outdated headers
      mmc: renesas_sdhi: R-Car D3 also has no HS400
      mmc: renesas_sdhi: make setup selection more understandable
      mmc: renesas_sdhi: remove a stale comment
      mmc: renesas_sdhi: make 'fixed_addr_mode' a quirk
      mmc: renesas_sdhi: make 'dmac_only_one_rx' a quirk
      mmc: renesas_sdhi: style fix for proper function bodies
      mmc: renesas_sdhi: R-Car V3M also has no HS400
      mmc: renesas_sdhi: R-Car V3H ES2.0 gained HS400 support
      mmc: renesas_sdhi: remove superfluous specific M3W entry
      mmc: core: improve API to make clear that mmc_sw_reset is for cards
      mmc: improve API to make clear hw_reset callback is for cards
      mmc: sh_mmcif: move platform_data header to proper location

Yann Gautier (1):
      mmc: mmci: stm32: use a buffer for unaligned DMA requests

 .../bindings/mmc/brcm,sdhci-brcmstb.yaml           |  20 +-
 .../devicetree/bindings/mmc/fsl-imx-esdhc.yaml     |  31 ++-
 .../bindings/mmc/marvell,dove-sdhci.yaml           |  44 ++++
 .../bindings/mmc/marvell,orion-sdio.yaml           |  44 ++++
 .../bindings/mmc/marvell,xenon-sdhci.txt           | 173 -------------
 .../bindings/mmc/marvell,xenon-sdhci.yaml          | 275 +++++++++++++++++++++
 .../devicetree/bindings/mmc/mmc-controller.yaml    |   5 +-
 Documentation/devicetree/bindings/mmc/mtk-sd.yaml  |  15 +-
 .../devicetree/bindings/mmc/orion-sdio.txt         |  16 --
 .../devicetree/bindings/mmc/sdhci-am654.yaml       |   7 +
 .../devicetree/bindings/mmc/sdhci-dove.txt         |  14 --
 .../devicetree/bindings/mmc/sdhci-msm.txt          | 123 ---------
 .../devicetree/bindings/mmc/sdhci-msm.yaml         | 194 +++++++++++++++
 .../bindings/mmc/snps,dwcmshc-sdhci.yaml           |   1 +
 MAINTAINERS                                        |   3 +-
 arch/sh/boards/board-sh7757lcr.c                   |   2 +-
 arch/sh/boards/mach-ecovec24/setup.c               |   2 +-
 arch/sh/boot/romimage/mmcif-sh7724.c               |   2 +-
 drivers/mmc/core/block.c                           |  52 ++--
 drivers/mmc/core/core.c                            |   7 +-
 drivers/mmc/core/mmc.c                             |  11 +-
 drivers/mmc/core/queue.c                           |   2 +
 drivers/mmc/core/sd.c                              |   7 +
 drivers/mmc/host/atmel-mci.c                       |   9 +-
 drivers/mmc/host/bcm2835.c                         |   2 +-
 drivers/mmc/host/dw_mmc.c                          |   2 +-
 drivers/mmc/host/jz4740_mmc.c                      |  20 ++
 drivers/mmc/host/meson-gx-mmc.c                    |  21 +-
 drivers/mmc/host/meson-mx-sdhc-mmc.c               |   2 +-
 drivers/mmc/host/mmci.c                            |   6 +-
 drivers/mmc/host/mmci_stm32_sdmmc.c                |  88 +++++--
 drivers/mmc/host/mtk-sd.c                          |   2 +-
 drivers/mmc/host/of_mmc_spi.c                      |   4 +
 drivers/mmc/host/omap.c                            |  23 +-
 drivers/mmc/host/renesas_sdhi.h                    |   2 +
 drivers/mmc/host/renesas_sdhi_core.c               |   2 -
 drivers/mmc/host/renesas_sdhi_internal_dmac.c      |  76 +++---
 drivers/mmc/host/sdhci-brcmstb.c                   |  67 +++--
 drivers/mmc/host/sdhci-msm.c                       |  25 ++
 drivers/mmc/host/sdhci-of-arasan.c                 |   3 +
 drivers/mmc/host/sdhci-omap.c                      |   9 +-
 drivers/mmc/host/sdhci-pci-gli.c                   |  10 +
 drivers/mmc/host/sdhci.c                           |   2 +-
 drivers/mmc/host/sdhci_am654.c                     |  23 +-
 drivers/mmc/host/sh_mmcif.c                        |   2 +-
 drivers/mmc/host/sunxi-mmc.c                       |   2 +-
 drivers/mmc/host/uniphier-sd.c                     |   2 +-
 include/linux/amba/mmci.h                          |   6 -
 include/linux/mmc/core.h                           |   2 +-
 include/linux/mmc/host.h                           |   2 +-
 include/linux/{mmc => platform_data}/sh_mmcif.h    |   2 -
 51 files changed, 963 insertions(+), 503 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/mmc/marvell,dove-sdhci.yaml
 create mode 100644 Documentation/devicetree/bindings/mmc/marvell,orion-sdio.yaml
 delete mode 100644 Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.txt
 create mode 100644 Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml
 delete mode 100644 Documentation/devicetree/bindings/mmc/orion-sdio.txt
 delete mode 100644 Documentation/devicetree/bindings/mmc/sdhci-dove.txt
 delete mode 100644 Documentation/devicetree/bindings/mmc/sdhci-msm.txt
 create mode 100644 Documentation/devicetree/bindings/mmc/sdhci-msm.yaml
 rename include/linux/{mmc => platform_data}/sh_mmcif.h (99%)

Comments

Linus Torvalds May 24, 2022, 10 p.m. UTC | #1
On Mon, May 23, 2022 at 5:18 AM Ulf Hansson <ulf.hansson@linaro.org> wrote:
>
>   git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git tags/mmc-v5.19

Please stop doing the horrible undocumented merges.

You have three merge commits that have *no* documentation. They say
"Merge branch 'fixes' into next", and that's it.

If you can't be bothered to explain why and what a merge does, then
just don't do it.

It really is that simple.

I've pulled this, but I really want to stop seeing bad merges.

                    Linus
pr-tracker-bot@kernel.org May 24, 2022, 10:27 p.m. UTC | #2
The pull request you sent on Mon, 23 May 2022 14:18:36 +0200:

> git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git tags/mmc-v5.19

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/638971b77f1c4fb9997c674ad66d1b96f7931c2b

Thank you!
Ulf Hansson May 25, 2022, 7:18 a.m. UTC | #3
On Wed, 25 May 2022 at 00:00, Linus Torvalds
<torvalds@linux-foundation.org> wrote:
>
> On Mon, May 23, 2022 at 5:18 AM Ulf Hansson <ulf.hansson@linaro.org> wrote:
> >
> >   git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git tags/mmc-v5.19
>
> Please stop doing the horrible undocumented merges.
>
> You have three merge commits that have *no* documentation. They say
> "Merge branch 'fixes' into next", and that's it.

My bad, I have simply forgotten about them lately. Earlier I was more
often doing a re-base of my next branch against some later rc, which
makes the merges to disappear from the history.

>
> If you can't be bothered to explain why and what a merge does, then
> just don't do it.
>
> It really is that simple.
>
> I've pulled this, but I really want to stop seeing bad merges.

Thanks, I will make sure this doesn't happen again, sorry for the inconvenience.

>
>                     Linus

Kind regards
Uffe