Merge remote-tracking branch 'u-boot/master'

[u-boot] / arch / arm / include / asm / arch-tegra124 / mc.h

diff --git a/arch/arm/include/asm/arch-tegra124/mc.h b/arch/arm/include/asm/arch-tegra124/mc.h
index d526dfe15c303100326062916bb540f8116df318..37998a4d606ebd82c5f97ef11d0d6aacc38a0142 100644 (file)
--- a/arch/arm/include/asm/arch-tegra124/mc.h
+++ b/arch/arm/include/asm/arch-tegra124/mc.h
@@ -35,14 +35,47 @@ struct mc_ctlr {
        u32 mc_emem_adr_cfg;                    /* offset 0x54 */
        u32 mc_emem_adr_cfg_dev0;               /* offset 0x58 */
        u32 mc_emem_adr_cfg_dev1;               /* offset 0x5C */
-       u32 reserved3[12];                      /* offset 0x60 - 0x8C */
+       u32 reserved3[4];                       /* offset 0x60 - 0x6C */
+       u32 mc_security_cfg0;                   /* offset 0x70 */
+       u32 mc_security_cfg1;                   /* offset 0x74 */
+       u32 reserved4[6];                       /* offset 0x7C - 0x8C */
        u32 mc_emem_arb_reserved[28];           /* offset 0x90 - 0xFC */
-       u32 reserved4[338];                     /* offset 0x100 - 0x644 */
+       u32 reserved5[74];                      /* offset 0x100 - 0x224 */
+       u32 mc_smmu_translation_enable_0;       /* offset 0x228 */
+       u32 mc_smmu_translation_enable_1;       /* offset 0x22C */
+       u32 mc_smmu_translation_enable_2;       /* offset 0x230 */
+       u32 mc_smmu_translation_enable_3;       /* offset 0x234 */
+       u32 mc_smmu_afi_asid;                   /* offset 0x238 */
+       u32 mc_smmu_avpc_asid;                  /* offset 0x23C */
+       u32 mc_smmu_dc_asid;                    /* offset 0x240 */
+       u32 mc_smmu_dcb_asid;                   /* offset 0x244 */
+       u32 reserved6[2];                       /* offset 0x248 - 0x24C */
+       u32 mc_smmu_hc_asid;                    /* offset 0x250 */
+       u32 mc_smmu_hda_asid;                   /* offset 0x254 */
+       u32 mc_smmu_isp2_asid;                  /* offset 0x258 */
+       u32 reserved7[2];                       /* offset 0x25C - 0x260 */
+       u32 mc_smmu_msenc_asid;                 /* offset 0x264 */
+       u32 mc_smmu_nv_asid;                    /* offset 0x268 */
+       u32 mc_smmu_nv2_asid;                   /* offset 0x26C */
+       u32 mc_smmu_ppcs_asid;                  /* offset 0x270 */
+       u32 mc_smmu_sata_asid;                  /* offset 0x274 */
+       u32 reserved8[1];                       /* offset 0x278 */
+       u32 mc_smmu_vde_asid;                   /* offset 0x27C */
+       u32 mc_smmu_vi_asid;                    /* offset 0x280 */
+       u32 mc_smmu_vic_asid;                   /* offset 0x284 */
+       u32 mc_smmu_xusb_host_asid;             /* offset 0x288 */
+       u32 mc_smmu_xusb_dev_asid;              /* offset 0x28C */
+       u32 reserved9[1];                       /* offset 0x290 */
+       u32 mc_smmu_tsec_asid;                  /* offset 0x294 */
+       u32 mc_smmu_ppcs1_asid;                 /* offset 0x298 */
+       u32 reserved10[235];                    /* offset 0x29C - 0x644 */
        u32 mc_video_protect_bom;               /* offset 0x648 */
        u32 mc_video_protect_size_mb;           /* offset 0x64c */
        u32 mc_video_protect_reg_ctrl;          /* offset 0x650 */
 };
 
+#define TEGRA_MC_SMMU_CONFIG_ENABLE (1 << 0)
+
 #define TEGRA_MC_VIDEO_PROTECT_REG_WRITE_ACCESS_ENABLED                (0 << 0)
 #define TEGRA_MC_VIDEO_PROTECT_REG_WRITE_ACCESS_DISABLED       (1 << 0)