From: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
To: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
arm@kernel.org, soc@kernel.org
Cc: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>,
linux-kernel@vger.kernel.org,
Krzysztof Kozlowski <krzk@kernel.org>
Subject: [GIT PULL 1/2] memory: drivers for v5.14
Date: Fri, 11 Jun 2021 16:06:58 +0200 [thread overview]
Message-ID: <20210611140659.61980-1-krzysztof.kozlowski@canonical.com> (raw)
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(-)
next reply other threads:[~2021-06-11 14:07 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-11 14:06 Krzysztof Kozlowski [this message]
2021-06-11 14:06 ` [GIT PULL 2/2] memory: pl353-smc for v5.14 Krzysztof Kozlowski
2021-06-11 14:06 ` Krzysztof Kozlowski
2021-06-11 18:43 ` Miquel Raynal
2021-06-11 18:43 ` Miquel Raynal
2021-06-12 16:10 ` [GIT PULL 1/2] memory: drivers " patchwork-bot+linux-soc
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210611140659.61980-1-krzysztof.kozlowski@canonical.com \
--to=krzysztof.kozlowski@canonical.com \
--cc=arm@kernel.org \
--cc=arnd@arndb.de \
--cc=krzk@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=olof@lixom.net \
--cc=soc@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.