Tegra: Split tegra_get_chip_type() into _soc and _sku functions
Subsystems (2)
PATCH 1/1 Tegra: Split tegra_get_chip_type() into _soc and _sku functions
As suggested by Stephen Warren, use tegra_get_soc_type() 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_soc_sku(), which returns an ID like TEGRA_SOC_T25, TEGRA_SOC_T33, etc.
--- arch/arm/cpu/arm720t/tegra-common/cpu.c | 4 ++-- arch/arm/cpu/arm720t/tegra-common/cpu.h | 2 +- arch/arm/cpu/tegra-common/ap.c | 26 +++++++++++++++++--------- arch/arm/cpu/tegra20-common/pmu.c | 2 +- arch/arm/include/asm/arch-tegra/ap.h | 12 ++++++++++-- board/nvidia/common/emc.c | 2 +- 6 files changed, 32 insertions(+), 16 deletions(-)
arch/arm/cpu/arm720t/tegra-common/cpu.c +2 -2
@@ -150,7 +150,7 @@ void init_pllx(void)debug ("init_pllx entry\n" );/* get chip type */ - chip_type =tegra_get_chip_type (); + chip_type =tegra_get_soc_sku ();debug (" init_pllx: chip_type = %d\n" , chip_type);/* get osc freq */
@@ -303,7 +303,7 @@ void clock_enable_coresight(int enable)* Clock divider request for 204MHz would setup CSITE clock as * 144MHz for PLLP base 216MHz and 204MHz for PLLP base 408MHz */ - chip =tegra_get_chip_type (); + chip =tegra_get_soc_sku ();if (chip ==TEGRA_SOC_T30 || chip ==TEGRA_SOC_T114 ) src =CLK_DIVIDER (NVBL_PLLP_KHZ ,204000 );else if (chip ==TEGRA_SOC_T20 || chip ==TEGRA_SOC_T25 )
arch/arm/cpu/arm720t/tegra-common/cpu.h +1 -1
@@ -80,5 +80,5 @@ 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_soc_sku (void );void adjust_pllp_out_freqs (void );
arch/arm/cpu/tegra-common/ap.c +17 -9
@@ -34,23 +34,31 @@#include <asm/arch-tegra/tegra.h> #include <asm/arch-tegra/warmboot.h> -int tegra_get_chip_type (void ) +unsigned tegra_get_soc_type (void ) { -struct apb_misc_gp_ctlr *gp; -struct fuse_regs *fuse = (struct fuse_regs *)NV_PA_FUSE_BASE ; -uint tegra_sku_id, rev; +unsigned rev; +struct apb_misc_gp_ctlr *gp = + (struct apb_misc_gp_ctlr *)NV_PA_APB_MISC_GP_BASE ;/* -* This is undocumented, Chip ID is bits 15:8 of the register -* APB_MISC + 0x804, and has value 0x20 for Tegra20, 0x30 for -* Tegra30, and 0x35 for T114. +* Chip ID is bits 15:8 of the register APB_MISC + 0x804, +* and has value 0x20 for Tegra20, 0x30 for Tegra30, and +* 0x35 for T114. */ - gp = (struct apb_misc_gp_ctlr *)NV_PA_APB_MISC_GP_BASE ; rev = (readl (&gp->hidrev) &HIDREV_CHIPID_MASK ) >>HIDREV_CHIPID_SHIFT ; +return rev; +} + +unsigned tegra_get_soc_sku (void ) +{ +struct fuse_regs *fuse = (struct fuse_regs *)NV_PA_FUSE_BASE ; +unsigned soc, tegra_sku_id; + + soc =tegra_get_soc_type (); tegra_sku_id =readl (&fuse->sku_info) &0xff ; -switch (rev) { +switch (soc) {case CHIPID_TEGRA20 :switch (tegra_sku_id) {case SKU_ID_T20 :
arch/arm/cpu/tegra20-common/pmu.c +1 -1
@@ -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_soc_sku ()) {case TEGRA_SOC_T20 : core =VDD_CORE_NOMINAL_T20 ; cpu =VDD_CPU_NOMINAL_T20 ;
arch/arm/include/asm/arch-tegra/ap.h +10 -2
@@ -59,9 +59,17 @@extern void _start (void );/** -* Works out the SOC type used for clocks settings +* Works out the SKU-based SOC ID used for clocks settings * * @return SOC type - see TEGRA_SOC... */ -int tegra_get_chip_type (void ); +unsigned tegra_get_soc_sku (void ); + +/** +* Returns the pure CHIPID from the HIDREV register +* +* @return 8-bit HIDREV CHIPID, i.e. 0x20, 0x30, 0x35 +*/ +unsigned tegra_get_soc_type (void ); +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_soc_sku ()) {default :case TEGRA_SOC_T20 : rate =EMC_SDRAM_RATE_T20 ;
Signature · 1 line
1.8.1.5
PATCH 1/1 Tegra: Split tegra_get_chip_type() into _soc and _sku functions
Quoted 9 lines · Tom Warren
As suggested by Stephen Warren, use
tegra_get_soc_type()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_soc_sku(), which returns an ID likeTEGRA_SOC_T25,TEGRA_SOC_T33, etc.
arch/arm/cpu/arm720t/tegra-common/cpu.c void init_pllx(void) · line 154
Quoted 6 lines
arch/arm/cpu/arm720t/tegra-common/cpu.c +1
-1@@ -150,7 +150,7 @@ void init_pllx(void)debug ("init_pllx entry\n" );/* get chip type */ - chip_type =tegra_get_chip_type (); + chip_type =tegra_get_soc_sku ();debug (" init_pllx: chip_type = %d\n" , chip_type);
Here, I think you need to retrieve both soc_type and soc_sku; the code immediately after the above that accesss pll_x_table arguably wants to use the SKU, yet the code that conditionally calls adjust_pllp_out_freqs() probably only cares about soc_type.
arch/arm/cpu/arm720t/tegra-common/cpu.c void clock_enable_coresight(int enable) · line 304
Quoted 4 lines
arch/arm/cpu/arm720t/tegra-common/cpu.c +1
-1@@ -303,7 +303,7 @@ void clock_enable_coresight(int enable) - chip =tegra_get_chip_type (); + chip =tegra_get_soc_sku ();
I think this should be converted to soc_type not soc_sku, since Tegra20/25 are handled identically, so the SKU is irrelevant. Tegra30/33 will likely also be identical here.
arch/arm/cpu/arm720t/tegra-common/cpu.h void init_pllx(void); · line 83
Quoted 8 lines
arch/arm/cpu/arm720t/tegra-common/cpu.c +0
-0if (chip ==TEGRA_SOC_T30 || chip ==TEGRA_SOC_T114 ) src =CLK_DIVIDER (NVBL_PLLP_KHZ ,204000 );else if (chip ==TEGRA_SOC_T20 || chip ==TEGRA_SOC_T25 )arch/arm/cpu/arm720t/tegra-common/cpu.h +1
-1-int tegra_get_chip_type (void ); +int tegra_get_soc_sku (void );
Aren't both tegra_get_soc_type() and tegra_get_soc_sku() going to be used, and hence need prototyping?
Oh, I guess you didn't mean to add tegra_get_soc_sku() here, since this patch protoypes both new functions in arch/arm/include/asm/arch-tegra/ap.h.