Unverified Commit 57cf6633 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

Merge tag 'memory-controller-drv-6.5' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl into soc/drivers

Memory controller drivers for v6.5

1. Renesas RPC IF: correct the Strobe Timing Adjustment.
2. Broadcom DPFE: fix smatch warning for testing array offset after use.
3. Atmel SDRAMC: drop driver because it was just a wrapper over enabling
   clock which is not handled by its clock controller.
4. Minor bindings cleanup.

* tag 'memory-controller-drv-6.5' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl:
  dt-bindings: memory-controllers: drop unneeded quotes
  memory: atmel-sdramc: remove the driver
  memory: brcmstb_dpfe: fix testing array offset after use
  memory: renesas-rpc-if: Fix PHYCNT.STRTIM setting

Link: https://lore.kernel.org/r/20230612175508.288775-1-krzysztof.kozlowski@linaro.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 2d0d3a10 6a66fb9f

Documentation/devicetree/bindings/memory-controllers/nvidia,tegra20-emc.yaml

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ patternProperties: 
        const: 0



      lpddr2:

        $ref: "ddr/jedec,lpddr2.yaml#"

        $ref: ddr/jedec,lpddr2.yaml#

        type: object



    patternProperties:

Documentation/devicetree/bindings/memory-controllers/ti,gpmc.yaml

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ patternProperties: 
      The child device node represents the device connected to the GPMC

      bus. The device can be a NAND chip, SRAM device, NOR device

      or an ASIC.

    $ref: "ti,gpmc-child.yaml"

    $ref: ti,gpmc-child.yaml





required:

arch/arm/mach-at91/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -97,7 +97,6 @@ config SOC_AT91SAM9 
	depends on ARCH_MULTI_V5

	select ATMEL_AIC_IRQ

	select ATMEL_PM if PM

	select ATMEL_SDRAMC

	select CPU_ARM926T

	select HAVE_AT91_SMD

	select HAVE_AT91_USB_CLK
@@ -131,7 +130,6 @@ config SOC_SAM9X60 
	depends on ARCH_MULTI_V5

	select ATMEL_AIC5_IRQ

	select ATMEL_PM if PM

	select ATMEL_SDRAMC

	select CPU_ARM926T

	select HAVE_AT91_USB_CLK

	select HAVE_AT91_GENERATED_CLK
@@ -213,7 +211,6 @@ config SOC_SAMA5 
	bool

	select ATMEL_AIC5_IRQ

	select ATMEL_PM if PM

	select ATMEL_SDRAMC

	select MEMORY

	select SOC_SAM_V7

	select SRAM if PM
@@ -234,7 +231,6 @@ config SOC_SAMA7 
	bool

	select ARM_GIC

	select ATMEL_PM if PM

	select ATMEL_SDRAMC

	select MEMORY

	select SOC_SAM_V7

	select SRAM if PM

drivers/memory/Kconfig

+0 −11
Original line number Diff line number Diff line
@@ -30,17 +30,6 @@ config ARM_PL172_MPMC 
	  If you have an embedded system with an AMBA bus and a PL172

	  controller, say Y or M here.



config ATMEL_SDRAMC

	bool "Atmel (Multi-port DDR-)SDRAM Controller"

	default y if ARCH_AT91

	depends on ARCH_AT91 || COMPILE_TEST

	depends on OF

	help

	  This driver is for Atmel SDRAM Controller or Atmel Multi-port

	  DDR-SDRAM Controller available on Atmel AT91SAM9 and SAMA5 SoCs.

	  Starting with the at91sam9g45, this controller supports SDR, DDR and

	  LP-DDR memories.



config ATMEL_EBI

	bool "Atmel EBI driver"

	default y if ARCH_AT91

drivers/memory/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ ifeq ($(CONFIG_DDR),y) 
obj-$(CONFIG_OF)		+= of_memory.o

endif

obj-$(CONFIG_ARM_PL172_MPMC)	+= pl172.o

obj-$(CONFIG_ATMEL_SDRAMC)	+= atmel-sdramc.o

obj-$(CONFIG_ATMEL_EBI)		+= atmel-ebi.o

obj-$(CONFIG_BRCMSTB_DPFE)	+= brcmstb_dpfe.o

obj-$(CONFIG_BRCMSTB_MEMC)	+= brcmstb_memc.o