]> git.kernelconcepts.de Git - karo-tx-uboot.git/blobdiff - arch/arm/include/asm/omap_common.h
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
[karo-tx-uboot.git] / arch / arm / include / asm / omap_common.h
index fcf9ce50d62d127fc2069c7eadd56301726a14e7..091ddb508d5673bb493e76ec255d7ce8de284413 100644 (file)
@@ -27,6 +27,8 @@
 
 #include <common.h>
 
+#define NUM_SYS_CLKS   8
+
 struct prcm_regs {
        /* cm1.ckgen */
        u32 cm_clksel_core;
@@ -42,6 +44,8 @@ struct prcm_regs {
        u32 cm_div_h12_dpll_core;
        u32 cm_div_h13_dpll_core;
        u32 cm_div_h14_dpll_core;
+       u32 cm_div_h21_dpll_core;
+       u32 cm_div_h24_dpll_core;
        u32 cm_ssc_deltamstep_dpll_core;
        u32 cm_ssc_modfreqdiv_dpll_core;
        u32 cm_emu_override_dpll_core;
@@ -81,6 +85,7 @@ struct prcm_regs {
        u32 cm_div_h12_dpll_ddrphy;
        u32 cm_div_h13_dpll_ddrphy;
        u32 cm_ssc_deltamstep_dpll_ddrphy;
+       u32 cm_clkmode_dpll_dsp;
        u32 cm_shadow_freq_config1;
        u32 cm_mpu_mpu_clkctrl;
 
@@ -126,6 +131,7 @@ struct prcm_regs {
        u32 cm_div_m3_dpll_per;
        u32 cm_div_h11_dpll_per;
        u32 cm_div_h12_dpll_per;
+       u32 cm_div_h13_dpll_per;
        u32 cm_div_h14_dpll_per;
        u32 cm_ssc_deltamstep_dpll_per;
        u32 cm_ssc_modfreqdiv_dpll_per;
@@ -138,6 +144,11 @@ struct prcm_regs {
        u32 cm_ssc_deltamstep_dpll_usb;
        u32 cm_ssc_modfreqdiv_dpll_usb;
        u32 cm_clkdcoldo_dpll_usb;
+       u32 cm_clkmode_dpll_pcie_ref;
+       u32 cm_clkmode_apll_pcie;
+       u32 cm_idlest_apll_pcie;
+       u32 cm_div_m2_apll_pcie;
+       u32 cm_clkvcoldo_apll_pcie;
        u32 cm_clkmode_dpll_unipro;
        u32 cm_idlest_dpll_unipro;
        u32 cm_autoidle_dpll_unipro;
@@ -148,13 +159,14 @@ struct prcm_regs {
 
        /* cm2.core */
        u32 cm_coreaon_bandgap_clkctrl;
+       u32 cm_coreaon_io_srcomp_clkctrl;
        u32 cm_l3_1_clkstctrl;
        u32 cm_l3_1_dynamicdep;
        u32 cm_l3_1_l3_1_clkctrl;
        u32 cm_l3_2_clkstctrl;
        u32 cm_l3_2_dynamicdep;
        u32 cm_l3_2_l3_2_clkctrl;
-       u32 cm_l3_2_gpmc_clkctrl;
+       u32 cm_l3_gpmc_clkctrl;
        u32 cm_l3_2_ocmc_ram_clkctrl;
        u32 cm_mpu_m3_clkstctrl;
        u32 cm_mpu_m3_staticdep;
@@ -199,6 +211,12 @@ struct prcm_regs {
        u32 cm_cam_clkstctrl;
        u32 cm_cam_iss_clkctrl;
        u32 cm_cam_fdif_clkctrl;
+       u32 cm_cam_vip1_clkctrl;
+       u32 cm_cam_vip2_clkctrl;
+       u32 cm_cam_vip3_clkctrl;
+       u32 cm_cam_lvdsrx_clkctrl;
+       u32 cm_cam_csi1_clkctrl;
+       u32 cm_cam_csi2_clkctrl;
 
        /* cm2.dss */
        u32 cm_dss_clkstctrl;
@@ -295,6 +313,9 @@ struct prcm_regs {
        u32 cm_wkup_rtc_clkctrl;
        u32 cm_wkup_bandgap_clkctrl;
        u32 cm_wkupaon_scrm_clkctrl;
+       u32 cm_wkupaon_io_srcomp_clkctrl;
+       u32 prm_rstctrl;
+       u32 prm_rstst;
        u32 prm_vc_val_bypass;
        u32 prm_vc_cfg_i2c_mode;
        u32 prm_vc_cfg_i2c_clk;
@@ -324,11 +345,204 @@ struct prcm_regs {
        u32 prm_vc_cfg_channel;
 };
 
+struct omap_sys_ctrl_regs {
+       u32 control_status;
+       u32 control_core_mmr_lock1;
+       u32 control_core_mmr_lock2;
+       u32 control_core_mmr_lock3;
+       u32 control_core_mmr_lock4;
+       u32 control_core_mmr_lock5;
+       u32 control_core_control_io1;
+       u32 control_core_control_io2;
+       u32 control_id_code;
+       u32 control_std_fuse_opp_bgap;
+       u32 control_ldosram_iva_voltage_ctrl;
+       u32 control_ldosram_mpu_voltage_ctrl;
+       u32 control_ldosram_core_voltage_ctrl;
+       u32 control_padconf_core_base;
+       u32 control_paconf_global;
+       u32 control_paconf_mode;
+       u32 control_smart1io_padconf_0;
+       u32 control_smart1io_padconf_1;
+       u32 control_smart1io_padconf_2;
+       u32 control_smart2io_padconf_0;
+       u32 control_smart2io_padconf_1;
+       u32 control_smart2io_padconf_2;
+       u32 control_smart3io_padconf_0;
+       u32 control_smart3io_padconf_1;
+       u32 control_pbias;
+       u32 control_i2c_0;
+       u32 control_camera_rx;
+       u32 control_hdmi_tx_phy;
+       u32 control_uniportm;
+       u32 control_dsiphy;
+       u32 control_mcbsplp;
+       u32 control_usb2phycore;
+       u32 control_hdmi_1;
+       u32 control_hsi;
+       u32 control_ddr3ch1_0;
+       u32 control_ddr3ch2_0;
+       u32 control_ddrch1_0;
+       u32 control_ddrch1_1;
+       u32 control_ddrch2_0;
+       u32 control_ddrch2_1;
+       u32 control_lpddr2ch1_0;
+       u32 control_lpddr2ch1_1;
+       u32 control_ddrio_0;
+       u32 control_ddrio_1;
+       u32 control_ddrio_2;
+       u32 control_lpddr2io1_0;
+       u32 control_lpddr2io1_1;
+       u32 control_lpddr2io1_2;
+       u32 control_lpddr2io1_3;
+       u32 control_lpddr2io2_0;
+       u32 control_lpddr2io2_1;
+       u32 control_lpddr2io2_2;
+       u32 control_lpddr2io2_3;
+       u32 control_hyst_1;
+       u32 control_usbb_hsic_control;
+       u32 control_c2c;
+       u32 control_core_control_spare_rw;
+       u32 control_core_control_spare_r;
+       u32 control_core_control_spare_r_c0;
+       u32 control_srcomp_north_side;
+       u32 control_srcomp_south_side;
+       u32 control_srcomp_east_side;
+       u32 control_srcomp_west_side;
+       u32 control_srcomp_code_latch;
+       u32 control_pbiaslite;
+       u32 control_port_emif1_sdram_config;
+       u32 control_port_emif1_lpddr2_nvm_config;
+       u32 control_port_emif2_sdram_config;
+       u32 control_emif1_sdram_config_ext;
+       u32 control_emif2_sdram_config_ext;
+       u32 control_smart1nopmio_padconf_0;
+       u32 control_smart1nopmio_padconf_1;
+       u32 control_padconf_mode;
+       u32 control_xtal_oscillator;
+       u32 control_i2c_2;
+       u32 control_ckobuffer;
+       u32 control_wkup_control_spare_rw;
+       u32 control_wkup_control_spare_r;
+       u32 control_wkup_control_spare_r_c0;
+       u32 control_srcomp_east_side_wkup;
+       u32 control_efuse_1;
+       u32 control_efuse_2;
+       u32 control_efuse_3;
+       u32 control_efuse_4;
+       u32 control_efuse_5;
+       u32 control_efuse_6;
+       u32 control_efuse_7;
+       u32 control_efuse_8;
+       u32 control_efuse_9;
+       u32 control_efuse_10;
+       u32 control_efuse_11;
+       u32 control_efuse_12;
+       u32 control_efuse_13;
+       u32 control_padconf_wkup_base;
+};
+
+struct dpll_params {
+       u32 m;
+       u32 n;
+       s8 m2;
+       s8 m3;
+       s8 m4_h11;
+       s8 m5_h12;
+       s8 m6_h13;
+       s8 m7_h14;
+       s8 h21;
+       s8 h22;
+       s8 h23;
+       s8 h24;
+};
+
+struct dpll_regs {
+       u32 cm_clkmode_dpll;
+       u32 cm_idlest_dpll;
+       u32 cm_autoidle_dpll;
+       u32 cm_clksel_dpll;
+       u32 cm_div_m2_dpll;
+       u32 cm_div_m3_dpll;
+       u32 cm_div_m4_h11_dpll;
+       u32 cm_div_m5_h12_dpll;
+       u32 cm_div_m6_h13_dpll;
+       u32 cm_div_m7_h14_dpll;
+       u32 reserved[2];
+       u32 cm_div_h21_dpll;
+       u32 cm_div_h22_dpll;
+       u32 cm_div_h23_dpll;
+       u32 cm_div_h24_dpll;
+};
+
+struct dplls {
+       const struct dpll_params *mpu;
+       const struct dpll_params *core;
+       const struct dpll_params *per;
+       const struct dpll_params *abe;
+       const struct dpll_params *iva;
+       const struct dpll_params *usb;
+       const struct dpll_params *ddr;
+};
+
+struct pmic_data {
+       u32 base_offset;
+       u32 step;
+       u32 start_code;
+       unsigned gpio;
+       int gpio_en;
+};
+
+struct volts {
+       u32 value;
+       u32 addr;
+       struct pmic_data *pmic;
+};
+
+struct vcores_data {
+       struct volts mpu;
+       struct volts core;
+       struct volts mm;
+};
+
 extern struct prcm_regs const **prcm;
 extern struct prcm_regs const omap5_es1_prcm;
+extern struct prcm_regs const omap5_es2_prcm;
 extern struct prcm_regs const omap4_prcm;
+extern struct prcm_regs const dra7xx_prcm;
+extern struct dplls const **dplls_data;
+extern struct vcores_data const **omap_vcores;
+extern const u32 sys_clk_array[8];
+extern struct omap_sys_ctrl_regs const **ctrl;
+extern struct omap_sys_ctrl_regs const omap4_ctrl;
+extern struct omap_sys_ctrl_regs const omap5_ctrl;
+extern struct omap_sys_ctrl_regs const dra7xx_ctrl;
 
 void hw_data_init(void);
+
+const struct dpll_params *get_mpu_dpll_params(struct dplls const *);
+const struct dpll_params *get_core_dpll_params(struct dplls const *);
+const struct dpll_params *get_per_dpll_params(struct dplls const *);
+const struct dpll_params *get_iva_dpll_params(struct dplls const *);
+const struct dpll_params *get_usb_dpll_params(struct dplls const *);
+const struct dpll_params *get_abe_dpll_params(struct dplls const *);
+
+void do_enable_clocks(u32 const *clk_domains,
+                     u32 const *clk_modules_hw_auto,
+                     u32 const *clk_modules_explicit_en,
+                     u8 wait_for_enable);
+
+void setup_post_dividers(u32 const base,
+                       const struct dpll_params *params);
+u32 omap_ddr_clk(void);
+u32 get_sys_clk_index(void);
+void enable_basic_clocks(void);
+void enable_basic_uboot_clocks(void);
+void enable_non_essential_clocks(void);
+void scale_vcores(struct vcores_data const *);
+u32 get_offset_code(u32 volt_offset, struct pmic_data *pmic);
+void do_scale_vcore(u32 vcore_reg, u32 volt_mv, struct pmic_data *pmic);
+
 /* Max value for DPLL multiplier M */
 #define OMAP_DPLL_MAX_N        127
 
@@ -364,4 +578,9 @@ static inline u32 omap_revision(void)
 #define OMAP5430_SILICON_ID_INVALID    0
 #define OMAP5430_ES1_0 0x54300100
 #define OMAP5432_ES1_0 0x54320100
+#define OMAP5430_ES2_0  0x54300200
+#define OMAP5432_ES2_0  0x54320200
+
+/* DRA7XX */
+#define DRA752_ES1_0   0x07520100
 #endif /* _OMAP_COMMON_H_ */