As suggested by Russell King - ARM Linux <linux@arm.linux.org.uk>, there's no need to keep local prototypes in non-local headers. Add mach-omap1/common.h and mach-omap2/common.h and move the local prototypes there from plat/common.h and mach/omap4-common.h. Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
		
			
				
	
	
		
			89 lines
		
	
	
	
		
			2.8 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			89 lines
		
	
	
	
		
			2.8 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * OMAP3 Voltage Processor (VP) data
 | 
						|
 *
 | 
						|
 * Copyright (C) 2007, 2010 Texas Instruments, Inc.
 | 
						|
 * Rajendra Nayak <rnayak@ti.com>
 | 
						|
 * Lesly A M <x0080970@ti.com>
 | 
						|
 * Thara Gopinath <thara@ti.com>
 | 
						|
 *
 | 
						|
 * Copyright (C) 2008, 2011 Nokia Corporation
 | 
						|
 * Kalle Jokiniemi
 | 
						|
 * Paul Walmsley
 | 
						|
 *
 | 
						|
 * This program is free software; you can redistribute it and/or modify
 | 
						|
 * it under the terms of the GNU General Public License version 2 as
 | 
						|
 * published by the Free Software Foundation.
 | 
						|
 */
 | 
						|
 | 
						|
#include <linux/io.h>
 | 
						|
#include <linux/err.h>
 | 
						|
#include <linux/init.h>
 | 
						|
 | 
						|
#include "common.h"
 | 
						|
 | 
						|
#include "prm44xx.h"
 | 
						|
#include "prm-regbits-44xx.h"
 | 
						|
#include "voltage.h"
 | 
						|
 | 
						|
#include "vp.h"
 | 
						|
 | 
						|
static const struct omap_vp_ops omap4_vp_ops = {
 | 
						|
	.check_txdone = omap4_prm_vp_check_txdone,
 | 
						|
	.clear_txdone = omap4_prm_vp_clear_txdone,
 | 
						|
};
 | 
						|
 | 
						|
/*
 | 
						|
 * VP data common to 44xx chips
 | 
						|
 * XXX This stuff presumably belongs in the vp44xx.c or vp.c file.
 | 
						|
 */
 | 
						|
static const struct omap_vp_common omap4_vp_common = {
 | 
						|
	.vpconfig_erroroffset_mask = OMAP4430_ERROROFFSET_MASK,
 | 
						|
	.vpconfig_errorgain_mask = OMAP4430_ERRORGAIN_MASK,
 | 
						|
	.vpconfig_initvoltage_mask = OMAP4430_INITVOLTAGE_MASK,
 | 
						|
	.vpconfig_timeouten = OMAP4430_TIMEOUTEN_MASK,
 | 
						|
	.vpconfig_initvdd = OMAP4430_INITVDD_MASK,
 | 
						|
	.vpconfig_forceupdate = OMAP4430_FORCEUPDATE_MASK,
 | 
						|
	.vpconfig_vpenable = OMAP4430_VPENABLE_MASK,
 | 
						|
	.vstepmin_smpswaittimemin_shift = OMAP4430_SMPSWAITTIMEMIN_SHIFT,
 | 
						|
	.vstepmax_smpswaittimemax_shift = OMAP4430_SMPSWAITTIMEMAX_SHIFT,
 | 
						|
	.vstepmin_stepmin_shift = OMAP4430_VSTEPMIN_SHIFT,
 | 
						|
	.vstepmax_stepmax_shift = OMAP4430_VSTEPMAX_SHIFT,
 | 
						|
	.vlimitto_vddmin_shift = OMAP4430_VDDMIN_SHIFT,
 | 
						|
	.vlimitto_vddmax_shift = OMAP4430_VDDMAX_SHIFT,
 | 
						|
	.vlimitto_timeout_shift = OMAP4430_TIMEOUT_SHIFT,
 | 
						|
	.vpvoltage_mask = OMAP4430_VPVOLTAGE_MASK,
 | 
						|
	.ops = &omap4_vp_ops,
 | 
						|
};
 | 
						|
 | 
						|
struct omap_vp_instance omap4_vp_mpu = {
 | 
						|
	.id = OMAP4_VP_VDD_MPU_ID,
 | 
						|
	.common = &omap4_vp_common,
 | 
						|
	.vpconfig = OMAP4_PRM_VP_MPU_CONFIG_OFFSET,
 | 
						|
	.vstepmin = OMAP4_PRM_VP_MPU_VSTEPMIN_OFFSET,
 | 
						|
	.vstepmax = OMAP4_PRM_VP_MPU_VSTEPMAX_OFFSET,
 | 
						|
	.vlimitto = OMAP4_PRM_VP_MPU_VLIMITTO_OFFSET,
 | 
						|
	.vstatus = OMAP4_PRM_VP_MPU_STATUS_OFFSET,
 | 
						|
	.voltage = OMAP4_PRM_VP_MPU_VOLTAGE_OFFSET,
 | 
						|
};
 | 
						|
 | 
						|
struct omap_vp_instance omap4_vp_iva = {
 | 
						|
	.id = OMAP4_VP_VDD_IVA_ID,
 | 
						|
	.common = &omap4_vp_common,
 | 
						|
	.vpconfig = OMAP4_PRM_VP_IVA_CONFIG_OFFSET,
 | 
						|
	.vstepmin = OMAP4_PRM_VP_IVA_VSTEPMIN_OFFSET,
 | 
						|
	.vstepmax = OMAP4_PRM_VP_IVA_VSTEPMAX_OFFSET,
 | 
						|
	.vlimitto = OMAP4_PRM_VP_IVA_VLIMITTO_OFFSET,
 | 
						|
	.vstatus = OMAP4_PRM_VP_IVA_STATUS_OFFSET,
 | 
						|
	.voltage = OMAP4_PRM_VP_IVA_VOLTAGE_OFFSET,
 | 
						|
};
 | 
						|
 | 
						|
struct omap_vp_instance omap4_vp_core = {
 | 
						|
	.id = OMAP4_VP_VDD_CORE_ID,
 | 
						|
	.common = &omap4_vp_common,
 | 
						|
	.vpconfig = OMAP4_PRM_VP_CORE_CONFIG_OFFSET,
 | 
						|
	.vstepmin = OMAP4_PRM_VP_CORE_VSTEPMIN_OFFSET,
 | 
						|
	.vstepmax = OMAP4_PRM_VP_CORE_VSTEPMAX_OFFSET,
 | 
						|
	.vlimitto = OMAP4_PRM_VP_CORE_VLIMITTO_OFFSET,
 | 
						|
	.vstatus = OMAP4_PRM_VP_CORE_STATUS_OFFSET,
 | 
						|
	.voltage = OMAP4_PRM_VP_CORE_VOLTAGE_OFFSET,
 | 
						|
};
 |