GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

skylake: prefix the gpio functions with 'gpio_' 

In order to provide more clarity on what some of the gpio
functions are doing add a 'gpio_' prefix to the globally
visible functions.

BUG=chrome-os-partner:42982
BRANCH=None
TEST=Built glados.

Change-Id: I4cf48558c1eb9986ed52b160b6564ceaa3cb94b4
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Original-Commit-Id: f79ef113797884063621fe6cd5cc374c53390ebd
Original-Change-Id: I0d8003efff77b92802e0caf8125046203f315ae4
Original-Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/288192
Original-Reviewed-by: Robbie Zhang <robbie.zhang@intel.com>
Original-Reviewed-by: Duncan Laurie <dlaurie@chromium.org>
Reviewed-on: http://review.coreboot.org/11067
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
Aaron Durbin 2015-07-22 20:57:05 -05:00 committed by Patrick Georgi
parent ed575681d1
commit 4f5efb6c21
3 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/soc/intel/skylake/gpio.c
View File

@ -25,8 +25,8 @@
#include <soc/pm.h>
/* Keep the ordering intact GPP_A ~ G, GPD.
* As the gpio/smi functions get_smi_status() and
* enable_gpio_groupsmi() depends on this ordering.
* As the gpio/smi functions gpio_get_smi_status() and
* gpio_enable_groupsmi() depends on this ordering.
*/
static const GPIO_GROUP_INFO gpio_group_info[] = {
/* GPP_A */
@ -245,7 +245,7 @@ void gpio_set(gpio_t gpio_num, int value)
WRITE, &outputvalue);
}
void clear_all_smi(void)
void gpio_clear_all_smi(void)
{
u32 gpiogroupinfolength;
u32 gpioindex = 0;
@ -264,7 +264,7 @@ void clear_all_smi(void)
}
}
void get_smi_status(u32 status[GPIO_COMMUNITY_MAX])
void gpio_get_smi_status(u32 status[GPIO_COMMUNITY_MAX])
{
u32 num_of_communities;
u32 gpioindex;
@ -285,7 +285,7 @@ void get_smi_status(u32 status[GPIO_COMMUNITY_MAX])
}
}
void enable_all_smi(void)
void gpio_enable_all_smi(void)
{
u32 gpiogroupinfolength;
u32 gpioindex = 0;
@ -304,7 +304,7 @@ void enable_all_smi(void)
}
}
void enable_gpio_groupsmi(gpio_t gpio_num, u32 mask)
void gpio_enable_groupsmi(gpio_t gpio_num, u32 mask)
{
u32 gpioindex = 0;
u32 smien = 0;

34
src/soc/intel/skylake/include/soc/gpio.h
View File

@ -23,6 +23,23 @@
#include <stdint.h>
/* SOC has 8 GPIO communities GPP A~G, GPD */
#define GPIO_COMMUNITY_MAX 8
typedef int gpio_t;
/* Clear GPIO SMI Status */
void gpio_clear_all_smi(void);
/* Get GPIO SMI Status */
void gpio_get_smi_status(u32 status[GPIO_COMMUNITY_MAX]);
/* Enable GPIO SMI */
void gpio_enable_all_smi(void);
/* Enable GPIO individual Group SMI */
void gpio_enable_groupsmi(gpio_t gpio_num, u32 mask);
/*
* GPP_Ax to GPP_Gx;
* where x=24 [between GPIO Community A to F]
@ -123,9 +140,6 @@ typedef struct {
#define V_PCH_GPIO_GPP_G_PAD_MAX 8
#define V_PCH_GPIO_GPD_PAD_MAX 12
/* SOC has 8 GPIO communities GPP A~G, GPD */
#define GPIO_COMMUNITY_MAX 8
#define GPIO_GET_GROUP_INDEX(group) (group & 0xFF)
#define GPIO_GET_GROUP_INDEX_FROM_PAD(pad) (\
GPIO_GET_GROUP_INDEX((pad >> 16)))
@ -295,20 +309,6 @@ typedef enum {
GpioResetResume = 0x7 /* Resume Reset */
} GPIO_RESET_CONFIG;
typedef int gpio_t;
/* Clear GPIO SMI Status */
void clear_all_smi(void);
/* Get GPIO SMI Status */
void get_smi_status(u32 status[GPIO_COMMUNITY_MAX]);
/* Enable GPIO SMI */
void enable_all_smi(void);
/* Enable GPIO individual Group SMI */
void enable_gpio_groupsmi(gpio_t gpio_num, u32 mask);
/*
* GPIO Electrical Configuration
* Set GPIO termination and Pad Tolerance (applicable only for some pads)

6
src/soc/intel/skylake/pmutil.c
View File

@ -219,7 +219,7 @@ void disable_smi(u32 mask)
void reset_alt_smi_status(void)
{
/*Clear GPIO SMI Status*/
clear_all_smi();
gpio_clear_all_smi();
}
/* Print GPIO SMI status bits */
@ -237,7 +237,7 @@ static u32 print_alt_smi_status(void)
};
printk(BIOS_DEBUG, "ALT_STS: ");
get_smi_status(alt_sts);
gpio_get_smi_status(alt_sts);
/* GPP_A to GPP_E GPIO has Status and Enable functionality*/
for (gpio_index = 0; gpio_index < ARRAY_SIZE(gpiowell);
gpio_index++) {
@ -262,7 +262,7 @@ u32 clear_alt_smi_status(void)
void enable_alt_smi(int gpionum, u32 mask)
{
/*Set GPIO EN Status*/
enable_gpio_groupsmi(gpionum, mask);
gpio_enable_groupsmi(gpionum, mask);
}