aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrea Adami <andrea.adami@gmail.com>2016-05-06 14:53:37 +0200
committerAndrea Adami <andrea.adami@gmail.com>2016-05-06 15:07:28 +0200
commitd3f1e2f7679d75e5638487b246b832ec3f47ea51 (patch)
treed04c32d3e6892957baad78a07f48c35ee679a74c
parent953fa6c69c4bb10d5377e2045dc21de9b9d9b1b3 (diff)
downloadmeta-handheld-d3f1e2f7679d75e5638487b246b832ec3f47ea51.tar.gz
meta-handheld-d3f1e2f7679d75e5638487b246b832ec3f47ea51.tar.bz2
meta-handheld-d3f1e2f7679d75e5638487b246b832ec3f47ea51.zip
linux-handheld-4.4: update patch for sound/soc/pxa module autoloading
Prepare patch for upstream submission Minor changes to defconfigs Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
-rw-r--r--recipes-kernel/linux/linux-handheld-4.4/ASoC-pxa-fix-module-autoload-for-platform-drivers.patch95
-rw-r--r--recipes-kernel/linux/linux-handheld-4.4/c7x0/defconfig1
-rw-r--r--recipes-kernel/linux/linux-handheld-4.4/collie/defconfig2
-rw-r--r--recipes-kernel/linux/linux-handheld-4.4/poodle/defconfig2
-rw-r--r--recipes-kernel/linux/linux-handheld-4.4/snd-soc-pxa2xx-modalias.patch7
-rw-r--r--recipes-kernel/linux/linux-handheld_4.4.bb2
6 files changed, 98 insertions, 11 deletions
diff --git a/recipes-kernel/linux/linux-handheld-4.4/ASoC-pxa-fix-module-autoload-for-platform-drivers.patch b/recipes-kernel/linux/linux-handheld-4.4/ASoC-pxa-fix-module-autoload-for-platform-drivers.patch
new file mode 100644
index 0000000..b4cf2c6
--- /dev/null
+++ b/recipes-kernel/linux/linux-handheld-4.4/ASoC-pxa-fix-module-autoload-for-platform-drivers.patch
@@ -0,0 +1,95 @@
+From 25b3edd15fef06d8828b70a38b0420d569edc26e Mon Sep 17 00:00:00 2001
+From: Andrea Adami <andrea.adami@gmail.com>
+Date: Fri, 6 May 2016 14:27:02 +0200
+Subject: [PATCH 1/1] ASoC: pxa: Fix module autoload for platform drivers
+
+These platform drivers are lacking MODULE_ALIAS so module autoloading
+doesn't work. Tested on corgi and poodle with kernel 4.4.
+
+Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
+---
+ sound/soc/pxa/brownstone.c | 1 +
+ sound/soc/pxa/mioa701_wm9713.c | 1 +
+ sound/soc/pxa/mmp-pcm.c | 1 +
+ sound/soc/pxa/mmp-sspa.c | 1 +
+ sound/soc/pxa/palm27x.c | 1 +
+ sound/soc/pxa/pxa-ssp.c | 1 +
+ sound/soc/pxa/pxa2xx-ac97.c | 1 +
+ sound/soc/pxa/pxa2xx-pcm.c | 1 +
+ 8 files changed, 8 insertions(+)
+
+diff --git a/sound/soc/pxa/brownstone.c b/sound/soc/pxa/brownstone.c
+index ec522e9..b6cb995 100644
+--- a/sound/soc/pxa/brownstone.c
++++ b/sound/soc/pxa/brownstone.c
+@@ -133,3 +133,4 @@ module_platform_driver(mmp_driver);
+ MODULE_AUTHOR("Leo Yan <leoy@marvell.com>");
+ MODULE_DESCRIPTION("ALSA SoC Brownstone");
+ MODULE_LICENSE("GPL");
++MODULE_ALIAS("platform:brownstone-audio");
+diff --git a/sound/soc/pxa/mioa701_wm9713.c b/sound/soc/pxa/mioa701_wm9713.c
+index 5c8f9db..d1661fa 100644
+--- a/sound/soc/pxa/mioa701_wm9713.c
++++ b/sound/soc/pxa/mioa701_wm9713.c
+@@ -207,3 +207,4 @@ module_platform_driver(mioa701_wm9713_driver);
+ MODULE_AUTHOR("Robert Jarzmik (rjarzmik@free.fr)");
+ MODULE_DESCRIPTION("ALSA SoC WM9713 MIO A701");
+ MODULE_LICENSE("GPL");
++MODULE_ALIAS("platform:mioa701-wm9713");
+diff --git a/sound/soc/pxa/mmp-pcm.c b/sound/soc/pxa/mmp-pcm.c
+index 51e790d..96df9b2 100644
+--- a/sound/soc/pxa/mmp-pcm.c
++++ b/sound/soc/pxa/mmp-pcm.c
+@@ -248,3 +248,4 @@ module_platform_driver(mmp_pcm_driver);
+ MODULE_AUTHOR("Leo Yan <leoy@marvell.com>");
+ MODULE_DESCRIPTION("MMP Soc Audio DMA module");
+ MODULE_LICENSE("GPL");
++MODULE_ALIAS("platform:mmp-pcm-audio");
+diff --git a/sound/soc/pxa/mmp-sspa.c b/sound/soc/pxa/mmp-sspa.c
+index eca60c2..ca8b23f 100644
+--- a/sound/soc/pxa/mmp-sspa.c
++++ b/sound/soc/pxa/mmp-sspa.c
+@@ -482,3 +482,4 @@ module_platform_driver(asoc_mmp_sspa_driver);
+ MODULE_AUTHOR("Leo Yan <leoy@marvell.com>");
+ MODULE_DESCRIPTION("MMP SSPA SoC Interface");
+ MODULE_LICENSE("GPL");
++MODULE_ALIAS("platform:mmp-sspa-dai");
+diff --git a/sound/soc/pxa/palm27x.c b/sound/soc/pxa/palm27x.c
+index 4e74d95..bcc81e9 100644
+--- a/sound/soc/pxa/palm27x.c
++++ b/sound/soc/pxa/palm27x.c
+@@ -161,3 +161,4 @@ module_platform_driver(palm27x_wm9712_driver);
+ MODULE_AUTHOR("Marek Vasut <marek.vasut@gmail.com>");
+ MODULE_DESCRIPTION("ALSA SoC Palm T|X, T5 and LifeDrive");
+ MODULE_LICENSE("GPL");
++MODULE_ALIAS("platform:palm27x-asoc");
+diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c
+index da03fad..3cad990 100644
+--- a/sound/soc/pxa/pxa-ssp.c
++++ b/sound/soc/pxa/pxa-ssp.c
+@@ -833,3 +833,4 @@ module_platform_driver(asoc_ssp_driver);
+ MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>");
+ MODULE_DESCRIPTION("PXA SSP/PCM SoC Interface");
+ MODULE_LICENSE("GPL");
++MODULE_ALIAS("platform:pxa-ssp-dai");
+diff --git a/sound/soc/pxa/pxa2xx-ac97.c b/sound/soc/pxa/pxa2xx-ac97.c
+index f3de615..9615e6d 100644
+--- a/sound/soc/pxa/pxa2xx-ac97.c
++++ b/sound/soc/pxa/pxa2xx-ac97.c
+@@ -287,3 +287,4 @@ module_platform_driver(pxa2xx_ac97_driver);
+ MODULE_AUTHOR("Nicolas Pitre");
+ MODULE_DESCRIPTION("AC97 driver for the Intel PXA2xx chip");
+ MODULE_LICENSE("GPL");
++MODULE_ALIAS("platform:pxa2xx-ac97");
+diff --git a/sound/soc/pxa/pxa2xx-pcm.c b/sound/soc/pxa/pxa2xx-pcm.c
+index 9f39039..410d48b 100644
+--- a/sound/soc/pxa/pxa2xx-pcm.c
++++ b/sound/soc/pxa/pxa2xx-pcm.c
+@@ -117,3 +117,4 @@ module_platform_driver(pxa_pcm_driver);
+ MODULE_AUTHOR("Nicolas Pitre");
+ MODULE_DESCRIPTION("Intel PXA2xx PCM DMA module");
+ MODULE_LICENSE("GPL");
++MODULE_ALIAS("platform:pxa-pcm-audio");
+--
+1.9.1
+
diff --git a/recipes-kernel/linux/linux-handheld-4.4/c7x0/defconfig b/recipes-kernel/linux/linux-handheld-4.4/c7x0/defconfig
index e90e210..d4ad4d6 100644
--- a/recipes-kernel/linux/linux-handheld-4.4/c7x0/defconfig
+++ b/recipes-kernel/linux/linux-handheld-4.4/c7x0/defconfig
@@ -230,6 +230,7 @@ CONFIG_PDA_POWER=y
CONFIG_APM_POWER=y
CONFIG_WATCHDOG=y
CONFIG_SOFT_WATCHDOG=m
+CONFIG_REGULATOR=y
CONFIG_FB=y
CONFIG_FB_W100=y
CONFIG_BACKLIGHT_LCD_SUPPORT=y
diff --git a/recipes-kernel/linux/linux-handheld-4.4/collie/defconfig b/recipes-kernel/linux/linux-handheld-4.4/collie/defconfig
index 423bfa0..32c79dd 100644
--- a/recipes-kernel/linux/linux-handheld-4.4/collie/defconfig
+++ b/recipes-kernel/linux/linux-handheld-4.4/collie/defconfig
@@ -161,7 +161,6 @@ CONFIG_MTD_ROM=y
CONFIG_MTD_COMPLEX_MAPPINGS=y
CONFIG_MTD_PHYSMAP=y
CONFIG_MTD_SA1100=y
-CONFIG_MTD_NAND=y
CONFIG_MTD_UBI=y
CONFIG_BLK_DEV_LOOP=m
CONFIG_BLK_DEV_CRYPTOLOOP=m
@@ -280,7 +279,6 @@ CONFIG_MMC_SPI=y
CONFIG_NEW_LEDS=y
CONFIG_LEDS_CLASS=y
CONFIG_LEDS_LOCOMO=y
-CONFIG_LEDS_GPIO=y
CONFIG_LEDS_TRIGGERS=y
CONFIG_LEDS_TRIGGER_TIMER=y
CONFIG_LEDS_TRIGGER_HEARTBEAT=y
diff --git a/recipes-kernel/linux/linux-handheld-4.4/poodle/defconfig b/recipes-kernel/linux/linux-handheld-4.4/poodle/defconfig
index dc8afef..e0cc494 100644
--- a/recipes-kernel/linux/linux-handheld-4.4/poodle/defconfig
+++ b/recipes-kernel/linux/linux-handheld-4.4/poodle/defconfig
@@ -234,6 +234,7 @@ CONFIG_SENSORS_MAX1111=y
CONFIG_WATCHDOG=y
CONFIG_SOFT_WATCHDOG=m
CONFIG_MFD_LOCOMO=y
+CONFIG_REGULATOR=y
CONFIG_FB=y
CONFIG_FB_PXA=y
CONFIG_BACKLIGHT_LCD_SUPPORT=y
@@ -277,7 +278,6 @@ CONFIG_MMC_SPI=y
CONFIG_NEW_LEDS=y
CONFIG_LEDS_CLASS=y
CONFIG_LEDS_LOCOMO=y
-CONFIG_LEDS_GPIO=y
CONFIG_LEDS_TRIGGERS=y
CONFIG_LEDS_TRIGGER_TIMER=y
CONFIG_LEDS_TRIGGER_HEARTBEAT=y
diff --git a/recipes-kernel/linux/linux-handheld-4.4/snd-soc-pxa2xx-modalias.patch b/recipes-kernel/linux/linux-handheld-4.4/snd-soc-pxa2xx-modalias.patch
deleted file mode 100644
index d5fa539..0000000
--- a/recipes-kernel/linux/linux-handheld-4.4/snd-soc-pxa2xx-modalias.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- a/sound/soc/pxa/pxa2xx-pcm.c 2016-01-11 00:01:32.000000000 +0100
-+++ b/sound/soc/pxa/pxa2xx-pcm.c 2016-04-20 23:07:02.000000000 +0200
-@@ -117,3 +117,4 @@
- MODULE_AUTHOR("Nicolas Pitre");
- MODULE_DESCRIPTION("Intel PXA2xx PCM DMA module");
- MODULE_LICENSE("GPL");
-+MODULE_ALIAS("platform:pxa-pcm-audio");
diff --git a/recipes-kernel/linux/linux-handheld_4.4.bb b/recipes-kernel/linux/linux-handheld_4.4.bb
index c4ec006..8b529f3 100644
--- a/recipes-kernel/linux/linux-handheld_4.4.bb
+++ b/recipes-kernel/linux/linux-handheld_4.4.bb
@@ -13,7 +13,7 @@ SRC_URI[kernel.sha256sum] = "401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec517
SRC_URI[stablepatch.md5sum] = "c1d8f46e5b2ee7c925fc38f20a3726d3"
SRC_URI[stablepatch.sha256sum] = "11ec99ae0600bd831ff8d71b77e64592f4b6918b7857fd9ff0284ea4cf267b4e"
-SRC_URI += "file://snd-soc-pxa2xx-modalias.patch"
+SRC_URI += "file://ASoC-pxa-fix-module-autoload-for-platform-drivers.patch"
LOCOMO_PATCHES = "\
file://locomo/0001-mfd-add-new-driver-for-Sharp-LoCoMo.patch \