[kernel] Revert "Merge branch 'master' into baytrail"
Josh Boyer
jwboyer at fedoraproject.org
Thu Nov 27 14:27:39 UTC 2014
commit 96440958bcce1ee3b72ba020c32883693390bf5b
Author: Josh Boyer <jwboyer at fedoraproject.org>
Date: Wed Nov 26 16:51:00 2014 -0500
Revert "Merge branch 'master' into baytrail"
This reverts commit 7511bcf2e6ddc31ee27418487f2d4b7d93bed1e2, reversing
changes made to cd44fa829c5e8255bf623a4b072cf85bb61b3092.
This should get the tree back to the state it was before the errant push.
The history will be ugly because Fedora disallows force pushing (sigh), but
oh well.
...emporary-dep-solution-for-battery-support.patch | 148 -----------
...ID-for-Dell-Venue-8-Pro-s-wireless-adapte.patch | 24 --
...t-to-fix-battery-issue-on-the-Asus-T100TA.patch | 233 -----------------
baytrail-backlight.patch | 270 --------------------
config-generic | 5 +-
config-x86-generic | 84 ------
kernel.spec | 59 +----
rt5640_enable_mic.patch | 13 -
sdhci-pm.patch | 25 --
soc_button_use_leftmeta.patch | 14 -
...l-OEM-chipset-found-in-Venue-8-Pro-SDIO-I.patch | 25 --
11 files changed, 8 insertions(+), 892 deletions(-)
---
diff --git a/config-generic b/config-generic
index 109be03..9ab5158 100644
--- a/config-generic
+++ b/config-generic
@@ -2312,9 +2312,6 @@ 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
#
@@ -5123,7 +5120,7 @@ CONFIG_ZSMALLOC=y
# CONFIG_PGTABLE_MAPPING is not set
# CONFIG_MDIO_GPIO is not set
-CONFIG_KEYBOARD_GPIO=m
+# CONFIG_KEYBOARD_GPIO is not set
# 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 79a3f44..88347fe 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -190,90 +190,6 @@ 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 3c8545e..2710406 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -24,8 +24,7 @@ Summary: The Linux kernel
%global zipsed -e 's/\.ko$/\.ko.xz/'
%endif
-%global dist awb
-%define buildid .1
+# % define buildid .local
# baserelease defines which build revision of this kernel version we're
# building. We used to call this fedora_build, but the magical name
@@ -619,38 +618,6 @@ Patch26071: usb-quirks-Add-reset-resume-quirk-for-MS-Wireless-La.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: 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
-
-# https://bugs.freedesktop.org/show_bug.cgi?id=85977
-# Hacky implementation of backlight support for (at least) Dell Venue 8 Pro
-# This is the patch attached to the bug plus a further change sent by email
-# by J-M which makes the hack optional, enabled only if
-# i915.force_backlight_pmic=1 is passed on the cmdline
-Patch31015: baytrail-backlight.patch
-
-# END OF AWB PATCH DEFINITIONS
-
# END OF PATCH DEFINITIONS
%endif
@@ -1379,18 +1346,6 @@ ApplyPatch kernel-arm64.patch -R
%endif
%endif
-# END OF FEDORA PATCH APPLICATIONS
-
-# AWB (BAYTRAIL) PATCH APPLICATIONS
-ApplyPatch 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
-ApplyPatch baytrail-backlight.patch
-
-# END OF AWB (BAYTRAIL) PATCH APPLICATIONS
-
# END OF PATCH APPLICATIONS
%endif
@@ -2243,12 +2198,12 @@ fi
#
#
# ___________________________________________________________
-# / This branch is for Fedora 21. You probably want to commit \
-# _____ ____ _ \ to the F-20 branch instead, or in addition to this one. /
-# | ___|___ \/ | -----------------------------------------------------------
-# | |_ __) | | \ ^__^
-# | _| / __/| | \ (@@)\_______
-# |_| |_____|_| (__)\ )\/\
+# / This branch is for Fedora 22. You probably want to commit \
+# _____ ____ ____ \ to the f21 branch instead, or in addition to this one. /
+# | ___|___ \|___ \ -----------------------------------------------------------
+# | |_ __) | __) | \ ^__^
+# | _| / __/ / __/ \ (@@)\_______
+# |_| |_____|_____| (__)\ )\/\
# ||----w |
# || ||
%changelog
More information about the scm-commits
mailing list