diff options
Diffstat (limited to 'arch')
| -rwxr-xr-x[-rw-r--r--] | arch/arm/mach-omap2/omap4_trim_quirks.c | 19 | ||||
| -rwxr-xr-x | arch/arm/mach-omap2/opp4xxx_data.c | 2 |
2 files changed, 12 insertions, 9 deletions
diff --git a/arch/arm/mach-omap2/omap4_trim_quirks.c b/arch/arm/mach-omap2/omap4_trim_quirks.c index dd96726..d6d33c5 100644..100755 --- a/arch/arm/mach-omap2/omap4_trim_quirks.c +++ b/arch/arm/mach-omap2/omap4_trim_quirks.c @@ -20,6 +20,7 @@ #define OMAP4_DPLL_MPU_TRIMMED_VAL_2P4 (0x1 << 18) #define OMAP4_DPLL_MPU_TRIMMED_VAL_3P0 (0x3 << 18) #define OMAP4_DPLL_MPU_TRIMMED_MASK (BIT(19) | BIT(18)) + /* * Trim value has to be written to CONTROL_EFUSE_2 according to * OMAP4430 errata i684 (version B) @@ -28,7 +29,6 @@ #define OMAP4_LPDDR2_I684_FIX_VALUE 0x004E4000 #define OMAP4_PROD_ID_I684_MASK 0x000C0000 - static bool bgap_trim_sw_overide; static bool dpll_trim_override; static bool ddr_io_trim_override; @@ -60,13 +60,16 @@ int omap4_ldo_trim_configure(void) OMAP4_CTRL_MODULE_CORE_LDOSRAM_IVA_VOLTAGE_CTRL); } - /* For all trimmed and untrimmed write value as per recomendation */ - val = 0x10 << OMAP4_AVDAC_TRIM_BYTE0_SHIFT; - val |= 0x01 << OMAP4_AVDAC_TRIM_BYTE1_SHIFT; - val |= 0x4d << OMAP4_AVDAC_TRIM_BYTE2_SHIFT; - val |= 0x1C << OMAP4_AVDAC_TRIM_BYTE3_SHIFT; - omap4_ctrl_pad_writel(val, - OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_EFUSE_1); + /* OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_EFUSE_1 is reserved for 4470 */ + if (!cpu_is_omap447x()) { + /* For all trimmed and untrimmed write recommended value */ + val = 0x10 << OMAP4_AVDAC_TRIM_BYTE0_SHIFT; + val |= 0x01 << OMAP4_AVDAC_TRIM_BYTE1_SHIFT; + val |= 0x4d << OMAP4_AVDAC_TRIM_BYTE2_SHIFT; + val |= 0x1C << OMAP4_AVDAC_TRIM_BYTE3_SHIFT; + omap4_ctrl_pad_writel(val, + OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_EFUSE_1); + } /* DDR I/O Trim override as per erratum i684 */ if (ddr_io_trim_override) { diff --git a/arch/arm/mach-omap2/opp4xxx_data.c b/arch/arm/mach-omap2/opp4xxx_data.c index 21ac13f..c03c72a 100755 --- a/arch/arm/mach-omap2/opp4xxx_data.c +++ b/arch/arm/mach-omap2/opp4xxx_data.c @@ -167,7 +167,7 @@ struct omap_volt_data omap446x_vdd_mpu_volt_data[] = { VOLT_DATA_DEFINE(OMAP4460_VDD_MPU_OPP100_UV, 0, OMAP44XX_CONTROL_FUSE_MPU_OPP100, 0xf9, 0x16, OMAP_ABB_NOMINAL_OPP), VOLT_DATA_DEFINE(OMAP4460_VDD_MPU_OPPTURBO_UV, 0, OMAP44XX_CONTROL_FUSE_MPU_OPPTURBO, 0xfa, 0x23, OMAP_ABB_NOMINAL_OPP), VOLT_DATA_DEFINE(OMAP4460_VDD_MPU_OPPNITRO_UV, 0, OMAP44XX_CONTROL_FUSE_MPU_OPPNITRO, 0xfa, 0x27, OMAP_ABB_FAST_OPP), - VOLT_DATA_DEFINE(OMAP4460_VDD_MPU_OPPNITROSB_UV, OMAP44XX_CONTROL_FUSE_MPU_OPPNITROSB, 0xfa, 0x27, OMAP_ABB_FAST_OPP), + VOLT_DATA_DEFINE(OMAP4460_VDD_MPU_OPPNITROSB_UV, 0, OMAP44XX_CONTROL_FUSE_MPU_OPPNITROSB, 0xfa, 0x27, OMAP_ABB_FAST_OPP), VOLT_DATA_DEFINE(0, 0, 0, 0, 0, 0), }; |