[GIT PULL 1/2] memory: drivers for v5.14

* [GIT PULL 1/2] memory: drivers for v5.14
@ 2021-06-11 14:06 Krzysztof Kozlowski
  2021-06-11 14:06 ` [GIT PULL 2/2] memory: pl353-smc " Krzysztof Kozlowski
  0 siblings, 1 reply; 3+ messages in thread
From: Krzysztof Kozlowski @ 2021-06-11 14:06 UTC (permalink / raw)
  To: Olof Johansson, Arnd Bergmann, arm, soc
  Cc: Krzysztof Kozlowski, linux-kernel, Krzysztof Kozlowski

Hi,

This branch contains one change for pl353-smc driver, so might create merge
with my second pull request here - tags/memory-controller-drv-pl353-5.14.

I did not experience conflict and git shows the merge as:

diff --cc drivers/memory/pl353-smc.c
index b0b251bb207f,925d856663ac..f84b98278745

--- a/drivers/memory/pl353-smc.c
+++ b/drivers/memory/pl353-smc.c
@@@ -407,14 -116,10 +116,11 @@@ static int pl353_smc_probe(struct amba_
                break;
        }
        if (!match) {
 +              err = -ENODEV;
                dev_err(&adev->dev, "no matching children\n");
-               goto out_clk_disable;
+               goto disable_mem_clk;
        }
  
-       init = match->data;
-       if (init)
-               init(adev, child);
        of_platform_device_create(child, NULL, &adev->dev);
  
        return 0;


Best regards,
Krzysztof


The following changes since commit 6efb943b8616ec53a5e444193dccf1af9ad627b5:

  Linux 5.13-rc1 (2021-05-09 14:17:44 -0700)

are available in the Git repository at:

  https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git tags/memory-controller-drv-5.14

for you to fetch changes up to 729a611e6f53da00ed62a181f2d5d2bcf22d74d1:

  memory: emif: remove unused frequency and voltage notifiers (2021-06-10 09:24:46 +0200)

----------------------------------------------------------------
Memory controller drivers for v5.14

Several small fixes and cleanups for stm32, atmel, pl353, renesas-rpc,
TI emif and fsl_ifc.

----------------------------------------------------------------
Krzysztof Kozlowski (7):
      memory: stm32-fmc2-ebi: add missing of_node_put for loop iteration
      memory: atmel-ebi: add missing of_node_put for loop iteration
      memory: renesas-rpc-if: correct whitespace
      MAINTAINERS: memory: cover also header file
      memory: fsl_ifc: fix leak of IO mapping on probe failure
      memory: fsl_ifc: fix leak of private memory on probe failure
      memory: emif: remove unused frequency and voltage notifiers

Zhen Lei (1):
      memory: pl353: Fix error return code in pl353_smc_probe()

 MAINTAINERS                     |   1 +
 drivers/memory/atmel-ebi.c      |   4 +-
 drivers/memory/emif.c           | 678 ----------------------------------------
 drivers/memory/fsl_ifc.c        |   8 +-
 drivers/memory/pl353-smc.c      |   1 +
 drivers/memory/stm32-fmc2-ebi.c |   4 +
 include/memory/renesas-rpc-if.h |   6 +-
 7 files changed, 16 insertions(+), 686 deletions(-)

^ permalink raw reply	[flat|nested] 3+ messages in thread