Merge tag 'u-boot-atmel-fixes-2020.07-a' of https://gitlab.denx.de/u-boot/custodians...
[oweals/u-boot.git] / arch / arm / include / asm / arch-imx8m / imx-regs.h
index 3facd5450c01b80f10cc914f336a9052f7684c86..3cfa169c971927761fa90edd65f6cfba47bc08b5 100644 (file)
 #ifndef __ASM_ARCH_IMX8M_REGS_H__
 #define __ASM_ARCH_IMX8M_REGS_H__
 
+#define ARCH_MXC
+
 #include <asm/mach-imx/regs-lcdif.h>
 
-#define ROM_VERSION_A0         0x800
-#define ROM_VERSION_B0         0x83C
+#define ROM_VERSION_A0         IS_ENABLED(CONFIG_IMX8MQ) ? 0x800 : 0x800
+#define ROM_VERSION_B0         IS_ENABLED(CONFIG_IMX8MQ) ? 0x83C : 0x800
 
-#define M4_BOOTROM_BASE_ADDR   0x007E0000
+#define M4_BOOTROM_BASE_ADDR   0x007E0000
 
-#define SAI1_BASE_ADDR         0x30010000
-#define SAI6_BASE_ADDR         0x30030000
-#define SAI5_BASE_ADDR         0x30040000
-#define SAI4_BASE_ADDR         0x30050000
-#define SPBA2_BASE_ADDR                0x300F0000
-#define AIPS1_BASE_ADDR                0x301F0000
 #define GPIO1_BASE_ADDR                0X30200000
 #define GPIO2_BASE_ADDR                0x30210000
 #define GPIO3_BASE_ADDR                0x30220000
 #define GPIO4_BASE_ADDR                0x30230000
 #define GPIO5_BASE_ADDR                0x30240000
-#define ANA_TSENSOR_BASE_ADDR  0x30260000
-#define ANA_OSC_BASE_ADDR      0x30270000
 #define WDOG1_BASE_ADDR                0x30280000
 #define WDOG2_BASE_ADDR                0x30290000
 #define WDOG3_BASE_ADDR                0x302A0000
-#define SDMA2_BASE_ADDR                0x302C0000
-#define GPT1_BASE_ADDR         0x302D0000
-#define GPT2_BASE_ADDR         0x302E0000
-#define GPT3_BASE_ADDR         0x302F0000
-#define ROMCP_BASE_ADDR                0x30310000
-#define LCDIF_BASE_ADDR                0x30320000
 #define IOMUXC_BASE_ADDR       0x30330000
 #define IOMUXC_GPR_BASE_ADDR   0x30340000
 #define OCOTP_BASE_ADDR                0x30350000
 #define ANATOP_BASE_ADDR       0x30360000
-#define SNVS_HP_BASE_ADDR      0x30370000
 #define CCM_BASE_ADDR          0x30380000
 #define SRC_BASE_ADDR          0x30390000
 #define GPC_BASE_ADDR          0x303A0000
-#define SEMAPHORE1_BASE_ADDR   0x303B0000
-#define SEMAPHORE2_BASE_ADDR   0x303C0000
-#define RDC_BASE_ADDR          0x303D0000
-#define CSU_BASE_ADDR          0x303E0000
 
-#define AIPS2_BASE_ADDR                0x305F0000
-#define PWM1_BASE_ADDR         0x30660000
-#define PWM2_BASE_ADDR         0x30670000
-#define PWM3_BASE_ADDR         0x30680000
-#define PWM4_BASE_ADDR         0x30690000
 #define SYSCNT_RD_BASE_ADDR    0x306A0000
 #define SYSCNT_CMP_BASE_ADDR   0x306B0000
 #define SYSCNT_CTRL_BASE_ADDR  0x306C0000
-#define GPT6_BASE_ADDR         0x306E0000
-#define GPT5_BASE_ADDR         0x306F0000
-#define GPT4_BASE_ADDR         0x30700000
-#define PERFMON1_BASE_ADDR     0x307C0000
-#define PERFMON2_BASE_ADDR     0x307D0000
-#define QOSC_BASE_ADDR         0x307F0000
 
-#define SPDIF1_BASE_ADDR       0x30810000
-#define ECSPI1_BASE_ADDR       0x30820000
-#define ECSPI2_BASE_ADDR       0x30830000
-#define ECSPI3_BASE_ADDR       0x30840000
 #define UART1_BASE_ADDR                0x30860000
 #define UART3_BASE_ADDR                0x30880000
 #define UART2_BASE_ADDR                0x30890000
