Unverified Commit 9841d927 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Memory controller drivers for v6.17

1. Several cleanups: Use dev_fwnode() in OMAP GPMX, convert
   arm,pl172.txt DT bindings to DT schema, use
   syscon_regmap_lookup_by_phandle_args() wrapper, correct kerneldoc.

2. Mediatek MT8186 SMI: Extend hardware bandwidth limits to fix VENC
   hardware during stress testing.

3. Broadcom brcmstb_memc: Add additional fallback compatible and
   simplify device driver matching.  The change comes from Broadcom
   SoC maintainer (Florian Fainelli), thus its ABI impact is
   acknowledged.

* tag 'memory-controller-drv-6.17' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl:
  dt-bindings: memory: renesas,rzg3e-xspi: Document RZ/V2H(P) and RZ/V2N support
  memory: brcmstb_memc: Simplify compatible matching
  dt-bindings: memory-controller: Define fallback compatible
  memory: omap-gpmx: Use dev_fwnode()
  memory: mtk-smi: Add ostd setting for mt8186
  dt-bindings: memory-controllers: convert arm,pl172.txt to yaml format
  memory: stm32_omm: Use syscon_regmap_lookup_by_phandle_args
  memory: emif: Add missing kerneldoc for lpmode

Link: https://lore.kernel.org/r/20250715095315.59299-2-krzysztof.kozlowski@linaro.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 1c37b63a 93a7aedc

Documentation/devicetree/bindings/memory-controllers/arm,pl172.txt

deleted100644 → 0
+0 −127
Original line number Diff line number Diff line 
* Device tree bindings for ARM PL172/PL175/PL176 MultiPort Memory Controller



Required properties:



- compatible:		Must be "arm,primecell" and exactly one from

			"arm,pl172", "arm,pl175" or "arm,pl176".



- reg:			Must contains offset/length value for controller.



- #address-cells:	Must be 2. The partition number has to be encoded in the

			first address cell and it may accept values 0..N-1

			(N - total number of partitions). The second cell is the

			offset into the partition.



- #size-cells:		Must be set to 1.



- ranges:		Must contain one or more chip select memory regions.



- clocks:		Must contain references to controller clocks.



- clock-names:		Must contain "mpmcclk" and "apb_pclk".



- clock-ranges:		Empty property indicating that child nodes can inherit

			named clocks. Required only if clock tree data present

			in device tree.

			See clock-bindings.txt



Child chip-select (cs) nodes contain the memory devices nodes connected to

such as NOR (e.g. cfi-flash) and NAND.



Required child cs node properties:



- #address-cells:	Must be 2.



- #size-cells:		Must be 1.



- ranges:		Empty property indicating that child nodes can inherit

			memory layout.



- clock-ranges:		Empty property indicating that child nodes can inherit

			named clocks. Required only if clock tree data present

			in device tree.



- mpmc,cs:		Chip select number. Indicates to the pl0172 driver

			which chipselect is used for accessing the memory.



- mpmc,memory-width:	Width of the chip select memory. Must be equal to

			either 8, 16 or 32.



Optional child cs node config properties:



- mpmc,async-page-mode:	Enable asynchronous page mode.



- mpmc,cs-active-high:	Set chip select polarity to active high.



- mpmc,byte-lane-low:	Set byte lane state to low.



- mpmc,extended-wait:	Enable extended wait.



- mpmc,buffer-enable:	Enable write buffer, option is not supported by

			PL175 and PL176 controllers.



- mpmc,write-protect:	Enable write protect.



Optional child cs node timing properties:



- mpmc,write-enable-delay:	Delay from chip select assertion to write

				enable (WE signal) in nano seconds.



- mpmc,output-enable-delay:	Delay from chip select assertion to output

				enable (OE signal) in nano seconds.



- mpmc,write-access-delay:	Delay from chip select assertion to write

				access in nano seconds.



- mpmc,read-access-delay:	Delay from chip select assertion to read

				access in nano seconds.



- mpmc,page-mode-read-delay:	Delay for asynchronous page mode sequential

				accesses in nano seconds.



