From: Greg Kroah-Hartman Date: Mon, 10 Dec 2012 18:21:45 +0000 (-0800) Subject: remove patches.armadillo800/0106-ARM-shmobile-armadillo800eva-fixup-sound-card-detect... X-Git-Tag: v3.4.25-ltsi~6 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f36da817c4ad9ed77e826b6fa8b506eb6ca6ded1;p=platform%2Fkernel%2Flinux-stable.git remove patches.armadillo800/0106-ARM-shmobile-armadillo800eva-fixup-sound-card-detect.patch Simon Horman reported: I am unsure what the best way to handle this is, but I would like to request that the following patch is removed from LTSI-3.4. The reason is that without other changes it inverts the initialisation order of sound cards. Morimoto-san tells me that the resulting order is not the desired one. Signed-off-by: Greg Kroah-Hartman --- diff --git a/patches.armadillo800/0106-ARM-shmobile-armadillo800eva-fixup-sound-card-detect.patch b/patches.armadillo800/0106-ARM-shmobile-armadillo800eva-fixup-sound-card-detect.patch deleted file mode 100644 index 58ffe1c24a30..000000000000 --- a/patches.armadillo800/0106-ARM-shmobile-armadillo800eva-fixup-sound-card-detect.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 974462b8ff3fbb6468b94d52690a5707b2ccb955 Mon Sep 17 00:00:00 2001 -From: Kuninori Morimoto -Date: Wed, 8 Aug 2012 23:03:07 -0700 -Subject: ARM: shmobile: armadillo800eva: fixup: sound card detection order - -Since armadillo800eva has 2 sound cards, -and had reversed deferred probe order issue, -it was purposely registered in reverse order. - -But it was solved by -1d29cfa57471a5e4b8a7c2a7433eeba170d3ad92 -(driver core: fixup reversed deferred probe order) - -armadillo800eva board is expecting that -FSI-WM8978 is the 1st, and FSI-HDMI is the 2nd sound card. -This patch fixes it up - -Signed-off-by: Kuninori Morimoto -Signed-off-by: Simon Horman -(cherry picked from commit ee3c843d0fc21c68ced93b982b5731178a24df68) - -Signed-off-by: Simon Horman ---- - arch/arm/mach-shmobile/board-armadillo800eva.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c -index 65cb793..453a6e5 100644 ---- a/arch/arm/mach-shmobile/board-armadillo800eva.c -+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c -@@ -902,8 +902,8 @@ static struct platform_device *eva_devices[] __initdata = { - &camera_device, - &ceu0_device, - &fsi_device, -- &fsi_hdmi_device, - &fsi_wm8978_device, -+ &fsi_hdmi_device, - }; - - static void __init eva_clock_init(void) --- -1.8.0.197.g5a90748 - diff --git a/series b/series index fa7b2091f269..1dac84846964 100644 --- a/series +++ b/series @@ -410,7 +410,6 @@ patches.armadillo800/0102-ARM-mach-shmobile-r8a7740-generic-board-support-via-.p patches.armadillo800/0103-ARM-mach-shmobile-armadillo800eva-defconfig-Allow-us.patch patches.armadillo800/0104-ARM-mach-shmobile-armadillo800eva-Fix-GPIO-buttons-d.patch patches.armadillo800/0105-ARM-mach-shmobile-armadillo800eva-Enable-power-butto.patch -patches.armadillo800/0106-ARM-shmobile-armadillo800eva-fixup-sound-card-detect.patch patches.armadillo800/0107-ARM-shmobile-armadillo800eva-enable-rw-rootfs-mount.patch patches.armadillo800/asoc-sh-fsi-select-simple-card-on-kconfig.patch