-#define SPDIF2_BASE_ADDR       0x308A0000
-#define SAI2_BASE_ADDR         0x308B0000
-#define SAI3_BASE_ADDR         0x308C0000
-#define SPBA1_BASE_ADDR                0x308F0000
-#define CAAM_BASE_ADDR         0x30900000
-#define AIPS3_BASE_ADDR                0x309F0000
-#define MIPI_PHY_BASE_ADDR     0x30A00000
-#define MIPI_DSI_BASE_ADDR     0x30A10000
 #define I2C1_BASE_ADDR         0x30A20000
 #define I2C2_BASE_ADDR         0x30A30000
 #define I2C3_BASE_ADDR         0x30A40000
 #define I2C4_BASE_ADDR         0x30A50000
 #define UART4_BASE_ADDR                0x30A60000
-#define MIPI_CSI_BASE_ADDR     0x30A70000
-#define MIPI_CSI_PHY1_BASE_ADDR        0x30A80000
-#define CSI1_BASE_ADDR         0x30A90000
-#define MU_A_BASE_ADDR         0x30AA0000
-#define MU_B_BASE_ADDR         0x30AB0000
-#define SEMAPHOR_HS_BASE_ADDR  0x30AC0000
 #define USDHC1_BASE_ADDR       0x30B40000
 #define USDHC2_BASE_ADDR       0x30B50000
-#define MIPI_CS2_BASE_ADDR     0x30B60000
-#define MIPI_CSI_PHY2_BASE_ADDR        0x30B70000
-#define CSI2_BASE_ADDR         0x30B80000
-#define QSPI0_BASE_ADDR                0x30BB0000
-#define QSPI0_AMBA_BASE                0x08000000
-#define SDMA1_BASE_ADDR                0x30BD0000
-#define ENET1_BASE_ADDR                0x30BE0000
+#ifdef CONFIG_IMX8MM
+#define USDHC3_BASE_ADDR       0x30B60000
+#endif
 
-#define HDMI_CTRL_BASE_ADDR    0x32C00000
-#define AIPS4_BASE_ADDR                0x32DF0000
-#define DC1_BASE_ADDR          0x32E00000
-#define DC2_BASE_ADDR          0x32E10000
-#define DC3_BASE_ADDR          0x32E20000
-#define HDMI_SEC_BASE_ADDR     0x32E40000
 #define TZASC_BASE_ADDR                0x32F80000
-#define MTR_BASE_ADDR          0x32FB0000
-#define PLATFORM_CTRL_BASE_ADDR        0x32FE0000
-
-#define MXS_APBH_BASE          0x33000000
-#define MXS_GPMI_BASE          0x33002000
-#define MXS_BCH_BASE           0x33004000
 
-#define USB1_BASE_ADDR         0x38100000
-#define USB2_BASE_ADDR         0x38200000
-#define USB1_PHY_BASE_ADDR     0x381F0000
-#define USB2_PHY_BASE_ADDR     0x382F0000
-
-#define MXS_LCDIF_BASE         LCDIF_BASE_ADDR
+#define MXS_LCDIF_BASE         IS_ENABLED(CONFIG_IMX8MQ) ? \
+                                       0x30320000 : 0x32e00000
 
 #define SRC_IPS_BASE_ADDR      0x30390000
 #define SRC_DDRC_RCR_ADDR      0x30391000
@@ -203,6 +137,41 @@ struct fuse_bank1_regs {
        u32 rsvd3[3];
 };
 
