summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Williamson <awilliam@redhat.com>2014-11-26 12:52:57 -0800
committerAdam Williamson <awilliam@redhat.com>2014-11-26 12:52:57 -0800
commitbd7d8d0d9e94b127c4c3b1677c9714fb1caece8f (patch)
treea65eb04fc82036dac4a6b8bdc3efa925211b4981
parent7511bcf2e6ddc31ee27418487f2d4b7d93bed1e2 (diff)
downloadkernel-bd7d8d0d9e94b127c4c3b1677c9714fb1caece8f.tar.gz
kernel-bd7d8d0d9e94b127c4c3b1677c9714fb1caece8f.tar.xz
kernel-bd7d8d0d9e94b127c4c3b1677c9714fb1caece8f.zip
fully drop now-unnecessary mic enablement patch
-rw-r--r--kernel.spec5
-rw-r--r--rt5640_enable_mic.patch13
2 files changed, 0 insertions, 18 deletions
diff --git a/kernel.spec b/kernel.spec
index 3c8545ee0..6b02d9f6a 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -635,10 +635,6 @@ Patch31011: support-Dell-OEM-chipset-found-in-Venue-8-Pro-SDIO-I.patch
# 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
@@ -1384,7 +1380,6 @@ ApplyPatch kernel-arm64.patch -R
# 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
diff --git a/rt5640_enable_mic.patch b/rt5640_enable_mic.patch
deleted file mode 100644
index cfb8718ac..000000000
--- a/rt5640_enable_mic.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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