OMAP4: Add basic support for OMAP4470/TWL6032
PATCH 2/2 OMAP4: Add basic support for OMAP4470/TWL6032
H/W used for test: TI Blaze/Tablet OMAP4470 Processor Board (750-2173-005) mounted on a custom main board (MMS benvolio4).
Fixed bug in vcores_data omap4460_volts struct referencing tps62361 instead of twl6030 for core and mm voltages.
Fixed some comments.
Signed-off-by Lubomir Popov <[email protected]>
--- arch/arm/cpu/armv7/omap4/hw_data.c | 53 ++++++++++++++++++++++-- arch/arm/cpu/armv7/omap4/hwinit.c | 6 +++ arch/arm/cpu/armv7/omap4/sdram_elpida.c | 65 ++++++++++++++++++++++++++---- arch/arm/include/asm/arch-omap4/clocks.h | 7 +++- arch/arm/include/asm/arch-omap4/omap.h | 1 + 5 files changed, 119 insertions(+), 13 deletions(-)
arch/arm/cpu/armv7/omap4/hw_data.c +49 -4
@@ -7,6 +7,9 @@* * Sricharan R <[email protected]> * +* 03/2013 Lubomir Popov <[email protected]> <[email protected]> +* Added basic support for 750-2173 OMAP4470 board. +* * See file CREDITS for list of people who contributed to this * project. *
@@ -66,6 +69,7 @@ static const struct dpll_params mpu_dpll_params_1400mhz[NUM_SYS_CLKS] = {/* * dpll locked at 1600 MHz - MPU clk at 800 MHz(OPP Turbo 4430) * OMAP4430 OPP_TURBO frequency +* OMAP4470 OPP_NOM frequency */ static const struct dpll_params mpu_dpll_params_1600mhz[NUM_SYS_CLKS ] = { {200 ,2 ,1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 },/* 12 MHz */
@@ -92,6 +96,7 @@ static const struct dpll_params mpu_dpll_params_1200mhz[NUM_SYS_CLKS] = { };/* OMAP4460 OPP_NOM frequency */ +/* OMAP4470 OPP_NOM (Low Power) frequency */ static const struct dpll_params core_dpll_params_1600mhz[NUM_SYS_CLKS ] = { {200 ,2 ,1 ,5 ,8 ,4 ,6 ,5 ,-1 ,-1 ,-1 ,-1 },/* 12 MHz */ {800 ,12 ,1 ,5 ,8 ,4 ,6 ,5 ,-1 ,-1 ,-1 ,-1 },/* 13 MHz */
@@ -214,16 +219,30 @@ struct dplls omap4460_dplls = { .ddr = NULL }; +struct dplls omap4470_dplls = { + .mpu = mpu_dpll_params_1600mhz, + .core = core_dpll_params_1600mhz, + .per = per_dpll_params_1536mhz, + .iva = iva_dpll_params_1862mhz, +#ifdef CONFIG_SYS_OMAP_ABE_SYSCK + .abe = abe_dpll_params_sysclk_196608khz, +#else + .abe = &abe_dpll_params_32k_196608khz, +#endif + .usb = usb_dpll_params_1920mhz, + .ddr =NULL +}; +struct pmic_data twl6030_4430es1 = { .base_offset =PHOENIX_SMPS_BASE_VOLT_STD_MODE_UV , - .step =12660 ,/* 10 mV represented in uV */ + .step =12660 ,/* 12.7 mV represented in uV */ /* The code starts at 1 not 0 */ .start_code =1 , };struct pmic_data twl6030 = { .base_offset =PHOENIX_SMPS_BASE_VOLT_STD_MODE_WITH_OFFSET_UV , - .step =12660 ,/* 10 mV represented in uV */ + .step =12660 ,/* 12.7 mV represented in uV */ /* The code starts at 1 not 0 */ .start_code =1 , };
@@ -236,6 +255,13 @@ struct pmic_data tps62361 = { .gpio_en = 1 }; +struct pmic_data twl6032 = { + .base_offset =PHOENIX_SMPS_BASE_VOLT_STD_MODE_WITH_OFFSET_UV , + .step =12660 ,/* 12.7 mV represented in uV */ +/* The code starts at 1 not 0 */ + .start_code =1 , +}; +struct vcores_data omap4430_volts_es1 = { .mpu.value =1325 , .mpu.addr =SMPS_REG_ADDR_VCORE1 ,
@@ -271,11 +297,25 @@ struct vcores_data omap4460_volts = { .core.value = 1200, .core.addr = SMPS_REG_ADDR_VCORE1, - .core.pmic = &tps62361, + .core.pmic = &twl6030, .mm.value = 1200, .mm.addr = SMPS_REG_ADDR_VCORE2, - .mm.pmic = &tps62361, + .mm.pmic = &twl6030, +}; + +struct vcores_data omap4470_volts = { + .mpu.value =1203 , + .mpu.addr =SMPS1_REG_ADDR_MPU , + .mpu.pmic = &twl6032, + + .core.value =1127 , + .core.addr =SMPS2_REG_ADDR_CORE , + .core.pmic = &twl6032, + + .mm.value =1139 , + .mm.addr =SMPS5_REG_ADDR_MM , + .mm.pmic = &twl6032, };/*
@@ -483,6 +523,11 @@ void hw_data_init(void) *omap_vcores = &omap4460_volts;break ; +case OMAP4470_ES1_0 : + *dplls_data = &omap4470_dplls; + *omap_vcores = &omap4470_volts; +break ; +default :printf ("\n INVALID OMAP REVISION " ); }
arch/arm/cpu/armv7/omap4/hwinit.c +6 -0
@@ -9,6 +9,9 @@* Aneesh V <[email protected]> * Steve Sakoman <[email protected]> * +* 03/2013 Lubomir Popov <[email protected]> <[email protected]> +* Added basic support for 750-2173 OMAP4470 board. +* * See file CREDITS for list of people who contributed to this * project. *
@@ -153,6 +156,9 @@ void init_omap_revision(void)break ;case MIDR_CORTEX_A9_R2P10 :switch (readl (CONTROL_ID_CODE )) { +case OMAP4470_CONTROL_ID_CODE_ES1_0 : + *omap_si_rev =OMAP4470_ES1_0 ; +break ;case OMAP4460_CONTROL_ID_CODE_ES1_1 : *omap_si_rev =OMAP4460_ES1_1 ;break ;
arch/arm/cpu/armv7/omap4/sdram_elpida.c +57 -8
118 lines not on this page · raw message
arch/arm/include/asm/arch-omap4/clocks.h +6 -1
@@ -188,11 +188,16 @@/* PRM_VC_VAL_BYPASS */ #define PRM_VC_I2C_CHANNEL_FREQ_KHZ 400 -/* SMPS */ +/* PMIC Slave Address */ #define SMPS_I2C_SLAVE_ADDR 0x12 +/* TWL6030 SMPS */ #define SMPS_REG_ADDR_VCORE1 0x55#define SMPS_REG_ADDR_VCORE2 0x5B#define SMPS_REG_ADDR_VCORE3 0x61 +/* TWL6032 SMPS */ +#define SMPS1_REG_ADDR_MPU 0x55/* mpu */ +#define SMPS5_REG_ADDR_MM 0x49/* mm */ +#define SMPS2_REG_ADDR_CORE 0x5B/* core */ #define PHOENIX_SMPS_BASE_VOLT_STD_MODE_UV 607700#define PHOENIX_SMPS_BASE_VOLT_STD_MODE_WITH_OFFSET_UV 709000
arch/arm/include/asm/arch-omap4/omap.h +1 -0
@@ -65,6 +65,7 @@#define OMAP4_CONTROL_ID_CODE_ES2_3 0x6B95C02F#define OMAP4460_CONTROL_ID_CODE_ES1_0 0x0B94E02F#define OMAP4460_CONTROL_ID_CODE_ES1_1 0x2B94E02F +#define OMAP4470_CONTROL_ID_CODE_ES1_0 0x0B97502F/* UART */ #define UART1_BASE (OMAP44XX_L4_PER_BASE + 0x6a000)
Signature · 1 line
1.7.9.5