+struct fuse_bank3_regs {
+       u32 mem_trim0;
+       u32 rsvd0[3];
+       u32 mem_trim1;
+       u32 rsvd1[3];
+       u32 mem_trim2;
+       u32 rsvd2[3];
+       u32 ana0;
+       u32 rsvd3[3];
+};
+
+struct fuse_bank9_regs {
+       u32 mac_addr0;
+       u32 rsvd0[3];
+       u32 mac_addr1;
+       u32 rsvd1[11];
+};
+
+struct fuse_bank38_regs {
+       u32 ana_trim1; /* trim0 is at 0xD70, bank 37*/
+       u32 rsvd0[3];
+       u32 ana_trim2;
+       u32 rsvd1[3];
+       u32 ana_trim3;
+       u32 rsvd2[3];
+       u32 ana_trim4;
+       u32 rsvd3[3];
+};
+
+struct fuse_bank39_regs {
+       u32 ana_trim5;
+       u32 rsvd[15];
+};
+
+#ifdef CONFIG_IMX8MQ
 struct anamix_pll {
        u32 audio_pll1_cfg0;
        u32 audio_pll1_cfg1;
@@ -237,13 +206,60 @@ struct anamix_pll {
        u32 frac_pllout_div_cfg;
        u32 sscg_pllout_div_cfg;
 };
-
-struct fuse_bank9_regs {
-       u32 mac_addr0;
-       u32 rsvd0[3];
-       u32 mac_addr1;
-       u32 rsvd1[11];
+#else
+struct anamix_pll {
+       u32 audio_pll1_gnrl_ctl;
+       u32 audio_pll1_fdiv_ctl0;
+       u32 audio_pll1_fdiv_ctl1;
+       u32 audio_pll1_sscg_ctl;
+       u32 audio_pll1_mnit_ctl;
+       u32 audio_pll2_gnrl_ctl;
+       u32 audio_pll2_fdiv_ctl0;
+       u32 audio_pll2_fdiv_ctl1;
+       u32 audio_pll2_sscg_ctl;
+       u32 audio_pll2_mnit_ctl;
+       u32 video_pll1_gnrl_ctl;
+       u32 video_pll1_fdiv_ctl0;
+       u32 video_pll1_fdiv_ctl1;
+       u32 video_pll1_sscg_ctl;
+       u32 video_pll1_mnit_ctl;
+       u32 reserved[5];
+       u32 dram_pll_gnrl_ctl;
+       u32 dram_pll_fdiv_ctl0;
+       u32 dram_pll_fdiv_ctl1;
+       u32 dram_pll_sscg_ctl;
+       u32 dram_pll_mnit_ctl;
+       u32 gpu_pll_gnrl_ctl;
+       u32 gpu_pll_div_ctl;
+       u32 gpu_pll_locked_ctl1;
+       u32 gpu_pll_mnit_ctl;
+       u32 vpu_pll_gnrl_ctl;
+       u32 vpu_pll_div_ctl;
+       u32 vpu_pll_locked_ctl1;
+       u32 vpu_pll_mnit_ctl;
+       u32 arm_pll_gnrl_ctl;
+       u32 arm_pll_div_ctl;
+       u32 arm_pll_locked_ctl1;
+       u32 arm_pll_mnit_ctl;
+       u32 sys_pll1_gnrl_ctl;
+       u32 sys_pll1_div_ctl;
+       u32 sys_pll1_locked_ctl1;
+       u32 reserved2[24];
+       u32 sys_pll1_mnit_ctl;
+       u32 sys_pll2_gnrl_ctl;
+       u32 sys_pll2_div_ctl;
+       u32 sys_pll2_locked_ctl1;
+       u32 sys_pll2_mnit_ctl;
+       u32 sys_pll3_gnrl_ctl;
+       u32 sys_pll3_div_ctl;
+       u32 sys_pll3_locked_ctl1;
+       u32 sys_pll3_mnit_ctl;
+       u32 anamix_misc_ctl;
+       u32 anamix_clk_mnit_ctl;
+       u32 reserved3[437];
+       u32 digprog;
 };
+#endif
 
 /* System Reset Controller (SRC) */
 struct src {
@@ -286,155 +302,6 @@ struct src {
        u32 ddr2_rcr;
 };
 
-struct gpc_reg {
-       u32 lpcr_bsc;
-       u32 lpcr_ad;
-       u32 lpcr_cpu1;
-       u32 lpcr_cpu2;
-       u32 lpcr_cpu3;
-       u32 slpcr;
-       u32 mst_cpu_mapping;
-       u32 mmdc_cpu_mapping;
-       u32 mlpcr;
-       u32 pgc_ack_sel;
-       u32 pgc_ack_sel_m4;
-       u32 gpc_misc;
-       u32 imr1_core0;
-       u32 imr2_core0;
-       u32 imr3_core0;
-       u32 imr4_core0;
-       u32 imr1_core1;
-       u32 imr2_core1;
-       u32 imr3_core1;
-       u32 imr4_core1;
-       u32 imr1_cpu1;
-       u32 imr2_cpu1;
-       u32 imr3_cpu1;
-       u32 imr4_cpu1;
-       u32 imr1_cpu3;
-       u32 imr2_cpu3;
-       u32 imr3_cpu3;
-       u32 imr4_cpu3;
-       u32 isr1_cpu0;
-       u32 isr2_cpu0;
-       u32 isr3_cpu0;
-       u32 isr4_cpu0;
-       u32 isr1_cpu1;
-       u32 isr2_cpu1;
-       u32 isr3_cpu1;
-       u32 isr4_cpu1;
-       u32 isr1_cpu2;
-       u32 isr2_cpu2;
-       u32 isr3_cpu2;
-       u32 isr4_cpu2;
-       u32 isr1_cpu3;
-       u32 isr2_cpu3;
-       u32 isr3_cpu3;
-       u32 isr4_cpu3;
-       u32 slt0_cfg;
-       u32 slt1_cfg;
-       u32 slt2_cfg;
-       u32 slt3_cfg;
-       u32 slt4_cfg;
-       u32 slt5_cfg;
-       u32 slt6_cfg;
-       u32 slt7_cfg;
-       u32 slt8_cfg;
-       u32 slt9_cfg;
-       u32 slt10_cfg;
-       u32 slt11_cfg;
-       u32 slt12_cfg;
-       u32 slt13_cfg;
-       u32 slt14_cfg;
-       u32 pgc_cpu_0_1_mapping;
-       u32 cpu_pgc_up_trg;
-       u32 mix_pgc_up_trg;
-       u32 pu_pgc_up_trg;
-       u32 cpu_pgc_dn_trg;
-       u32 mix_pgc_dn_trg;
-       u32 pu_pgc_dn_trg;
-       u32 lpcr_bsc2;
-       u32 pgc_cpu_2_3_mapping;
-       u32 lps_cpu0;
-       u32 lps_cpu1;
-       u32 lps_cpu2;
-       u32 lps_cpu3;
-       u32 gpc_gpr;
-       u32 gtor;
-       u32 debug_addr1;
-       u32 debug_addr2;
-       u32 cpu_pgc_up_status1;
-       u32 mix_pgc_up_status0;
-       u32 mix_pgc_up_status1;
-       u32 mix_pgc_up_status2;
-       u32 m4_mix_pgc_up_status0;
-       u32 m4_mix_pgc_up_status1;
-       u32 m4_mix_pgc_up_status2;
-       u32 pu_pgc_up_status0;
-       u32 pu_pgc_up_status1;
-       u32 pu_pgc_up_status2;
-       u32 m4_pu_pgc_up_status0;
-       u32 m4_pu_pgc_up_status1;
-       u32 m4_pu_pgc_up_status2;
-       u32 a53_lp_io_0;
-       u32 a53_lp_io_1;
-       u32 a53_lp_io_2;
-       u32 cpu_pgc_dn_status1;
-       u32 mix_pgc_dn_status0;
-       u32 mix_pgc_dn_status1;
-       u32 mix_pgc_dn_status2;
-       u32 m4_mix_pgc_dn_status0;
-       u32 m4_mix_pgc_dn_status1;
-       u32 m4_mix_pgc_dn_status2;
-       u32 pu_pgc_dn_status0;
-       u32 pu_pgc_dn_status1;
-       u32 pu_pgc_dn_status2;
-       u32 m4_pu_pgc_dn_status0;
-       u32 m4_pu_pgc_dn_status1;
-       u32 m4_pu_pgc_dn_status2;
-       u32 res[3];
-       u32 mix_pdn_flg;
-       u32 pu_pdn_flg;
-       u32 m4_mix_pdn_flg;
-       u32 m4_pu_pdn_flg;
-       u32 imr1_core2;
-       u32 imr2_core2;
-       u32 imr3_core2;
-       u32 imr4_core2;
-       u32 imr1_core3;
-       u32 imr2_core3;
-       u32 imr3_core3;
-       u32 imr4_core3;
-       u32 pgc_ack_sel_pu;
-       u32 pgc_ack_sel_m4_pu;
-       u32 slt15_cfg;
-       u32 slt16_cfg;
-       u32 slt17_cfg;
-       u32 slt18_cfg;
-       u32 slt19_cfg;
-       u32 gpc_pu_pwrhsk;
-       u32 slt0_cfg_pu;
-       u32 slt1_cfg_pu;
-       u32 slt2_cfg_pu;
-       u32 slt3_cfg_pu;
-       u32 slt4_cfg_pu;
-       u32 slt5_cfg_pu;
-       u32 slt6_cfg_pu;
-       u32 slt7_cfg_pu;
-       u32 slt8_cfg_pu;
-       u32 slt9_cfg_pu;
-       u32 slt10_cfg_pu;
-       u32 slt11_cfg_pu;
-       u32 slt12_cfg_pu;
-       u32 slt13_cfg_pu;
-       u32 slt14_cfg_pu;
-       u32 slt15_cfg_pu;
-       u32 slt16_cfg_pu;
-       u32 slt17_cfg_pu;
-       u32 slt18_cfg_pu;
-       u32 slt19_cfg_pu;
-};
-
 #define WDOG_WDT_MASK  BIT(3)
 #define WDOG_WDZST_MASK        BIT(0)
 struct wdog_regs {
@@ -457,7 +324,8 @@ struct bootrom_sw_info {
        u32 reserved_3[3];
 };
 
-#define ROM_SW_INFO_ADDR_B0    0x00000968
+#define ROM_SW_INFO_ADDR_B0    (IS_ENABLED(CONFIG_IMX8MQ) ? 0x00000968 :\
+                                0x000009e8)
 #define ROM_SW_INFO_ADDR_A0    0x000009e8
 
 #define ROM_SW_INFO_ADDR is_soc_rev(CHIP_REV_1_0) ? \