From 947e64c461f63831330a2a47c4451bd6fb88b39c Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Wed, 29 Jul 2015 02:16:08 +0000
Subject: [PATCH] core/linux-am33x to 4.1.3-3

---
 core/linux-am33x/PKGBUILD |  8 ++++----
 core/linux-am33x/config   | 10 +++++++++-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/core/linux-am33x/PKGBUILD b/core/linux-am33x/PKGBUILD
index 38746f5d3..4c69e60a3 100644
--- a/core/linux-am33x/PKGBUILD
+++ b/core/linux-am33x/PKGBUILD
@@ -8,8 +8,8 @@ _srcname=linux-4.1
 _kernelname=${pkgbase#linux}
 _desc="TI AM335x Beaglebone (Black)"
 pkgver=4.1.3
-pkgrel=2
-rcnrel=bone14
+pkgrel=3
+rcnrel=bone15
 arch=('armv7h')
 url="http://www.kernel.org/"
 license=('GPL2')
@@ -23,9 +23,9 @@ source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
         'config')
 md5sums=('fe9dc0f6729f36400ea81aa41d614c37'
          '6a388f552b05243ae4165735da839e24'
-         'a18ba3bd8e62dc2b00b9193d7f32b53f'
+         '09cf428a693ba8f4834373bba2e7728c'
          'SKIP'
-         '30929baa05110b5846077d24bce21e7f')
+         '9c6782c60f92aa673e4e442d73652a91')
 
 prepare() {
   cd "${srcdir}/${_srcname}"
diff --git a/core/linux-am33x/config b/core/linux-am33x/config
index bb937b0b7..a0a2dea1e 100644
--- a/core/linux-am33x/config
+++ b/core/linux-am33x/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.1.3-1 Kernel Configuration
+# Linux/arm 4.1.3-3 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -589,6 +589,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
 # CPU frequency scaling drivers
 #
 CONFIG_CPUFREQ_DT=y
+CONFIG_CPUFREQ_VOLTDM=y
 # CONFIG_ARM_KIRKWOOD_CPUFREQ is not set
 CONFIG_ARM_OMAP2PLUS_CPUFREQ=y
 # CONFIG_QORIQ_CPUFREQ is not set
@@ -2612,6 +2613,7 @@ CONFIG_GENERIC_PINCONF=y
 CONFIG_PINCTRL_AS3722=y
 # CONFIG_PINCTRL_AMD is not set
 CONFIG_PINCTRL_SINGLE=y
+CONFIG_PINCTRL_TI_IODELAY=y
 CONFIG_PINCTRL_PALMAS=y
 CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
@@ -2746,6 +2748,12 @@ CONFIG_POWER_RESET_RESTART=y
 CONFIG_POWER_RESET_SYSCON=y
 CONFIG_POWER_RESET_SYSCON_POWEROFF=y
 CONFIG_POWER_AVS=y
+CONFIG_VOLTAGE_DOMAIN=y
+
+#
+# Voltage Domain Framework Drivers
+#
+CONFIG_VOLTAGE_DOMAIN_OMAP=y
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set