[coreboot-gerrit] Change in coreboot[master]: [WIP]mb/google/octopus/var/meep: Update GPIO config for meep

Wisley Chen (Code Review) gerrit at coreboot.org
Tue Aug 21 15:13:13 CEST 2018


Wisley Chen has uploaded this change for review. ( https://review.coreboot.org/28252


Change subject: [WIP]mb/google/octopus/var/meep: Update GPIO config for meep
......................................................................

[WIP]mb/google/octopus/var/meep: Update GPIO config for meep

The change updates GPIO configuration for meep
1. Dynamically update touchscreen power enable GPIO in devicetree.
2. Provide default override tables for GPIO configuration.

BUG=none
TEST=Boot on meep proto board with Intel (Jefferson Peak) wifi card.

Change-Id: Idb4e7a510eef15c2e118058d5848080782f4f665
Signed-off-by: Wisley Chen <wisley.chen at quantatw.com>
---
A src/mainboard/google/octopus/variants/meep/Makefile.inc
A src/mainboard/google/octopus/variants/meep/gpio.c
A src/mainboard/google/octopus/variants/meep/variant.c
3 files changed, 152 insertions(+), 0 deletions(-)



  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/52/28252/1

diff --git a/src/mainboard/google/octopus/variants/meep/Makefile.inc b/src/mainboard/google/octopus/variants/meep/Makefile.inc
new file mode 100644
index 0000000..d54ed40
--- /dev/null
+++ b/src/mainboard/google/octopus/variants/meep/Makefile.inc
@@ -0,0 +1,4 @@
+bootblock-y += gpio.c
+
+ramstage-y += variant.c
+ramstage-y += gpio.c
diff --git a/src/mainboard/google/octopus/variants/meep/gpio.c b/src/mainboard/google/octopus/variants/meep/gpio.c
new file mode 100644
index 0000000..61b1802
--- /dev/null
+++ b/src/mainboard/google/octopus/variants/meep/gpio.c
@@ -0,0 +1,81 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright 2018 Google LLC.
+ *
+ * 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.
+ */
+
+#include <baseboard/gpio.h>
+#include <baseboard/variants.h>
+#include <boardid.h>
+#include <gpio.h>
+#include <soc/gpio.h>
+
+static const struct pad_config default_override_table[] = {
+	PAD_NC(GPIO_104, UP_20K),
+
+	/* CAM_SOC_EC_SYNC */
+	PAD_CFG_GPI_APIC_IOS(GPIO_134, NONE, DEEP, EDGE_SINGLE, INVERT, TxDRxE,
+			     DISPUPD),
+
+	/* EN_PP3300_TOUCHSCREEN */
+	PAD_CFG_GPO_IOSSTATE_IOSTERM(GPIO_146, 0, DEEP, NONE, Tx0RxDCRx0,
+				     DISPUPD),
+
+	/* EN_PP3300_WLAN_L */
+	PAD_CFG_GPO(GPIO_178, 0, DEEP),
+};
+
+const struct pad_config *variant_override_gpio_table(size_t *num)
+{
+	*num = ARRAY_SIZE(default_override_table);
+	return default_override_table;
+}
+
+/* GPIOs needed prior to ramstage. */
+static const struct pad_config early_gpio_table[] = {
+	/* PCH_WP_OD */
+	PAD_CFG_GPI(GPIO_190, NONE, DEEP),
+	/* H1_PCH_INT_ODL */
+	PAD_CFG_GPI_APIC_IOS(GPIO_63, NONE, DEEP, EDGE_SINGLE, INVERT, TxDRxE,
+			     DISPUPD),
+	/* H1_SLAVE_SPI_CLK_R */
+	PAD_CFG_NF(GPIO_79, NONE, DEEP, NF1),
+	/* H1_SLAVE_SPI_CS_L_R */
+	PAD_CFG_NF(GPIO_80, NONE, DEEP, NF1),
+	/* H1_SLAVE_SPI_MISO */
+	PAD_CFG_NF(GPIO_82, NONE, DEEP, NF1),
+	/* H1_SLAVE_SPI_MOSI_R */
+	PAD_CFG_NF(GPIO_83, NONE, DEEP, NF1),
+
+	PAD_CFG_GPO(GPIO_178, 0, DEEP),
+
+	/* WLAN_PE_RST */
+	PAD_CFG_GPO(GPIO_164, 0, DEEP),
+
+	/*
+	 * ESPI_IO1 acts as ALERT# (which is open-drain) and requies a weak
+	 * pull-up for proper operation. Since there is no external pull present
+	 * on this platform, configure an internal weak pull-up.
+	 */
+	PAD_CFG_NF_IOSSTATE_IOSTERM(GPIO_151, UP_20K, DEEP, NF2, HIZCRx1,
+				    ENPU),
+};
+
+const struct pad_config *variant_early_gpio_table(size_t *num)
+{
+	/*
+	 * This is a hack to configure EN_PP3300_WLAN based on board id. Once
+	 * board id 0 is deprecated, we can get rid of this.
+	 */
+	*num = ARRAY_SIZE(early_gpio_table);
+	return early_gpio_table;
+}
diff --git a/src/mainboard/google/octopus/variants/meep/variant.c b/src/mainboard/google/octopus/variants/meep/variant.c
new file mode 100644
index 0000000..c5c79ef
--- /dev/null
+++ b/src/mainboard/google/octopus/variants/meep/variant.c
@@ -0,0 +1,67 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright 2018 Google LLC.
+ *
+ * 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.
+ */
+
+#include <arch/acpi_device.h>
+#include <baseboard/variants.h>
+#include <boardid.h>
+#include <device/device.h>
+#include <drivers/i2c/generic/chip.h>
+#include <drivers/i2c/hid/chip.h>
+#include <soc/gpio.h>
+#include <soc/pci_devs.h>
+#include <string.h>
+
+extern struct chip_operations drivers_i2c_generic_ops;
+extern struct chip_operations drivers_i2c_hid_ops;
+
+void variant_update_devtree(struct device *dev)
+{
+	struct device *touchscreen_i2c_host;
+	struct device *child;
+	const struct bus *children_bus;
+	static const struct acpi_gpio new_enable_gpio =
+		ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_146);
+
+
+	touchscreen_i2c_host = dev_find_slot(0, PCH_DEVFN_I2C7);
+
+	if (touchscreen_i2c_host == NULL)
+		return;
+
+	children_bus = touchscreen_i2c_host->link_list;
+	child = NULL;
+
+	/* Find all children on bus to update touchscreen enable gpio. */
+	while ((child = dev_bus_each_child(children_bus, child)) != NULL) {
+		struct drivers_i2c_generic_config *cfg;
+
+		/* No configration to change. */
+		if (child->chip_info == NULL)
+			continue;
+
+		if (child->chip_ops == &drivers_i2c_generic_ops)
+			cfg = child->chip_info;
+		else if (child->chip_ops == &drivers_i2c_hid_ops) {
+			struct drivers_i2c_hid_config *hid_cfg;
+			hid_cfg = child->chip_info;
+			cfg = &hid_cfg->generic;
+		} else
+			continue;
+
+		/* Update the enable gpio. */
+		memcpy(&cfg->enable_gpio, &new_enable_gpio,
+			sizeof(new_enable_gpio));
+	}
+}

-- 
To view, visit https://review.coreboot.org/28252
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idb4e7a510eef15c2e118058d5848080782f4f665
Gerrit-Change-Number: 28252
Gerrit-PatchSet: 1
Gerrit-Owner: Wisley Chen <wisley.chen at quantatw.com>
Gerrit-Reviewer: Wisley Chen <wisley.chen at quanta.corp-partner.google.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20180821/e19f13ee/attachment.html>


More information about the coreboot-gerrit mailing list