- mpmc,turn-round-delay:	Delay between access to memory banks in nano

				seconds.



If any of the above timing parameters are absent, current parameter value will

be taken from the corresponding HW reg.



Example for pl172 with nor flash on chip select 0 shown below.



emc: memory-controller@40005000 {

	compatible = "arm,pl172", "arm,primecell";

	reg = <0x40005000 0x1000>;

	clocks = <&ccu1 CLK_CPU_EMCDIV>, <&ccu1 CLK_CPU_EMC>;

	clock-names = "mpmcclk", "apb_pclk";

	#address-cells = <2>;

	#size-cells = <1>;

	ranges = <0 0 0x1c000000 0x1000000

		  1 0 0x1d000000 0x1000000

		  2 0 0x1e000000 0x1000000

		  3 0 0x1f000000 0x1000000>;



	cs0 {

		#address-cells = <2>;

		#size-cells = <1>;

		ranges;



		mpmc,cs = <0>;

		mpmc,memory-width = <16>;

		mpmc,byte-lane-low;

		mpmc,write-enable-delay = <0>;

		mpmc,output-enable-delay = <0>;

		mpmc,read-enable-delay = <70>;

		mpmc,page-mode-read-delay = <70>;



		flash@0,0 {

			compatible = "sst,sst39vf320", "cfi-flash";

			reg = <0 0 0x400000>;

			bank-width = <2>;

			#address-cells = <1>;

			#size-cells = <1>;

			partition@0 {

				label = "data";

				reg = <0 0x400000>;

			};

		};

	};

};

Documentation/devicetree/bindings/memory-controllers/arm,pl172.yaml

0 → 100644
+222 −0
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/arm,pl172.yaml#

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



title: ARM PL172/PL175/PL176 MultiPort Memory Controller



maintainers:

  - Frank Li <Frank.Li@nxp.com>



# We need a select here so we don't match all nodes with 'arm,primecell'

select:

  properties:

    compatible:

      contains:

        enum:

          - arm,pl172

          - arm,pl175

          - arm,pl176

  required:

    - compatible



properties:

  compatible:

    items:

      - enum:

          - arm,pl172

          - arm,pl175

          - arm,pl176

      - const: arm,primecell



  reg:

    maxItems: 1



  '#address-cells':

    const: 2



  '#size-cells':

    const: 1



  ranges: true



  clocks:

    maxItems: 2



  clock-names:

    items:

      - const: mpmcclk

      - const: apb_pclk



  clock-ranges: true



  resets:

    maxItems: 1



patternProperties:

  "^cs[0-9]$":

    type: object

    additionalProperties: false

    patternProperties:

      "^flash@[0-9],[0-9a-f]+$":

        type: object

        $ref: /schemas/mtd/mtd-physmap.yaml#

        unevaluatedProperties: false



      "^(gpio|sram)@[0-9],[0-9a-f]+$":

        type: object

        additionalProperties: true



    properties:

      '#address-cells':

        const: 2



      '#size-cells':

        const: 1



      ranges: true



      clocks:

        maxItems: 2



      clock-ranges: true



      mpmc,cs:

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

        description:

          Chip select number. Indicates to the pl0172 driver

          which chipselect is used for accessing the memory.



      mpmc,memory-width:

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

        enum: [8, 16, 32]

        description:

          Width of the chip select memory. Must be equal to either 8, 16 or 32.



      mpmc,async-page-mode:

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

        description:

          Enable asynchronous page mode.



      mpmc,cs-active-high:

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

        description:

          Set chip select polarity to active high.



      mpmc,byte-lane-low:

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

        description:

          Set byte lane state to low.



      mpmc,extended-wait:

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

        description:

          Enable extended wait.



      mpmc,buffer-enable:

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

        description:

          Enable write buffer, option is not supported by

          PL175 and PL176 controllers.



      mpmc,write-protect:

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

        description:

          Enable write protect.



      mpmc,read-enable-delay:

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

        description:

          Delay from chip select assertion to read

          enable (RE signal) in nano seconds.



      mpmc,write-enable-delay:

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

        description:

          Delay from chip select assertion to write

          enable (WE signal) in nano seconds.



      mpmc,output-enable-delay:

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

        description:

          Delay from chip select assertion to output

          enable (OE signal) in nano seconds.



      mpmc,write-access-delay:

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

        description:

          Delay from chip select assertion to write

          access in nano seconds.



      mpmc,read-access-delay:

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

        description:

          Delay from chip select assertion to read

          access in nano seconds.



      mpmc,page-mode-read-delay:

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

        description:

          Delay for asynchronous page mode sequential

          accesses in nano seconds.



      mpmc,turn-round-delay:

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

        description:

          Delay between access to memory banks in nano

          seconds.



