memory: tegra: Make IRQ support opitonal
[linux-2.6-microblaze.git] / drivers / memory / tegra / tegra124.c
index 459211f..d780a84 100644 (file)
@@ -16,921 +16,1055 @@ static const struct tegra_mc_client tegra124_mc_clients[] = {
                .id = 0x00,
                .name = "ptcr",
                .swgroup = TEGRA_SWGROUP_PTC,
-               .la = {
-                       .reg = 0x34c,
-                       .shift = 0,
-                       .mask = 0xff,
-                       .def = 0x0,
+               .regs = {
+                       .la = {
+                               .reg = 0x34c,
+                               .shift = 0,
+                               .mask = 0xff,
+                               .def = 0x0,
+                       },
                },
        }, {
                .id = 0x01,
                .name = "display0a",
                .swgroup = TEGRA_SWGROUP_DC,
-               .smmu = {
-                       .reg = 0x228,
-                       .bit = 1,
-               },
-               .la = {
-                       .reg = 0x2e8,
-                       .shift = 0,
-                       .mask = 0xff,
-                       .def = 0xc2,
+               .regs = {
+                       .smmu = {
+                               .reg = 0x228,
+                               .bit = 1,
+                       },
+                       .la = {
+                               .reg = 0x2e8,
+                               .shift = 0,
+                               .mask = 0xff,
+                               .def = 0xc2,
+                       },
                },
        }, {
                .id = 0x02,
                .name = "display0ab",
                .swgroup = TEGRA_SWGROUP_DCB,
-               .smmu = {
-                       .reg = 0x228,
-                       .bit = 2,
-               },
-               .la = {
-                       .reg = 0x2f4,
-                       .shift = 0,
-                       .mask = 0xff,
-                       .def = 0xc6,
+               .regs = {
+                       .smmu = {
+                               .reg = 0x228,
+                               .bit = 2,
+                       },
+                       .la = {
+                               .reg = 0x2f4,
+                               .shift = 0,
+                               .mask = 0xff,
+                               .def = 0xc6,
+                       },
                },
        }, {
                .id = 0x03,
                .name = "display0b",
                .swgroup = TEGRA_SWGROUP_DC,
-               .smmu = {
-                       .reg = 0x228,
-                       .bit = 3,
-               },
-               .la = {
-                       .reg = 0x2e8,
-                       .shift = 16,
-                       .mask = 0xff,
-                       .def = 0x50,
+               .regs = {
+                       .smmu = {
+                               .reg = 0x228,
+                               .bit = 3,
+                       },
+                       .la = {
+                               .reg = 0x2e8,
+                               .shift = 16,
+                               .mask = 0xff,
+                               .def = 0x50,
+                       },
                },
        }, {
                .id = 0x04,
                .name = "display0bb",
                .swgroup = TEGRA_SWGROUP_DCB,
-               .smmu = {
-                       .reg = 0x228,
-                       .bit = 4,
-               },
-               .la = {
-                       .reg = 0x2f4,
-                       .shift = 16,
-                       .mask = 0xff,
-                       .def = 0x50,
+               .regs = {
+                       .smmu = {
+                               .reg = 0x228,
+                               .bit = 4,
+                       },
+                       .la = {
+                               .reg = 0x2f4,
+                               .shift = 16,
+                               .mask = 0xff,
+                               .def = 0x50,
+                       },
                },
        }, {
                .id = 0x05,
                .name = "display0c",
                .swgroup = TEGRA_SWGROUP_DC,
-               .smmu = {
-                       .reg = 0x228,
-                       .bit = 5,
-               },
-               .la = {
-                       .reg = 0x2ec,
-                       .shift = 0,
-                       .mask = 0xff,
-                       .def = 0x50,
+               .regs = {
+                       .smmu = {
+                               .reg = 0x228,
+                               .bit = 5,
+                       },
+                       .la = {
+                               .reg = 0x2ec,
+                               .shift = 0,
+                               .mask = 0xff,
+                               .def = 0x50,
+                       },
                },
        }, {
                .id = 0x06,
                .name = "display0cb",
                .swgroup = TEGRA_SWGROUP_DCB,
-               .smmu = {
-                       .reg = 0x228,
-                       .bit = 6,
-               },
-               .la = {
-                       .reg = 0x2f8,
-                       .shift = 0,
-                       .mask = 0xff,
-                       .def = 0x50,
+               .regs = {
+                       .smmu = {
+                               .reg = 0x228,
+                               .bit = 6,
+                       },
+                       .la = {
+                               .reg = 0x2f8,
+                               .shift = 0,
+                               .mask = 0xff,
+                               .def = 0x50,
+                       },
                },
        }, {
                .id = 0x0e,
                .name = "afir",
                .swgroup = TEGRA_SWGROUP_AFI,
-               .smmu = {
-                       .reg = 0x228,
-                       .bit = 14,
-               },
-               .la = {
-                       .reg = 0x2e0,
-                       .shift = 0,
-                       .mask = 0xff,
-                       .def = 0x13,
+               .regs = {
+                       .smmu = {
+                               .reg = 0x228,
+                               .bit = 14,
+                       },
+                       .la = {
+                               .reg = 0x2e0,
+                               .shift = 0,
+                               .mask = 0xff,
+                               .def = 0x13,
+                       },
                },
        }, {
                .id = 0x0f,
                .name = "avpcarm7r",
                .swgroup = TEGRA_SWGROUP_AVPC,
-               .smmu = {
-                       .reg = 0x228,
-                       .bit = 15,
-               },
-               .la = {
-                       .reg = 0x2e4,
-                       .shift = 0,
-                       .mask = 0xff,
-                       .def = 0x04,
+               .regs = {
+                       .smmu = {
+                               .reg = 0x228,
+                               .bit = 15,
+                       },
+                       .la = {
+                               .reg = 0x2e4,
+                               .shift = 0,
+                               .mask = 0xff,
+                               .def = 0x04,
+                       },
                },
        }, {
                .id = 0x10,
                .name = "displayhc",
                .swgroup = TEGRA_SWGROUP_DC,
-               .smmu = {
-                       .reg = 0x228,
-                       .bit = 16,
-               },
-               .la = {
-                       .reg = 0x2f0,
-                       .shift = 0,
-                       .mask = 0xff,
-                       .def = 0x50,
+               .regs = {
+                       .smmu = {
+                               .reg = 0x228,
+                               .bit = 16,
+                       },
+                       .la = {
+                               .reg = 0x2f0,
+                               .shift = 0,
+                               .mask = 0xff,
+                               .def = 0x50,
+                       },
                },
        }, {
                .id = 0x11,
                .name = "displayhcb",
                .swgroup = TEGRA_SWGROUP_DCB,
-               .smmu = {
-                       .reg = 0x228,
-                       .bit = 17,
-               },
-               .la = {
-                       .reg = 0x2fc,
-                       .shift = 0,
-                       .mask = 0xff,
-                       .def = 0x50,
+               .regs = {
+                       .smmu = {
+                               .reg = 0x228,
+                               .bit = 17,
+                       },
+                       .la = {
+                               .reg = 0x2fc,
+                               .shift = 0,
+                               .mask = 0xff,
+                               .def = 0x50,
+                       },
                },
        }, {
                .id = 0x15,
                .name = "hdar",
                .swgroup = TEGRA_SWGROUP_HDA,
-               .smmu = {
-                       .reg = 0x228,
-                       .bit = 21,
-               },
-               .la = {
-                       .reg = 0x318,
-                       .shift = 0,
-                       .mask = 0xff,
-                       .def = 0x24,
+               .regs = {
+                       .smmu = {
+                               .reg = 0x228,
+                               .bit = 21,
+                       },
+                       .la = {
+                               .reg = 0x318,
+                               .shift = 0,
+                               .mask = 0xff,
+                               .def = 0x24,
+                       },
                },
        }, {
                .id = 0x16,
                .name = "host1xdmar",
                .swgroup = TEGRA_SWGROUP_HC,
-               .smmu = {
-                       .reg = 0x228,
-                       .bit = 22,
-               },
-               .la = {
-                       .reg = 0x310,
-                       .shift = 0,
-                       .mask = 0xff,
-                       .def = 0x1e,
+               .regs = {
+                       .smmu = {
+                               .reg = 0x228,
+                               .bit = 22,
+                       },
+                       .la = {
+                               .reg = 0x310,
+                               .shift = 0,
+                               .mask = 0xff,
+                               .def = 0x1e,
+                       },
                },
        }, {
                .id = 0x17,
                .name = "host1xr",
                .swgroup = TEGRA_SWGROUP_HC,
-               .smmu = {
-                       .reg = 0x228,
-                       .bit = 23,
-               },
-               .la = {
-                       .reg = 0x310,
-                       .shift = 16,
-                       .mask = 0xff,
-                       .def = 0x50,
+               .regs = {
+                       .smmu = {
+                               .reg = 0x228,
+                               .bit = 23,
+                       },
+                       .la = {
+                               .reg = 0x310,
+                               .shift = 16,
+                               .mask = 0xff,
+                               .def = 0x50,
+                       },
                },
        }, {
                .id = 0x1c,
                .name = "msencsrd",
                .swgroup = TEGRA_SWGROUP_MSENC,
-               .smmu = {
-                       .reg = 0x228,
-                       .bit = 28,
-               },
-               .la = {
-                       .reg = 0x328,
-                       .shift = 0,
-                       .mask = 0xff,
-                       .def = 0x23,
+               .regs = {
+                       .smmu = {
+                               .reg = 0x228,
+                               .bit = 28,
+                       },
+                       .la = {
+                               .reg = 0x328,
+                               .shift = 0,
+                               .mask = 0xff,
+                               .def = 0x23,
+                       },
                },
        }, {
                .id = 0x1d,
                .name = "ppcsahbdmar",
                .swgroup = TEGRA_SWGROUP_PPCS,
-               .smmu = {
-                       .reg = 0x228,
-                       .bit = 29,
-               },
-               .la = {
-                       .reg = 0x344,
-                       .shift = 0,
-                       .mask = 0xff,
-                       .def = 0x49,
+               .regs = {
+                       .smmu = {
+                               .reg = 0x228,
+                               .bit = 29,
+                       },
+                       .la = {
+                               .reg = 0x344,
+                               .shift = 0,
+                               .mask = 0xff,
+                               .def = 0x49,
+                       },
                },
        }, {
                .id = 0x1e,
                .name = "ppcsahbslvr",
                .swgroup = TEGRA_SWGROUP_PPCS,
-               .smmu = {
-                       .reg = 0x228,
-                       .bit = 30,
-               },
-               .la = {
-                       .reg = 0x344,
-                       .shift = 16,
-                       .mask = 0xff,
-                       .def = 0x1a,
+               .regs = {
+                       .smmu = {
+                               .reg = 0x228,
+                               .bit = 30,
+                       },
+                       .la = {
+                               .reg = 0x344,
+                               .shift = 16,
+                               .mask = 0xff,
+                               .def = 0x1a,
+                       },
                },
        }, {
                .id = 0x1f,
                .name = "satar",
                .swgroup = TEGRA_SWGROUP_SATA,
-               .smmu = {
-                       .reg = 0x228,
-                       .bit = 31,
-               },
-               .la = {
-                       .reg = 0x350,
-                       .shift = 0,
-                       .mask = 0xff,
-                       .def = 0x65,
+               .regs = {
+                       .smmu = {
+                               .reg = 0x228,
+                               .bit = 31,
+                       },
+                       .la = {
+                               .reg = 0x350,
+                               .shift = 0,
+                               .mask = 0xff,
+                               .def = 0x65,
+                       },
                },
        }, {
                .id = 0x22,
                .name = "vdebsevr",
                .swgroup = TEGRA_SWGROUP_VDE,
-               .smmu = {
-                       .reg = 0x22c,
-                       .bit = 2,
-               },
-               .la = {
-                       .reg = 0x354,
-                       .shift = 0,
-                       .mask = 0xff,
-                       .def = 0x4f,
+               .regs = {
+                       .smmu = {
+                               .reg = 0x22c,
+                               .bit = 2,
+                       },
+                       .la = {
+                               .reg = 0x354,
+                               .shift = 0,
+                               .mask = 0xff,
+                               .def = 0x4f,
+                       },
                },
        }, {
                .id = 0x23,
                .name = "vdember",
                .swgroup = TEGRA_SWGROUP_VDE,
-               .smmu = {
-                       .reg = 0x22c,
-                       .bit = 3,
-               },
-               .la = {
-                       .reg = 0x354,
-                       .shift = 16,
-                       .mask = 0xff,
-                       .def = 0x3d,
+               .regs = {
+                       .smmu = {
+                               .reg = 0x22c,
+                               .bit = 3,
+                       },
+                       .la = {
+                               .reg = 0x354,
+                               .shift = 16,
+                               .mask = 0xff,
+                               .def = 0x3d,
+                       },
                },
        }, {
                .id = 0x24,
                .name = "vdemcer",
                .swgroup = TEGRA_SWGROUP_VDE,
-               .smmu = {
-                       .reg = 0x22c,
-                       .bit = 4,
-               },
-               .la = {
-                       .reg = 0x358,
-                       .shift = 0,
-                       .mask = 0xff,
-                       .def = 0x66,
+               .regs = {
+                       .smmu = {
+                               .reg = 0x22c,
+                               .bit = 4,
+                       },
+                       .la = {
+                               .reg = 0x358,
+                               .shift = 0,
+                               .mask = 0xff,
+                               .def = 0x66,
+                       },
                },
        }, {
                .id = 0x25,
                .name = "vdetper",
                .swgroup = TEGRA_SWGROUP_VDE,
-               .smmu = {
-                       .reg = 0x22c,
-                       .bit = 5,
-               },
-               .la = {
-                       .reg = 0x358,
-                       .shift = 16,
-                       .mask = 0xff,
-                       .def = 0xa5,
+               .regs = {
+                       .smmu = {
+                               .reg = 0x22c,
+                               .bit = 5,
+                       },
+                       .la = {
+                               .reg = 0x358,
+                               .shift = 16,
+                               .mask = 0xff,
+                               .def = 0xa5,
+                       },
                },
        }, {
                .id = 0x26,
                .name = "mpcorelpr",
                .swgroup = TEGRA_SWGROUP_MPCORELP,
-               .la = {
-                       .reg = 0x324,
-                       .shift = 0,
-                       .mask = 0xff,
-                       .def = 0x04,
+               .regs = {
+                       .la = {
+                               .reg = 0x324,
+                               .shift = 0,
+                               .mask = 0xff,
+                               .def = 0x04,
+                       },
                },
        }, {
                .id = 0x27,
                .name = "mpcorer",
                .swgroup = TEGRA_SWGROUP_MPCORE,
-               .la = {
-                       .reg = 0x320,
-                       .shift = 0,
-                       .mask = 0xff,
-                       .def = 0x04,
+               .regs = {
+                       .la = {
+                               .reg = 0x320,
+                               .shift = 0,
+                               .mask = 0xff,
+                               .def = 0x04,
+                       },
                },
        }, {
                .id = 0x2b,
                .name = "msencswr",
                .swgroup = TEGRA_SWGROUP_MSENC,
-               .smmu = {
-                       .reg = 0x22c,
-                       .bit = 11,
-               },
-               .la = {
-                       .reg = 0x328,
-                       .shift = 16,
-                       .mask = 0xff,
-                       .def = 0x80,
+               .regs = {
+                       .smmu = {
+                               .reg = 0x22c,
+                               .bit = 11,
+                       },
+                       .la = {
+                               .reg = 0x328,
+                               .shift = 16,
+                               .mask = 0xff,
+                               .def = 0x80,
+                       },
                },
        }, {
                .id = 0x31,
                .name = "afiw",
                .swgroup = TEGRA_SWGROUP_AFI,
-               .smmu = {
-                       .reg = 0x22c,
-                       .bit = 17,
-               },
-               .la = {
-                       .reg = 0x2e0,
-                       .shift = 16,
-                       .mask = 0xff,
-                       .def = 0x80,
+               .regs = {
+                       .smmu = {
+                               .reg = 0x22c,
+                               .bit = 17,
+                       },
+                       .la = {
+                               .reg = 0x2e0,
+                               .shift = 16,
+                               .mask = 0xff,
+                               .def = 0x80,
+                       },
                },
        }, {
                .id = 0x32,
                .name = "avpcarm7w",
                .swgroup = TEGRA_SWGROUP_AVPC,
-               .smmu = {
-                       .reg = 0x22c,
-                       .bit = 18,
-               },
-               .la = {
-                       .reg = 0x2e4,
-                       .shift = 16,
-                       .mask = 0xff,
-                       .def = 0x80,
+               .regs = {
+                       .smmu = {
+                               .reg = 0x22c,
+                               .bit = 18,
+                       },
+                       .la = {
+                               .reg = 0x2e4,
+                               .shift = 16,
+                               .mask = 0xff,
+                               .def = 0x80,
+                       },
                },
        }, {
                .id = 0x35,
                .name = "hdaw",
                .swgroup = TEGRA_SWGROUP_HDA,
-               .smmu = {
-                       .reg = 0x22c,
-                       .bit = 21,
-               },
-               .la = {
-                       .reg = 0x318,
-                       .shift = 16,
-                       .mask = 0xff,
-                       .def = 0x80,
+               .regs = {
+                       .smmu = {
+                               .reg = 0x22c,
+                               .bit = 21,
+                       },
+                       .la = {
+                               .reg = 0x318,
+                               .shift = 16,
+                               .mask = 0xff,
+                               .def = 0x80,
+                       },
                },
        }, {
                .id = 0x36,
                .name = "host1xw",
                .swgroup = TEGRA_SWGROUP_HC,
-               .smmu = {
-                       .reg = 0x22c,
-                       .bit = 22,
-               },
-               .la = {
-                       .reg = 0x314,
-                       .shift = 0,
-                       .mask = 0xff,
-                       .def = 0x80,
+               .regs = {
+                       .smmu = {
+                               .reg = 0x22c,
+                               .bit = 22,
+                       },
+                       .la = {
+                               .reg = 0x314,
+                               .shift = 0,
+                               .mask = 0xff,
+                               .def = 0x80,
+                       },
                },
        }, {
                .id = 0x38,
                .name = "mpcorelpw",
                .swgroup = TEGRA_SWGROUP_MPCORELP,
-               .la = {
-                       .reg = 0x324,
-                       .shift = 16,
-                       .mask = 0xff,
-                       .def = 0x80,
+               .regs = {
+                       .la = {
+                               .reg = 0x324,
+                               .shift = 16,
+                               .mask = 0xff,
+                               .def = 0x80,
+                       },
                },
        }, {
                .id = 0x39,
                .name = "mpcorew",
                .swgroup = TEGRA_SWGROUP_MPCORE,
-               .la = {
-                       .reg = 0x320,
-                       .shift = 16,
-                       .mask = 0xff,
-                       .def = 0x80,
+               .regs = {
+                       .la = {
+                               .reg = 0x320,
+                               .shift = 16,
+                               .mask = 0xff,
+                               .def = 0x80,
+                       },
                },
        }, {
                .id = 0x3b,
                .name = "ppcsahbdmaw",
                .swgroup = TEGRA_SWGROUP_PPCS,
-               .smmu = {
-                       .reg = 0x22c,
-                       .bit = 27,
-               },
-               .la = {
-                       .reg = 0x348,
-                       .shift = 0,
-                       .mask = 0xff,
-                       .def = 0x80,
+               .regs = {
+                       .smmu = {
+                               .reg = 0x22c,
+                               .bit = 27,
+                       },
+                       .la = {
+                               .reg = 0x348,
+                               .shift = 0,
+                               .mask = 0xff,
+                               .def = 0x80,
+                       },
                },
        }, {
                .id = 0x3c,
                .name = "ppcsahbslvw",
                .swgroup = TEGRA_SWGROUP_PPCS,
-               .smmu = {
-                       .reg = 0x22c,
-                       .bit = 28,
-               },
-               .la = {
-                       .reg = 0x348,
-                       .shift = 16,
-                       .mask = 0xff,
-                       .def = 0x80,
+               .regs = {
+                       .smmu = {
+                               .reg = 0x22c,
+                               .bit = 28,
+                       },
+                       .la = {
+                               .reg = 0x348,
+                               .shift = 16,
+                               .mask = 0xff,
+                               .def = 0x80,
+                       },
                },
        }, {
                .id = 0x3d,
                .name = "sataw",
                .swgroup = TEGRA_SWGROUP_SATA,
-               .smmu = {
-                       .reg = 0x22c,
-                       .bit = 29,
-               },
-               .la = {
-                       .reg = 0x350,
-                       .shift = 16,
-                       .mask = 0xff,
-                       .def = 0x65,
+               .regs = {
+                       .smmu = {
+                               .reg = 0x22c,
+                               .bit = 29,
+                       },
+                       .la = {
+                               .reg = 0x350,
+                               .shift = 16,
+                               .mask = 0xff,
+                               .def = 0x65,
+                       },
                },
        }, {
                .id = 0x3e,
                .name = "vdebsevw",
                .swgroup = TEGRA_SWGROUP_VDE,
-               .smmu = {
-                       .reg = 0x22c,
-                       .bit = 30,
-               },
-               .la = {
-                       .reg = 0x35c,
-                       .shift = 0,
-                       .mask = 0xff,
-                       .def = 0x80,
+               .regs = {
+                       .smmu = {
+                               .reg = 0x22c,
+                               .bit = 30,
+                       },
+                       .la = {
+                               .reg = 0x35c,
+                               .shift = 0,
+                               .mask = 0xff,
+                               .def = 0x80,
+                       },
                },
        }, {
                .id = 0x3f,
                .name = "vdedbgw",
                .swgroup = TEGRA_SWGROUP_VDE,
-               .smmu = {
-                       .reg = 0x22c,
-                       .bit = 31,
-               },
-               .la = {
-                       .reg = 0x35c,
-                       .shift = 16,
-                       .mask = 0xff,
-                       .def = 0x80,
+               .regs = {
+                       .smmu = {
+                               .reg = 0x22c,
+                               .bit = 31,
+                       },
+                       .la = {
+                               .reg = 0x35c,
+                               .shift = 16,
+                               .mask = 0xff,
+                               .def = 0x80,
+                       },
                },
        }, {
                .id = 0x40,
                .name = "vdembew",
                .swgroup = TEGRA_SWGROUP_VDE,
-               .smmu = {
-                       .reg = 0x230,
-                       .bit = 0,
-               },
-               .la = {
-                       .reg = 0x360,
-                       .shift = 0,
-                       .mask = 0xff,
-                       .def = 0x80,
+               .regs = {
+                       .smmu = {
+                               .reg = 0x230,
+                               .bit = 0,
+                       },
+                       .la = {
+                               .reg = 0x360,
+                               .shift = 0,
+                               .mask = 0xff,
+                               .def = 0x80,
+                       },
                },
        }, {
                .id = 0x41,
                .name = "vdetpmw",
                .swgroup = TEGRA_SWGROUP_VDE,
-               .smmu = {
-                       .reg = 0x230,
-                       .bit = 1,
-               },
-               .la = {
-                       .reg = 0x360,
-                       .shift = 16,
-                       .mask = 0xff,
-                       .def = 0x80,
+               .regs = {
+                       .smmu = {
+                               .reg = 0x230,
+                               .bit = 1,
+                       },
+                       .la = {
+                               .reg = 0x360,
+                               .shift = 16,
+                               .mask = 0xff,
+                               .def = 0x80,
+                       },
                },
        }, {
                .id = 0x44,
                .name = "ispra",
                .swgroup = TEGRA_SWGROUP_ISP2,
-               .smmu = {
-                       .reg = 0x230,
-                       .bit = 4,
-               },
-               .la = {
-                       .reg = 0x370,
-                       .shift = 0,
-                       .mask = 0xff,
-                       .def = 0x18,
+               .regs = {
+                       .smmu = {
+                               .reg = 0x230,
+                               .bit = 4,
+                       },
+                       .la = {
+                               .reg = 0x370,
+                               .shift = 0,
+                               .mask = 0xff,
+                               .def = 0x18,
+                       },
                },
        }, {
                .id = 0x46,
                .name = "ispwa",
                .swgroup = TEGRA_SWGROUP_ISP2,
-               .smmu = {
-                       .reg = 0x230,
-                       .bit = 6,
-               },
-               .la = {
-                       .reg = 0x374,
-                       .shift = 0,
-                       .mask = 0xff,
-                       .def = 0x80,
+               .regs = {
+                       .smmu = {
+                               .reg = 0x230,
+                               .bit = 6,
+                       },
+                       .la = {
+                               .reg = 0x374,
+                               .shift = 0,
+                               .mask = 0xff,
+                               .def = 0x80,
+                       },
                },
        }, {
                .id = 0x47,
                .name = "ispwb",
                .swgroup = TEGRA_SWGROUP_ISP2,
-               .smmu = {
-                       .reg = 0x230,
-                       .bit = 7,
-               },
-               .la = {
-                       .reg = 0x374,
-                       .shift = 16,
-                       .mask = 0xff,
-                       .def = 0x80,
+               .regs = {
+                       .smmu = {
+                               .reg = 0x230,
+                               .bit = 7,
+                       },
+                       .la = {
+                               .reg = 0x374,
+                               .shift = 16,
+                               .mask = 0xff,
+                               .def = 0x80,
+                       },
                },
        }, {
                .id = 0x4a,
                .name = "xusb_hostr",
                .swgroup = TEGRA_SWGROUP_XUSB_HOST,
-               .smmu = {
-                       .reg = 0x230,
-                       .bit = 10,
-               },
-               .la = {
-                       .reg = 0x37c,
-                       .shift = 0,
-                       .mask = 0xff,
-                       .def = 0x39,
+               .regs = {
+                       .smmu = {
+                               .reg = 0x230,
+                               .bit = 10,
+                       },
+                       .la = {
+                               .reg = 0x37c,
+                               .shift = 0,
+                               .mask = 0xff,
+                               .def = 0x39,
+                       },
                },
        }, {
                .id = 0x4b,
                .name = "xusb_hostw",
                .swgroup = TEGRA_SWGROUP_XUSB_HOST,
-               .smmu = {
-                       .reg = 0x230,
-                       .bit = 11,
-               },
-               .la = {
-                       .reg = 0x37c,
-                       .shift = 16,
-                       .mask = 0xff,
-                       .def = 0x80,
+               .regs = {
+                       .smmu = {
+                               .reg = 0x230,
+                               .bit = 11,
+                       },
+                       .la = {
+                               .reg = 0x37c,
+                               .shift = 16,
+                               .mask = 0xff,
+                               .def = 0x80,
+                       },
                },
        }, {
                .id = 0x4c,
                .name = "xusb_devr",
                .swgroup = TEGRA_SWGROUP_XUSB_DEV,
-               .smmu = {
-                       .reg = 0x230,
-                       .bit = 12,
-               },
-               .la = {
-                       .reg = 0x380,
-                       .shift = 0,
-                       .mask = 0xff,
-                       .def = 0x39,
+               .regs = {
+                       .smmu = {
+                               .reg = 0x230,
+                               .bit = 12,
+                       },
+                       .la = {
+                               .reg = 0x380,
+                               .shift = 0,
+                               .mask = 0xff,
+                               .def = 0x39,
+                       },
                },
        }, {
                .id = 0x4d,
                .name = "xusb_devw",
                .swgroup = TEGRA_SWGROUP_XUSB_DEV,
-               .smmu = {
-                       .reg = 0x230,
-                       .bit = 13,
-               },
-               .la = {
-                       .reg = 0x380,
-                       .shift = 16,
-                       .mask = 0xff,
-                       .def = 0x80,
+               .regs = {
+                       .smmu = {
+                               .reg = 0x230,
+                               .bit = 13,
+                       },
+                       .la = {
+                               .reg = 0x380,
+                               .shift = 16,
+                               .mask = 0xff,
+                               .def = 0x80,
+                       },
                },
        }, {
                .id = 0x4e,
                .name = "isprab",
                .swgroup = TEGRA_SWGROUP_ISP2B,
-               .smmu = {
-                       .reg = 0x230,
-                       .bit = 14,
-               },
-               .la = {
-                       .reg = 0x384,
-                       .shift = 0,
-                       .mask = 0xff,
-                       .def = 0x18,
+               .regs = {
+                       .smmu = {
+                               .reg = 0x230,
+                               .bit = 14,
+                       },
+                       .la = {
+                               .reg = 0x384,
+                               .shift = 0,
+                               .mask = 0xff,
+                               .def = 0x18,
+                       },
                },
        }, {
                .id = 0x50,
                .name = "ispwab",
                .swgroup = TEGRA_SWGROUP_ISP2B,
-               .smmu = {
-                       .reg = 0x230,
-                       .bit = 16,
-               },
-               .la = {
-                       .reg = 0x388,
-                       .shift = 0,
-                       .mask = 0xff,
-                       .def = 0x80,
+               .regs = {
+                       .smmu = {
+                               .reg = 0x230,
+                               .bit = 16,
+                       },
+                       .la = {
+                               .reg = 0x388,
+                               .shift = 0,
+                               .mask = 0xff,
+                               .def = 0x80,
+                       },
                },
        }, {
                .id = 0x51,
                .name = "ispwbb",
                .swgroup = TEGRA_SWGROUP_ISP2B,
-               .smmu = {
-                       .reg = 0x230,
-                       .bit = 17,
-               },
-               .la = {
-                       .reg = 0x388,
-                       .shift = 16,
-                       .mask = 0xff,
-                       .def = 0x80,
+               .regs = {
+                       .smmu = {
+                               .reg = 0x230,
+                               .bit = 17,
+                       },
+                       .la = {
+                               .reg = 0x388,
+                               .shift = 16,
+                               .mask = 0xff,
+                               .def = 0x80,
+                       },
                },
        }, {
                .id = 0x54,
                .name = "tsecsrd",
                .swgroup = TEGRA_SWGROUP_TSEC,
-               .smmu = {
-                       .reg = 0x230,
-                       .bit = 20,
-               },
-               .la = {
-                       .reg = 0x390,
-                       .shift = 0,
-                       .mask = 0xff,
-                       .def = 0x9b,
+               .regs = {
+                       .smmu = {
+                               .reg = 0x230,
+                               .bit = 20,
+                       },
+                       .la = {
+                               .reg = 0x390,
+                               .shift = 0,
+                               .mask = 0xff,
+                               .def = 0x9b,
+                       },
                },
        }, {
                .id = 0x55,
                .name = "tsecswr",
                .swgroup = TEGRA_SWGROUP_TSEC,
-               .smmu = {
-                       .reg = 0x230,
-                       .bit = 21,
-               },
-               .la = {
-                       .reg = 0x390,
-                       .shift = 16,
-                       .mask = 0xff,
-                       .def = 0x80,
+               .regs = {
+                       .smmu = {
+                               .reg = 0x230,
+                               .bit = 21,
+                       },
+                       .la = {
+                               .reg = 0x390,
+                               .shift = 16,
+                               .mask = 0xff,
+                               .def = 0x80,
+                       },
                },
        }, {
                .id = 0x56,
                .name = "a9avpscr",
                .swgroup = TEGRA_SWGROUP_A9AVP,
-               .smmu = {
-                       .reg = 0x230,
-                       .bit = 22,
-               },
-               .la = {
-                       .reg = 0x3a4,
-                       .shift = 0,
-                       .mask = 0xff,
-                       .def = 0x04,
+               .regs = {
+                       .smmu = {
+                               .reg = 0x230,
+                               .bit = 22,
+                       },
+                       .la = {
+                               .reg = 0x3a4,
+                               .shift = 0,
+                               .mask = 0xff,
+                               .def = 0x04,
+                       },
                },
        }, {
                .id = 0x57,
                .name = "a9avpscw",
                .swgroup = TEGRA_SWGROUP_A9AVP,
-               .smmu = {
-                       .reg = 0x230,
-                       .bit = 23,
-               },
-               .la = {
-                       .reg = 0x3a4,
-                       .shift = 16,
-                       .mask = 0xff,
-                       .def = 0x80,
+               .regs = {
+                       .smmu = {
+                               .reg = 0x230,
+                               .bit = 23,
+                       },
+                       .la = {
+                               .reg = 0x3a4,
+                               .shift = 16,
+                               .mask = 0xff,
+                               .def = 0x80,
+                       },
                },
        }, {
                .id = 0x58,
                .name = "gpusrd",
                .swgroup = TEGRA_SWGROUP_GPU,
-               .smmu = {
-                       /* read-only */
-                       .reg = 0x230,
-                       .bit = 24,
-               },
-               .la = {
-                       .reg = 0x3c8,
-                       .shift = 0,
-                       .mask = 0xff,
-                       .def = 0x1a,
+               .regs = {
+                       .smmu = {
+                               /* read-only */
+                               .reg = 0x230,
+                               .bit = 24,
+                       },
+                       .la = {
+                               .reg = 0x3c8,
+                               .shift = 0,
+                               .mask = 0xff,
+                               .def = 0x1a,
+                       },
                },
        }, {
                .id = 0x59,
                .name = "gpuswr",
                .swgroup = TEGRA_SWGROUP_GPU,
-               .smmu = {
-                       /* read-only */
-                       .reg = 0x230,
-                       .bit = 25,
-               },
-               .la = {
-                       .reg = 0x3c8,
-                       .shift = 16,
-                       .mask = 0xff,
-                       .def = 0x80,
+               .regs = {
+                       .smmu = {
+                               /* read-only */
+                               .reg = 0x230,
+                               .bit = 25,
+                       },
+                       .la = {
+                               .reg = 0x3c8,
+                               .shift = 16,
+                               .mask = 0xff,
+                               .def = 0x80,
+                       },
                },
        }, {
                .id = 0x5a,
                .name = "displayt",
                .swgroup = TEGRA_SWGROUP_DC,
-               .smmu = {
-                       .reg = 0x230,
-                       .bit = 26,
-               },
-               .la = {
-                       .reg = 0x2f0,
-                       .shift = 16,
-                       .mask = 0xff,
-                       .def = 0x50,
+               .regs = {
+                       .smmu = {
+                               .reg = 0x230,
+                               .bit = 26,
+                       },
+                       .la = {
+                               .reg = 0x2f0,
+                               .shift = 16,
+                               .mask = 0xff,
+                               .def = 0x50,
+                       },
                },
        }, {
                .id = 0x60,
                .name = "sdmmcra",
                .swgroup = TEGRA_SWGROUP_SDMMC1A,
-               .smmu = {
-                       .reg = 0x234,
-                       .bit = 0,
-               },
-               .la = {
-                       .reg = 0x3b8,
-                       .shift = 0,
-                       .mask = 0xff,
-                       .def = 0x49,
+               .regs = {
+                       .smmu = {
+                               .reg = 0x234,
+                               .bit = 0,
+                       },
+                       .la = {
+                               .reg = 0x3b8,
+                               .shift = 0,
+                               .mask = 0xff,
+                               .def = 0x49,
+                       },
                },
        }, {
                .id = 0x61,
                .name = "sdmmcraa",
                .swgroup = TEGRA_SWGROUP_SDMMC2A,
-               .smmu = {
-                       .reg = 0x234,
-                       .bit = 1,
-               },
-               .la = {
-                       .reg = 0x3bc,
-                       .shift = 0,
-                       .mask = 0xff,
-                       .def = 0x49,
+               .regs = {
+                       .smmu = {
+                               .reg = 0x234,
+                               .bit = 1,
+                       },
+                       .la = {
+                               .reg = 0x3bc,
+                               .shift = 0,
+                               .mask = 0xff,
+                               .def = 0x49,
+                       },
                },
        }, {
                .id = 0x62,
                .name = "sdmmcr",
                .swgroup = TEGRA_SWGROUP_SDMMC3A,
-               .smmu = {
-                       .reg = 0x234,
-                       .bit = 2,
-               },
-               .la = {
-                       .reg = 0x3c0,
-                       .shift = 0,
-                       .mask = 0xff,
-                       .def = 0x49,
+               .regs = {
+                       .smmu = {
+                               .reg = 0x234,
+                               .bit = 2,
+                       },
+                       .la = {
+                               .reg = 0x3c0,
+                               .shift = 0,
+                               .mask = 0xff,
+                               .def = 0x49,
+                       },
                },
        }, {
                .id = 0x63,
                .swgroup = TEGRA_SWGROUP_SDMMC4A,
                .name = "sdmmcrab",
-               .smmu = {
-                       .reg = 0x234,
-                       .bit = 3,
-               },
-               .la = {
-                       .reg = 0x3c4,
-                       .shift = 0,
-                       .mask = 0xff,
-                       .def = 0x49,
+               .regs = {
+                       .smmu = {
+                               .reg = 0x234,
+                               .bit = 3,
+                       },
+                       .la = {
+                               .reg = 0x3c4,
+                               .shift = 0,
+                               .mask = 0xff,
+                               .def = 0x49,
+                       },
                },
        }, {
                .id = 0x64,
                .name = "sdmmcwa",
                .swgroup = TEGRA_SWGROUP_SDMMC1A,
-               .smmu = {
-                       .reg = 0x234,
-                       .bit = 4,
-               },
-               .la = {
-                       .reg = 0x3b8,
-                       .shift = 16,
-                       .mask = 0xff,
-                       .def = 0x80,
+               .regs = {
+                       .smmu = {
+                               .reg = 0x234,
+                               .bit = 4,
+                       },
+                       .la = {
+                               .reg = 0x3b8,
+                               .shift = 16,
+                               .mask = 0xff,
+                               .def = 0x80,
+                       },
                },
        }, {
                .id = 0x65,
                .name = "sdmmcwaa",
                .swgroup = TEGRA_SWGROUP_SDMMC2A,
-               .smmu = {
-                       .reg = 0x234,
-                       .bit = 5,
-               },
-               .la = {
-                       .reg = 0x3bc,
-                       .shift = 16,
-                       .mask = 0xff,
-                       .def = 0x80,
+               .regs = {
+                       .smmu = {
+                               .reg = 0x234,
+                               .bit = 5,
+                       },
+                       .la = {
+                               .reg = 0x3bc,
+                               .shift = 16,
+                               .mask = 0xff,
+                               .def = 0x80,
+                       },
                },
        }, {
                .id = 0x66,
                .name = "sdmmcw",
                .swgroup = TEGRA_SWGROUP_SDMMC3A,
-               .smmu = {
-                       .reg = 0x234,
-                       .bit = 6,
-               },
-               .la = {
-                       .reg = 0x3c0,
-                       .shift = 16,
-                       .mask = 0xff,
-                       .def = 0x80,
+               .regs = {
+                       .smmu = {
+                               .reg = 0x234,
+                               .bit = 6,
+                       },
+                       .la = {
+                               .reg = 0x3c0,
+                               .shift = 16,
+                               .mask = 0xff,
+                               .def = 0x80,
+                       },
                },
        }, {
                .id = 0x67,
                .name = "sdmmcwab",
                .swgroup = TEGRA_SWGROUP_SDMMC4A,
-               .smmu = {
-                       .reg = 0x234,
-                       .bit = 7,
-               },
-               .la = {
-                       .reg = 0x3c4,
-                       .shift = 16,
-                       .mask = 0xff,
-                       .def = 0x80,
+               .regs = {
+                       .smmu = {
+                               .reg = 0x234,
+                               .bit = 7,
+                       },
+                       .la = {
+                               .reg = 0x3c4,
+                               .shift = 16,
+                               .mask = 0xff,
+                               .def = 0x80,
+                       },
                },
        }, {
                .id = 0x6c,
                .name = "vicsrd",
                .swgroup = TEGRA_SWGROUP_VIC,
-               .smmu = {
-                       .reg = 0x234,
-                       .bit = 12,
-               },
-               .la = {
-                       .reg = 0x394,
-                       .shift = 0,
-                       .mask = 0xff,
-                       .def = 0x1a,
+               .regs = {
+                       .smmu = {
+                               .reg = 0x234,
+                               .bit = 12,
+                       },
+                       .la = {
+                               .reg = 0x394,
+                               .shift = 0,
+                               .mask = 0xff,
+                               .def = 0x1a,
+                       },
                },
        }, {
                .id = 0x6d,
                .name = "vicswr",
                .swgroup = TEGRA_SWGROUP_VIC,
-               .smmu = {
-                       .reg = 0x234,
-                       .bit = 13,
-               },
-               .la = {
-                       .reg = 0x394,
-                       .shift = 16,
-                       .mask = 0xff,
-                       .def = 0x80,
+               .regs = {
+                       .smmu = {
+                               .reg = 0x234,
+                               .bit = 13,
+                       },
+                       .la = {
+                               .reg = 0x394,
+                               .shift = 16,
+                               .mask = 0xff,
+                               .def = 0x80,
+                       },
                },
        }, {
                .id = 0x72,
                .name = "viw",
                .swgroup = TEGRA_SWGROUP_VI,
-               .smmu = {
-                       .reg = 0x234,
-                       .bit = 18,
-               },
-               .la = {
-                       .reg = 0x398,
-                       .shift = 0,
-                       .mask = 0xff,
-                       .def = 0x80,
+               .regs = {
+                       .smmu = {
+                               .reg = 0x234,
+                               .bit = 18,
+                       },
+                       .la = {
+                               .reg = 0x398,
+                               .shift = 0,
+                               .mask = 0xff,
+                               .def = 0x80,
+                       },
                },
        }, {
                .id = 0x73,
                .name = "displayd",
                .swgroup = TEGRA_SWGROUP_DC,
-               .smmu = {
-                       .reg = 0x234,
-                       .bit = 19,
-               },
-               .la = {
-                       .reg = 0x3c8,
-                       .shift = 0,
-                       .mask = 0xff,
-                       .def = 0x50,
+               .regs = {
+                       .smmu = {
+                               .reg = 0x234,
+                               .bit = 19,
+                       },
+                       .la = {
+                               .reg = 0x3c8,
+                               .shift = 0,
+                               .mask = 0xff,
+                               .def = 0x50,
+                       },
                },
        },
 };
@@ -1140,6 +1274,7 @@ const struct tegra_mc_soc tegra124_mc_soc = {
        .resets = tegra124_mc_resets,
        .num_resets = ARRAY_SIZE(tegra124_mc_resets),
        .icc_ops = &tegra124_mc_icc_ops,
+       .ops = &tegra30_mc_ops,
 };
 #endif /* CONFIG_ARCH_TEGRA_124_SOC */
 
@@ -1171,5 +1306,6 @@ const struct tegra_mc_soc tegra132_mc_soc = {
        .resets = tegra124_mc_resets,
        .num_resets = ARRAY_SIZE(tegra124_mc_resets),
        .icc_ops = &tegra124_mc_icc_ops,
+       .ops = &tegra30_mc_ops,
 };
 #endif /* CONFIG_ARCH_TEGRA_132_SOC */