Tegra114: Fix PLLX M, N, P init settings
The M, N and P width have been changed from Tegra30. The maximum value for N is limited to 255. So, the tegra_pll_x_table for Tegra114 should be set accordingly. Signed-off-by: Jimmy Zhang <jimmzhang@nvidia.com> Reviewed-by: Tom Warren <twarren@nvidia.com> Signed-off-by: Thierry Reding <treding@nvidia.com> Acked-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Tom Warren <twarren@nvidia.com>
This commit is contained in:
		
							parent
							
								
									d2c7074b95
								
							
						
					
					
						commit
						44de8e22ec
					
				|  | @ -49,33 +49,68 @@ int get_num_cpus(void) | |||
|  * Timing tables for each SOC for all four oscillator options. | ||||
|  */ | ||||
| struct clk_pll_table tegra_pll_x_table[TEGRA_SOC_CNT][CLOCK_OSC_FREQ_COUNT] = { | ||||
| 	/* T20: 1 GHz */ | ||||
| 	/*  n,  m, p, cpcon */ | ||||
| 	{{ 1000, 13, 0, 12},	/* OSC 13M */ | ||||
| 	 { 625,  12, 0, 8},	/* OSC 19.2M */ | ||||
| 	 { 1000, 12, 0, 12},	/* OSC 12M */ | ||||
| 	 { 1000, 26, 0, 12},	/* OSC 26M */ | ||||
| 	/*
 | ||||
| 	 * T20: 1 GHz | ||||
| 	 * | ||||
| 	 * Register   Field  Bits   Width | ||||
| 	 * ------------------------------ | ||||
| 	 * PLLX_BASE  p      22:20    3 | ||||
| 	 * PLLX_BASE  n      17: 8   10 | ||||
| 	 * PLLX_BASE  m       4: 0    5 | ||||
| 	 * PLLX_MISC  cpcon  11: 8    4 | ||||
| 	 */ | ||||
| 	{ | ||||
| 		{ .n = 1000, .m = 13, .p = 0, .cpcon = 12 }, /* OSC: 13.0 MHz */ | ||||
| 		{ .n =  625, .m = 12, .p = 0, .cpcon =  8 }, /* OSC: 19.2 MHz */ | ||||
| 		{ .n = 1000, .m = 12, .p = 0, .cpcon = 12 }, /* OSC: 12.0 MHz */ | ||||
| 		{ .n = 1000, .m = 26, .p = 0, .cpcon = 12 }, /* OSC: 26.0 MHz */ | ||||
| 	}, | ||||
| 
 | ||||
| 	/* T25: 1.2 GHz */ | ||||
| 	{{ 923, 10, 0, 12}, | ||||
| 	 { 750, 12, 0, 8}, | ||||
| 	 { 600,  6, 0, 12}, | ||||
| 	 { 600, 13, 0, 12}, | ||||
| 	/*
 | ||||
| 	 * T25: 1.2 GHz | ||||
| 	 * | ||||
| 	 * Register   Field  Bits   Width | ||||
| 	 * ------------------------------ | ||||
| 	 * PLLX_BASE  p      22:20    3 | ||||
| 	 * PLLX_BASE  n      17: 8   10 | ||||
| 	 * PLLX_BASE  m       4: 0    5 | ||||
| 	 * PLLX_MISC  cpcon  11: 8    4 | ||||
| 	 */ | ||||
| 	{ | ||||
| 		{ .n = 923, .m = 10, .p = 0, .cpcon = 12 }, /* OSC: 13.0 MHz */ | ||||
| 		{ .n = 750, .m = 12, .p = 0, .cpcon =  8 }, /* OSC: 19.2 MHz */ | ||||
| 		{ .n = 600, .m =  6, .p = 0, .cpcon = 12 }, /* OSC: 12.0 MHz */ | ||||
| 		{ .n = 600, .m = 13, .p = 0, .cpcon = 12 }, /* OSC: 26.0 MHz */ | ||||
| 	}, | ||||
| 
 | ||||
| 	/* T30: 1.4 GHz */ | ||||
| 	{{ 862, 8, 0, 8}, | ||||
| 	 { 583, 8, 0, 4}, | ||||
| 	 { 700, 6, 0, 8}, | ||||
| 	 { 700, 13, 0, 8}, | ||||
| 	/*
 | ||||
| 	 * T30: 1.4 GHz | ||||
| 	 * | ||||
| 	 * Register   Field  Bits   Width | ||||
| 	 * ------------------------------ | ||||
| 	 * PLLX_BASE  p      22:20    3 | ||||
| 	 * PLLX_BASE  n      17: 8   10 | ||||
| 	 * PLLX_BASE  m       4: 0    5 | ||||
| 	 * PLLX_MISC  cpcon  11: 8    4 | ||||
| 	 */ | ||||
| 	{ | ||||
| 		{ .n = 862, .m =  8, .p = 0, .cpcon = 8 }, /* OSC: 13.0 MHz */ | ||||
| 		{ .n = 583, .m =  8, .p = 0, .cpcon = 4 }, /* OSC: 19.2 MHz */ | ||||
| 		{ .n = 700, .m =  6, .p = 0, .cpcon = 8 }, /* OSC: 12.0 MHz */ | ||||
| 		{ .n = 700, .m = 13, .p = 0, .cpcon = 8 }, /* OSC: 26.0 MHz */ | ||||
| 	}, | ||||
| 
 | ||||
| 	/* T114: 1.4 GHz */ | ||||
| 	{{ 862, 8, 0, 8}, | ||||
| 	 { 583, 8, 0, 4}, | ||||
| 	 { 696, 12, 0, 8}, | ||||
| 	 { 700, 13, 0, 8}, | ||||
| 	/*
 | ||||
| 	 * T114: 700 MHz | ||||
| 	 * | ||||
| 	 * Register   Field  Bits   Width | ||||
| 	 * ------------------------------ | ||||
| 	 * PLLX_BASE  p      23:20    4 | ||||
| 	 * PLLX_BASE  n      15: 8    8 | ||||
| 	 * PLLX_BASE  m       7: 0    8 | ||||
| 	 */ | ||||
| 	{ | ||||
| 		{ .n = 108, .m = 1, .p = 1 }, /* OSC: 13.0 MHz */ | ||||
| 		{ .n =  73, .m = 1, .p = 1 }, /* OSC: 19.2 MHz */ | ||||
| 		{ .n = 116, .m = 1, .p = 1 }, /* OSC: 12.0 MHz */ | ||||
| 		{ .n = 108, .m = 2, .p = 1 }, /* OSC: 26.0 MHz */ | ||||
| 	}, | ||||
| }; | ||||
| 
 | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue