Unverified Commit 3cb5b035 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Memory controller drivers for v6.6

1. Tegra:
 - Extend support for Tegra234 SoC Memory Controllers with DRM and GPU
   clients.
 - Tegra186: Skip MRQ DVFS where it is not supported and do not fail
   probe.
2. Wide cleanup of DT includes.
3. Devicetree bindings:
 - Reference common peripheral (client) properties in Ingenic NEMC and
   TI GPMC.
 - Convert Davicom DM9000 to DT schema.

* tag 'memory-controller-drv-6.6' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl:
  memory: tegra: add MC client for Tegra234 GPU
  dt-bindings: net: davicom,dm9000: convert to DT schema
  dt-bindings: memory-controllers: reference TI GPMC peripheral properties
  dt-bindings: memory-controllers: ingenic,nemc: reference peripheral properties
  memory: Explicitly include correct DT includes
  memory: tegra: Prefer octal over symbolic permissions
  memory: tegra: add check if MRQ_EMC_DVFS_LATENCY is supported
  memory: tegra: Add clients used by DRM in Tegra234
  memory: tegra: sort tegra234_mc_clients table as per register offsets
  memory: tegra: make icc_set_bw return zero if BWMGR not supported
  memory: tegra: Add dummy implementation on Tegra194

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 93e0acae 35bd78cf

Documentation/devicetree/bindings/memory-controllers/ingenic,nemc.yaml

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ properties: 
patternProperties:

  ".*@[0-9]+$":

    type: object

    $ref: mc-peripheral-props.yaml#



required:

  - compatible

Documentation/devicetree/bindings/memory-controllers/mc-peripheral-props.yaml

+2 −0
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ required: 
# The controller specific properties go here.

allOf:

  - $ref: st,stm32-fmc2-ebi-props.yaml#

  - $ref: ingenic,nemc-peripherals.yaml#

  - $ref: intel,ixp4xx-expansion-peripheral-props.yaml#

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



additionalProperties: true

Documentation/devicetree/bindings/net/davicom,dm9000.yaml

0 → 100644
+59 −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/net/davicom,dm9000.yaml#

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



title: Davicom DM9000 Fast Ethernet Controller



maintainers:

  - Paul Cercueil <paul@crapouillou.net>



properties:

  compatible:

    const: davicom,dm9000



  reg:

    items:

      - description: Address registers

      - description: Data registers



  interrupts:

    maxItems: 1



  davicom,no-eeprom:

    type: boolean

    description: Configuration EEPROM is not available



  davicom,ext-phy:

    type: boolean

    description: Use external PHY



  reset-gpios:

    maxItems: 1



  vcc-supply: true



required:

  - compatible

  - reg

  - interrupts



allOf:

  - $ref: /schemas/memory-controllers/mc-peripheral-props.yaml#

  - $ref: /schemas/net/ethernet-controller.yaml#



unevaluatedProperties: false



examples:

  - |

    #include <dt-bindings/interrupt-controller/irq.h>



    ethernet@a8000000 {

        compatible = "davicom,dm9000";

        reg = <0xa8000000 0x2>, <0xa8000002 0x2>;

        interrupt-parent = <&gph1>;

        interrupts = <1 IRQ_TYPE_LEVEL_HIGH>;

        local-mac-address = [00 00 de ad be ef];

        davicom,no-eeprom;

    };

Documentation/devicetree/bindings/net/davicom-dm9000.txt

deleted100644 → 0
+0 −27
Original line number Diff line number Diff line 
Davicom DM9000 Fast Ethernet controller



Required properties:

- compatible = "davicom,dm9000";

- reg : physical addresses and sizes of registers, must contain 2 entries:

    first entry : address register,

    second entry : data register.

- interrupts : interrupt specifier specific to interrupt controller



Optional properties:

- davicom,no-eeprom : Configuration EEPROM is not available

- davicom,ext-phy : Use external PHY

- reset-gpios : phandle of gpio that will be used to reset chip during probe

- vcc-supply : phandle of regulator that will be used to enable power to chip



Example:



	ethernet@18000000 {

		compatible = "davicom,dm9000";

		reg = <0x18000000 0x2 0x18000004 0x2>;

		interrupt-parent = <&gpn>;

		interrupts = <7 4>;

		local-mac-address = [00 00 de ad be ef];

		davicom,no-eeprom;

		reset-gpios = <&gpf 12 GPIO_ACTIVE_LOW>;

		vcc-supply = <&eth0_power>;

	};

drivers/memory/brcmstb_dpfe.c

+1 −2
Original line number Diff line number Diff line
@@ -32,8 +32,7 @@ 
#include <linux/firmware.h>

#include <linux/io.h>

#include <linux/module.h>

#include <linux/of_address.h>

#include <linux/of_device.h>

#include <linux/of.h>

#include <linux/platform_device.h>



#define DRVNAME			"brcmstb-dpfe"