memory: tegra210: Use bindings for client ids

Since the related binding is being added, use that for the client ids
instead of hardcoded magic numbers.

Signed-off-by: Aaron Kling <webgeek1234@gmail.com>
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

diff --git a/drivers/memory/tegra/tegra210.c b/drivers/memory/tegra/tegra210.c
index 8ab6498dbe7d2f410d4eb262926c18b77edb0b3d..cfa61dd885577a8fbd79c396a1316101197ca1f2 100644 (file)
--- a/drivers/memory/tegra/tegra210.c
+++ b/drivers/memory/tegra/tegra210.c
@@ -9,11 +9,11 @@
 
 static const struct tegra_mc_client tegra210_mc_clients[] = {
        {
-               .id = 0x00,
+               .id = TEGRA210_MC_PTCR,
                .name = "ptcr",
                .swgroup = TEGRA_SWGROUP_PTC,
        }, {
-               .id = 0x01,
+               .id = TEGRA210_MC_DISPLAY0A,
                .name = "display0a",
                .swgroup = TEGRA_SWGROUP_DC,
                .regs = {
@@ -29,7 +29,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x02,
+               .id = TEGRA210_MC_DISPLAY0AB,
                .name = "display0ab",
                .swgroup = TEGRA_SWGROUP_DCB,
                .regs = {
@@ -45,7 +45,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x03,
+               .id = TEGRA210_MC_DISPLAY0B,
                .name = "display0b",
                .swgroup = TEGRA_SWGROUP_DC,
                .regs = {
@@ -61,7 +61,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x04,
+               .id = TEGRA210_MC_DISPLAY0BB,
                .name = "display0bb",
                .swgroup = TEGRA_SWGROUP_DCB,
                .regs = {
@@ -77,7 +77,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x05,
+               .id = TEGRA210_MC_DISPLAY0C,
                .name = "display0c",
                .swgroup = TEGRA_SWGROUP_DC,
                .regs = {
@@ -93,7 +93,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x06,
+               .id = TEGRA210_MC_DISPLAY0CB,
                .name = "display0cb",
                .swgroup = TEGRA_SWGROUP_DCB,
                .regs = {
@@ -109,7 +109,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x0e,
+               .id = TEGRA210_MC_AFIR,
                .name = "afir",
                .swgroup = TEGRA_SWGROUP_AFI,
                .regs = {
@@ -125,7 +125,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x0f,
+               .id = TEGRA210_MC_AVPCARM7R,
                .name = "avpcarm7r",
                .swgroup = TEGRA_SWGROUP_AVPC,
                .regs = {
@@ -141,7 +141,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x10,
+               .id = TEGRA210_MC_DISPLAYHC,
                .name = "displayhc",
                .swgroup = TEGRA_SWGROUP_DC,
                .regs = {
@@ -157,7 +157,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x11,
+               .id = TEGRA210_MC_DISPLAYHCB,
                .name = "displayhcb",
                .swgroup = TEGRA_SWGROUP_DCB,
                .regs = {
@@ -173,7 +173,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x15,
+               .id = TEGRA210_MC_HDAR,
                .name = "hdar",
                .swgroup = TEGRA_SWGROUP_HDA,
                .regs = {
@@ -189,7 +189,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x16,
+               .id = TEGRA210_MC_HOST1XDMAR,
                .name = "host1xdmar",
                .swgroup = TEGRA_SWGROUP_HC,
                .regs = {
@@ -205,7 +205,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x17,
+               .id = TEGRA210_MC_HOST1XR,
                .name = "host1xr",
                .swgroup = TEGRA_SWGROUP_HC,
                .regs = {
@@ -221,7 +221,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x1c,
+               .id = TEGRA210_MC_NVENCSRD,
                .name = "nvencsrd",
                .swgroup = TEGRA_SWGROUP_NVENC,
                .regs = {
@@ -237,7 +237,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x1d,
+               .id = TEGRA210_MC_PPCSAHBDMAR,
                .name = "ppcsahbdmar",
                .swgroup = TEGRA_SWGROUP_PPCS,
                .regs = {
@@ -253,7 +253,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x1e,
+               .id = TEGRA210_MC_PPCSAHBSLVR,
                .name = "ppcsahbslvr",
                .swgroup = TEGRA_SWGROUP_PPCS,
                .regs = {
@@ -269,7 +269,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x1f,
+               .id = TEGRA210_MC_SATAR,
                .name = "satar",
                .swgroup = TEGRA_SWGROUP_SATA,
                .regs = {
@@ -285,7 +285,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x27,
+               .id = TEGRA210_MC_MPCORER,
                .name = "mpcorer",
                .swgroup = TEGRA_SWGROUP_MPCORE,
                .regs = {
@@ -297,7 +297,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x2b,
+               .id = TEGRA210_MC_NVENCSWR,
                .name = "nvencswr",
                .swgroup = TEGRA_SWGROUP_NVENC,
                .regs = {
@@ -313,7 +313,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x31,
+               .id = TEGRA210_MC_AFIW,
                .name = "afiw",
                .swgroup = TEGRA_SWGROUP_AFI,
                .regs = {
@@ -329,7 +329,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x32,
+               .id = TEGRA210_MC_AVPCARM7W,
                .name = "avpcarm7w",
                .swgroup = TEGRA_SWGROUP_AVPC,
                .regs = {
@@ -345,7 +345,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x35,
+               .id = TEGRA210_MC_HDAW,
                .name = "hdaw",
                .swgroup = TEGRA_SWGROUP_HDA,
                .regs = {
@@ -361,7 +361,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x36,
+               .id = TEGRA210_MC_HOST1XW,
                .name = "host1xw",
                .swgroup = TEGRA_SWGROUP_HC,
                .regs = {
@@ -377,7 +377,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x39,
+               .id = TEGRA210_MC_MPCOREW,
                .name = "mpcorew",
                .swgroup = TEGRA_SWGROUP_MPCORE,
                .regs = {
@@ -389,7 +389,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x3b,
+               .id = TEGRA210_MC_PPCSAHBDMAW,
                .name = "ppcsahbdmaw",
                .swgroup = TEGRA_SWGROUP_PPCS,
                .regs = {
@@ -405,7 +405,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x3c,
+               .id = TEGRA210_MC_PPCSAHBSLVW,
                .name = "ppcsahbslvw",
                .swgroup = TEGRA_SWGROUP_PPCS,
                .regs = {
@@ -421,7 +421,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x3d,
+               .id = TEGRA210_MC_SATAW,
                .name = "sataw",
                .swgroup = TEGRA_SWGROUP_SATA,
                .regs = {
@@ -437,7 +437,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x44,
+               .id = TEGRA210_MC_ISPRA,
                .name = "ispra",
                .swgroup = TEGRA_SWGROUP_ISP2,
                .regs = {
@@ -453,7 +453,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x46,
+               .id = TEGRA210_MC_ISPWA,
                .name = "ispwa",
                .swgroup = TEGRA_SWGROUP_ISP2,
                .regs = {
@@ -469,7 +469,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x47,
+               .id = TEGRA210_MC_ISPWB,
                .name = "ispwb",
                .swgroup = TEGRA_SWGROUP_ISP2,
                .regs = {
@@ -485,7 +485,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x4a,
+               .id = TEGRA210_MC_XUSB_HOSTR,
                .name = "xusb_hostr",
                .swgroup = TEGRA_SWGROUP_XUSB_HOST,
                .regs = {
@@ -501,7 +501,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x4b,
+               .id = TEGRA210_MC_XUSB_HOSTW,
                .name = "xusb_hostw",
                .swgroup = TEGRA_SWGROUP_XUSB_HOST,
                .regs = {
@@ -517,7 +517,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x4c,
+               .id = TEGRA210_MC_XUSB_DEVR,
                .name = "xusb_devr",
                .swgroup = TEGRA_SWGROUP_XUSB_DEV,
                .regs = {
@@ -533,7 +533,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x4d,
+               .id = TEGRA210_MC_XUSB_DEVW,
                .name = "xusb_devw",
                .swgroup = TEGRA_SWGROUP_XUSB_DEV,
                .regs = {
@@ -549,7 +549,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x4e,
+               .id = TEGRA210_MC_ISPRAB,
                .name = "isprab",
                .swgroup = TEGRA_SWGROUP_ISP2B,
                .regs = {
@@ -565,7 +565,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x50,
+               .id = TEGRA210_MC_ISPWAB,
                .name = "ispwab",
                .swgroup = TEGRA_SWGROUP_ISP2B,
                .regs = {
@@ -581,7 +581,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x51,
+               .id = TEGRA210_MC_ISPWBB,
                .name = "ispwbb",
                .swgroup = TEGRA_SWGROUP_ISP2B,
                .regs = {
@@ -597,7 +597,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x54,
+               .id = TEGRA210_MC_TSECSRD,
                .name = "tsecsrd",
                .swgroup = TEGRA_SWGROUP_TSEC,
                .regs = {
@@ -613,7 +613,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x55,
+               .id = TEGRA210_MC_TSECSWR,
                .name = "tsecswr",
                .swgroup = TEGRA_SWGROUP_TSEC,
                .regs = {
@@ -629,7 +629,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x56,
+               .id = TEGRA210_MC_A9AVPSCR,
                .name = "a9avpscr",
                .swgroup = TEGRA_SWGROUP_A9AVP,
                .regs = {
@@ -645,7 +645,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x57,
+               .id = TEGRA210_MC_A9AVPSCW,
                .name = "a9avpscw",
                .swgroup = TEGRA_SWGROUP_A9AVP,
                .regs = {
@@ -661,7 +661,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x58,
+               .id = TEGRA210_MC_GPUSRD,
                .name = "gpusrd",
                .swgroup = TEGRA_SWGROUP_GPU,
                .regs = {
@@ -678,7 +678,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x59,
+               .id = TEGRA210_MC_GPUSWR,
                .name = "gpuswr",
                .swgroup = TEGRA_SWGROUP_GPU,
                .regs = {
@@ -695,7 +695,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x5a,
+               .id = TEGRA210_MC_DISPLAYT,
                .name = "displayt",
                .swgroup = TEGRA_SWGROUP_DC,
                .regs = {
@@ -711,7 +711,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x60,
+               .id = TEGRA210_MC_SDMMCRA,
                .name = "sdmmcra",
                .swgroup = TEGRA_SWGROUP_SDMMC1A,
                .regs = {
@@ -727,7 +727,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x61,
+               .id = TEGRA210_MC_SDMMCRAA,
                .name = "sdmmcraa",
                .swgroup = TEGRA_SWGROUP_SDMMC2A,
                .regs = {
@@ -743,7 +743,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x62,
+               .id = TEGRA210_MC_SDMMCR,
                .name = "sdmmcr",
                .swgroup = TEGRA_SWGROUP_SDMMC3A,
                .regs = {
@@ -759,7 +759,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x63,
+               .id = TEGRA210_MC_SDMMCRAB,
                .swgroup = TEGRA_SWGROUP_SDMMC4A,
                .name = "sdmmcrab",
                .regs = {
@@ -775,7 +775,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x64,
+               .id = TEGRA210_MC_SDMMCWA,
                .name = "sdmmcwa",
                .swgroup = TEGRA_SWGROUP_SDMMC1A,
                .regs = {
@@ -791,7 +791,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x65,
+               .id = TEGRA210_MC_SDMMCWAA,
                .name = "sdmmcwaa",
                .swgroup = TEGRA_SWGROUP_SDMMC2A,
                .regs = {
@@ -807,7 +807,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x66,
+               .id = TEGRA210_MC_SDMMCW,
                .name = "sdmmcw",
                .swgroup = TEGRA_SWGROUP_SDMMC3A,
                .regs = {
@@ -823,7 +823,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x67,
+               .id = TEGRA210_MC_SDMMCWAB,
                .name = "sdmmcwab",
                .swgroup = TEGRA_SWGROUP_SDMMC4A,
                .regs = {
@@ -839,7 +839,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x6c,
+               .id = TEGRA210_MC_VICSRD,
                .name = "vicsrd",
                .swgroup = TEGRA_SWGROUP_VIC,
                .regs = {
@@ -855,7 +855,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x6d,
+               .id = TEGRA210_MC_VICSWR,
                .name = "vicswr",
                .swgroup = TEGRA_SWGROUP_VIC,
                .regs = {
@@ -871,7 +871,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x72,
+               .id = TEGRA210_MC_VIW,
                .name = "viw",
                .swgroup = TEGRA_SWGROUP_VI,
                .regs = {
@@ -887,7 +887,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x73,
+               .id = TEGRA210_MC_DISPLAYD,
                .name = "displayd",
                .swgroup = TEGRA_SWGROUP_DC,
                .regs = {
@@ -903,7 +903,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x78,
+               .id = TEGRA210_MC_NVDECSRD,
                .name = "nvdecsrd",
                .swgroup = TEGRA_SWGROUP_NVDEC,
                .regs = {
@@ -919,7 +919,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x79,
+               .id = TEGRA210_MC_NVDECSWR,
                .name = "nvdecswr",
                .swgroup = TEGRA_SWGROUP_NVDEC,
                .regs = {
@@ -935,7 +935,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x7a,
+               .id = TEGRA210_MC_APER,
                .name = "aper",
                .swgroup = TEGRA_SWGROUP_APE,
                .regs = {
@@ -951,7 +951,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x7b,
+               .id = TEGRA210_MC_APEW,
                .name = "apew",
                .swgroup = TEGRA_SWGROUP_APE,
                .regs = {
@@ -967,7 +967,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x7e,
+               .id = TEGRA210_MC_NVJPGRD,
                .name = "nvjpgsrd",
                .swgroup = TEGRA_SWGROUP_NVJPG,
                .regs = {
@@ -983,7 +983,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x7f,
+               .id = TEGRA210_MC_NVJPGWR,
                .name = "nvjpgswr",
                .swgroup = TEGRA_SWGROUP_NVJPG,
                .regs = {
@@ -999,7 +999,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x80,
+               .id = TEGRA210_MC_SESRD,
                .name = "sesrd",
                .swgroup = TEGRA_SWGROUP_SE,
                .regs = {
@@ -1015,7 +1015,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x81,
+               .id = TEGRA210_MC_SESRD,
                .name = "seswr",
                .swgroup = TEGRA_SWGROUP_SE,
                .regs = {
@@ -1031,7 +1031,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x82,
+               .id = TEGRA210_MC_AXIAPR,
                .name = "axiapr",
                .swgroup = TEGRA_SWGROUP_AXIAP,
                .regs = {
@@ -1047,7 +1047,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x83,
+               .id = TEGRA210_MC_AXIAPW,
                .name = "axiapw",
                .swgroup = TEGRA_SWGROUP_AXIAP,
                .regs = {
@@ -1063,7 +1063,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x84,
+               .id = TEGRA210_MC_ETRR,
                .name = "etrr",
                .swgroup = TEGRA_SWGROUP_ETR,
                .regs = {
@@ -1079,7 +1079,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x85,
+               .id = TEGRA210_MC_ETRR,
                .name = "etrw",
                .swgroup = TEGRA_SWGROUP_ETR,
                .regs = {
@@ -1095,7 +1095,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x86,
+               .id = TEGRA210_MC_TSECSRDB,
                .name = "tsecsrdb",
                .swgroup = TEGRA_SWGROUP_TSECB,
                .regs = {
@@ -1111,7 +1111,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x87,
+               .id = TEGRA210_MC_TSECSWRB,
                .name = "tsecswrb",
                .swgroup = TEGRA_SWGROUP_TSECB,
                .regs = {
@@ -1127,7 +1127,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x88,
+               .id = TEGRA210_MC_GPUSRD2,
                .name = "gpusrd2",
                .swgroup = TEGRA_SWGROUP_GPU,
                .regs = {
@@ -1144,7 +1144,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
                        },
                },
        }, {
-               .id = 0x89,
+               .id = TEGRA210_MC_GPUSWR2,
                .name = "gpuswr2",
                .swgroup = TEGRA_SWGROUP_GPU,
                .regs = {