f9b49e8782
This adds a 10us delay in between (re-)configuring and reading GPIOs in gpio_base2_value() to give the values stored some time to update. As far as I know this hasn't bitten us since the function was added, but adding a short delay here seems like the right thing to do. BUG=none BRANCH=none TEST=built and booted on Brain Change-Id: I869cf375680435ad87729f93d29a623bdf09dfbc Signed-off-by: Patrick Georgi <pgeorgi@chromium.org> Original-Commit-Id: 2484900fc9ceba87220a293de8ef20c3b9b20cfd Original-Signed-off-by: David Hendricks <dhendrix@chromium.org> Original-Change-Id: I79616a09d8d2ce4e416ffc94e35798dd25a6250d Original-Reviewed-on: https://chromium-review.googlesource.com/240854 Original-Reviewed-by: Julius Werner <jwerner@chromium.org> Reviewed-on: http://review.coreboot.org/9725 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
98 lines
2.6 KiB
C
98 lines
2.6 KiB
C
/*
|
|
* This file is part of the coreboot project.
|
|
*
|
|
* Copyright 2014 Google Inc.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; version 2 of the License.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#include <base3.h>
|
|
#include <console/console.h>
|
|
#include <delay.h>
|
|
#include <gpio.h>
|
|
|
|
int gpio_base2_value(gpio_t gpio[], int num_gpio)
|
|
{
|
|
int i, result = 0;
|
|
|
|
for (i = 0; i < num_gpio; i++)
|
|
gpio_input(gpio[i]);
|
|
|
|
/* Wait until signals become stable */
|
|
udelay(10);
|
|
|
|
for (i = 0; i < num_gpio; i++)
|
|
result |= gpio_get(gpio[i]) << i;
|
|
|
|
return result;
|
|
}
|
|
|
|
int gpio_base3_value(gpio_t gpio[], int num_gpio)
|
|
{
|
|
/*
|
|
* GPIOs which are tied to stronger external pull up or pull down
|
|
* will stay there regardless of the internal pull up or pull
|
|
* down setting.
|
|
*
|
|
* GPIOs which are floating will go to whatever level they're
|
|
* internally pulled to.
|
|
*/
|
|
|
|
static const char tristate_char[] = {[0] = '0', [1] = '1', [Z] = 'Z'};
|
|
int temp;
|
|
int index;
|
|
int result = 0;
|
|
char value[num_gpio];
|
|
|
|
/* Enable internal pull up */
|
|
for (index = 0; index < num_gpio; ++index)
|
|
gpio_input_pullup(gpio[index]);
|
|
|
|
/* Wait until signals become stable */
|
|
udelay(10);
|
|
|
|
/* Get gpio values at internal pull up */
|
|
for (index = 0; index < num_gpio; ++index)
|
|
value[index] = gpio_get(gpio[index]);
|
|
|
|
/* Enable internal pull down */
|
|
for (index = 0; index < num_gpio; ++index)
|
|
gpio_input_pulldown(gpio[index]);
|
|
|
|
/* Wait until signals become stable */
|
|
udelay(10);
|
|
|
|
/*
|
|
* Get gpio values at internal pull down.
|
|
* Compare with gpio pull up value and then
|
|
* determine a gpio final value/state:
|
|
* 0: pull down
|
|
* 1: pull up
|
|
* 2: floating
|
|
*/
|
|
printk(BIOS_DEBUG, "Reading tristate GPIOs: ");
|
|
for (index = num_gpio - 1; index >= 0; --index) {
|
|
temp = gpio_get(gpio[index]);
|
|
temp |= ((value[index] ^ temp) << 1);
|
|
printk(BIOS_DEBUG, "%c ", tristate_char[temp]);
|
|
result = (result * 3) + temp;
|
|
}
|
|
printk(BIOS_DEBUG, "= %d\n", result);
|
|
|
|
/* Disable pull up / pull down to conserve power */
|
|
for (index = 0; index < num_gpio; ++index)
|
|
gpio_input(gpio[index]);
|
|
|
|
return result;
|
|
}
|