Skip to content

Commit a5eb346

Browse files
committed
Merge tag 'memory-controller-drv-6.4' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl into soc/drivers
Memory controller drivers for v6.4 1. STM32 FMC2: allow using driver on all STM32MP SoCs. 2. Cleanups: - Atmel EBI: use preferred of_property_present() API. - Tegra210 MC: drop redundant variable initialization. - Drop redundant quotes in Devicetree bindings. - Remove MODULE_LICENSE in non-modules (several drivers). * tag 'memory-controller-drv-6.4' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl: dt-bindings: memory-controller: Drop unneeded quotes memory: stm32-fmc2-ebi: depends on ARCH_STM32 instead of MACH_STM32MP157 memory: tegra: remove redundant variable initialization memory: atmel-ebi: Use of_property_present() for testing DT property presence memory: remove MODULE_LICENSE in non-modules memory: tegra: remove MODULE_LICENSE in non-modules Link: https://lore.kernel.org/r/20230403161427.328128-1-krzysztof.kozlowski@linaro.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 4e7b171 + 69d170c commit a5eb346

12 files changed

Lines changed: 8 additions & 16 deletions

File tree

Documentation/devicetree/bindings/memory-controllers/renesas,dbsc.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
22
%YAML 1.2
33
---
4-
$id: "http://devicetree.org/schemas/memory-controllers/renesas,dbsc.yaml#"
5-
$schema: "http://devicetree.org/meta-schemas/core.yaml#"
4+
$id: http://devicetree.org/schemas/memory-controllers/renesas,dbsc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

77
title: Renesas DDR Bus Controllers
88

Documentation/devicetree/bindings/memory-controllers/renesas,rpc-if.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ description: |
2020
- if it contains "cfi-flash", then HyperFlash is used.
2121
2222
allOf:
23-
- $ref: "/schemas/spi/spi-controller.yaml#"
23+
- $ref: /schemas/spi/spi-controller.yaml#
2424

2525
properties:
2626
compatible:

Documentation/devicetree/bindings/memory-controllers/samsung,exynos5422-dmc.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,15 @@ properties:
4242
maxItems: 8
4343

4444
devfreq-events:
45-
$ref: '/schemas/types.yaml#/definitions/phandle-array'
45+
$ref: /schemas/types.yaml#/definitions/phandle-array
4646
minItems: 1
4747
maxItems: 16
4848
items:
4949
maxItems: 1
5050
description: phandles of the PPMU events used by the controller.
5151

5252
device-handle:
53-
$ref: '/schemas/types.yaml#/definitions/phandle'
53+
$ref: /schemas/types.yaml#/definitions/phandle
5454
description: |
5555
phandle of the connected DRAM memory device. For more information please
5656
refer to jedec,lpddr3.yaml.
@@ -73,7 +73,7 @@ properties:
7373
- description: registers of DREX1
7474

7575
samsung,syscon-clk:
76-
$ref: '/schemas/types.yaml#/definitions/phandle'
76+
$ref: /schemas/types.yaml#/definitions/phandle
7777
description: |
7878
Phandle of the clock register set used by the controller, these registers
7979
are used for enabling a 'pause' feature and are not exposed by clock

drivers/memory/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ config RENESAS_RPCIF
228228

229229
config STM32_FMC2_EBI
230230
tristate "Support for FMC2 External Bus Interface on STM32MP SoCs"
231-
depends on MACH_STM32MP157 || COMPILE_TEST
231+
depends on ARCH_STM32 || COMPILE_TEST
232232
select MFD_SYSCON
233233
help
234234
Select this option to enable the STM32 FMC2 External Bus Interface

drivers/memory/atmel-ebi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -598,7 +598,7 @@ static int atmel_ebi_probe(struct platform_device *pdev)
598598
reg_cells += val;
599599

600600
for_each_available_child_of_node(np, child) {
601-
if (!of_find_property(child, "reg", NULL))
601+
if (!of_property_present(child, "reg"))
602602
continue;
603603

604604
ret = atmel_ebi_dev_setup(ebi, child, reg_cells);

drivers/memory/bt1-l2-ctl.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,4 +321,3 @@ module_platform_driver(l2_ctl_driver);
321321

322322
MODULE_AUTHOR("Serge Semin <Sergey.Semin@baikalelectronics.ru>");
323323
MODULE_DESCRIPTION("Baikal-T1 L2-cache driver");
324-
MODULE_LICENSE("GPL v2");

drivers/memory/da8xx-ddrctl.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,4 +164,3 @@ module_platform_driver(da8xx_ddrctl_driver);
164164

165165
MODULE_AUTHOR("Bartosz Golaszewski <bgolaszewski@baylibre.com>");
166166
MODULE_DESCRIPTION("TI da8xx DDR2/mDDR controller driver");
167-
MODULE_LICENSE("GPL v2");

drivers/memory/fsl_ifc.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,5 @@ static int __init fsl_ifc_init(void)
327327
}
328328
subsys_initcall(fsl_ifc_init);
329329

330-
MODULE_LICENSE("GPL");
331330
MODULE_AUTHOR("Freescale Semiconductor");
332331
MODULE_DESCRIPTION("Freescale Integrated Flash Controller driver");

drivers/memory/mvebu-devbus.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,5 @@ static int __init mvebu_devbus_init(void)
341341
}
342342
module_init(mvebu_devbus_init);
343343

344-
MODULE_LICENSE("GPL v2");
345344
MODULE_AUTHOR("Ezequiel Garcia <ezequiel.garcia@free-electrons.com>");
346345
MODULE_DESCRIPTION("Marvell EBU SoC Device Bus controller");

drivers/memory/tegra/mc.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -985,4 +985,3 @@ arch_initcall(tegra_mc_init);
985985

986986
MODULE_AUTHOR("Thierry Reding <treding@nvidia.com>");
987987
MODULE_DESCRIPTION("NVIDIA Tegra Memory Controller driver");
988-
MODULE_LICENSE("GPL v2");

0 commit comments

Comments
 (0)