diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2022-03-01 12:47:13 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2022-03-01 12:47:14 +0300 |
| commit | b903f9c55ea4a2af9a627268becc1e5f48ffbeec (patch) | |
| tree | cbfcff4e0413e0a1c6bd9c47e314664aa5b73ebb /drivers/memory/mtk-smi.c | |
| parent | 254a1864e4d0f82ee9ce2b4eaf469bfd176ac7a2 (diff) | |
| parent | a06bf59d07f45a0a6ab4ab8ac69c1d708d3fadcb (diff) | |
| download | linux-b903f9c55ea4a2af9a627268becc1e5f48ffbeec.tar.xz | |
Merge tag 'memory-controller-drv-5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl into arm/drivers
Memory controller drivers for v5.18
1. Minor improvements: Mediatek SMI, Freescale/NXP IFC, Tegra20 and
Tegra30.
2. Convert Freescale/NXP IFC bindings to dtschema.
3. Convert LPDDR bindings to dtschema.
4. Adjust revision ID property in LPDDR2 bindings to match LPDDR3
bindings.
* tag 'memory-controller-drv-5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl:
memory: Update of_memory lpddr2 revision-id binding
dt-bindings: memory: lpddr2: Adjust revision ID property to match lpddr3
memory: of: parse max-freq property
dt-bindings: memory: lpddr3: deprecate passing timings frequency as unit address
dt-bindings: memory: lpddr3: deprecate manufacturer ID
dt-bindings: memory: lpddr3: adjust IO width to spec
dt-bindings: memory: lpddr3: convert to dtschema
dt-bindings: memory: lpddr3-timings: convert to dtschema
dt-bindings: memory: lpddr2-timings: convert to dtschema
memory: brcmstb_dpfe: fix typo in a comment
memory: fsl_ifc: populate child devices without relying on simple-bus
dt-bindings: memory: fsl: convert ifc binding to yaml schema
memory: mtk-smi: Use ARRAY_SIZE to define MTK_SMI_CLK_NR_MAX
Link: https://lore.kernel.org/r/20220228164313.52931-1-krzysztof.kozlowski@canonical.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/memory/mtk-smi.c')
| -rw-r--r-- | drivers/memory/mtk-smi.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/memory/mtk-smi.c b/drivers/memory/mtk-smi.c index e201e5976f34..a0d50ce71e9c 100644 --- a/drivers/memory/mtk-smi.c +++ b/drivers/memory/mtk-smi.c @@ -94,8 +94,6 @@ enum mtk_smi_type { MTK_SMI_GEN2_SUB_COMM, /* gen2 smi sub common */ }; -#define MTK_SMI_CLK_NR_MAX 4 - /* larbs: Require apb/smi clocks while gals is optional. */ static const char * const mtk_smi_larb_clks[] = {"apb", "smi", "gals"}; #define MTK_SMI_LARB_REQ_CLK_NR 2 @@ -106,6 +104,7 @@ static const char * const mtk_smi_larb_clks[] = {"apb", "smi", "gals"}; * sub common: Require apb/smi/gals0 clocks in has_gals case. Otherwise, only apb/smi are required. */ static const char * const mtk_smi_common_clks[] = {"apb", "smi", "gals0", "gals1"}; +#define MTK_SMI_CLK_NR_MAX ARRAY_SIZE(mtk_smi_common_clks) #define MTK_SMI_COM_REQ_CLK_NR 2 #define MTK_SMI_COM_GALS_REQ_CLK_NR MTK_SMI_CLK_NR_MAX #define MTK_SMI_SUB_COM_GALS_REQ_CLK_NR 3 |