Unverified Commit a5eb3469 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'memory-controller-drv-6.4' of... 

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 4e7b171f 69d170c4

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

+2 −2
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: "http://devicetree.org/schemas/memory-controllers/renesas,dbsc.yaml#"

$schema: "http://devicetree.org/meta-schemas/core.yaml#"

$id: http://devicetree.org/schemas/memory-controllers/renesas,dbsc.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Renesas DDR Bus Controllers

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

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ description: | 
  - if it contains "cfi-flash", then HyperFlash is used.



allOf:

  - $ref: "/schemas/spi/spi-controller.yaml#"

  - $ref: /schemas/spi/spi-controller.yaml#



properties:

  compatible:

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

+3 −3
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ properties: 
    maxItems: 8



  devfreq-events:

    $ref: '/schemas/types.yaml#/definitions/phandle-array'

    $ref: /schemas/types.yaml#/definitions/phandle-array

    minItems: 1

    maxItems: 16

    items:
@@ -50,7 +50,7 @@ properties: 
    description: phandles of the PPMU events used by the controller.



  device-handle:

    $ref: '/schemas/types.yaml#/definitions/phandle'

    $ref: /schemas/types.yaml#/definitions/phandle

    description: |

      phandle of the connected DRAM memory device. For more information please

      refer to jedec,lpddr3.yaml.
@@ -73,7 +73,7 @@ properties: 
      - description: registers of DREX1



  samsung,syscon-clk:

    $ref: '/schemas/types.yaml#/definitions/phandle'

    $ref: /schemas/types.yaml#/definitions/phandle

    description: |

      Phandle of the clock register set used by the controller, these registers

      are used for enabling a 'pause' feature and are not exposed by clock

drivers/memory/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ config RENESAS_RPCIF 


config STM32_FMC2_EBI

	tristate "Support for FMC2 External Bus Interface on STM32MP SoCs"

	depends on MACH_STM32MP157 || COMPILE_TEST

	depends on ARCH_STM32 || COMPILE_TEST

	select MFD_SYSCON

	help

	  Select this option to enable the STM32 FMC2 External Bus Interface

drivers/memory/atmel-ebi.c

+1 −1
Original line number Diff line number Diff line
@@ -598,7 +598,7 @@ static int atmel_ebi_probe(struct platform_device *pdev) 
	reg_cells += val;



	for_each_available_child_of_node(np, child) {

		if (!of_find_property(child, "reg", NULL))

		if (!of_property_present(child, "reg"))

			continue;



		ret = atmel_ebi_dev_setup(ebi, child, reg_cells);