summaryrefslogtreecommitdiffstats
path: root/meta-phosphor/common
diff options
context:
space:
mode:
Diffstat (limited to 'meta-phosphor/common')
-rw-r--r--meta-phosphor/common/recipes-kernel/linux/linux-obmc.inc2
-rw-r--r--meta-phosphor/common/recipes-kernel/linux/linux-obmc/phosphor-gpio-keys.cfg7
-rw-r--r--meta-phosphor/common/recipes-kernel/linux/linux-obmc/phosphor-gpio-keys.scc2
3 files changed, 11 insertions, 0 deletions
diff --git a/meta-phosphor/common/recipes-kernel/linux/linux-obmc.inc b/meta-phosphor/common/recipes-kernel/linux/linux-obmc.inc
index fc4a4f9c5..c26f4afb2 100644
--- a/meta-phosphor/common/recipes-kernel/linux/linux-obmc.inc
+++ b/meta-phosphor/common/recipes-kernel/linux/linux-obmc.inc
@@ -8,6 +8,8 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
KSRC ?= "git://github.com/openbmc/linux;protocol=git;branch=${KBRANCH}"
SRC_URI = "${KSRC}"
+SRC_URI += "file://phosphor-gpio-keys.scc"
+SRC_URI += "file://phosphor-gpio-keys.cfg"
SRC_URI += "file://v3-0001-drivers-fsi-Increase-delay-before-sampling-input-.patch"
LINUX_VERSION_EXTENSION ?= "-${SRCREV}"
diff --git a/meta-phosphor/common/recipes-kernel/linux/linux-obmc/phosphor-gpio-keys.cfg b/meta-phosphor/common/recipes-kernel/linux/linux-obmc/phosphor-gpio-keys.cfg
new file mode 100644
index 000000000..f5c01bed7
--- /dev/null
+++ b/meta-phosphor/common/recipes-kernel/linux/linux-obmc/phosphor-gpio-keys.cfg
@@ -0,0 +1,7 @@
+CONFIG_INPUT_KEYBOARD=y
+# CONFIG_INPUT_LEDS is not set
+# CONFIG_INPUT_MOUSDEV is not set
+CONFIG_INPUT_EVDEV=y
+# CONFIG_KEYBOARD_ATKBD is not set
+CONFIG_KEYBOARD_GPIO=y
+# CONFIG_INPUT_MOUSE is not set
diff --git a/meta-phosphor/common/recipes-kernel/linux/linux-obmc/phosphor-gpio-keys.scc b/meta-phosphor/common/recipes-kernel/linux/linux-obmc/phosphor-gpio-keys.scc
new file mode 100644
index 000000000..78961af7a
--- /dev/null
+++ b/meta-phosphor/common/recipes-kernel/linux/linux-obmc/phosphor-gpio-keys.scc
@@ -0,0 +1,2 @@
+define KFEATURE_DESCRIPTION "Enable gpio-keys"
+kconf non-hardware phosphor-gpio-keys.cfg
OpenPOWER on IntegriCloud