mirror of
https://github.com/torvalds/linux.git
synced 2024-11-18 18:11:56 +00:00
c0718df4d6
This is a first pass at reorganizing mach-omap2/voltage.c: - Separate almost all of the data from the code of mach-omap2/voltage.c. The code remains in mach-omap2/voltage.c. The data goes into one of several places, depending on what type of data it is: - Silicon process/validation data: mach-omap2/opp*_data.c - VC (Voltage Controller) data: mach-omap2/vc*_data.c - VP (Voltage Processor) data: mach-omap2/vp*_data.c - Voltage domain data: mach-omap2/voltagedomains*_data.c The ultimate goal is for all this data to be autogenerated, the same way we autogenerate the rest of our data. - Separate VC and VP common data from VDD-specific VC and VP data. - Separate common voltage.c code from SoC-specific code; reuse common code. - Reorganize structures to avoid unnecessary memory loss due to unpacked fields. There is much left to be done. VC code and VP code should be separated out into vc*.c and vp*.c files. Many fields in the existing structures are superfluous, and should be removed. Some code in voltage.c seems to be duplicated; that code should be moved into functions of its own. Proper voltage domain code should be created, as was done with the powerdomain and clockdomains, and powerdomains should reference voltagedomains. Thanks to Shweta Gulati <shweta.gulati@ti.com> for comments. Thanks to Rajendra Nayak <rnayak@ti.com> for finding and fixing some bugs that prevented OMAP4 from booting: https://patchwork.kernel.org/patch/587311/ His patch has been folded into this one to avoid breaking OMAP4 between patches. Thanks also to Kevin Hilman <khilman@ti.com> for finding and fixing a compile problem when !CONFIG_PM: http://www.spinics.net/lists/arm-kernel/msg118067.html His patch has also been folded into this one to avoid breaking !CONFIG_PM builds. Signed-off-by: Paul Walmsley <paul@pwsan.com> Cc: Shweta Gulati <shweta.gulati@ti.com> Cc: Rajendra Nayak <rnayak@ti.com> Cc: Kevin Hilman <khilman@ti.com>
84 lines
2.7 KiB
C
84 lines
2.7 KiB
C
/*
|
|
* OMAP3/4 Voltage Controller (VC) structure and macro definitions
|
|
*
|
|
* 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.
|
|
*/
|
|
#ifndef __ARCH_ARM_MACH_OMAP2_VC_H
|
|
#define __ARCH_ARM_MACH_OMAP2_VC_H
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
/**
|
|
* struct omap_vc_common_data - per-VC register/bitfield data
|
|
* @cmd_on_mask: ON bitmask in PRM_VC_CMD_VAL* register
|
|
* @valid: VALID bitmask in PRM_VC_BYPASS_VAL register
|
|
* @smps_sa_reg: Offset of PRM_VC_SMPS_SA reg from PRM start
|
|
* @smps_volra_reg: Offset of PRM_VC_SMPS_VOL_RA reg from PRM start
|
|
* @bypass_val_reg: Offset of PRM_VC_BYPASS_VAL reg from PRM start
|
|
* @data_shift: DATA field shift in PRM_VC_BYPASS_VAL register
|
|
* @slaveaddr_shift: SLAVEADDR field shift in PRM_VC_BYPASS_VAL register
|
|
* @regaddr_shift: REGADDR field shift in PRM_VC_BYPASS_VAL register
|
|
* @cmd_on_shift: ON field shift in PRM_VC_CMD_VAL_* register
|
|
* @cmd_onlp_shift: ONLP field shift in PRM_VC_CMD_VAL_* register
|
|
* @cmd_ret_shift: RET field shift in PRM_VC_CMD_VAL_* register
|
|
* @cmd_off_shift: OFF field shift in PRM_VC_CMD_VAL_* register
|
|
*
|
|
* XXX One of cmd_on_mask and cmd_on_shift are not needed
|
|
* XXX VALID should probably be a shift, not a mask
|
|
*/
|
|
struct omap_vc_common_data {
|
|
u32 cmd_on_mask;
|
|
u32 valid;
|
|
u8 smps_sa_reg;
|
|
u8 smps_volra_reg;
|
|
u8 bypass_val_reg;
|
|
u8 data_shift;
|
|
u8 slaveaddr_shift;
|
|
u8 regaddr_shift;
|
|
u8 cmd_on_shift;
|
|
u8 cmd_onlp_shift;
|
|
u8 cmd_ret_shift;
|
|
u8 cmd_off_shift;
|
|
};
|
|
|
|
/**
|
|
* struct omap_vc_instance_data - VC per-instance data
|
|
* @vc_common: pointer to VC common data for this platform
|
|
* @smps_sa_mask: SA* bitmask in the PRM_VC_SMPS_SA register
|
|
* @smps_volra_mask: VOLRA* bitmask in the PRM_VC_VOL_RA register
|
|
* @smps_sa_shift: SA* field shift in the PRM_VC_SMPS_SA register
|
|
* @smps_volra_shift: VOLRA* field shift in the PRM_VC_VOL_RA register
|
|
*
|
|
* XXX It is not necessary to have both a *_mask and a *_shift -
|
|
* remove one
|
|
*/
|
|
struct omap_vc_instance_data {
|
|
const struct omap_vc_common_data *vc_common;
|
|
u32 smps_sa_mask;
|
|
u32 smps_volra_mask;
|
|
u8 cmdval_reg;
|
|
u8 smps_sa_shift;
|
|
u8 smps_volra_shift;
|
|
};
|
|
|
|
extern struct omap_vc_instance_data omap3_vc1_data;
|
|
extern struct omap_vc_instance_data omap3_vc2_data;
|
|
|
|
extern struct omap_vc_instance_data omap4_vc_mpu_data;
|
|
extern struct omap_vc_instance_data omap4_vc_iva_data;
|
|
extern struct omap_vc_instance_data omap4_vc_core_data;
|
|
|
|
#endif
|
|
|