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>
75 lines
2.4 KiB
C
75 lines
2.4 KiB
C
/*
|
|
* OMAP4 Voltage Controller (VC) 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 <plat/common.h>
|
|
|
|
#include "prm44xx.h"
|
|
#include "prm-regbits-44xx.h"
|
|
#include "voltage.h"
|
|
|
|
#include "vc.h"
|
|
|
|
/*
|
|
* VC data common to 44xx chips
|
|
* XXX This stuff presumably belongs in the vc3xxx.c or vc.c file.
|
|
*/
|
|
static const struct omap_vc_common_data omap4_vc_common = {
|
|
.smps_sa_reg = OMAP4_PRM_VC_SMPS_SA_OFFSET,
|
|
.smps_volra_reg = OMAP4_PRM_VC_VAL_SMPS_RA_VOL_OFFSET,
|
|
.bypass_val_reg = OMAP4_PRM_VC_VAL_BYPASS_OFFSET,
|
|
.data_shift = OMAP4430_DATA_SHIFT,
|
|
.slaveaddr_shift = OMAP4430_SLAVEADDR_SHIFT,
|
|
.regaddr_shift = OMAP4430_REGADDR_SHIFT,
|
|
.valid = OMAP4430_VALID_MASK,
|
|
.cmd_on_shift = OMAP4430_ON_SHIFT,
|
|
.cmd_on_mask = OMAP4430_ON_MASK,
|
|
.cmd_onlp_shift = OMAP4430_ONLP_SHIFT,
|
|
.cmd_ret_shift = OMAP4430_RET_SHIFT,
|
|
.cmd_off_shift = OMAP4430_OFF_SHIFT,
|
|
};
|
|
|
|
/* VC instance data for each controllable voltage line */
|
|
struct omap_vc_instance_data omap4_vc_mpu_data = {
|
|
.vc_common = &omap4_vc_common,
|
|
.cmdval_reg = OMAP4_PRM_VC_VAL_CMD_VDD_MPU_L_OFFSET,
|
|
.smps_sa_shift = OMAP4430_SA_VDD_MPU_L_PRM_VC_SMPS_SA_SHIFT,
|
|
.smps_sa_mask = OMAP4430_SA_VDD_MPU_L_PRM_VC_SMPS_SA_MASK,
|
|
.smps_volra_shift = OMAP4430_VOLRA_VDD_MPU_L_SHIFT,
|
|
.smps_volra_mask = OMAP4430_VOLRA_VDD_MPU_L_MASK,
|
|
};
|
|
|
|
struct omap_vc_instance_data omap4_vc_iva_data = {
|
|
.vc_common = &omap4_vc_common,
|
|
.cmdval_reg = OMAP4_PRM_VC_VAL_CMD_VDD_IVA_L_OFFSET,
|
|
.smps_sa_shift = OMAP4430_SA_VDD_IVA_L_PRM_VC_SMPS_SA_SHIFT,
|
|
.smps_sa_mask = OMAP4430_SA_VDD_IVA_L_PRM_VC_SMPS_SA_MASK,
|
|
.smps_volra_shift = OMAP4430_VOLRA_VDD_IVA_L_SHIFT,
|
|
.smps_volra_mask = OMAP4430_VOLRA_VDD_IVA_L_MASK,
|
|
};
|
|
|
|
struct omap_vc_instance_data omap4_vc_core_data = {
|
|
.vc_common = &omap4_vc_common,
|
|
.cmdval_reg = OMAP4_PRM_VC_VAL_CMD_VDD_CORE_L_OFFSET,
|
|
.smps_sa_shift = OMAP4430_SA_VDD_CORE_L_0_6_SHIFT,
|
|
.smps_sa_mask = OMAP4430_SA_VDD_CORE_L_0_6_MASK,
|
|
.smps_volra_shift = OMAP4430_VOLRA_VDD_CORE_L_SHIFT,
|
|
.smps_volra_mask = OMAP4430_VOLRA_VDD_CORE_L_MASK,
|
|
};
|
|
|