diff --git a/core/linux-odroid/PKGBUILD b/core/linux-odroid/PKGBUILD
index 0fe36d08e..8f5814cd1 100644
--- a/core/linux-odroid/PKGBUILD
+++ b/core/linux-odroid/PKGBUILD
@@ -8,21 +8,21 @@ pkgname=('linux-odroid-x' 'linux-odroid-x2' 'linux-odroid-u2' 'linux-headers-odr
 _kernelname=${pkgname#linux}
 _basekernel=3.8
 pkgver=${_basekernel}.13.13
-pkgrel=2
+pkgrel=3
 arch=('armv7h')
 url="http://github.com/hardkernel/linux/"
 license=('GPL2')
 makedepends=('xmlto' 'docbook-xsl' 'kmod' 'git' 'inetutils' 'bc')
 options=('!strip')
-_commit=391595b096a2dc84bf5cfbcc6089d03bcb22e5c1
+_commit=e2a919d69a91ec7e15c5cd0e294bcdbfaf600371
 source=("https://github.com/hardkernel/linux/archive/${_commit}.tar.gz"
         'config_x'
         'config_x2'
         'config_u2')
-md5sums=('23c28be51297f3f277c163f25779b5da'
-         'a92d9c7b9739488a7fabd32b75c6c52d'
-         'b7d9fcda146474139edfd1b694e55551'
-         'e92646a61c70d4daed3330bc16a0b4a7')
+md5sums=('dd090aa57aa39b0b9d27e0d8284e3d57'
+         '39be2e9a142b79a22577a929bd0ee263'
+         'db1b483d614a48302e10f04171412d4d'
+         'e9276f9ba16154a5761717ee0a181aec')
 
 build() {
   cd "${srcdir}/linux-${_commit}"
diff --git a/core/linux-odroid/config_u2 b/core/linux-odroid/config_u2
index ba88a6a47..aed507d3a 100644
--- a/core/linux-odroid/config_u2
+++ b/core/linux-odroid/config_u2
@@ -302,7 +302,7 @@ CONFIG_ARCH_EXYNOS=y
 # CONFIG_ARCH_DAVINCI is not set
 # CONFIG_ARCH_OMAP1 is not set
 # CONFIG_ARCH_VT8500_SINGLE is not set
-# CONFIG_GPIO_PCA953X is not set
+CONFIG_GPIO_PCA953X=m
 CONFIG_KEYBOARD_GPIO_POLLED=m
 CONFIG_PLAT_SAMSUNG=y
 CONFIG_PLAT_S5P=y
@@ -321,7 +321,7 @@ CONFIG_S5P_IRQ=y
 CONFIG_S5P_GPIO_INT=y
 CONFIG_SAMSUNG_GPIOLIB_4BIT=y
 CONFIG_S5P_GPIO_DRVSTR=y
-CONFIG_SAMSUNG_GPIO_EXTRA=0
+CONFIG_SAMSUNG_GPIO_EXTRA=16
 CONFIG_S3C_GPIO_SPACE=0
 CONFIG_S3C_GPIO_TRACK=y
 # CONFIG_S3C_ADC is not set
@@ -337,6 +337,9 @@ CONFIG_S3C_DEV_USB_HSOTG=y
 CONFIG_S3C_DEV_WDT=y
 CONFIG_S3C_DEV_RTC=y
 CONFIG_SAMSUNG_DEV_ADC=y
+CONFIG_S3C64XX_DEV_SPI0=y
+CONFIG_S3C64XX_DEV_SPI1=y
+CONFIG_S3C64XX_DEV_SPI2=y
 CONFIG_SAMSUNG_DEV_KEYPAD=y
 CONFIG_SAMSUNG_DEV_PWM=y
 CONFIG_SAMSUNG_DEV_BACKLIGHT=y
@@ -394,6 +397,7 @@ CONFIG_EXYNOS4_SETUP_DWMCI=y
 CONFIG_EXYNOS4_SETUP_DWMCI_GPIO=y
 CONFIG_EXYNOS4_SETUP_FIMC=y
 CONFIG_EXYNOS4_SETUP_USB_PHY=y
+CONFIG_EXYNOS_SETUP_SPI=y
 
 #
 # EXYNOS4210 Boards
@@ -1168,7 +1172,8 @@ CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
 CONFIG_FIRMWARE_IN_KERNEL=y
-CONFIG_EXTRA_FIRMWARE=""
+CONFIG_EXTRA_FIRMWARE="edid/1024x768.bin edid/1280x1024.bin edid/1280x720.bin edid/1680x1050.bin edid/1920x1080.bin"
+CONFIG_EXTRA_FIRMWARE_DIR="firmware"
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
@@ -1861,7 +1866,7 @@ CONFIG_I2C_ALGOBIT=y
 #
 # CONFIG_I2C_CBUS_GPIO is not set
 # CONFIG_I2C_DESIGNWARE_PLATFORM is not set
-# CONFIG_I2C_GPIO is not set
+CONFIG_I2C_GPIO=y
 # CONFIG_I2C_NOMADIK is not set
 # CONFIG_I2C_OCORES is not set
 # CONFIG_I2C_PCA_PLATFORM is not set
@@ -1887,15 +1892,15 @@ CONFIG_I2C_STUB=m
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
 CONFIG_SPI=y
-# CONFIG_SPI_DEBUG is not set
+CONFIG_SPI_DEBUG=y
 CONFIG_SPI_MASTER=y
 
 #
 # SPI Master Controller Drivers
 #
 # CONFIG_SPI_ALTERA is not set
-# CONFIG_SPI_BITBANG is not set
-# CONFIG_SPI_GPIO is not set
+CONFIG_SPI_BITBANG=y
+CONFIG_SPI_GPIO=y
 # CONFIG_SPI_OC_TINY is not set
 # CONFIG_SPI_PL022 is not set
 # CONFIG_SPI_PXA2XX_PCI is not set
@@ -1908,7 +1913,7 @@ CONFIG_SPI_S3C64XX=y
 #
 # SPI Protocol Masters
 #
-# CONFIG_SPI_SPIDEV is not set
+CONFIG_SPI_SPIDEV=y
 # CONFIG_SPI_TLE62X0 is not set
 # CONFIG_HSI is not set
 
@@ -2574,7 +2579,7 @@ CONFIG_UMP_USING_OS_MEMORY=y
 CONFIG_DRM=y
 CONFIG_DRM_USB=m
 CONFIG_DRM_KMS_HELPER=y
-# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
+CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 
 #
 # I2C encoder or helper chips
@@ -3482,6 +3487,7 @@ CONFIG_PWM_SAMSUNG=y
 # Hardkernel Specific Hardware
 #
 CONFIG_ODROID_U2_FAN=y
+CONFIG_VIDEO_SAMSUNG_S5P_HDMI_CEC=y
 
 #
 # Ubuntu Supplied Third-Party Device Drivers
diff --git a/core/linux-odroid/config_x b/core/linux-odroid/config_x
index dbe0b36c6..2620bbefe 100644
--- a/core/linux-odroid/config_x
+++ b/core/linux-odroid/config_x
@@ -302,7 +302,7 @@ CONFIG_ARCH_EXYNOS=y
 # CONFIG_ARCH_DAVINCI is not set
 # CONFIG_ARCH_OMAP1 is not set
 # CONFIG_ARCH_VT8500_SINGLE is not set
-# CONFIG_GPIO_PCA953X is not set
+CONFIG_GPIO_PCA953X=m
 CONFIG_KEYBOARD_GPIO_POLLED=m
 CONFIG_PLAT_SAMSUNG=y
 CONFIG_PLAT_S5P=y
@@ -321,7 +321,7 @@ CONFIG_S5P_IRQ=y
 CONFIG_S5P_GPIO_INT=y
 CONFIG_SAMSUNG_GPIOLIB_4BIT=y
 CONFIG_S5P_GPIO_DRVSTR=y
-CONFIG_SAMSUNG_GPIO_EXTRA=0
+CONFIG_SAMSUNG_GPIO_EXTRA=16
 CONFIG_S3C_GPIO_SPACE=0
 CONFIG_S3C_GPIO_TRACK=y
 # CONFIG_S3C_ADC is not set
@@ -337,6 +337,9 @@ CONFIG_S3C_DEV_USB_HSOTG=y
 CONFIG_S3C_DEV_WDT=y
 CONFIG_S3C_DEV_RTC=y
 CONFIG_SAMSUNG_DEV_ADC=y
+CONFIG_S3C64XX_DEV_SPI0=y
+CONFIG_S3C64XX_DEV_SPI1=y
+CONFIG_S3C64XX_DEV_SPI2=y
 CONFIG_SAMSUNG_DEV_KEYPAD=y
 CONFIG_SAMSUNG_DEV_PWM=y
 CONFIG_SAMSUNG_DEV_BACKLIGHT=y
@@ -394,6 +397,7 @@ CONFIG_EXYNOS4_SETUP_DWMCI=y
 CONFIG_EXYNOS4_SETUP_DWMCI_GPIO=y
 CONFIG_EXYNOS4_SETUP_FIMC=y
 CONFIG_EXYNOS4_SETUP_USB_PHY=y
+CONFIG_EXYNOS_SETUP_SPI=y
 
 #
 # EXYNOS4210 Boards
@@ -1168,7 +1172,8 @@ CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
 CONFIG_FIRMWARE_IN_KERNEL=y
-CONFIG_EXTRA_FIRMWARE=""
+CONFIG_EXTRA_FIRMWARE="edid/1024x768.bin edid/1280x1024.bin edid/1280x720.bin edid/1680x1050.bin edid/1920x1080.bin"
+CONFIG_EXTRA_FIRMWARE_DIR="firmware"
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
@@ -1861,7 +1866,7 @@ CONFIG_I2C_ALGOBIT=y
 #
 # CONFIG_I2C_CBUS_GPIO is not set
 # CONFIG_I2C_DESIGNWARE_PLATFORM is not set
-# CONFIG_I2C_GPIO is not set
+CONFIG_I2C_GPIO=y
 # CONFIG_I2C_NOMADIK is not set
 # CONFIG_I2C_OCORES is not set
 # CONFIG_I2C_PCA_PLATFORM is not set
@@ -1887,15 +1892,15 @@ CONFIG_I2C_STUB=m
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
 CONFIG_SPI=y
-# CONFIG_SPI_DEBUG is not set
+CONFIG_SPI_DEBUG=y
 CONFIG_SPI_MASTER=y
 
 #
 # SPI Master Controller Drivers
 #
 # CONFIG_SPI_ALTERA is not set
-# CONFIG_SPI_BITBANG is not set
-# CONFIG_SPI_GPIO is not set
+CONFIG_SPI_BITBANG=y
+CONFIG_SPI_GPIO=y
 # CONFIG_SPI_OC_TINY is not set
 # CONFIG_SPI_PL022 is not set
 # CONFIG_SPI_PXA2XX_PCI is not set
@@ -1908,7 +1913,7 @@ CONFIG_SPI_S3C64XX=y
 #
 # SPI Protocol Masters
 #
-# CONFIG_SPI_SPIDEV is not set
+CONFIG_SPI_SPIDEV=y
 # CONFIG_SPI_TLE62X0 is not set
 # CONFIG_HSI is not set
 
@@ -2574,7 +2579,7 @@ CONFIG_UMP_USING_OS_MEMORY=y
 CONFIG_DRM=y
 CONFIG_DRM_USB=m
 CONFIG_DRM_KMS_HELPER=y
-# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
+CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 
 #
 # I2C encoder or helper chips
@@ -3481,6 +3486,7 @@ CONFIG_PWM_SAMSUNG=y
 #
 # Hardkernel Specific Hardware
 #
+CONFIG_VIDEO_SAMSUNG_S5P_HDMI_CEC=y
 
 #
 # Ubuntu Supplied Third-Party Device Drivers
diff --git a/core/linux-odroid/config_x2 b/core/linux-odroid/config_x2
index 273fdca5c..8caecfa6f 100644
--- a/core/linux-odroid/config_x2
+++ b/core/linux-odroid/config_x2
@@ -302,7 +302,7 @@ CONFIG_ARCH_EXYNOS=y
 # CONFIG_ARCH_DAVINCI is not set
 # CONFIG_ARCH_OMAP1 is not set
 # CONFIG_ARCH_VT8500_SINGLE is not set
-# CONFIG_GPIO_PCA953X is not set
+CONFIG_GPIO_PCA953X=m
 CONFIG_KEYBOARD_GPIO_POLLED=m
 CONFIG_PLAT_SAMSUNG=y
 CONFIG_PLAT_S5P=y
@@ -321,7 +321,7 @@ CONFIG_S5P_IRQ=y
 CONFIG_S5P_GPIO_INT=y
 CONFIG_SAMSUNG_GPIOLIB_4BIT=y
 CONFIG_S5P_GPIO_DRVSTR=y
-CONFIG_SAMSUNG_GPIO_EXTRA=0
+CONFIG_SAMSUNG_GPIO_EXTRA=16
 CONFIG_S3C_GPIO_SPACE=0
 CONFIG_S3C_GPIO_TRACK=y
 # CONFIG_S3C_ADC is not set
@@ -337,6 +337,9 @@ CONFIG_S3C_DEV_USB_HSOTG=y
 CONFIG_S3C_DEV_WDT=y
 CONFIG_S3C_DEV_RTC=y
 CONFIG_SAMSUNG_DEV_ADC=y
+CONFIG_S3C64XX_DEV_SPI0=y
+CONFIG_S3C64XX_DEV_SPI1=y
+CONFIG_S3C64XX_DEV_SPI2=y
 CONFIG_SAMSUNG_DEV_KEYPAD=y
 CONFIG_SAMSUNG_DEV_PWM=y
 CONFIG_SAMSUNG_DEV_BACKLIGHT=y
@@ -394,6 +397,7 @@ CONFIG_EXYNOS4_SETUP_DWMCI=y
 CONFIG_EXYNOS4_SETUP_DWMCI_GPIO=y
 CONFIG_EXYNOS4_SETUP_FIMC=y
 CONFIG_EXYNOS4_SETUP_USB_PHY=y
+CONFIG_EXYNOS_SETUP_SPI=y
 
 #
 # EXYNOS4210 Boards
@@ -1168,7 +1172,8 @@ CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
 CONFIG_FIRMWARE_IN_KERNEL=y
-CONFIG_EXTRA_FIRMWARE=""
+CONFIG_EXTRA_FIRMWARE="edid/1024x768.bin edid/1280x1024.bin edid/1280x720.bin edid/1680x1050.bin edid/1920x1080.bin"
+CONFIG_EXTRA_FIRMWARE_DIR="firmware"
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
@@ -1861,7 +1866,7 @@ CONFIG_I2C_ALGOBIT=y
 #
 # CONFIG_I2C_CBUS_GPIO is not set
 # CONFIG_I2C_DESIGNWARE_PLATFORM is not set
-# CONFIG_I2C_GPIO is not set
+CONFIG_I2C_GPIO=y
 # CONFIG_I2C_NOMADIK is not set
 # CONFIG_I2C_OCORES is not set
 # CONFIG_I2C_PCA_PLATFORM is not set
@@ -1887,15 +1892,15 @@ CONFIG_I2C_STUB=m
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
 CONFIG_SPI=y
-# CONFIG_SPI_DEBUG is not set
+CONFIG_SPI_DEBUG=y
 CONFIG_SPI_MASTER=y
 
 #
 # SPI Master Controller Drivers
 #
 # CONFIG_SPI_ALTERA is not set
-# CONFIG_SPI_BITBANG is not set
-# CONFIG_SPI_GPIO is not set
+CONFIG_SPI_BITBANG=y
+CONFIG_SPI_GPIO=y
 # CONFIG_SPI_OC_TINY is not set
 # CONFIG_SPI_PL022 is not set
 # CONFIG_SPI_PXA2XX_PCI is not set
@@ -1908,7 +1913,7 @@ CONFIG_SPI_S3C64XX=y
 #
 # SPI Protocol Masters
 #
-# CONFIG_SPI_SPIDEV is not set
+CONFIG_SPI_SPIDEV=y
 # CONFIG_SPI_TLE62X0 is not set
 # CONFIG_HSI is not set
 
@@ -2574,7 +2579,7 @@ CONFIG_UMP_USING_OS_MEMORY=y
 CONFIG_DRM=y
 CONFIG_DRM_USB=m
 CONFIG_DRM_KMS_HELPER=y
-# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
+CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 
 #
 # I2C encoder or helper chips
@@ -3481,6 +3486,7 @@ CONFIG_PWM_SAMSUNG=y
 #
 # Hardkernel Specific Hardware
 #
+CONFIG_VIDEO_SAMSUNG_S5P_HDMI_CEC=y
 
 #
 # Ubuntu Supplied Third-Party Device Drivers