required:

  - compatible

  - reg

  - '#address-cells'

  - '#size-cells'

  - ranges

  - clocks

  - clock-names



additionalProperties: false



examples:

  - |

    #include <dt-bindings/clock/lpc18xx-ccu.h>



    memory-controller@40005000 {

        compatible = "arm,pl172", "arm,primecell";

        reg = <0x40005000 0x1000>;

        clocks = <&ccu1 CLK_CPU_EMCDIV>, <&ccu1 CLK_CPU_EMC>;

        clock-names = "mpmcclk", "apb_pclk";

        #address-cells = <2>;

        #size-cells = <1>;

        ranges = <0 0 0x1c000000 0x1000000

                  1 0 0x1d000000 0x1000000

                  2 0 0x1e000000 0x1000000

                  3 0 0x1f000000 0x1000000>;



        cs0 {

            #address-cells = <2>;

            #size-cells = <1>;

            ranges;



            mpmc,cs = <0>;

            mpmc,memory-width = <16>;

            mpmc,byte-lane-low;

            mpmc,write-enable-delay = <0>;

            mpmc,output-enable-delay = <0>;

            mpmc,read-enable-delay = <70>;

            mpmc,page-mode-read-delay = <70>;



            flash@0,0 {

                compatible = "sst,sst39vf320", "cfi-flash";

                reg = <0 0 0x400000>;

                bank-width = <2>;

                #address-cells = <1>;

                #size-cells = <1>;

                partition@0 {

                    label = "data";

                    reg = <0 0x400000>;

                };

            };

        };

    };

Documentation/devicetree/bindings/memory-controllers/brcm,brcmstb-memc-ddr.yaml

+34 −20
Original line number Diff line number Diff line
@@ -11,11 +11,10 @@ maintainers: 


properties:

  compatible:

    oneOf:

      - description: Revision > 2.1 controllers

        items:

          - enum:

          - brcm,brcmstb-memc-ddr-rev-b.1.x

          - brcm,brcmstb-memc-ddr-rev-b.2.0

          - brcm,brcmstb-memc-ddr-rev-b.2.1

              - brcm,brcmstb-memc-ddr-rev-b.2.2

              - brcm,brcmstb-memc-ddr-rev-b.2.3

              - brcm,brcmstb-memc-ddr-rev-b.2.5
@@ -29,6 +28,19 @@ properties: 
              - brcm,brcmstb-memc-ddr-rev-c.1.2

              - brcm,brcmstb-memc-ddr-rev-c.1.3

              - brcm,brcmstb-memc-ddr-rev-c.1.4

          - const: brcm,brcmstb-memc-ddr-rev-b.2.1

          - const: brcm,brcmstb-memc-ddr

      - description: Revision 2.1 controllers

        items:

          - const: brcm,brcmstb-memc-ddr-rev-b.2.1

          - const: brcm,brcmstb-memc-ddr

      - description: Revision 2.0 controllers

        items:

          - const: brcm,brcmstb-memc-ddr-rev-b.2.0

          - const: brcm,brcmstb-memc-ddr

      - description: Revision 1.x controllers

        items:

          - const: brcm,brcmstb-memc-ddr-rev-b.1.x

          - const: brcm,brcmstb-memc-ddr



  reg:
