Tegra: Split tegra_get_chip_type() into soc & sku funcs
Subsystems (2)
PATCH v2 1/1 Tegra: Split tegra_get_chip_type() into soc & sku funcs
As suggested by Stephen Warren, use tegra_get_chip() to return the pure CHIPID for a Tegra SoC (i.e. 0x20 for Tegra20, 0x30 for Tegra30, etc.) and rename tegra_get_chip_type() to reflect its true function, i.e. tegra_get_chip_sku(), which returns an ID like TEGRA_SOC_T25, TEGRA_SOC_T33, etc.
--- arch/arm/cpu/arm720t/tegra-common/cpu.c | 48 +++++++++++++++++++-------------- arch/arm/cpu/arm720t/tegra-common/cpu.h | 4 ++- arch/arm/cpu/tegra-common/ap.c | 43 +++++++++++++++++++++-------- arch/arm/cpu/tegra20-common/pmu.c | 4 +-- arch/arm/include/asm/arch-tegra/ap.h | 20 ++++++++++++-- board/nvidia/common/emc.c | 2 +- 6 files changed, 84 insertions(+), 37 deletions(-)
arch/arm/cpu/arm720t/tegra-common/cpu.c +28 -20
@@ -143,26 +143,34 @@ void init_pllx(void) {struct clk_rst_ctlr *clkrst = (struct clk_rst_ctlr *)NV_PA_CLK_RST_BASE ;struct clk_pll_simple *pll = &clkrst->crc_pll_simple[SIMPLE_PLLX ]; -int chip_type; +int soc_type, sku_info, chip_sku;enum clock_osc_freq osc;struct clk_pll_table *sel;debug ("init_pllx entry\n" ); -/* get chip type */ - chip_type =tegra_get_chip_type (); -debug (" init_pllx: chip_type = %d\n" , chip_type); +/* get SOC (chip) type */ + soc_type =tegra_get_chip (); +debug (" init_pllx: SoC = 0x%02X\n" , soc_type); + +/* get SKU info */ + sku_info =tegra_get_sku_info (); +debug (" init_pllx: SKU info byte = 0x%02X\n" , sku_info); + +/* get chip SKU, combo of the above info */ + chip_sku =tegra_get_chip_sku (); +debug (" init_pllx: Chip SKU = %d\n" , chip_sku);/* get osc freq */ osc =clock_get_osc_freq (); -debug (" init_pllx: osc = %d\n" , osc); +debug (" init_pllx: osc = %d\n" , osc);/* set pllx */ - sel = &tegra_pll_x_table[chip_type][osc]; + sel = &tegra_pll_x_table[chip_sku][osc];pllx_set_rate (pll, sel->n, sel->m, sel->p, sel->cpcon); -/* adjust PLLP_out1-4 on T30/T114 */ -if (chip_type ==TEGRA_SOC_T30 || chip_type ==TEGRA_SOC_T114 ) { +/* adjust PLLP_out1-4 on T3x/T114 */ +if (soc_type >=CHIPID_TEGRA30 ) {debug (" init_pllx: adjusting PLLP out freqs\n" );adjust_pllp_out_freqs (); }
@@ -287,7 +295,7 @@ void reset_A9_cpu(int reset)void clock_enable_coresight (int enable) {u32 rst, src =2 ; -int chip; +int soc_type;debug ("clock_enable_coresight entry\n" );clock_set_enable (PERIPH_ID_CORESIGHT , enable);
@@ -295,21 +303,21 @@ void clock_enable_coresight(int enable)if (enable) {/* -* Put CoreSight on PLLP_OUT0 (216 MHz) and divide it down by -* 1.5, giving an effective frequency of 144MHz. -* Set PLLP_OUT0 [bits31:30 = 00], and use a 7.1 divisor -* (bits 7:0), so 00000001b == 1.5 (n+1 + .5) -* -* Clock divider request for 204MHz would setup CSITE clock as -* 144MHz for PLLP base 216MHz and 204MHz for PLLP base 408MHz +* Put CoreSight on PLLP_OUT0 and divide it down as per +* PLLP base frequency based on SoC type (T20/T30/T114). +* Clock divider request would setup CSITE clock as 144MHz +* for PLLP base 216MHz and 204MHz for PLLP base 408MHz */ - chip =tegra_get_chip_type (); -if (chip ==TEGRA_SOC_T30 || chip ==TEGRA_SOC_T114 ) + + soc_type =tegra_get_chip (); +if (soc_type ==CHIPID_TEGRA30 || soc_type ==CHIPID_TEGRA114 ) src =CLK_DIVIDER (NVBL_PLLP_KHZ ,204000 ); -else if (chip ==TEGRA_SOC_T20 || chip ==TEGRA_SOC_T25 ) +else if (soc_type ==CHIPID_TEGRA20 ) src =CLK_DIVIDER (NVBL_PLLP_KHZ ,144000 );else -printf ("%s: Unknown chip type %X!\n" , __func__, chip); +printf ("%s: Unknown SoC type %X!\n" , + __func__, soc_type); +clock_ll_set_source_divisor (PERIPH_ID_CSI ,0 , src);/* Unlock the CPU CoreSight interfaces */
arch/arm/cpu/arm720t/tegra-common/cpu.h +3 -1
@@ -80,5 +80,7 @@ void init_pllx(void);void powerup_cpu (void );void reset_A9_cpu (int reset);void start_cpu (u32 reset_vector); -int tegra_get_chip_type (void ); +int tegra_get_chip (void ); +int tegra_get_sku_info (void ); +int tegra_get_chip_sku (void );void adjust_pllp_out_freqs (void );
arch/arm/cpu/tegra-common/ap.c +32 -11
77 lines not on this page · raw message
arch/arm/cpu/tegra20-common/pmu.c +2 -2
@@ -44,7 +44,7 @@ int pmu_set_nominal(void)int core, cpu, bus;/* by default, the table has been filled with T25 settings */ -switch (tegra_get_chip_type ()) { +switch (tegra_get_chip_sku ()) {case TEGRA_SOC_T20 : core =VDD_CORE_NOMINAL_T20 ; cpu =VDD_CPU_NOMINAL_T20 ;
@@ -54,7 +54,7 @@ int pmu_set_nominal(void) cpu =VDD_CPU_NOMINAL_T25 ;break ;default : -debug ("%s: Unknown chip type\n" , __func__); +debug ("%s: Unknown SKU id\n" , __func__);return -1 ; }
arch/arm/include/asm/arch-tegra/ap.h +18 -2
@@ -59,9 +59,25 @@extern void _start (void );/** -* Works out the SOC type used for clocks settings +* Works out the SOC/SKU type used for clocks settings * * @return SOC type - see TEGRA_SOC... */ -int tegra_get_chip_type (void ); +int tegra_get_chip_sku (void ); + +/** +* Returns the pure SOC (chip ID) from the HIDREV register +* +* @return SOC ID - see CHIPID_TEGRAxx... +*/ +int tegra_get_chip (void ); + +/** +* Returns the SKU ID from the sku_info register +* +* @return SKU ID - see SKU_ID_Txx... +*/ +int tegra_get_sku_info (void ); + +/* Do any chip-specific cache config */ void config_cache (void );
board/nvidia/common/emc.c +1 -1
@@ -40,7 +40,7 @@ int board_emc_init(void) {unsigned rate; -switch (tegra_get_chip_type ()) { +switch (tegra_get_chip_sku ()) {default :case TEGRA_SOC_T20 : rate =EMC_SDRAM_RATE_T20 ;
Signature · 1 line
1.8.1.5
PATCH v2 1/1 Tegra: Split tegra_get_chip_type() into soc & sku funcs
arch/arm/cpu/arm720t/tegra-common/cpu.c void init_pllx(void) · line 173
Quoted 13 lines · Tom Warren
As suggested by Stephen Warren, use
tegra_get_chip()to return the pure CHIPID for a Tegra SoC (i.e.0x20for Tegra20,0x30for Tegra30, etc.) and renametegra_get_chip_type()to reflect its true function, i.e.tegra_get_chip_sku(), which returns an ID likeTEGRA_SOC_T25,TEGRA_SOC_T33, etc.arch/arm/cpu/arm720t/tegra-common/cpu.c +4
-0+/* get SOC (chip) type */ + soc_type =tegra_get_chip (); +/* adjust PLLP_out1-4 on T3x/T114 */ +if (soc_type >=CHIPID_TEGRA30 ) {
In the long run, I doubt >= will work here, since there's probably no guarantee that newer chips will have larger chipid values. However, it's fine for the chips we currently support.