From: Greg Kroah-Hartman Date: Fri, 29 Nov 2013 20:52:31 +0000 (-0800) Subject: 3.4-stable patches X-Git-Tag: v3.4.72~51 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=120904385997f33c73c4834e88bc0d13439911c1;p=thirdparty%2Fkernel%2Fstable-queue.git 3.4-stable patches added patches: arm-integrator_cp-set-lcd-0-1-enable-lines-when-turning-on-clcd.patch arm-sa11x0-assabet-ensure-cs2-is-configured-appropriately.patch asoc-ak4642-prevent-un-necessary-changes-to-sg_sl1.patch asoc-blackfin-fix-missing-break.patch asoc-wm8962-turn-on-regcache_cache_only-before-disabling-regulator.patch backlight-atmel-pwm-bl-fix-reported-brightness.patch staging-tidspbridge-disable-driver.patch --- diff --git a/queue-3.4/arm-integrator_cp-set-lcd-0-1-enable-lines-when-turning-on-clcd.patch b/queue-3.4/arm-integrator_cp-set-lcd-0-1-enable-lines-when-turning-on-clcd.patch new file mode 100644 index 00000000000..32d6d234422 --- /dev/null +++ b/queue-3.4/arm-integrator_cp-set-lcd-0-1-enable-lines-when-turning-on-clcd.patch @@ -0,0 +1,33 @@ +From 30aeadd44deea3f3b0df45b9a70ee0fd5f8d6dc2 Mon Sep 17 00:00:00 2001 +From: Jonathan Austin +Date: Thu, 29 Aug 2013 18:41:11 +0100 +Subject: ARM: integrator_cp: Set LCD{0,1} enable lines when turning on CLCD + +From: Jonathan Austin + +commit 30aeadd44deea3f3b0df45b9a70ee0fd5f8d6dc2 upstream. + +This turns on the internal integrator LCD display(s). It seems that the code +to do this got lost in refactoring of the CLCD driver. + +Signed-off-by: Jonathan Austin +Acked-by: Linus Walleij +Signed-off-by: Olof Johansson +Signed-off-by: Greg Kroah-Hartman + +--- + arch/arm/mach-integrator/integrator_cp.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/arch/arm/mach-integrator/integrator_cp.c ++++ b/arch/arm/mach-integrator/integrator_cp.c +@@ -366,7 +366,8 @@ static AMBA_APB_DEVICE(aaci, "mb:1d", 0, + static void cp_clcd_enable(struct clcd_fb *fb) + { + struct fb_var_screeninfo *var = &fb->fb.var; +- u32 val = CM_CTRL_STATIC1 | CM_CTRL_STATIC2; ++ u32 val = CM_CTRL_STATIC1 | CM_CTRL_STATIC2 ++ | CM_CTRL_LCDEN0 | CM_CTRL_LCDEN1; + + if (var->bits_per_pixel <= 8 || + (var->bits_per_pixel == 16 && var->green.length == 5)) diff --git a/queue-3.4/arm-sa11x0-assabet-ensure-cs2-is-configured-appropriately.patch b/queue-3.4/arm-sa11x0-assabet-ensure-cs2-is-configured-appropriately.patch new file mode 100644 index 00000000000..49edffd4c4b --- /dev/null +++ b/queue-3.4/arm-sa11x0-assabet-ensure-cs2-is-configured-appropriately.patch @@ -0,0 +1,33 @@ +From f3964fe1c9d9a887d65faf594669852e4dec46e0 Mon Sep 17 00:00:00 2001 +From: Russell King +Date: Wed, 16 Oct 2013 00:09:02 +0100 +Subject: ARM: sa11x0/assabet: ensure CS2 is configured appropriately + +From: Russell King + +commit f3964fe1c9d9a887d65faf594669852e4dec46e0 upstream. + +The CS2 region contains the Assabet board configuration and status +registers, which are 32-bit. Unfortunately, some boot loaders do not +configure this region correctly, leaving it setup as a 16-bit region. +Fix this. + +Signed-off-by: Russell King +Signed-off-by: Greg Kroah-Hartman + +--- + arch/arm/mach-sa1100/assabet.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/arch/arm/mach-sa1100/assabet.c ++++ b/arch/arm/mach-sa1100/assabet.c +@@ -509,6 +509,9 @@ static void __init assabet_map_io(void) + * Its called GPCLKR0 in my SA1110 manual. + */ + Ser1SDCR0 |= SDCR0_SUS; ++ MSC1 = (MSC1 & ~0xffff) | ++ MSC_NonBrst | MSC_32BitStMem | ++ MSC_RdAcc(2) | MSC_WrAcc(2) | MSC_Rec(0); + + if (!machine_has_neponset()) + sa1100_register_uart_fns(&assabet_port_fns); diff --git a/queue-3.4/asoc-ak4642-prevent-un-necessary-changes-to-sg_sl1.patch b/queue-3.4/asoc-ak4642-prevent-un-necessary-changes-to-sg_sl1.patch new file mode 100644 index 00000000000..1df77c19816 --- /dev/null +++ b/queue-3.4/asoc-ak4642-prevent-un-necessary-changes-to-sg_sl1.patch @@ -0,0 +1,34 @@ +From 7b5bfb82882b9b1c8423ce0ed6852ca3762d967a Mon Sep 17 00:00:00 2001 +From: Phil Edworthy +Date: Thu, 31 Oct 2013 23:06:17 -0700 +Subject: ASoC: ak4642: prevent un-necessary changes to SG_SL1 + +From: Phil Edworthy + +commit 7b5bfb82882b9b1c8423ce0ed6852ca3762d967a upstream. + +If you record the sound during playback, +the playback sound becomes silent. +Modify so that the codec driver does not clear +SG_SL1::DACL bit which is controlled under widget + +Signed-off-by: Phil Edworthy +Signed-off-by: Kuninori Morimoto +Signed-off-by: Mark Brown +Signed-off-by: Greg Kroah-Hartman + +--- + sound/soc/codecs/ak4642.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/sound/soc/codecs/ak4642.c ++++ b/sound/soc/codecs/ak4642.c +@@ -262,7 +262,7 @@ static int ak4642_dai_startup(struct snd + * This operation came from example code of + * "ASAHI KASEI AK4642" (japanese) manual p94. + */ +- snd_soc_write(codec, SG_SL1, PMMP | MGAIN0); ++ snd_soc_update_bits(codec, SG_SL1, PMMP | MGAIN0, PMMP | MGAIN0); + snd_soc_write(codec, TIMER, ZTM(0x3) | WTM(0x3)); + snd_soc_write(codec, ALC_CTL1, ALC | LMTH0); + snd_soc_update_bits(codec, PW_MGMT1, PMADL, PMADL); diff --git a/queue-3.4/asoc-blackfin-fix-missing-break.patch b/queue-3.4/asoc-blackfin-fix-missing-break.patch new file mode 100644 index 00000000000..c7146990111 --- /dev/null +++ b/queue-3.4/asoc-blackfin-fix-missing-break.patch @@ -0,0 +1,29 @@ +From afed4dbe3a043dbd833a53b6b4951e155708afd2 Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Wed, 13 Nov 2013 17:15:00 +0100 +Subject: ASoC: blackfin: Fix missing break + +From: Takashi Iwai + +commit afed4dbe3a043dbd833a53b6b4951e155708afd2 upstream. + +Fixes: 4b2ffc205cb9 ('ASoC: Blackfin I2S: add 8-bit sample support') +Reported-by: David Binderman +Signed-off-by: Takashi Iwai +Signed-off-by: Mark Brown +Signed-off-by: Greg Kroah-Hartman + +--- + sound/soc/blackfin/bf5xx-i2s.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/sound/soc/blackfin/bf5xx-i2s.c ++++ b/sound/soc/blackfin/bf5xx-i2s.c +@@ -111,6 +111,7 @@ static int bf5xx_i2s_hw_params(struct sn + bf5xx_i2s->tcr2 |= 7; + bf5xx_i2s->rcr2 |= 7; + sport_handle->wdsize = 1; ++ break; + case SNDRV_PCM_FORMAT_S16_LE: + bf5xx_i2s->tcr2 |= 15; + bf5xx_i2s->rcr2 |= 15; diff --git a/queue-3.4/asoc-wm8962-turn-on-regcache_cache_only-before-disabling-regulator.patch b/queue-3.4/asoc-wm8962-turn-on-regcache_cache_only-before-disabling-regulator.patch new file mode 100644 index 00000000000..49d67a85cb7 --- /dev/null +++ b/queue-3.4/asoc-wm8962-turn-on-regcache_cache_only-before-disabling-regulator.patch @@ -0,0 +1,34 @@ +From 50bfcf2df2fadf77e143d6099150e6fa7ef4d78c Mon Sep 17 00:00:00 2001 +From: Nicolin Chen +Date: Thu, 14 Nov 2013 11:59:21 +0800 +Subject: ASoC: wm8962: Turn on regcache_cache_only before disabling regulator + +From: Nicolin Chen + +commit 50bfcf2df2fadf77e143d6099150e6fa7ef4d78c upstream. + +It's safer to turn on regcache_cache_only before disabling regulator since +the driver will turn off the regcache_cache_only after enabling regulator. + +If we remain cache_only false, some command like 'amixer cset' would get +failure if being run before wm8962_resume(). + +Signed-off-by: Nicolin Chen +Signed-off-by: Mark Brown +Signed-off-by: Greg Kroah-Hartman + +--- + sound/soc/codecs/wm8962.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/sound/soc/codecs/wm8962.c ++++ b/sound/soc/codecs/wm8962.c +@@ -3675,6 +3675,8 @@ static __devinit int wm8962_i2c_probe(st + if (ret < 0) + goto err_regmap; + ++ regcache_cache_only(wm8962->regmap, true); ++ + /* The drivers should power up as needed */ + regulator_bulk_disable(ARRAY_SIZE(wm8962->supplies), wm8962->supplies); + diff --git a/queue-3.4/backlight-atmel-pwm-bl-fix-reported-brightness.patch b/queue-3.4/backlight-atmel-pwm-bl-fix-reported-brightness.patch new file mode 100644 index 00000000000..a8a465bbeb9 --- /dev/null +++ b/queue-3.4/backlight-atmel-pwm-bl-fix-reported-brightness.patch @@ -0,0 +1,42 @@ +From 185d91442550110db67a7dc794a32efcea455a36 Mon Sep 17 00:00:00 2001 +From: Johan Hovold +Date: Tue, 12 Nov 2013 15:09:38 -0800 +Subject: backlight: atmel-pwm-bl: fix reported brightness + +From: Johan Hovold + +commit 185d91442550110db67a7dc794a32efcea455a36 upstream. + +The driver supports 16-bit brightness values, but the value returned +from get_brightness was truncated to eight bits. + +Signed-off-by: Johan Hovold +Cc: Jingoo Han +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/video/backlight/atmel-pwm-bl.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/video/backlight/atmel-pwm-bl.c ++++ b/drivers/video/backlight/atmel-pwm-bl.c +@@ -70,7 +70,7 @@ static int atmel_pwm_bl_set_intensity(st + static int atmel_pwm_bl_get_intensity(struct backlight_device *bd) + { + struct atmel_pwm_bl *pwmbl = bl_get_data(bd); +- u8 intensity; ++ u32 intensity; + + if (pwmbl->pdata->pwm_active_low) { + intensity = pwm_channel_readl(&pwmbl->pwmc, PWM_CDTY) - +@@ -80,7 +80,7 @@ static int atmel_pwm_bl_get_intensity(st + pwm_channel_readl(&pwmbl->pwmc, PWM_CDTY); + } + +- return intensity; ++ return intensity & 0xffff; + } + + static int atmel_pwm_bl_init_pwm(struct atmel_pwm_bl *pwmbl) diff --git a/queue-3.4/series b/queue-3.4/series new file mode 100644 index 00000000000..f5d1bbe8398 --- /dev/null +++ b/queue-3.4/series @@ -0,0 +1,7 @@ +arm-sa11x0-assabet-ensure-cs2-is-configured-appropriately.patch +arm-integrator_cp-set-lcd-0-1-enable-lines-when-turning-on-clcd.patch +staging-tidspbridge-disable-driver.patch +backlight-atmel-pwm-bl-fix-reported-brightness.patch +asoc-ak4642-prevent-un-necessary-changes-to-sg_sl1.patch +asoc-wm8962-turn-on-regcache_cache_only-before-disabling-regulator.patch +asoc-blackfin-fix-missing-break.patch diff --git a/queue-3.4/staging-tidspbridge-disable-driver.patch b/queue-3.4/staging-tidspbridge-disable-driver.patch new file mode 100644 index 00000000000..a7325769b65 --- /dev/null +++ b/queue-3.4/staging-tidspbridge-disable-driver.patch @@ -0,0 +1,52 @@ +From 930ba4a374b96560ef9fde2145cdc454a164ddcc Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman +Date: Wed, 27 Nov 2013 09:32:49 -0800 +Subject: Staging: tidspbridge: disable driver + +From: Greg Kroah-Hartman + +commit 930ba4a374b96560ef9fde2145cdc454a164ddcc upstream. + +There seems to be no active maintainer for the driver, and there is an +unfixed security bug, so disable the driver for now. + +Hopefully someone steps up to be the maintainer, and works to get this +out of staging, otherwise it will be deleted soon. + +Reported-by: Nico Golde +Reported-by: Dan Carpenter +Cc: Omar Ramirez Luna +Cc: Omar Ramirez Luna +Cc: Kanigeri, Hari +Cc: Ameya Palande +Cc: Guzman Lugo, Fernando +Cc: Hebbar, Shivananda +Cc: Ramos Falcon, Ernesto +Cc: Felipe Contreras +Cc: Anna, Suman +Cc: Gupta, Ramesh +Cc: Gomez Castellanos, Ivan +Cc: Andy Shevchenko +Cc: Armando Uribe De Leon +Cc: Deepak Chitriki +Cc: Menon, Nishanth +Cc: Phil Carmody +Cc: Ohad Ben-Cohen +Cc: stable +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/staging/tidspbridge/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/staging/tidspbridge/Kconfig ++++ b/drivers/staging/tidspbridge/Kconfig +@@ -4,7 +4,7 @@ + + menuconfig TIDSPBRIDGE + tristate "DSP Bridge driver" +- depends on ARCH_OMAP3 ++ depends on ARCH_OMAP3 && BROKEN + select OMAP_MBOX_FWK + help + DSP/BIOS Bridge is designed for platforms that contain a GPP and