From f07edd2ccab5afd838a6d8545c45d7b658ee6c59 Mon Sep 17 00:00:00 2001
From: Alex Gonzalez <alex.gonzalez@digi.com>
Date: Tue, 13 Aug 2013 13:54:48 +0200
Subject: [PATCH] meta-digi-arm: Update linux-dey to support the pswitch
 driver.

https://jira.digi.com/browse/DEL-580

Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
---
 .../linux/linux-dey-3.10/ccardimx28js/defconfig             | 6 +++++-
 meta-digi-arm/recipes-kernel/linux/linux-dey-rev_3.10.inc   | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey-3.10/ccardimx28js/defconfig b/meta-digi-arm/recipes-kernel/linux/linux-dey-3.10/ccardimx28js/defconfig
index 2604c28ab..8d8e3f676 100644
--- a/meta-digi-arm/recipes-kernel/linux/linux-dey-3.10/ccardimx28js/defconfig
+++ b/meta-digi-arm/recipes-kernel/linux/linux-dey-3.10/ccardimx28js/defconfig
@@ -1,3 +1,4 @@
+CONFIG_LOCALVERSION="mxs"
 # CONFIG_SWAP is not set
 CONFIG_SYSVIPC=y
 CONFIG_NO_HZ=y
@@ -23,6 +24,8 @@ CONFIG_ARCH_MXS=y
 # CONFIG_ARM_THUMB is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_AEABI=y
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_FPE_NWFPE=y
 # CONFIG_BINFMT_SCRIPT is not set
 CONFIG_NET=y
@@ -92,7 +95,8 @@ CONFIG_ATH6KL=m
 CONFIG_ATH6KL_SDIO=m
 # CONFIG_INPUT_MOUSEDEV_PSAUX is not set
 CONFIG_INPUT_EVDEV=y
-# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_KEYBOARD_ATKBD is not set
+CONFIG_KEYBOARD_MXS_PSWITCH=y
 # CONFIG_INPUT_MOUSE is not set
 CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_TOUCHSCREEN_TSC2007=m
diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey-rev_3.10.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey-rev_3.10.inc
index 12f76a0e1..7afe389d4 100644
--- a/meta-digi-arm/recipes-kernel/linux/linux-dey-rev_3.10.inc
+++ b/meta-digi-arm/recipes-kernel/linux/linux-dey-rev_3.10.inc
@@ -1,7 +1,7 @@
 # Copyright (C) 2012 Digi International
 
 SRCREV_external = ""
-SRCREV_internal = "8c7126698001b717dd635a495663905727922f30"
+SRCREV_internal = "ce25e26b4937d169cc883612fa6a84622e656fec"
 SRCREV = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCREV_internal}', '${SRCREV_external}', d)}"
 
 SRC_URI_external = "${DIGI_GITHUB_GIT}/yocto-linux.git;protocol=git"