|
@@ -106,6 +106,10 @@
|
|
|
#define OMAP4430_CLKACTIVITY_CORE_DPLL_EMU_CLK_SHIFT 9
|
|
|
#define OMAP4430_CLKACTIVITY_CORE_DPLL_EMU_CLK_MASK (1 << 9)
|
|
|
|
|
|
+/* Used by CM_L4CFG_CLKSTCTRL */
|
|
|
+#define OMAP4460_CLKACTIVITY_CORE_TS_GFCLK_SHIFT 9
|
|
|
+#define OMAP4460_CLKACTIVITY_CORE_TS_GFCLK_MASK (1 << 9)
|
|
|
+
|
|
|
/* Used by CM_CEFUSE_CLKSTCTRL */
|
|
|
#define OMAP4430_CLKACTIVITY_CUST_EFUSE_SYS_CLK_SHIFT 9
|
|
|
#define OMAP4430_CLKACTIVITY_CUST_EFUSE_SYS_CLK_MASK (1 << 9)
|
|
@@ -418,6 +422,10 @@
|
|
|
#define OMAP4430_CLKACTIVITY_WKUP_32K_GFCLK_SHIFT 11
|
|
|
#define OMAP4430_CLKACTIVITY_WKUP_32K_GFCLK_MASK (1 << 11)
|
|
|
|
|
|
+/* Used by CM_WKUP_CLKSTCTRL */
|
|
|
+#define OMAP4460_CLKACTIVITY_WKUP_TS_GFCLK_SHIFT 13
|
|
|
+#define OMAP4460_CLKACTIVITY_WKUP_TS_GFCLK_MASK (1 << 13)
|
|
|
+
|
|
|
/*
|
|
|
* Used by CM1_ABE_TIMER5_CLKCTRL, CM1_ABE_TIMER6_CLKCTRL,
|
|
|
* CM1_ABE_TIMER7_CLKCTRL, CM1_ABE_TIMER8_CLKCTRL, CM_L3INIT_MMC1_CLKCTRL,
|
|
@@ -449,6 +457,10 @@
|
|
|
#define OMAP4430_CLKSEL_60M_SHIFT 24
|
|
|
#define OMAP4430_CLKSEL_60M_MASK (1 << 24)
|
|
|
|
|
|
+/* Used by CM_MPU_MPU_CLKCTRL */
|
|
|
+#define OMAP4460_CLKSEL_ABE_DIV_MODE_SHIFT 25
|
|
|
+#define OMAP4460_CLKSEL_ABE_DIV_MODE_MASK (1 << 25)
|
|
|
+
|
|
|
/* Used by CM1_ABE_AESS_CLKCTRL */
|
|
|
#define OMAP4430_CLKSEL_AESS_FCLK_SHIFT 24
|
|
|
#define OMAP4430_CLKSEL_AESS_FCLK_MASK (1 << 24)
|
|
@@ -468,6 +480,10 @@
|
|
|
#define OMAP4430_CLKSEL_DIV_SHIFT 24
|
|
|
#define OMAP4430_CLKSEL_DIV_MASK (1 << 24)
|
|
|
|
|
|
+/* Used by CM_MPU_MPU_CLKCTRL */
|
|
|
+#define OMAP4460_CLKSEL_EMIF_DIV_MODE_SHIFT 24
|
|
|
+#define OMAP4460_CLKSEL_EMIF_DIV_MODE_MASK (1 << 24)
|
|
|
+
|
|
|
/* Used by CM_CAM_FDIF_CLKCTRL */
|
|
|
#define OMAP4430_CLKSEL_FCLK_SHIFT 24
|
|
|
#define OMAP4430_CLKSEL_FCLK_MASK (0x3 << 24)
|
|
@@ -572,6 +588,14 @@
|
|
|
#define OMAP4430_D2D_STATDEP_SHIFT 18
|
|
|
#define OMAP4430_D2D_STATDEP_MASK (1 << 18)
|
|
|
|
|
|
+/* Used by CM_CLKSEL_DPLL_MPU */
|
|
|
+#define OMAP4460_DCC_COUNT_MAX_SHIFT 24
|
|
|
+#define OMAP4460_DCC_COUNT_MAX_MASK (0xff << 24)
|
|
|
+
|
|
|
+/* Used by CM_CLKSEL_DPLL_MPU */
|
|
|
+#define OMAP4460_DCC_EN_SHIFT 22
|
|
|
+#define OMAP4460_DCC_EN_MASK (1 << 22)
|
|
|
+
|
|
|
/*
|
|
|
* Used by CM_SSC_DELTAMSTEP_DPLL_ABE, CM_SSC_DELTAMSTEP_DPLL_CORE,
|
|
|
* CM_SSC_DELTAMSTEP_DPLL_CORE_RESTORE, CM_SSC_DELTAMSTEP_DPLL_DDRPHY,
|
|
@@ -582,6 +606,10 @@
|
|
|
#define OMAP4430_DELTAMSTEP_SHIFT 0
|
|
|
#define OMAP4430_DELTAMSTEP_MASK (0xfffff << 0)
|
|
|
|
|
|
+/* Renamed from DELTAMSTEP Used by CM_SSC_DELTAMSTEP_DPLL_USB */
|
|
|
+#define OMAP4460_DELTAMSTEP_0_20_SHIFT 0
|
|
|
+#define OMAP4460_DELTAMSTEP_0_20_MASK (0x1fffff << 0)
|
|
|
+
|
|
|
/* Used by CM_SHADOW_FREQ_CONFIG1, CM_SHADOW_FREQ_CONFIG1_RESTORE */
|
|
|
#define OMAP4430_DLL_OVERRIDE_SHIFT 2
|
|
|
#define OMAP4430_DLL_OVERRIDE_MASK (1 << 2)
|
|
@@ -1204,6 +1232,10 @@
|
|
|
#define OMAP4430_MODULEMODE_SHIFT 0
|
|
|
#define OMAP4430_MODULEMODE_MASK (0x3 << 0)
|
|
|
|
|
|
+/* Used by CM_L4CFG_DYNAMICDEP */
|
|
|
+#define OMAP4460_MPU_DYNDEP_SHIFT 19
|
|
|
+#define OMAP4460_MPU_DYNDEP_MASK (1 << 19)
|
|
|
+
|
|
|
/* Used by CM_DSS_DSS_CLKCTRL */
|
|
|
#define OMAP4430_OPTFCLKEN_48MHZ_CLK_SHIFT 9
|
|
|
#define OMAP4430_OPTFCLKEN_48MHZ_CLK_MASK (1 << 9)
|
|
@@ -1298,6 +1330,10 @@
|
|
|
#define OMAP4430_OPTFCLKEN_SYS_CLK_SHIFT 10
|
|
|
#define OMAP4430_OPTFCLKEN_SYS_CLK_MASK (1 << 10)
|
|
|
|
|
|
+/* Used by CM_WKUP_BANDGAP_CLKCTRL */
|
|
|
+#define OMAP4460_OPTFCLKEN_TS_FCLK_SHIFT 8
|
|
|
+#define OMAP4460_OPTFCLKEN_TS_FCLK_MASK (1 << 8)
|
|
|
+
|
|
|
/* Used by CM_DSS_DSS_CLKCTRL */
|
|
|
#define OMAP4430_OPTFCLKEN_TV_CLK_SHIFT 11
|
|
|
#define OMAP4430_OPTFCLKEN_TV_CLK_MASK (1 << 11)
|