 dbc0416104
			
		
	
	
	dbc0416104
	
	
	
		
			
			As the plat and mach includes need to disappear for single zImage work, we need to remove plat/hardware.h. Do this by splitting plat/hardware.h into omap1 and omap2+ specific files. The old plat/hardware.h already has omap1 only defines, so it gets moved to mach/hardware.h for omap1. For omap2+, we use the local soc.h that for now just includes the related SoC headers to keep this patch more readable. Note that the local soc.h still includes plat/cpu.h that can be dealt with in later patches. Let's also include plat/serial.h from common.h for all the board-*.c files. This allows making the include files local later on without patching these files again. Note that only minimal changes are done in this patch for the drivers/watchdog/omap_wdt.c driver to keep things compiling. Further patches are needed to eventually remove cpu_is_omap usage in the drivers. Also only minimal changes are done to sound/soc/omap/* to remove the unneeded includes and to define OMAP44XX_MCPDM_L3_BASE locally so there's no need to include omap44xx.h. While at it, also sort some of the includes in the standard way. Cc: linux-watchdog@vger.kernel.org Cc: alsa-devel@alsa-project.org Cc: Peter Ujfalusi <peter.ujfalusi@ti.com> Cc: Jarkko Nikula <jarkko.nikula@bitmer.com> Cc: Liam Girdwood <lrg@ti.com> Acked-by: Wim Van Sebroeck <wim@iguana.be> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
		
			
				
	
	
		
			135 lines
		
	
	
	
		
			4.8 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			135 lines
		
	
	
	
		
			4.8 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * opp2430_data.c - old-style "OPP" table for OMAP2430
 | |
|  *
 | |
|  * Copyright (C) 2005-2009 Texas Instruments, Inc.
 | |
|  * Copyright (C) 2004-2009 Nokia Corporation
 | |
|  *
 | |
|  * Richard Woodruff <r-woodruff2@ti.com>
 | |
|  *
 | |
|  * The OMAP2 processor can be run at several discrete 'PRCM configurations'.
 | |
|  * These configurations are characterized by voltage and speed for clocks.
 | |
|  * The device is only validated for certain combinations. One way to express
 | |
|  * these combinations is via the 'ratios' which the clocks operate with
 | |
|  * respect to each other. These ratio sets are for a given voltage/DPLL
 | |
|  * setting. All configurations can be described by a DPLL setting and a ratio.
 | |
|  *
 | |
|  * 2430 differs from 2420 in that there are no more phase synchronizers used.
 | |
|  * They both have a slightly different clock domain setup. 2420(iva1,dsp) vs
 | |
|  * 2430 (iva2.1, NOdsp, mdm)
 | |
|  *
 | |
|  * XXX Missing voltage data.
 | |
|  * XXX Missing 19.2MHz sys_clk rate sets.
 | |
|  *
 | |
|  * THe format described in this file is deprecated.  Once a reasonable
 | |
|  * OPP API exists, the data in this file should be converted to use it.
 | |
|  *
 | |
|  * This is technically part of the OMAP2xxx clock code.
 | |
|  */
 | |
| 
 | |
| #include <linux/kernel.h>
 | |
| 
 | |
| #include "opp2xxx.h"
 | |
| #include "sdrc.h"
 | |
| #include "clock.h"
 | |
| 
 | |
| /*
 | |
|  * Key dividers which make up a PRCM set. Ratios for a PRCM are mandated.
 | |
|  * xtal_speed, dpll_speed, mpu_speed, CM_CLKSEL_MPU,
 | |
|  * CM_CLKSEL_DSP, CM_CLKSEL_GFX, CM_CLKSEL1_CORE, CM_CLKSEL1_PLL,
 | |
|  * CM_CLKSEL2_PLL, CM_CLKSEL_MDM
 | |
|  *
 | |
|  * Filling in table based on 2430-SDPs variants available.  There are
 | |
|  * quite a few more rate combinations which could be defined.
 | |
|  *
 | |
|  * When multiple values are defined the start up will try and choose
 | |
|  * the fastest one. If a 'fast' value is defined, then automatically,
 | |
|  * the /2 one should be included as it can be used.  Generally having
 | |
|  * more than one fast set does not make sense, as static timings need
 | |
|  * to be changed to change the set.  The exception is the bypass
 | |
|  * setting which is available for low power bypass.
 | |
|  *
 | |
|  * Note: This table needs to be sorted, fastest to slowest.
 | |
|  */
 | |
