Skip to content

Commit 3cb5b03

Browse files
committed
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: Arnd Bergmann <arnd@arndb.de>
2 parents 93e0aca + 35bd78c commit 3cb5b03

23 files changed

+567
-371
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ properties:
3939
patternProperties:
4040
".*@[0-9]+$":
4141
type: object
42+
$ref: mc-peripheral-props.yaml#
4243

4344
required:
4445
- compatible

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ required:
3434
# The controller specific properties go here.
3535
allOf:
3636
- $ref: st,stm32-fmc2-ebi-props.yaml#
37+
- $ref: ingenic,nemc-peripherals.yaml#
3738
- $ref: intel,ixp4xx-expansion-peripheral-props.yaml#
39+
- $ref: ti,gpmc-child.yaml#
3840

3941
additionalProperties: true
Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/net/davicom,dm9000.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Davicom DM9000 Fast Ethernet Controller
8+
9+
maintainers:
10+
- Paul Cercueil <paul@crapouillou.net>
11+
12+
properties:
13+
compatible:
14+
const: davicom,dm9000
15+
16+
reg:
17+
items:
18+
- description: Address registers
19+
- description: Data registers
20+
21+
interrupts:
22+
maxItems: 1
23+
24+
davicom,no-eeprom:
25+
type: boolean
26+
description: Configuration EEPROM is not available
27+
28+
davicom,ext-phy:
29+
type: boolean
30+
description: Use external PHY
31+
32+
reset-gpios:
33+
maxItems: 1
34+
35+
vcc-supply: true
36+
37+
required:
38+
- compatible
39+
- reg
40+
- interrupts
41+
42+
allOf:
43+
- $ref: /schemas/memory-controllers/mc-peripheral-props.yaml#
44+
- $ref: /schemas/net/ethernet-controller.yaml#
45+
46+
unevaluatedProperties: false
47+
48+
examples:
49+
- |
50+
#include <dt-bindings/interrupt-controller/irq.h>
51+
52+
ethernet@a8000000 {
53+
compatible = "davicom,dm9000";
54+
reg = <0xa8000000 0x2>, <0xa8000002 0x2>;
55+
interrupt-parent = <&gph1>;
56+
interrupts = <1 IRQ_TYPE_LEVEL_HIGH>;
57+
local-mac-address = [00 00 de ad be ef];
58+
davicom,no-eeprom;
59+
};

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

Lines changed: 0 additions & 27 deletions
This file was deleted.

drivers/memory/brcmstb_dpfe.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@
3232
#include <linux/firmware.h>
3333
#include <linux/io.h>
3434
#include <linux/module.h>
35-
#include <linux/of_address.h>
36-
#include <linux/of_device.h>
35+
#include <linux/of.h>
3736
#include <linux/platform_device.h>
3837

3938
#define DRVNAME "brcmstb-dpfe"

drivers/memory/da8xx-ddrctl.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
#include <linux/module.h>
1212
#include <linux/of.h>
13-
#include <linux/of_device.h>
1413
#include <linux/platform_device.h>
1514
#include <linux/io.h>
1615

drivers/memory/fsl_ifc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include <linux/slab.h>
1616
#include <linux/io.h>
1717
#include <linux/of.h>
18-
#include <linux/of_device.h>
18+
#include <linux/of_platform.h>
1919
#include <linux/platform_device.h>
2020
#include <linux/fsl_ifc.h>
2121
#include <linux/irqdomain.h>

drivers/memory/jz4780-nemc.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
#include <linux/math64.h>
1313
#include <linux/of.h>
1414
#include <linux/of_address.h>
15-
#include <linux/of_device.h>
1615
#include <linux/of_platform.h>
1716
#include <linux/platform_device.h>
1817
#include <linux/slab.h>

drivers/memory/pl353-smc.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include <linux/clk.h>
1111
#include <linux/kernel.h>
1212
#include <linux/module.h>
13+
#include <linux/of.h>
1314
#include <linux/of_platform.h>
1415
#include <linux/platform_device.h>
1516
#include <linux/amba/bus.h>

drivers/memory/renesas-rpc-if.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#include <linux/module.h>
1414
#include <linux/platform_device.h>
1515
#include <linux/of.h>
16-
#include <linux/of_device.h>
1716
#include <linux/regmap.h>
1817
#include <linux/reset.h>
1918

0 commit comments

Comments
 (0)