* [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
* [GIT PULL 2/2] memory: pl353-smc for v5.14
2021-06-11 14:06 [GIT PULL 1/2] memory: drivers for v5.14 Krzysztof Kozlowski
@ 2021-06-11 14:06 ` Krzysztof Kozlowski
2021-06-11 18:43 ` Miquel Raynal
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,
Miquel Raynal, linux-mtd, Richard Weinberger,
Vignesh Raghavendra
Hi,
Dedicated branch for pl353-smc driver changes.
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-pl353-5.14
for you to fetch changes up to d3d0e1e857110a2f8147b1aa3a045b1fccc1e7c3:
dt-binding: memory: pl353-smc: Convert to yaml (2021-06-10 23:09:05 +0200)
----------------------------------------------------------------
Memory controller drivers for v5.14 - PL353
Bigger work around ARM Primecell PL35x SMC memory controller driver by
Miquel Raynal built on previous series from Naga Sureshkumar Relli.
This includes bindings cleanup and correction, converting these to
dtschema and several cleanyps in pl353-smc driver.
----------------------------------------------------------------
Miquel Raynal (14):
dt-binding: memory: pl353-smc: Rephrase the binding
dt-binding: memory: pl353-smc: Document the range property
dt-binding: memory: pl353-smc: Drop the partitioning section
dt-binding: memory: pl353-smc: Describe the child reg property
dt-binding: memory: pl353-smc: Fix the example syntax and style
dt-binding: memory: pl353-smc: Drop unsupported nodes from the example
dt-binding: memory: pl353-smc: Fix the NAND controller node in the example
memory: pl353-smc: Fix style
memory: pl353-smc: Rename goto labels
memory: pl353-smc: Let lower level controller drivers handle inits
memory: pl353-smc: Avoid useless acronyms in descriptions
memory: pl353-smc: Declare variables following a reverse christmas tree order
MAINTAINERS: Add PL353 SMC entry
dt-binding: memory: pl353-smc: Convert to yaml
.../bindings/memory-controllers/arm,pl353-smc.yaml | 131 +++++++++
.../bindings/memory-controllers/pl353-smc.txt | 47 ---
MAINTAINERS | 8 +
drivers/memory/pl353-smc.c | 314 +--------------------
include/linux/pl353-smc.h | 30 --
5 files changed, 149 insertions(+), 381 deletions(-)
create mode 100644 Documentation/devicetree/bindings/memory-controllers/arm,pl353-smc.yaml
delete mode 100644 Documentation/devicetree/bindings/memory-controllers/pl353-smc.txt
delete mode 100644 include/linux/pl353-smc.h
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [GIT PULL 2/2] memory: pl353-smc for v5.14
2021-06-11 14:06 ` [GIT PULL 2/2] memory: pl353-smc " Krzysztof Kozlowski
@ 2021-06-11 18:43 ` Miquel Raynal
0 siblings, 0 replies; 3+ messages in thread
From: Miquel Raynal @ 2021-06-11 18:43 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: Olof Johansson, Arnd Bergmann, arm, soc, linux-kernel,
Krzysztof Kozlowski, linux-mtd, Richard Weinberger,
Vignesh Raghavendra
Hi Krzysztof,
Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> wrote on Fri,
11 Jun 2021 16:06:59 +0200:
> Hi,
>
> Dedicated branch for pl353-smc driver changes.
Thanks for the branch, I'll include it and add the last NAND patches on
top of it.
Thanks,
Miquèl
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-06-11 18:45 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-11 14:06 [GIT PULL 1/2] memory: drivers for v5.14 Krzysztof Kozlowski
2021-06-11 14:06 ` [GIT PULL 2/2] memory: pl353-smc " Krzysztof Kozlowski
2021-06-11 18:43 ` Miquel Raynal
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).