]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'memory-controller-drv-tegra-5.14-3' of git://git.kernel.org/pub/scm/linux...
authorArnd Bergmann <arnd@arndb.de>
Fri, 16 Jul 2021 20:50:56 +0000 (22:50 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 16 Jul 2021 20:51:01 +0000 (22:51 +0200)
commit7506d4e6f6113b2c0f9bf0827ba538df4c7105f6
tree64eb0df3df74bd8881d5a440e99d855f34789ce8
parentb1b49cbcf8bd66059ed6f80c573a7ff83991d8ef
parentdd7ba261f15bccde687cec10ea6721f6a4d23b71
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: Arnd Bergmann <arnd@arndb.de>