| const struct prcm_config omap2430_rate_table[] = {
 | |
| 	/* PRCM #4 - ratio2 (ES2.1) - FAST */
 | |
| 	{S13M, S798M, S399M, R2_CM_CLKSEL_MPU_VAL,		/* 399MHz ARM */
 | |
| 		R2_CM_CLKSEL_DSP_VAL, R2_CM_CLKSEL_GFX_VAL,
 | |
| 		R2_CM_CLKSEL1_CORE_VAL, M4_CM_CLKSEL1_PLL_13_VAL,
 | |
| 		MX_CLKSEL2_PLL_2x_VAL, R2_CM_CLKSEL_MDM_VAL,
 | |
| 		SDRC_RFR_CTRL_133MHz,
 | |
| 		RATE_IN_243X},
 | |
| 
 | |
| 	/* PRCM #2 - ratio1 (ES2) - FAST */
 | |
| 	{S13M, S658M, S329M, R1_CM_CLKSEL_MPU_VAL,		/* 330MHz ARM */
 | |
| 		R1_CM_CLKSEL_DSP_VAL, R1_CM_CLKSEL_GFX_VAL,
 | |
| 		R1_CM_CLKSEL1_CORE_VAL, M2_CM_CLKSEL1_PLL_13_VAL,
 | |
| 		MX_CLKSEL2_PLL_2x_VAL, R1_CM_CLKSEL_MDM_VAL,
 | |
| 		SDRC_RFR_CTRL_165MHz,
 | |
| 		RATE_IN_243X},
 | |
| 
 | |
| 	/* PRCM #5a - ratio1 - FAST */
 | |
| 	{S13M, S532M, S266M, R1_CM_CLKSEL_MPU_VAL,		/* 266MHz ARM */
 | |
| 		R1_CM_CLKSEL_DSP_VAL, R1_CM_CLKSEL_GFX_VAL,
 | |
| 		R1_CM_CLKSEL1_CORE_VAL, M5A_CM_CLKSEL1_PLL_13_VAL,
 | |
| 		MX_CLKSEL2_PLL_2x_VAL, R1_CM_CLKSEL_MDM_VAL,
 | |
| 		SDRC_RFR_CTRL_133MHz,
 | |
| 		RATE_IN_243X},
 | |
| 
 | |
| 	/* PRCM #5b - ratio1 - FAST */
 | |
| 	{S13M, S400M, S200M, R1_CM_CLKSEL_MPU_VAL,		/* 200MHz ARM */
 | |
| 		R1_CM_CLKSEL_DSP_VAL, R1_CM_CLKSEL_GFX_VAL,
 | |
| 		R1_CM_CLKSEL1_CORE_VAL, M5B_CM_CLKSEL1_PLL_13_VAL,
 | |
| 		MX_CLKSEL2_PLL_2x_VAL, R1_CM_CLKSEL_MDM_VAL,
 | |
| 		SDRC_RFR_CTRL_100MHz,
 | |
| 		RATE_IN_243X},
 | |
| 
 | |
| 	/* PRCM #4 - ratio1 (ES2.1) - SLOW */
 | |
| 	{S13M, S399M, S199M, R2_CM_CLKSEL_MPU_VAL,		/* 200MHz ARM */
 | |
| 		R2_CM_CLKSEL_DSP_VAL, R2_CM_CLKSEL_GFX_VAL,
 | |
| 		R2_CM_CLKSEL1_CORE_VAL, M4_CM_CLKSEL1_PLL_13_VAL,
 | |
| 		MX_CLKSEL2_PLL_1x_VAL, R2_CM_CLKSEL_MDM_VAL,
 | |
| 		SDRC_RFR_CTRL_133MHz,
 | |
| 		RATE_IN_243X},
 | |
| 
 | |
| 	/* PRCM #2 - ratio1 (ES2) - SLOW */
 | |
| 	{S13M, S329M, S164M, R1_CM_CLKSEL_MPU_VAL,		/* 165MHz ARM */
 | |
| 		R1_CM_CLKSEL_DSP_VAL, R1_CM_CLKSEL_GFX_VAL,
 | |
| 		R1_CM_CLKSEL1_CORE_VAL, M2_CM_CLKSEL1_PLL_13_VAL,
 | |
| 		MX_CLKSEL2_PLL_1x_VAL, R1_CM_CLKSEL_MDM_VAL,
 | |
| 		SDRC_RFR_CTRL_165MHz,
 | |
| 		RATE_IN_243X},
 | |
| 
 | |
| 	/* PRCM #5a - ratio1 - SLOW */
 | |
| 	{S13M, S266M, S133M, R1_CM_CLKSEL_MPU_VAL,		/* 133MHz ARM */
 | |
| 		R1_CM_CLKSEL_DSP_VAL, R1_CM_CLKSEL_GFX_VAL,
 | |
| 		R1_CM_CLKSEL1_CORE_VAL, M5A_CM_CLKSEL1_PLL_13_VAL,
 | |
| 		MX_CLKSEL2_PLL_1x_VAL, R1_CM_CLKSEL_MDM_VAL,
 | |
| 		SDRC_RFR_CTRL_133MHz,
 | |
| 		RATE_IN_243X},
 | |
| 
 | |
| 	/* PRCM #5b - ratio1 - SLOW*/
 | |
| 	{S13M, S200M, S100M, R1_CM_CLKSEL_MPU_VAL,		/* 100MHz ARM */
 | |
| 		R1_CM_CLKSEL_DSP_VAL, R1_CM_CLKSEL_GFX_VAL,
 | |
| 		R1_CM_CLKSEL1_CORE_VAL, M5B_CM_CLKSEL1_PLL_13_VAL,
 | |
| 		MX_CLKSEL2_PLL_1x_VAL, R1_CM_CLKSEL_MDM_VAL,
 | |
| 		SDRC_RFR_CTRL_100MHz,
 | |
| 		RATE_IN_243X},
 | |
| 
 | |
| 	/* PRCM-boot/bypass */
 | |
| 	{S13M, S13M, S13M, RB_CM_CLKSEL_MPU_VAL,		/* 13Mhz */
 | |
| 		RB_CM_CLKSEL_DSP_VAL, RB_CM_CLKSEL_GFX_VAL,
 | |
| 		RB_CM_CLKSEL1_CORE_VAL, MB_CM_CLKSEL1_PLL_13_VAL,
 | |
| 		MX_CLKSEL2_PLL_2x_VAL, RB_CM_CLKSEL_MDM_VAL,
 | |
| 		SDRC_RFR_CTRL_BYPASS,
 | |
| 		RATE_IN_243X},
 | |
| 
 | |
| 	/* PRCM-boot/bypass */
 | |
| 	{S12M, S12M, S12M, RB_CM_CLKSEL_MPU_VAL,		/* 12Mhz */
 | |
| 		RB_CM_CLKSEL_DSP_VAL, RB_CM_CLKSEL_GFX_VAL,
 | |
| 		RB_CM_CLKSEL1_CORE_VAL, MB_CM_CLKSEL1_PLL_12_VAL,
 | |
| 		MX_CLKSEL2_PLL_2x_VAL, RB_CM_CLKSEL_MDM_VAL,
 | |
| 		SDRC_RFR_CTRL_BYPASS,
 | |
| 		RATE_IN_243X},
 | |
| 
 | |
| 	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
 | |
| };
 |