Unverified Commit b6e473d1 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'memory-controller-drv-tegra-5.14-3' of...

Merge tag 'memory-controller-drv-tegra-5.14-3' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl into arm/fixes

Memory controller drivers for v5.14 - Tegra SoC, late fixes

Two fixes for recent series of changes in Tegra SoC memory controller
drivers:
1. Add a stub for tegra_mc_probe_device() to fix compile testing of
   arm-smmu without TEGRA_MC.
2. Fix arm-smmu dtschema syntax.

* tag 'memory-controller-drv-tegra-5.14-3' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl:
  dt-bindings: arm-smmu: Fix json-schema syntax
  memory: tegra: Add compile-test stub for tegra_mc_probe_device()

Link: https://lore.kernel.org/r/20210625073604.13562-1-krzysztof.kozlowski@canonical.com

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents e73f0f0e bf3ec9de
...@@ -52,16 +52,14 @@ properties: ...@@ -52,16 +52,14 @@ properties:
items: items:
- const: marvell,ap806-smmu-500 - const: marvell,ap806-smmu-500
- const: arm,mmu-500 - const: arm,mmu-500
- description: NVIDIA SoCs that program two ARM MMU-500s identically
items:
- description: NVIDIA SoCs that require memory controller interaction - description: NVIDIA SoCs that require memory controller interaction
and may program multiple ARM MMU-500s identically with the memory and may program multiple ARM MMU-500s identically with the memory
controller interleaving translations between multiple instances controller interleaving translations between multiple instances
for improved performance. for improved performance.
items: items:
- enum: - enum:
- const: nvidia,tegra194-smmu - nvidia,tegra194-smmu
- const: nvidia,tegra186-smmu - nvidia,tegra186-smmu
- const: nvidia,smmu-500 - const: nvidia,smmu-500
- items: - items:
- const: arm,mmu-500 - const: arm,mmu-500
......
...@@ -237,14 +237,19 @@ unsigned int tegra_mc_get_emem_device_count(struct tegra_mc *mc); ...@@ -237,14 +237,19 @@ unsigned int tegra_mc_get_emem_device_count(struct tegra_mc *mc);
#ifdef CONFIG_TEGRA_MC #ifdef CONFIG_TEGRA_MC
struct tegra_mc *devm_tegra_memory_controller_get(struct device *dev); struct tegra_mc *devm_tegra_memory_controller_get(struct device *dev);
int tegra_mc_probe_device(struct tegra_mc *mc, struct device *dev);
#else #else
static inline struct tegra_mc * static inline struct tegra_mc *
devm_tegra_memory_controller_get(struct device *dev) devm_tegra_memory_controller_get(struct device *dev)
{ {
return ERR_PTR(-ENODEV); return ERR_PTR(-ENODEV);
} }
#endif
int tegra_mc_probe_device(struct tegra_mc *mc, struct device *dev); static inline int
tegra_mc_probe_device(struct tegra_mc *mc, struct device *dev)
{
return -ENODEV;
}
#endif
#endif /* __SOC_TEGRA_MC_H__ */ #endif /* __SOC_TEGRA_MC_H__ */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment