Unverified Commit 64bdb49f authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'memory-controller-drv-fixes-6.18' of... 

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

Memory controller drivers - fixes for v6.18

Correct incorrect ID used for the memory controller client IDs in
Tegra210 Memory Controller driver, introduced in v6.18-rc1.

* tag 'memory-controller-drv-fixes-6.18' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl

:
  memory: tegra210: Fix incorrect client ids

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents dc00a9fe 6f37469a

drivers/memory/tegra/tegra210.c

+2 −2
Original line number Diff line number Diff line
@@ -1015,7 +1015,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = { 
			},

		},

	}, {

		.id = TEGRA210_MC_SESRD,

		.id = TEGRA210_MC_SESWR,

		.name = "seswr",

		.swgroup = TEGRA_SWGROUP_SE,

		.regs = {
@@ -1079,7 +1079,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = { 
			},

		},

	}, {

		.id = TEGRA210_MC_ETRR,

		.id = TEGRA210_MC_ETRW,

		.name = "etrw",

		.swgroup = TEGRA_SWGROUP_ETR,

		.regs = {