[coreboot-gerrit] [S] Change in coreboot[master]: google/skyrim: Enable gpio-keys only for Frostflow

[Tim Van Patten (Code Review)]

Tim Van Patten has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/73299 )

Change subject: google/skyrim: Enable gpio-keys only for Frostflow
......................................................................

google/skyrim: Enable gpio-keys only for Frostflow

Only Frostflow supports the stylus, so remove the gpio-keys ACPI node
from Skyrim and only enable DRIVERS_GENERIC_GPIO_KEYS for Frostflow.

BUG: none
TEST: build_packages --board=skyrim chromeos-bootimage --autosetgov
Change-Id: I9ffe215741b72b678d74405769f35167d8ded4b5
---
M src/mainboard/google/skyrim/Kconfig
M src/mainboard/google/skyrim/Kconfig.name
M src/mainboard/google/skyrim/variants/skyrim/overridetree.cb
3 files changed, 15 insertions(+), 13 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/99/73299/1

diff --git a/src/mainboard/google/skyrim/Kconfig b/src/mainboard/google/skyrim/Kconfig
index 13fb804..1dea4fe 100644
--- a/src/mainboard/google/skyrim/Kconfig
+++ b/src/mainboard/google/skyrim/Kconfig
@@ -17,7 +17,6 @@
    select BOARD_ROMSIZE_KB_16384
    select DISABLE_KEYBOARD_RESET_PIN
    select DISABLE_SPI_FLASH_ROM_SHARING
-	select DRIVERS_GENERIC_GPIO_KEYS
    select DRIVERS_GENERIC_MAX98357A
    select DRIVERS_ACPI_THERMAL_ZONE
    select DRIVERS_I2C_GENERIC
diff --git a/src/mainboard/google/skyrim/Kconfig.name b/src/mainboard/google/skyrim/Kconfig.name
index 1827760..be8774a 100644
--- a/src/mainboard/google/skyrim/Kconfig.name
+++ b/src/mainboard/google/skyrim/Kconfig.name
@@ -20,6 +20,7 @@
 config BOARD_GOOGLE_FROSTFLOW
    bool "->  Frostflow"
    select BOARD_GOOGLE_BASEBOARD_SKYRIM
+	select DRIVERS_GENERIC_GPIO_KEYS
    select DRIVERS_GENESYSLOGIC_GL9755
    select FEATURE_TABLET_MODE_DPTC
    select SOC_AMD_COMMON_BLOCK_ACPI_DPTC
diff --git a/src/mainboard/google/skyrim/variants/skyrim/overridetree.cb b/src/mainboard/google/skyrim/variants/skyrim/overridetree.cb
index 0b9781e..7b4d769 100644
--- a/src/mainboard/google/skyrim/variants/skyrim/overridetree.cb
+++ b/src/mainboard/google/skyrim/variants/skyrim/overridetree.cb
@@ -148,18 +148,6 @@
    		register "has_power_resource" = "1"
    		device i2c 10 on end
    	end
-		chip drivers/generic/gpio_keys
-			register "name" = ""PENH""
-			register "gpio" = "ACPI_GPIO_INPUT_ACTIVE_LOW(GPIO_3)"
-			register "key.dev_name" = ""EJCT""
-			register "key.wakeup_event_action" = "EV_ACT_DEASSERTED"
-			register "key.linux_code" = "SW_PEN_INSERTED"
-			register "key.linux_input_type" = "EV_SW"
-			register "key.label" = ""pen_eject""
-			register "key.debounce_interval" = "100"
-			register "key.wakeup_route" = "WAKEUP_ROUTE_GPIO_IRQ"
-			device generic 0 on end
-		end
    end # I2C1
    device ref i2c_2 on
    	chip drivers/i2c/generic