summaryrefslogtreecommitdiff
path: root/src/mainboard/samsung
diff options
context:
space:
mode:
Diffstat (limited to 'src/mainboard/samsung')
-rw-r--r--src/mainboard/samsung/lumpy/chromeos.c57
-rw-r--r--src/mainboard/samsung/stumpy/chromeos.c55
2 files changed, 41 insertions, 71 deletions
diff --git a/src/mainboard/samsung/lumpy/chromeos.c b/src/mainboard/samsung/lumpy/chromeos.c
index 5d688fe9f9..2d4fb61be8 100644
--- a/src/mainboard/samsung/lumpy/chromeos.c
+++ b/src/mainboard/samsung/lumpy/chromeos.c
@@ -34,46 +34,31 @@
#include "ec.h"
#include <ec/smsc/mec1308/ec.h>
-#define GPIO_COUNT 5
-
void fill_lb_gpios(struct lb_gpios *gpios)
{
struct device *dev = pcidev_on_root(0x1f, 0);
u16 gen_pmcon_1 = pci_read_config32(dev, GEN_PMCON_1);
- u8 lid = ec_read(0x83);
-
- gpios->size = sizeof(*gpios) + (GPIO_COUNT * sizeof(struct lb_gpio));
- gpios->count = GPIO_COUNT;
-
- /* Write Protect: GPIO24 = KBC3_SPI_WP# */
- gpios->gpios[0].port = GPIO_SPI_WP;
- gpios->gpios[0].polarity = ACTIVE_HIGH;
- gpios->gpios[0].value = get_write_protect_state();
- strncpy((char *)gpios->gpios[0].name,"write protect",
- GPIO_MAX_NAME_LENGTH);
-
- /* Recovery: GPIO42 = CHP3_REC_MODE# */
- gpios->gpios[1].port = GPIO_REC_MODE;
- gpios->gpios[1].polarity = ACTIVE_LOW;
- gpios->gpios[1].value = !get_recovery_mode_switch();
- strncpy((char *)gpios->gpios[1].name,"recovery", GPIO_MAX_NAME_LENGTH);
-
- gpios->gpios[2].port = 100;
- gpios->gpios[2].polarity = ACTIVE_HIGH;
- gpios->gpios[2].value = lid & 1;
- strncpy((char *)gpios->gpios[2].name,"lid", GPIO_MAX_NAME_LENGTH);
-
- /* Power Button */
- gpios->gpios[3].port = 101;
- gpios->gpios[3].polarity = ACTIVE_LOW;
- gpios->gpios[3].value = (gen_pmcon_1 >> 9) & 1;
- strncpy((char *)gpios->gpios[3].name,"power", GPIO_MAX_NAME_LENGTH);
-
- /* Did we load the VGA Option ROM? */
- gpios->gpios[4].port = -1; /* Indicate that this is a pseudo GPIO */
- gpios->gpios[4].polarity = ACTIVE_HIGH;
- gpios->gpios[4].value = gfx_get_init_done();
- strncpy((char *)gpios->gpios[4].name,"oprom", GPIO_MAX_NAME_LENGTH);
+ u8 lid = ec_read(0x83);
+
+ struct lb_gpio chromeos_gpios[] = {
+ /* Write Protect: GPIO24 = KBC3_SPI_WP# */
+ {GPIO_SPI_WP, ACTIVE_HIGH, get_write_protect_state(),
+ "write protect"},
+
+ /* Recovery: GPIO42 = CHP3_REC_MODE# */
+ {GPIO_REC_MODE, ACTIVE_LOW, !get_recovery_mode_switch(),
+ "recovery"},
+
+ {100, ACTIVE_HIGH, lid & 1, "lid"},
+
+ /* Power Button */
+ {101, ACTIVE_LOW, (gen_pmcon_1 >> 9) & 1, "power"},
+
+ /* Did we load the VGA Option ROM? */
+ /* -1 indicates that this is a pseudo GPIO */
+ {-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
+ };
+ lb_add_gpios(gpios, chromeos_gpios, ARRAY_SIZE(chromeos_gpios));
}
#endif
diff --git a/src/mainboard/samsung/stumpy/chromeos.c b/src/mainboard/samsung/stumpy/chromeos.c
index 295c31f49d..b1ad137113 100644
--- a/src/mainboard/samsung/stumpy/chromeos.c
+++ b/src/mainboard/samsung/stumpy/chromeos.c
@@ -31,46 +31,31 @@
#if ENV_RAMSTAGE
#include <boot/coreboot_tables.h>
-#define GPIO_COUNT 5
-
void fill_lb_gpios(struct lb_gpios *gpios)
{
struct device *dev = pcidev_on_root(0x1f, 0);
u16 gen_pmcon_1 = pci_read_config32(dev, GEN_PMCON_1);
- gpios->size = sizeof(*gpios) + (GPIO_COUNT * sizeof(struct lb_gpio));
- gpios->count = GPIO_COUNT;
-
- /* Write Protect: GPIO68 = CHP3_SPI_WP */
- gpios->gpios[0].port = GPIO_SPI_WP;
- gpios->gpios[0].polarity = ACTIVE_HIGH;
- gpios->gpios[0].value = get_write_protect_state();
- strncpy((char *)gpios->gpios[0].name,"write protect",
- GPIO_MAX_NAME_LENGTH);
-
- /* Recovery: GPIO42 = CHP3_REC_MODE# */
- gpios->gpios[1].port = GPIO_REC_MODE;
- gpios->gpios[1].polarity = ACTIVE_LOW;
- gpios->gpios[1].value = !get_recovery_mode_switch();
- strncpy((char *)gpios->gpios[1].name,"recovery", GPIO_MAX_NAME_LENGTH);
-
- /* Hard code the lid switch GPIO to open. */
- gpios->gpios[2].port = 100;
- gpios->gpios[2].polarity = ACTIVE_HIGH;
- gpios->gpios[2].value = 1;
- strncpy((char *)gpios->gpios[2].name,"lid", GPIO_MAX_NAME_LENGTH);
-
- /* Power Button */
- gpios->gpios[3].port = 101;
- gpios->gpios[3].polarity = ACTIVE_LOW;
- gpios->gpios[3].value = (gen_pmcon_1 >> 9) & 1;
- strncpy((char *)gpios->gpios[3].name,"power", GPIO_MAX_NAME_LENGTH);
-
- /* Did we load the VGA Option ROM? */
- gpios->gpios[4].port = -1; /* Indicate that this is a pseudo GPIO */
- gpios->gpios[4].polarity = ACTIVE_HIGH;
- gpios->gpios[4].value = gfx_get_init_done();
- strncpy((char *)gpios->gpios[4].name,"oprom", GPIO_MAX_NAME_LENGTH);
+ struct lb_gpio chromeos_gpios[] = {
+ /* Write Protect: GPIO68 = CHP3_SPI_WP */
+ {GPIO_SPI_WP, ACTIVE_HIGH, get_write_protect_state(),
+ "write protect"},
+
+ /* Recovery: GPIO42 = CHP3_REC_MODE# */
+ {GPIO_REC_MODE, ACTIVE_LOW, !get_recovery_mode_switch(),
+ "recovery"},
+
+ /* Hard code the lid switch GPIO to open. */
+ {100, ACTIVE_HIGH, 1, "lid"},
+
+ /* Power Button */
+ {101, ACTIVE_LOW, (gen_pmcon_1 >> 9) & 1, "power"},
+
+ /* Did we load the VGA Option ROM? */
+ /* -1 indicates that this is a pseudo GPIO */
+ {-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
+ };
+ lb_add_gpios(gpios, chromeos_gpios, ARRAY_SIZE(chromeos_gpios));
}
#endif