summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--0001-ACPI-temporary-dep-solution-for-battery-support.patch148
-rw-r--r--0001-add-device-ID-for-Dell-Venue-8-Pro-s-wireless-adapte.patch24
-rw-r--r--RFC-V2-ACPI-Add-_DEP-Operation-Region-Dependencies-support-to-fix-battery-issue-on-the-Asus-T100TA.patch225
-rw-r--r--config-generic5
-rw-r--r--config-x86-generic84
-rw-r--r--kernel.spec51
-rw-r--r--rt5640_enable_mic.patch13
-rw-r--r--sdhci-pm.patch25
-rw-r--r--soc_button_use_leftmeta.patch14
-rw-r--r--support-Dell-OEM-chipset-found-in-Venue-8-Pro-SDIO-I.patch25
10 files changed, 606 insertions, 8 deletions
diff --git a/0001-ACPI-temporary-dep-solution-for-battery-support.patch b/0001-ACPI-temporary-dep-solution-for-battery-support.patch
new file mode 100644
index 000000000..737cd1055
--- /dev/null
+++ b/0001-ACPI-temporary-dep-solution-for-battery-support.patch
@@ -0,0 +1,148 @@
+From bbadbc67de278123e28dd6f9ee7e88b6ada56ce4 Mon Sep 17 00:00:00 2001
+From: Lan Tianyu <tianyu.lan@intel.com>
+Date: Fri, 21 Mar 2014 16:42:12 +0800
+Subject: [PATCH] ACPI: temporary dep solution for battery support
+
+This is a dep workaround for battery support on Asus T100TA and the formal
+dep solution is under developing. This patch is just for test and will
+not be upstreamed.
+---
+ drivers/acpi/scan.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++---
+ drivers/i2c/i2c-acpi.c | 1 +
+ include/linux/acpi.h | 1 +
+ 3 files changed, 63 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
+index 7efe546..254afb7 100644
+--- a/drivers/acpi/scan.c
++++ b/drivers/acpi/scan.c
+@@ -36,6 +36,7 @@ bool acpi_force_hot_remove;
+
+ static const char *dummy_hid = "device";
+
++static LIST_HEAD(acpi_bus_dep_device_list);
+ static LIST_HEAD(acpi_bus_id_list);
+ static DEFINE_MUTEX(acpi_scan_lock);
+ static LIST_HEAD(acpi_scan_handlers_list);
+@@ -43,6 +44,12 @@ DEFINE_MUTEX(acpi_device_lock);
+ LIST_HEAD(acpi_wakeup_device_list);
+ static DEFINE_MUTEX(acpi_hp_context_lock);
+
++
++struct acpi_dep_handle {
++ struct list_head node;
++ acpi_handle handle;
++};
++
+ struct acpi_device_bus_id{
+ char bus_id[15];
+ unsigned int instance_no;
+@@ -2027,10 +2034,22 @@ static void acpi_scan_init_hotplug(struct acpi_device *adev)
+ }
+ }
+
++
++static int acpi_dep_device_check(acpi_handle handle)
++{
++ struct acpi_dep_handle *dep;
++
++ list_for_each_entry(dep, &acpi_bus_dep_device_list, node)
++ if (dep->handle == handle)
++ return -EEXIST;
++ return 0;
++}
++
+ static acpi_status acpi_bus_check_add(acpi_handle handle, u32 lvl_not_used,
+ void *not_used, void **return_value)
+ {
+ struct acpi_device *device = NULL;
++ struct acpi_dep_handle *dep = NULL;
+ int type;
+ unsigned long long sta;
+ int result;
+@@ -2048,9 +2067,24 @@ static acpi_status acpi_bus_check_add(acpi_handle handle, u32 lvl_not_used,
+ return AE_OK;
+ }
+
+- acpi_add_single_object(&device, handle, type, sta);
+- if (!device)
+- return AE_CTRL_DEPTH;
++ if (!acpi_dep_device_check(handle)
++ && acpi_has_method(handle, "_BIX")
++ && acpi_has_method(handle, "_DEP")) {
++ dep = kmalloc(sizeof(struct acpi_dep_handle), GFP_KERNEL);
++ if (!dep)
++ return AE_CTRL_DEPTH;
++ dep->handle = handle;
++ list_add_tail(&dep->node , &acpi_bus_dep_device_list);
++
++ acpi_handle_info(dep->handle,
++ "is added to dep device list.\n");
++
++ return AE_OK;
++ } else {
++ acpi_add_single_object(&device, handle, type, sta);
++ if (!device)
++ return AE_CTRL_DEPTH;
++ }
+
+ acpi_scan_init_hotplug(device);
+
+@@ -2061,6 +2095,30 @@ static acpi_status acpi_bus_check_add(acpi_handle handle, u32 lvl_not_used,
+ return AE_OK;
+ }
+
++int acpi_walk_dep_device_list(void)
++{
++ struct acpi_dep_handle *dep, *tmp;
++ acpi_status status;
++ unsigned long long sta;
++
++ list_for_each_entry_safe(dep, tmp, &acpi_bus_dep_device_list, node) {
++ status = acpi_evaluate_integer(dep->handle, "_STA", NULL, &sta);
++
++ if (ACPI_FAILURE(status)) {
++ acpi_handle_warn(dep->handle,
++ "Status check failed (0x%x)\n", status);
++ } else if (sta & ACPI_STA_DEVICE_ENABLED) {
++ acpi_bus_scan(dep->handle);
++ acpi_handle_info(dep->handle,
++ "Device is readly\n");
++ list_del(&dep->node);
++ kfree(dep);
++ }
++ }
++ return 0;
++}
++EXPORT_SYMBOL_GPL(acpi_walk_dep_device_list);
++
+ static int acpi_scan_attach_handler(struct acpi_device *device)
+ {
+ struct acpi_hardware_id *hwid;
+diff --git a/drivers/i2c/i2c-acpi.c b/drivers/i2c/i2c-acpi.c
+index a0ae867..471490a 100644
+--- a/drivers/i2c/i2c-acpi.c
++++ b/drivers/i2c/i2c-acpi.c
+@@ -349,6 +349,7 @@ int acpi_i2c_install_space_handler(struct i2c_adapter *adapter)
+ return -ENOMEM;
+ }
+
++ acpi_walk_dep_device_list();
+ return 0;
+ }
+
+diff --git a/include/linux/acpi.h b/include/linux/acpi.h
+index 667204c..66ad0dd 100644
+--- a/include/linux/acpi.h
++++ b/include/linux/acpi.h
+@@ -115,6 +115,7 @@ int acpi_boot_init (void);
+ void acpi_boot_table_init (void);
+ int acpi_mps_check (void);
+ int acpi_numa_init (void);
++int acpi_walk_dep_device_list(void);
+
+ int acpi_table_init (void);
+ int acpi_table_parse(char *id, acpi_tbl_table_handler handler);
+--
+1.8.3.1
+
diff --git a/0001-add-device-ID-for-Dell-Venue-8-Pro-s-wireless-adapte.patch b/0001-add-device-ID-for-Dell-Venue-8-Pro-s-wireless-adapte.patch
new file mode 100644
index 000000000..dc1c997df
--- /dev/null
+++ b/0001-add-device-ID-for-Dell-Venue-8-Pro-s-wireless-adapte.patch
@@ -0,0 +1,24 @@
+From 69968772071bb8632a57f42ec77a3acdddbe74d7 Mon Sep 17 00:00:00 2001
+From: Adam Williamson <awilliam@redhat.com>
+Date: Mon, 14 Apr 2014 16:05:32 -0700
+Subject: [PATCH] add device ID for Dell Venue 8 Pro's wireless adapter
+
+---
+ drivers/net/wireless/ath/ath6kl/sdio.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/net/wireless/ath/ath6kl/sdio.c b/drivers/net/wireless/ath/ath6kl/sdio.c
+index 7126bdd..f403ebb 100644
+--- a/drivers/net/wireless/ath/ath6kl/sdio.c
++++ b/drivers/net/wireless/ath/ath6kl/sdio.c
+@@ -1403,6 +1403,7 @@ static const struct sdio_device_id ath6kl_sdio_devices[] = {
+ {SDIO_DEVICE(MANUFACTURER_CODE, (MANUFACTURER_ID_AR6003_BASE | 0x1))},
+ {SDIO_DEVICE(MANUFACTURER_CODE, (MANUFACTURER_ID_AR6004_BASE | 0x0))},
+ {SDIO_DEVICE(MANUFACTURER_CODE, (MANUFACTURER_ID_AR6004_BASE | 0x1))},
++ {SDIO_DEVICE(MANUFACTURER_CODE, (MANUFACTURER_ID_AR6004_BASE | 0x18))},
+ {},
+ };
+
+--
+1.9.0
+
diff --git a/RFC-V2-ACPI-Add-_DEP-Operation-Region-Dependencies-support-to-fix-battery-issue-on-the-Asus-T100TA.patch b/RFC-V2-ACPI-Add-_DEP-Operation-Region-Dependencies-support-to-fix-battery-issue-on-the-Asus-T100TA.patch
new file mode 100644
index 000000000..55524f9a6
--- /dev/null
+++ b/RFC-V2-ACPI-Add-_DEP-Operation-Region-Dependencies-support-to-fix-battery-issue-on-the-Asus-T100TA.patch
@@ -0,0 +1,225 @@
+From patchwork Mon Oct 27 15:09:44 2014
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [RFC, V2] ACPI: Add _DEP(Operation Region Dependencies) support to fix
+ battery issue on the Asus T100TA
+From: "lan,Tianyu" <tianyu.lan@intel.com>
+X-Patchwork-Id: 5161621
+Message-Id: <1414422584-2638-1-git-send-email-tianyu.lan@intel.com>
+To: rjw@rjwysocki.net, lenb@kernel.org, wsa@the-dreams.de,
+ robert.moore@intel.com, lv.zheng@intel.com
+Cc: Lan Tianyu <tianyu.lan@intel.com>, linux-acpi@vger.kernel.org,
+ linux-kernel@vger.kernel.org, linux-i2c@vger.kernel.org, devel@acpica.org
+Date: Mon, 27 Oct 2014 23:09:44 +0800
+
+ACPI 5.0 introduces _DEP to designate device objects that OSPM should
+assign a higher priority in start ordering due to future operation region
+accesses.
+
+On Asus T100TA, ACPI battery info are read from a I2C slave device via
+I2C operation region. Before I2C operation region handler is installed,
+battery _STA always returns 0. There is a _DEP method of designating
+start order under battery device node.
+
+This patch is to implement _DEP feature to fix battery issue on the Asus T100TA.
+Introducing acpi_dep_list and adding dep_unmet count in the struct
+acpi_device. During ACPI namespace scan, create struct acpi_dep_data for a
+valid pair of master (device pointed to by _DEP)/slave(device with _DEP), record
+master's and slave's ACPI handle in it and put it into acpi_dep_list. The dep_unmet
+count will increase by one if there is a device under its _DEP. Driver's probe() should
+return EPROBE_DEFER when find dep_unmet larger than 0. When I2C operation
+region handler is installed, remove all struct acpi_dep_data on the acpi_dep_list
+whose master is pointed to I2C host controller and decrease slave's dep_unmet.
+When dep_unmet decreases to 0, all _DEP conditions are met and then do acpi_bus_attach()
+for the device in order to resolve battery _STA issue on the Asus T100TA.
+
+Signed-off-by: Lan Tianyu <tianyu.lan@intel.com>
+
+---
+Change since V1:
+ Rework struct acpi_dep_data, record master and slave's ACPI handle.
+Rename dep_present with dep_unmet and make it as a count. Increase dep_unmet
+during bootup and decrease it when associated operation region is installed.
+
+ drivers/acpi/scan.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++++
+ drivers/i2c/i2c-core.c | 1 +
+ include/acpi/acpi_bus.h | 1 +
+ include/linux/acpi.h | 3 ++
+ 4 files changed, 96 insertions(+)
+
+diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
+index 4da55d8..bfa9c77 100644
+--- a/drivers/acpi/scan.c
++++ b/drivers/acpi/scan.c
+@@ -36,6 +36,8 @@ bool acpi_force_hot_remove;
+
+ static const char *dummy_hid = "device";
+
++static LIST_HEAD(acpi_dep_list);
++static DEFINE_MUTEX(acpi_dep_list_lock);
+ static LIST_HEAD(acpi_bus_id_list);
+ static DEFINE_MUTEX(acpi_scan_lock);
+ static LIST_HEAD(acpi_scan_handlers_list);
+@@ -43,6 +45,12 @@ DEFINE_MUTEX(acpi_device_lock);
+ LIST_HEAD(acpi_wakeup_device_list);
+ static DEFINE_MUTEX(acpi_hp_context_lock);
+
++struct acpi_dep_data {
++ struct list_head node;
++ acpi_handle master;
++ acpi_handle slave;
++};
++
+ struct acpi_device_bus_id{
+ char bus_id[15];
+ unsigned int instance_no;
+@@ -2121,6 +2129,63 @@ static void acpi_scan_init_hotplug(struct acpi_device *adev)
+ }
+ }
+
++static void acpi_device_dep_initialize(struct acpi_device *adev)
++{
++ struct acpi_dep_data *dep;
++ struct acpi_handle_list dep_devices;
++ struct acpi_device_info *info;
++ acpi_status status;
++ int i, skip;
++
++ if (!acpi_has_method(adev->handle, "_DEP"))
++ return;
++
++ status = acpi_evaluate_reference(adev->handle, "_DEP", NULL,
++ &dep_devices);
++ if (ACPI_FAILURE(status)) {
++ dev_err(&adev->dev, "Failed to evaluate _DEP.\n");
++ return;
++ }
++
++ for (i = 0; i < dep_devices.count; i++) {
++
++ status = acpi_get_object_info(dep_devices.handles[i], &info);
++ if (ACPI_FAILURE(status)) {
++ dev_err(&adev->dev, "Error reading device info\n");
++ continue;
++ }
++
++ /*
++ * Skip the dependency of Windows System Power
++ * Management Controller
++ */
++ if (info->valid & ACPI_VALID_HID
++ && !strcmp(info->hardware_id.string, "INT3396"))
++ skip = 1;
++ else
++ skip = 0;
++
++ kfree(info);
++
++ if (skip)
++ continue;
++
++ dep = kzalloc(sizeof(struct acpi_dep_data), GFP_KERNEL);
++ if (!dep) {
++ dev_err(&adev->dev, "Not enough memory for _DEP list entry.\n");
++ return;
++ }
++
++ dep->master = dep_devices.handles[i];
++ dep->slave = adev->handle;
++ adev->dep_unmet++;
++
++ mutex_lock(&acpi_dep_list_lock);
++ list_add_tail(&dep->node , &acpi_dep_list);
++ mutex_unlock(&acpi_dep_list_lock);
++ }
++}
++
+ static acpi_status acpi_bus_check_add(acpi_handle handle, u32 lvl_not_used,
+ void *not_used, void **return_value)
+ {
+@@ -2147,6 +2212,7 @@ static acpi_status acpi_bus_check_add(acpi_handle handle, u32 lvl_not_used,
+ return AE_CTRL_DEPTH;
+
+ acpi_scan_init_hotplug(device);
++ acpi_device_dep_initialize(device);
+
+ out:
+ if (!*return_value)
+@@ -2267,6 +2333,31 @@ static void acpi_bus_attach(struct acpi_device *device)
+ device->handler->hotplug.notify_online(device);
+ }
+
++int acpi_walk_dep_device_list(acpi_handle handle)
++{
++ struct acpi_dep_data *dep, *tmp;
++ struct acpi_device *adev;
++
++ mutex_lock(&acpi_dep_list_lock);
++ list_for_each_entry_safe(dep, tmp, &acpi_dep_list, node) {
++ if (dep->master == handle) {
++ acpi_bus_get_device(dep->slave, &adev);
++ if (!adev)
++ continue;
++
++ adev->dep_unmet--;
++ if (!adev->dep_unmet)
++ acpi_bus_attach(adev);
++ list_del(&dep->node);
++ kfree(dep);
++ }
++ }
++ mutex_unlock(&acpi_dep_list_lock);
++
++ return 0;
++}
++EXPORT_SYMBOL_GPL(acpi_walk_dep_device_list);
++
+ /**
+ * acpi_bus_scan - Add ACPI device node objects in a given namespace scope.
+ * @handle: Root of the namespace scope to scan.
+diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
+index 126e182..d5495ca 100644
+--- a/drivers/i2c/i2c-core.c
++++ b/drivers/i2c/i2c-core.c
+@@ -402,6 +402,7 @@ static int acpi_i2c_install_space_handler(struct i2c_adapter *adapter)
+ return -ENOMEM;
+ }
+
++ acpi_walk_dep_device_list(handle);
+ return 0;
+ }
+
+diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
+index 98cd723..269f068 100644
+--- a/include/acpi/acpi_bus.h
++++ b/include/acpi/acpi_bus.h
+@@ -367,6 +367,7 @@ struct acpi_device {
+ void *driver_data;
+ struct device dev;
+ unsigned int physical_node_count;
++ unsigned int dep_unmet;
+ struct list_head physical_node_list;
+ struct mutex physical_node_lock;
+ void (*remove)(struct acpi_device *);
+diff --git a/include/linux/acpi.h b/include/linux/acpi.h
+index 2b9c235..cec5f55 100644
+--- a/include/linux/acpi.h
++++ b/include/linux/acpi.h
+@@ -428,6 +428,7 @@ extern bool acpi_driver_match_device(struct device *dev,
+
+ int acpi_device_uevent_modalias(struct device *, struct kobj_uevent_env *);
+ int acpi_device_modalias(struct device *, char *, int);
++int acpi_walk_dep_device_list(acpi_handle handle);
+
+ struct platform_device *acpi_create_platform_device(struct acpi_device *);
+ #define ACPI_PTR(_ptr) (_ptr)
+@@ -446,6 +447,8 @@ static inline const char *acpi_dev_name(struct acpi_device *adev)
+
+ static inline void acpi_early_init(void) { }
+
++static inline int acpi_walk_dep_device_list(acpi_handle handle) { }
++
+ static inline int early_acpi_boot_init(void)
+ {
+ return 0;
diff --git a/config-generic b/config-generic
index 0bf45a93d..498d28b0c 100644
--- a/config-generic
+++ b/config-generic
@@ -2312,6 +2312,9 @@ CONFIG_INPUT_MPU3050=m
CONFIG_INPUT_KXTJ9=m
# CONFIG_INPUT_KXTJ9_POLLED_MODE is not set
+# Baytrail buttons
+CONFIG_INPUT_SOC_BUTTON_ARRAY=m
+
#
# Character devices
#
@@ -5120,7 +5123,7 @@ CONFIG_ZSMALLOC=y
# CONFIG_PGTABLE_MAPPING is not set
# CONFIG_MDIO_GPIO is not set
-# CONFIG_KEYBOARD_GPIO is not set
+CONFIG_KEYBOARD_GPIO=m
# CONFIG_KEYBOARD_GPIO_POLLED is not set
# CONFIG_MOUSE_GPIO is not set
# CONFIG_I2C_DESIGNWARE_PLATFORM is not set
diff --git a/config-x86-generic b/config-x86-generic
index 88347fede..79a3f4482 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -190,6 +190,90 @@ CONFIG_EDAC_IE31200=m
CONFIG_SCHED_MC=y
+CONFIG_SND_ISA=y
+CONFIG_SND_ES18XX=m
+
+# Baytrail sound
+CONFIG_PWM_LPSS=m
+CONFIG_SND_SOC=m
+CONFIG_SND_SIMPLE_CARD=m
+CONFIG_SND_DESIGNWARE_I2S=m
+CONFIG_SND_ATMEL_SOC=m
+CONFIG_SND_SOC_INTEL_SST=m
+CONFIG_SND_SOC_INTEL_SST_ACPI=m
+CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
+CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m
+CONFIG_SND_SOC_INTEL_BAYTRAIL=m
+CONFIG_SND_SOC_RT286=m
+CONFIG_SND_SOC_RT5640=m
+CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH=m
+
+# no no no
+# CONFIG_SND_SOC_ADAU1701 is not set
+# CONFIG_SND_SOC_AK4554 is not set
+# CONFIG_SND_SOC_AK4642 is not set
+# CONFIG_SND_SOC_AK5386 is not set
+# CONFIG_SND_SOC_CS42L52 is not set
+# CONFIG_SND_SOC_CS42L73 is not set
+# CONFIG_SND_SOC_CS4270 is not set
+# CONFIG_SND_SOC_CS4271 is not set
+# CONFIG_SND_SOC_CS42XX8_I2C is not set
+# CONFIG_SND_SOC_HDMI_CODEC is not set
+# CONFIG_SND_SOC_PCM1681 is not set
+# CONFIG_SND_SOC_PCM512x_I2C is not set
+# CONFIG_SND_SOC_SGTL5000 is not set
+# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
+# CONFIG_SND_SOC_SPDIF is not set
+# CONFIG_SND_SOC_TAS5086 is not set
+# CONFIG_SND_SOC_TLV320AIC3X is not set
+# CONFIG_SND_SOC_WM8510 is not set
+# CONFIG_SND_SOC_WM8523 is not set
+# CONFIG_SND_SOC_WM8580 is not set
+# CONFIG_SND_SOC_WM8711 is not set
+# CONFIG_SND_SOC_WM8728 is not set
+# CONFIG_SND_SOC_WM8731 is not set
+# CONFIG_SND_SOC_WM8737 is not set
+# CONFIG_SND_SOC_WM8741 is not set
+# CONFIG_SND_SOC_WM8750 is not set
+# CONFIG_SND_SOC_WM8753 is not set
+# CONFIG_SND_SOC_WM8776 is not set
+# CONFIG_SND_SOC_WM8804 is not set
+# CONFIG_SND_SOC_WM8903 is not set
+# CONFIG_SND_SOC_WM8962 is not set
+# CONFIG_SND_SOC_TPA6130A2 is not set
+# CONFIG_SND_SOC_FSL_SAI is not set
+# CONFIG_SND_SOC_FSL_SSI is not set
+# CONFIG_SND_SOC_FSL_SPDIF is not set
+# CONFIG_SND_SOC_FSL_ESAI is not set
+# CONFIG_SND_SOC_IMX_AUDMUX is not set
+# CONFIG_SND_SOC_ALC5623 is not set
+# CONFIG_SND_SOC_CS42L56 is not set
+# CONFIG_SND_SOC_STA350 is not set
+# CONFIG_SND_SOC_FSL_ASRC is not set
+# CONFIG_SND_SOC_AK4104 is not set
+# CONFIG_SND_SOC_CS4265 is not set
+# CONFIG_SND_SOC_PCM1792A is not set
+# CONFIG_SND_SOC_PCM512x_SPI is not set
+# CONFIG_SND_SOC_TAS2552 is not set
+# CONFIG_SND_SOC_TLV320AIC31XX is not set
+# CONFIG_SND_SOC_WM8770 is not set
+# CONFIG_SND_SOC_CS35L32 is not set
+# CONFIG_SND_SOC_ES8328 is not set
+# CONFIG_SND_SOC_SSM2602_I2C is not set
+# CONFIG_SND_SOC_SSM4567 is not set
+# CONFIG_SND_SOC_WM8978 is not set
+
+
+# Baytrail other (from pbrobinson)
+CONFIG_INTEL_SOC_PMIC=y
+CONFIG_GPIO_CRYSTAL_COVE=m
+CONFIG_MFD_CORE=m
+CONFIG_REGMAP_I2C=m
+# https://lkml.org/lkml/2013/5/13/175
+CONFIG_SPI_PXA2XX=m
+CONFIG_SPI_PXA2XX_PCI=m
+
CONFIG_TCG_INFINEON=m
CONFIG_HW_RANDOM_INTEL=m
diff --git a/kernel.spec b/kernel.spec
index 7acce7119..9d139fcc1 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -24,7 +24,8 @@ Summary: The Linux kernel
%global zipsed -e 's/\.ko$/\.ko.xz/'
%endif
-# % define buildid .local
+%global dist awb
+%define buildid .1
# baserelease defines which build revision of this kernel version we're
# building. We used to call this fedora_build, but the magical name
@@ -617,6 +618,31 @@ Patch26070: HID-add-support-for-MS-Surface-Pro-3-Type-Cover.patch
# git clone ssh://git.fedorahosted.org/git/kernel-arm64.git, git diff master...devel
Patch30000: kernel-arm64.patch
+# END OF FEDORA PATCH DEFINITIONS
+
+# AWB PATCH DEFINITIONS (BAYTRAIL)
+
+# https://patchwork.kernel.org/patch/5161621/(minor rediff required)
+# https://bugzilla.kernel.org/show_bug.cgi?id=69011
+# Fixes battery status
+Patch31010: RFC-V2-ACPI-Add-_DEP-Operation-Region-Dependencies-support-to-fix-battery-issue-on-the-Asus-T100TA.patch
+
+# Add SDIO ID for the V8P wireless adapter to ath6kl driver
+Patch31011: support-Dell-OEM-chipset-found-in-Venue-8-Pro-SDIO-I.patch
+
+# Map 'Home' button on Venue 8 Pro to left meta key (i.e. "Start")
+# from Jan-Michael Brummer
+Patch31012: soc_button_use_leftmeta.patch
+
+# Enable mic on RT5640 (i.e. lots of Baytrail hardware, we hope)
+# from Jan-Michael Brummer
+Patch31013: rt5640_enable_mic.patch
+
+# Fix wifi on V8P(?) from Jan-Michael Brummer
+Patch31014: sdhci-pm.patch
+
+# END OF AWB PATCH DEFINITIONS
+
# END OF PATCH DEFINITIONS
%endif
@@ -1344,6 +1370,17 @@ ApplyPatch kernel-arm64.patch -R
%endif
%endif
+# END OF FEDORA PATCH APPLICATIONS
+
+# AWB (BAYTRAIL) PATCH APPLICATIONS
+ApplyPatch RFC-V2-ACPI-Add-_DEP-Operation-Region-Dependencies-support-to-fix-battery-issue-on-the-Asus-T100TA.patch
+ApplyPatch support-Dell-OEM-chipset-found-in-Venue-8-Pro-SDIO-I.patch
+#ApplyPatch rt5640_enable_mic.patch
+ApplyPatch soc_button_use_leftmeta.patch
+ApplyPatch sdhci-pm.patch
+
+# END OF AWB (BAYTRAIL) PATCH APPLICATIONS
+
# END OF PATCH APPLICATIONS
%endif
@@ -2196,12 +2233,12 @@ fi
#
#
# ___________________________________________________________
-# / This branch is for Fedora 22. You probably want to commit \
-# _____ ____ ____ \ to the f21 branch instead, or in addition to this one. /
-# | ___|___ \|___ \ -----------------------------------------------------------
-# | |_ __) | __) | \ ^__^
-# | _| / __/ / __/ \ (@@)\_______
-# |_| |_____|_____| (__)\ )\/\
+# / This branch is for Fedora 21. You probably want to commit \
+# _____ ____ _ \ to the F-20 branch instead, or in addition to this one. /
+# | ___|___ \/ | -----------------------------------------------------------
+# | |_ __) | | \ ^__^
+# | _| / __/| | \ (@@)\_______
+# |_| |_____|_| (__)\ )\/\
# ||----w |
# || ||
%changelog
diff --git a/rt5640_enable_mic.patch b/rt5640_enable_mic.patch
new file mode 100644
index 000000000..cfb8718ac
--- /dev/null
+++ b/rt5640_enable_mic.patch
@@ -0,0 +1,13 @@
+diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c
+index f1ec6e6..e7e480d 100644
+--- a/sound/soc/codecs/rt5640.c
++++ b/sound/soc/codecs/rt5640.c
+@@ -2195,6 +2195,7 @@ static int rt5640_i2c_probe(struct i2c_client *i2c,
+ regmap_update_bits(rt5640->regmap, RT5640_IN3_IN4,
+ RT5640_IN_DF2, RT5640_IN_DF2);
+
++ rt5640->pdata.dmic_en = 1;
+ if (rt5640->pdata.dmic_en) {
+ regmap_update_bits(rt5640->regmap, RT5640_GPIO_CTRL1,
+ RT5640_GP2_PIN_MASK, RT5640_GP2_PIN_DMIC1_SCL);
+ \ No newline at end of file
diff --git a/sdhci-pm.patch b/sdhci-pm.patch
new file mode 100644
index 000000000..62ba0e6fd
--- /dev/null
+++ b/sdhci-pm.patch
@@ -0,0 +1,25 @@
+diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
+index ada1a3e..306b4ac 100644
+--- a/drivers/mmc/host/sdhci.c
++++ b/drivers/mmc/host/sdhci.c
+@@ -1715,7 +1715,8 @@ static void sdhci_enable_sdio_irq(struct mmc_host *mmc, int enable)
+ struct sdhci_host *host = mmc_priv(mmc);
+ unsigned long flags;
+
+- sdhci_runtime_pm_get(host);
++ if (enable)
++ sdhci_runtime_pm_get(host);
+
+ spin_lock_irqsave(&host->lock, flags);
+ if (enable)
+@@ -1726,7 +1727,8 @@ static void sdhci_enable_sdio_irq(struct mmc_host *mmc, int enable)
+ sdhci_enable_sdio_irq_nolock(host, enable);
+ spin_unlock_irqrestore(&host->lock, flags);
+
+- sdhci_runtime_pm_put(host);
++ if (!enable)
++ sdhci_runtime_pm_put(host);
+ }
+
+ static int sdhci_do_start_signal_voltage_switch(struct sdhci_host *host,
+ \ No newline at end of file
diff --git a/soc_button_use_leftmeta.patch b/soc_button_use_leftmeta.patch
new file mode 100644
index 000000000..605a82321
--- /dev/null
+++ b/soc_button_use_leftmeta.patch
@@ -0,0 +1,14 @@
+diff --git a/drivers/input/misc/soc_button_array.c b/drivers/input/misc/soc_button_array.c
+index e34dfc2..0472e3a 100644
+--- a/drivers/input/misc/soc_button_array.c
++++ b/drivers/input/misc/soc_button_array.c
+@@ -185,7 +185,7 @@ static int soc_button_pnp_probe(struct pnp_dev *pdev,
+
+ static struct soc_button_info soc_button_PNP0C40[] = {
+ { "power", 0, EV_KEY, KEY_POWER, false, true },
+- { "home", 1, EV_KEY, KEY_HOME, false, true },
++ { "home", 1, EV_KEY, KEY_LEFTMETA, false, true },
+ { "volume_up", 2, EV_KEY, KEY_VOLUMEUP, true, false },
+ { "volume_down", 3, EV_KEY, KEY_VOLUMEDOWN, true, false },
+ { "rotation_lock", 4, EV_SW, SW_ROTATE_LOCK, false, false },
+ \ No newline at end of file
diff --git a/support-Dell-OEM-chipset-found-in-Venue-8-Pro-SDIO-I.patch b/support-Dell-OEM-chipset-found-in-Venue-8-Pro-SDIO-I.patch
new file mode 100644
index 000000000..a422a2c51
--- /dev/null
+++ b/support-Dell-OEM-chipset-found-in-Venue-8-Pro-SDIO-I.patch
@@ -0,0 +1,25 @@
+From da8b582fd0bf505d269d5d9e69f1607ea69d1d33 Mon Sep 17 00:00:00 2001
+From: Adam Williamson <awilliam@redhat.com>
+Date: Tue, 9 Sep 2014 17:26:15 -0700
+Subject: [PATCH] support Dell OEM chipset found in Venue 8 Pro (SDIO ID
+ 0271:0418)
+
+---
+ drivers/net/wireless/ath/ath6kl/sdio.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/net/wireless/ath/ath6kl/sdio.c b/drivers/net/wireless/ath/ath6kl/sdio.c
+index 339d89f..5384f14 100644
+--- a/drivers/net/wireless/ath/ath6kl/sdio.c
++++ b/drivers/net/wireless/ath/ath6kl/sdio.c
+@@ -1401,6 +1401,7 @@ static const struct sdio_device_id ath6kl_sdio_devices[] = {
+ {SDIO_DEVICE(MANUFACTURER_CODE, (MANUFACTURER_ID_AR6004_BASE | 0x0))},
+ {SDIO_DEVICE(MANUFACTURER_CODE, (MANUFACTURER_ID_AR6004_BASE | 0x1))},
+ {SDIO_DEVICE(MANUFACTURER_CODE, (MANUFACTURER_ID_AR6004_BASE | 0x2))},
++ {SDIO_DEVICE(MANUFACTURER_CODE, (MANUFACTURER_ID_AR6004_BASE | 0x18))},
+ {},
+ };
+
+--
+2.1.0
+