sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rambi: Add ncore GPIO config tables

Browse Source 
gpncore config tables were previously missing -- add them.

Also, make the baytrail GPIO/PAD LUTs easier to read.

TEST=Manual. Build + boot on bayleybay.
BUG=chrome-os-partner:22865

Change-Id: I49a1b23c7ad4fb5f4c86618e8c78ea9a1a42f79d
Signed-off-by: Shawn Nematbakhsh <shawnn@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/172510
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/4874
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
This commit is contained in:
Shawn Nematbakhsh
2013-10-09 15:29:46 -07:00
committed by Aaron Durbin
parent 1f5eb1f78e
commit 8561460d68
3 changed files with 102 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/mainboard/google/rambi/gpio.c
View File

@@ -20,6 +20,38 @@
#include <stdlib.h> #include <stdlib.h>
#include <baytrail/gpio.h> #include <baytrail/gpio.h>
/* NCORE GPIOs */
static const struct soc_gpio_map gpncore_gpio_map[] = {
GPIO_DEFAULT, /* GPIO 0 */
GPIO_DEFAULT, /* GPIO 1 */
GPIO_DEFAULT, /* GPIO 2 */
GPIO_DEFAULT, /* GPIO 3 */
GPIO_DEFAULT, /* GPIO 4 */
GPIO_DEFAULT, /* GPIO 5 */
GPIO_DEFAULT, /* GPIO 6 */
GPIO_DEFAULT, /* GPIO 7 */
GPIO_DEFAULT, /* GPIO 8 */
GPIO_DEFAULT, /* GPIO 9 */
GPIO_DEFAULT, /* GPIO 10 */
GPIO_DEFAULT, /* GPIO 11 */
GPIO_DEFAULT, /* GPIO 12 */
GPIO_DEFAULT, /* GPIO 13 */
GPIO_DEFAULT, /* GPIO 14 */
GPIO_DEFAULT, /* GPIO 15 */
GPIO_DEFAULT, /* GPIO 16 */
GPIO_DEFAULT, /* GPIO 17 */
GPIO_DEFAULT, /* GPIO 18 */
GPIO_DEFAULT, /* GPIO 19 */
GPIO_DEFAULT, /* GPIO 20 */
GPIO_DEFAULT, /* GPIO 21 */
GPIO_DEFAULT, /* GPIO 22 */
GPIO_DEFAULT, /* GPIO 23 */
GPIO_DEFAULT, /* GPIO 24 */
GPIO_DEFAULT, /* GPIO 25 */
GPIO_DEFAULT, /* GPIO 26 */
GPIO_END
};
/* SCORE GPIOs */ /* SCORE GPIOs */
static const struct soc_gpio_map gpscore_gpio_map[] = { static const struct soc_gpio_map gpscore_gpio_map[] = {
GPIO_DEFAULT, /* GPIO 0 */ GPIO_DEFAULT, /* GPIO 0 */
@@ -177,7 +209,7 @@ static const struct soc_gpio_map gpssus_gpio_map[] = {
}; };
static struct soc_gpio_config gpio_config = { static struct soc_gpio_config gpio_config = {
.ncore = NULL, .ncore = gpncore_gpio_map,
.score = gpscore_gpio_map, .score = gpscore_gpio_map,
.ssus = gpssus_gpio_map .ssus = gpssus_gpio_map
}; };

38
src/soc/intel/baytrail/baytrail/gpio.h
View File

@@ -142,25 +142,47 @@
* if not set correctly, even if the pin isn't configured as GPIO. */ * if not set correctly, even if the pin isn't configured as GPIO. */
#define PAD_VAL_DEFAULT (PAD_VAL_INPUT_ENABLE | PAD_VAL_OUTPUT_DISABLE) #define PAD_VAL_DEFAULT (PAD_VAL_INPUT_ENABLE | PAD_VAL_OUTPUT_DISABLE)
/* Configure GPIOs as legacy by default. GPNCORE doesn't support
* legacy config -- so also configure the pad regs as GPIO. We rely upon
* the fact that all GPNCORE pads are function 0 GPIO. */
#define GPIO_INPUT_PU_10K \ #define GPIO_INPUT_PU_10K \
{ .pad_conf0 = PAD_PU_10K | PAD_PU_UP | PAD_CONFIG0_DEFAULT, \ { .pad_conf0 = PAD_PU_10K | PAD_PU_UP | PAD_CONFIG0_DEFAULT \
| PAD_FUNC0, \
.pad_conf1 = PAD_CONFIG1_DEFAULT, \
.pad_val = PAD_VAL_INPUT_ENABLE, \
.use_sel = GPIO_USE_LEGACY, \
.io_sel = GPIO_DIR_INPUT }
#define GPIO_INPUT_PD_10K \
{ .pad_conf0 = PAD_PU_10K | PAD_PU_DOWN | PAD_CONFIG0_DEFAULT \
| PAD_FUNC0, \
.pad_conf1 = PAD_CONFIG1_DEFAULT, \
.pad_val = PAD_VAL_INPUT_ENABLE, \
.use_sel = GPIO_USE_LEGACY, \
.io_sel = GPIO_DIR_INPUT }
#define GPIO_INPUT_NOPU \
{ .pad_conf0 = PAD_PU_10K | PAD_PU_DISABLE | PAD_CONFIG0_DEFAULT \
| PAD_FUNC0, \
.pad_conf1 = PAD_CONFIG1_DEFAULT, \ .pad_conf1 = PAD_CONFIG1_DEFAULT, \
.pad_val = PAD_VAL_INPUT_ENABLE, \ .pad_val = PAD_VAL_INPUT_ENABLE, \
.use_sel = GPIO_USE_LEGACY, \ .use_sel = GPIO_USE_LEGACY, \
.io_sel = GPIO_DIR_INPUT } .io_sel = GPIO_DIR_INPUT }
#define GPIO_OUT_LOW \ #define GPIO_OUT_LOW \
{ .pad_conf0 = PAD_PU_DISABLE | PAD_CONFIG0_DEFAULT, \ { .pad_conf0 = PAD_PU_DISABLE | PAD_CONFIG0_DEFAULT \
| PAD_FUNC0, \
.pad_conf1 = PAD_CONFIG1_DEFAULT, \ .pad_conf1 = PAD_CONFIG1_DEFAULT, \
.pad_val = PAD_VAL_OUTPUT_ENABLE, \ .pad_val = PAD_VAL_OUTPUT_ENABLE | PAD_VAL_LOW, \
.use_sel = GPIO_USE_LEGACY, \ .use_sel = GPIO_USE_LEGACY, \
.io_sel = GPIO_DIR_OUTPUT, \ .io_sel = GPIO_DIR_OUTPUT, \
.gp_lvl = GPIO_LEVEL_LOW } .gp_lvl = GPIO_LEVEL_LOW }
#define GPIO_OUT_HIGH \ #define GPIO_OUT_HIGH \
{ .pad_conf0 = PAD_PU_DISABLE | PAD_CONFIG0_DEFAULT, \ { .pad_conf0 = PAD_PU_DISABLE | PAD_CONFIG0_DEFAULT \
| PAD_FUNC0, \
.pad_conf1 = PAD_CONFIG1_DEFAULT, \ .pad_conf1 = PAD_CONFIG1_DEFAULT, \
.pad_val = PAD_VAL_OUTPUT_ENABLE, \ .pad_val = PAD_VAL_OUTPUT_ENABLE | PAD_VAL_HIGH, \
.use_sel = GPIO_USE_LEGACY, \ .use_sel = GPIO_USE_LEGACY, \
.io_sel = GPIO_DIR_OUTPUT, \ .io_sel = GPIO_DIR_OUTPUT, \
.gp_lvl = GPIO_LEVEL_HIGH } .gp_lvl = GPIO_LEVEL_HIGH }
@@ -214,8 +236,10 @@
{ .pad_conf0 = GPIO_LIST_END } { .pad_conf0 = GPIO_LIST_END }
/* Common default GPIO settings */ /* Common default GPIO settings */
#define GPIO_INPUT GPIO_INPUT_PU_10K #define GPIO_INPUT GPIO_INPUT_NOPU
#define GPIO_UNUSED GPIO_INPUT_PU_10K #define GPIO_INPUT_PU GPIO_INPUT_PU_10K
#define GPIO_INPUT_PD GPIO_INPUT_PD_10K
#define GPIO_NC GPIO_INPUT_PU_10K
#define GPIO_DEFAULT GPIO_FUNC0 #define GPIO_DEFAULT GPIO_FUNC0
struct soc_gpio_map { struct soc_gpio_map {

72
src/soc/intel/baytrail/gpio.c
View File

@@ -23,53 +23,57 @@
/* GPIO-to-Pad LUTs */ /* GPIO-to-Pad LUTs */
static const u8 gpncore_gpio_to_pad[GPNCORE_COUNT] = static const u8 gpncore_gpio_to_pad[GPNCORE_COUNT] =
{ 25, 24, 23, 32, 33, 34, 36, 37, 35, 22, { 25, 24, 23, 32, 33, 34, 36, 37, /* [ 0: 7] */
20, 21, 18, 38, 39, 1, 4, 8, 17, 0, 35, 22, 20, 21, 18, 38, 39, 1, /* [ 8:15] */
3, 6, 16, 19, 2, 5, 9 }; 4, 8, 17, 0, 3, 6, 16, 19, /* [16:23] */
2, 5, 9 }; /* [24:26] */
static const u8 gpscore_gpio_to_pad[GPSCORE_COUNT] = static const u8 gpscore_gpio_to_pad[GPSCORE_COUNT] =
{ 85, 89, 93, 96, 99, 102, 98, 101, 34, 37, { 85, 89, 93, 96, 99, 102, 98, 101, /* [ 0: 7] */
36, 38, 39, 35, 40, 84, 62, 61, 64, 59, 34, 37, 36, 38, 39, 35, 40, 84, /* [ 8: 15] */
54, 56, 60, 55, 63, 57, 51, 50, 53, 47, 62, 61, 64, 59, 54, 56, 60, 55, /* [16: 23] */
52, 49, 48, 43, 46, 41, 45, 42, 58, 44, 63, 57, 51, 50, 53, 47, 52, 49, /* [24: 31] */
95, 105, 70, 68, 67, 66, 69, 71, 65, 72, 48, 43, 46, 41, 45, 42, 58, 44, /* [32: 39] */
86, 90, 88, 92, 103, 77, 79, 83, 78, 81, 95, 105, 70, 68, 67, 66, 69, 71, /* [40: 47] */
80, 82, 13, 12, 15, 14, 17, 18, 19, 16, 65, 72, 86, 90, 88, 92, 103, 77, /* [48: 55] */
2, 1, 0, 4, 6, 7, 9, 8, 33, 32, 79, 83, 78, 81, 80, 82, 13, 12, /* [56: 63] */
31, 30, 29, 27, 25, 28, 26, 23, 21, 20, 15, 14, 17, 18, 19, 16, 2, 1, /* [64: 71] */
24, 22, 5, 3, 10, 11, 106, 87, 91, 104, 0, 4, 6, 7, 9, 8, 33, 32, /* [72: 79] */
97, 100 }; 31, 30, 29, 27, 25, 28, 26, 23, /* [80: 87] */
21, 20, 24, 22, 5, 3, 10, 11, /* [88: 95] */
106, 87, 91, 104, 97, 100 }; /* [96:101] */
static const u8 gpssus_gpio_to_pad[GPSSUS_COUNT] = static const u8 gpssus_gpio_to_pad[GPSSUS_COUNT] =
{ 29, 33, 30, 31, 32, 34, 36, 35, 38, 37, { 29, 33, 30, 31, 32, 34, 36, 35, /* [ 0: 7] */
18, 7, 11, 20, 17, 1, 8, 10, 19, 12, 38, 37, 18, 7, 11, 20, 17, 1, /* [ 8:15] */
0, 2, 23, 39, 28, 27, 22, 21, 24, 25, 8, 10, 19, 12, 0, 2, 23, 39, /* [16:23] */
26, 51, 56, 54, 49, 55, 48, 57, 50, 58, 28, 27, 22, 21, 24, 25, 26, 51, /* [24:31] */
52, 53, 59, 40 }; 56, 54, 49, 55, 48, 57, 50, 58, /* [32:39] */
52, 53, 59, 40 }; /* [40:43] */
/* GPIO bank descriptions */ /* GPIO bank descriptions */
static const struct gpio_bank gpncore_bank = { static const struct gpio_bank gpncore_bank = {
.gpio_count = GPNCORE_COUNT, .gpio_count = GPNCORE_COUNT,
.gpio_to_pad = gpncore_gpio_to_pad, .gpio_to_pad = gpncore_gpio_to_pad,
.legacy_base = GP_LEGACY_BASE_NONE, .legacy_base = GP_LEGACY_BASE_NONE,
.pad_base = GPNCORE_PAD_BASE, .pad_base = GPNCORE_PAD_BASE,
.has_wake_en = 0, .has_wake_en = 0,
}; };
static const struct gpio_bank gpscore_bank = { static const struct gpio_bank gpscore_bank = {
.gpio_count = GPSCORE_COUNT, .gpio_count = GPSCORE_COUNT,
.gpio_to_pad = gpscore_gpio_to_pad, .gpio_to_pad = gpscore_gpio_to_pad,
.legacy_base = GPSCORE_LEGACY_BASE, .legacy_base = GPSCORE_LEGACY_BASE,
.pad_base = GPSCORE_PAD_BASE, .pad_base = GPSCORE_PAD_BASE,
.has_wake_en = 0, .has_wake_en = 0,
}; };
static const struct gpio_bank gpssus_bank = { static const struct gpio_bank gpssus_bank = {
.gpio_count = GPSSUS_COUNT, .gpio_count = GPSSUS_COUNT,
.gpio_to_pad = gpssus_gpio_to_pad, .gpio_to_pad = gpssus_gpio_to_pad,
.legacy_base = GPSSUS_LEGACY_BASE, .legacy_base = GPSSUS_LEGACY_BASE,
.pad_base = GPSSUS_PAD_BASE, .pad_base = GPSSUS_PAD_BASE,
.has_wake_en = 1, .has_wake_en = 1,
}; };
static void setup_gpios(const struct soc_gpio_map *gpios, static void setup_gpios(const struct soc_gpio_map *gpios,