On Mon, Apr 09, 2018 at 10:28:31PM +0300, Dmitry Osipenko wrote: > Tegra30+ has some minor differences in registers / bits layout compared > to Tegra20. Let's squash Tegra20 driver into the common tegra-mc driver > in a preparation for the upcoming MC hot reset controls implementation, > avoiding code duplication. > > Signed-off-by: Dmitry Osipenko > --- > drivers/memory/Kconfig | 10 -- > drivers/memory/Makefile | 1 - > drivers/memory/tegra/Makefile | 1 + > drivers/memory/tegra/mc.c | 120 +++++++++++++++++-- > drivers/memory/tegra/mc.h | 11 ++ > drivers/memory/tegra/tegra20.c | 178 +++++++++++++++++++++++++++++ > drivers/memory/tegra20-mc.c | 254 ----------------------------------------- > include/soc/tegra/mc.h | 2 +- > 8 files changed, 299 insertions(+), 278 deletions(-) > create mode 100644 drivers/memory/tegra/tegra20.c > delete mode 100644 drivers/memory/tegra20-mc.c I've applied this now and squashed in patch "memory: tegra: Remove handling of MC_GART_ERROR_REQ on Tegra20". Thanks, Thierry