@@ -46,7 +58,9 @@ additionalProperties: false 
examples:

  - |

    memory-controller@9902000 {

        compatible = "brcm,brcmstb-memc-ddr-rev-c.1.1", "brcm,brcmstb-memc-ddr";

        compatible = "brcm,brcmstb-memc-ddr-rev-c.1.1",

                     "brcm,brcmstb-memc-ddr-rev-b.2.1",

                     "brcm,brcmstb-memc-ddr";

        reg = <0x9902000 0x600>;

        clock-frequency = <2133000000>;

    };

Documentation/devicetree/bindings/memory-controllers/renesas,rzg3e-xspi.yaml

+8 −1
Original line number Diff line number Diff line
@@ -23,7 +23,14 @@ allOf: 


properties:

  compatible:

    const: renesas,r9a09g047-xspi  # RZ/G3E

    oneOf:

      - const: renesas,r9a09g047-xspi  # RZ/G3E



      - items:

          - enum:

              - renesas,r9a09g056-xspi  # RZ/V2N

              - renesas,r9a09g057-xspi  # RZ/V2H(P)

          - const: renesas,r9a09g047-xspi



  reg:

    items:

drivers/memory/brcmstb_memc.c

+2 −54
Original line number Diff line number Diff line
@@ -184,62 +184,10 @@ static const struct of_device_id brcmstb_memc_of_match[] = { 
		.compatible = "brcm,brcmstb-memc-ddr-rev-b.2.1",

		.data = &brcmstb_memc_versions[BRCMSTB_MEMC_V21]

	},

	{

		.compatible = "brcm,brcmstb-memc-ddr-rev-b.2.2",

		.data = &brcmstb_memc_versions[BRCMSTB_MEMC_V21]

	},

	{

		.compatible = "brcm,brcmstb-memc-ddr-rev-b.2.3",

		.data = &brcmstb_memc_versions[BRCMSTB_MEMC_V21]

	},

	{

		.compatible = "brcm,brcmstb-memc-ddr-rev-b.2.5",

		.data = &brcmstb_memc_versions[BRCMSTB_MEMC_V21]

	},

	{

		.compatible = "brcm,brcmstb-memc-ddr-rev-b.2.6",

		.data = &brcmstb_memc_versions[BRCMSTB_MEMC_V21]

	},

	{

		.compatible = "brcm,brcmstb-memc-ddr-rev-b.2.7",

		.data = &brcmstb_memc_versions[BRCMSTB_MEMC_V21]

	},

	{

		.compatible = "brcm,brcmstb-memc-ddr-rev-b.2.8",

		.data = &brcmstb_memc_versions[BRCMSTB_MEMC_V21]

	},

	{

		.compatible = "brcm,brcmstb-memc-ddr-rev-b.3.0",

		.data = &brcmstb_memc_versions[BRCMSTB_MEMC_V21]

	},

	{

		.compatible = "brcm,brcmstb-memc-ddr-rev-b.3.1",

		.data = &brcmstb_memc_versions[BRCMSTB_MEMC_V21]

	},

	{

		.compatible = "brcm,brcmstb-memc-ddr-rev-c.1.0",

		.data = &brcmstb_memc_versions[BRCMSTB_MEMC_V21]

	},

	{

		.compatible = "brcm,brcmstb-memc-ddr-rev-c.1.1",

		.data = &brcmstb_memc_versions[BRCMSTB_MEMC_V21]

	},

	{

		.compatible = "brcm,brcmstb-memc-ddr-rev-c.1.2",

		.data = &brcmstb_memc_versions[BRCMSTB_MEMC_V21]

	},

	{

		.compatible = "brcm,brcmstb-memc-ddr-rev-c.1.3",

		.data = &brcmstb_memc_versions[BRCMSTB_MEMC_V21]

	},

	{

		.compatible = "brcm,brcmstb-memc-ddr-rev-c.1.4",

		.data = &brcmstb_memc_versions[BRCMSTB_MEMC_V21]

	},

	/* default to the original offset */

	/* default to the V21 offset */

	{

		.compatible = "brcm,brcmstb-memc-ddr",

		.data = &brcmstb_memc_versions[BRCMSTB_MEMC_V1X]

		.data = &brcmstb_memc_versions[BRCMSTB_MEMC_V21]

	},

	{}

};