]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
3.14-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 2 May 2016 18:38:50 +0000 (11:38 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 2 May 2016 18:38:50 +0000 (11:38 -0700)
added patches:
drivers-misc-ad525x_dpot-ad5274-fix-rdac-read-back-errors.patch
fbdev-da8xx-fb-fix-videomodes-of-lcd-panels.patch
misc-bmp085-enable-building-as-a-module.patch
rtc-hym8563-fix-invalid-year-calculation.patch
rtc-vr41xx-wire-up-alarm_irq_enable.patch

queue-3.14/drivers-misc-ad525x_dpot-ad5274-fix-rdac-read-back-errors.patch [new file with mode: 0644]
queue-3.14/fbdev-da8xx-fb-fix-videomodes-of-lcd-panels.patch [new file with mode: 0644]
queue-3.14/misc-bmp085-enable-building-as-a-module.patch [new file with mode: 0644]
queue-3.14/rtc-hym8563-fix-invalid-year-calculation.patch [new file with mode: 0644]
queue-3.14/rtc-vr41xx-wire-up-alarm_irq_enable.patch [new file with mode: 0644]
queue-3.14/series

diff --git a/queue-3.14/drivers-misc-ad525x_dpot-ad5274-fix-rdac-read-back-errors.patch b/queue-3.14/drivers-misc-ad525x_dpot-ad5274-fix-rdac-read-back-errors.patch
new file mode 100644 (file)
index 0000000..0fbe8bd
--- /dev/null
@@ -0,0 +1,30 @@
+From f3df53e4d70b5736368a8fe8aa1bb70c1cb1f577 Mon Sep 17 00:00:00 2001
+From: Michael Hennerich <michael.hennerich@analog.com>
+Date: Mon, 22 Feb 2016 10:20:24 +0100
+Subject: drivers/misc/ad525x_dpot: AD5274 fix RDAC read back errors
+
+From: Michael Hennerich <michael.hennerich@analog.com>
+
+commit f3df53e4d70b5736368a8fe8aa1bb70c1cb1f577 upstream.
+
+Fix RDAC read back errors caused by a typo. Value must shift by 2.
+
+Fixes: a4bd394956f2 ("drivers/misc/ad525x_dpot.c: new features")
+Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/misc/ad525x_dpot.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/misc/ad525x_dpot.c
++++ b/drivers/misc/ad525x_dpot.c
+@@ -216,7 +216,7 @@ static s32 dpot_read_i2c(struct dpot_dat
+                        */
+                       value = swab16(value);
+-                      if (dpot->uid == DPOT_UID(AD5271_ID))
++                      if (dpot->uid == DPOT_UID(AD5274_ID))
+                               value = value >> 2;
+               return value;
+       default:
diff --git a/queue-3.14/fbdev-da8xx-fb-fix-videomodes-of-lcd-panels.patch b/queue-3.14/fbdev-da8xx-fb-fix-videomodes-of-lcd-panels.patch
new file mode 100644 (file)
index 0000000..c6be09d
--- /dev/null
@@ -0,0 +1,56 @@
+From 713fced8d10fa1c759c8fb6bf9aaa681bae68cad Mon Sep 17 00:00:00 2001
+From: Sushaanth Srirangapathi <sushaanth.s@ti.com>
+Date: Mon, 29 Feb 2016 18:42:19 +0530
+Subject: fbdev: da8xx-fb: fix videomodes of lcd panels
+
+From: Sushaanth Srirangapathi <sushaanth.s@ti.com>
+
+commit 713fced8d10fa1c759c8fb6bf9aaa681bae68cad upstream.
+
+Commit 028cd86b794f4a ("video: da8xx-fb: fix the polarities of the
+hsync/vsync pulse") fixes polarities of HSYNC/VSYNC pulse but
+forgot to update known_lcd_panels[] which had sync values
+according to old logic. This breaks LCD at least on DA850 EVM.
+
+This patch fixes this issue and I have tested this for panel
+"Sharp_LK043T1DG01" using DA850 EVM board.
+
+Fixes: 028cd86b794f4a ("video: da8xx-fb: fix the polarities of the hsync/vsync pulse")
+Signed-off-by: Sushaanth Srirangapathi <sushaanth.s@ti.com>
+Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/video/da8xx-fb.c |    7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+--- a/drivers/video/da8xx-fb.c
++++ b/drivers/video/da8xx-fb.c
+@@ -209,8 +209,7 @@ static struct fb_videomode known_lcd_pan
+               .lower_margin   = 2,
+               .hsync_len      = 0,
+               .vsync_len      = 0,
+-              .sync           = FB_SYNC_CLK_INVERT |
+-                      FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
++              .sync           = FB_SYNC_CLK_INVERT,
+       },
+       /* Sharp LK043T1DG01 */
+       [1] = {
+@@ -224,7 +223,7 @@ static struct fb_videomode known_lcd_pan
+               .lower_margin   = 2,
+               .hsync_len      = 41,
+               .vsync_len      = 10,
+-              .sync           = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
++              .sync           = 0,
+               .flag           = 0,
+       },
+       [2] = {
+@@ -239,7 +238,7 @@ static struct fb_videomode known_lcd_pan
+               .lower_margin   = 10,
+               .hsync_len      = 10,
+               .vsync_len      = 10,
+-              .sync           = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
++              .sync           = 0,
+               .flag           = 0,
+       },
+ };
diff --git a/queue-3.14/misc-bmp085-enable-building-as-a-module.patch b/queue-3.14/misc-bmp085-enable-building-as-a-module.patch
new file mode 100644 (file)
index 0000000..1e77d4a
--- /dev/null
@@ -0,0 +1,36 @@
+From 50e6315dba721cbc24ccd6d7b299f1782f210a98 Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben@decadent.org.uk>
+Date: Mon, 14 Dec 2015 14:29:23 +0000
+Subject: misc/bmp085: Enable building as a module
+
+From: Ben Hutchings <ben@decadent.org.uk>
+
+commit 50e6315dba721cbc24ccd6d7b299f1782f210a98 upstream.
+
+Commit 985087dbcb02 'misc: add support for bmp18x chips to the bmp085
+driver' changed the BMP085 config symbol to a boolean.  I see no
+reason why the shared code cannot be built as a module, so change it
+back to tristate.
+
+Fixes: 985087dbcb02 ("misc: add support for bmp18x chips to the bmp085 driver")
+Cc: Eric Andersson <eric.andersson@unixphere.com>
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+Acked-by: Arnd Bergmann <arnd@arndb.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/misc/Kconfig |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/misc/Kconfig
++++ b/drivers/misc/Kconfig
+@@ -438,7 +438,7 @@ config ARM_CHARLCD
+         still useful.
+ config BMP085
+-      bool
++      tristate
+       depends on SYSFS
+ config BMP085_I2C
diff --git a/queue-3.14/rtc-hym8563-fix-invalid-year-calculation.patch b/queue-3.14/rtc-hym8563-fix-invalid-year-calculation.patch
new file mode 100644 (file)
index 0000000..81d35ec
--- /dev/null
@@ -0,0 +1,34 @@
+From d5861262210067fc01b2fb4f7af2fd85a3453f15 Mon Sep 17 00:00:00 2001
+From: Alexander Kochetkov <al.kochet@gmail.com>
+Date: Sun, 6 Mar 2016 12:43:57 +0300
+Subject: rtc: hym8563: fix invalid year calculation
+
+From: Alexander Kochetkov <al.kochet@gmail.com>
+
+commit d5861262210067fc01b2fb4f7af2fd85a3453f15 upstream.
+
+Year field must be in BCD format, according to
+hym8563 datasheet.
+
+Due to the bug year 2016 became 2010.
+
+Fixes: dcaf03849352 ("rtc: add hym8563 rtc-driver")
+Signed-off-by: Alexander Kochetkov <al.kochet@gmail.com>
+Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/rtc/rtc-hym8563.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/rtc/rtc-hym8563.c
++++ b/drivers/rtc/rtc-hym8563.c
+@@ -144,7 +144,7 @@ static int hym8563_rtc_set_time(struct d
+        * it does not seem to carry it over a subsequent write/read.
+        * So we'll limit ourself to 100 years, starting at 2000 for now.
+        */
+-      buf[6] = tm->tm_year - 100;
++      buf[6] = bin2bcd(tm->tm_year - 100);
+       /*
+        * CTL1 only contains TEST-mode bits apart from stop,
diff --git a/queue-3.14/rtc-vr41xx-wire-up-alarm_irq_enable.patch b/queue-3.14/rtc-vr41xx-wire-up-alarm_irq_enable.patch
new file mode 100644 (file)
index 0000000..f96a28d
--- /dev/null
@@ -0,0 +1,48 @@
+From a25f4a95ec3cded34c1250364eba704c5e4fdac4 Mon Sep 17 00:00:00 2001
+From: Geert Uytterhoeven <geert@linux-m68k.org>
+Date: Tue, 1 Mar 2016 09:50:01 +0100
+Subject: rtc: vr41xx: Wire up alarm_irq_enable
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Geert Uytterhoeven <geert@linux-m68k.org>
+
+commit a25f4a95ec3cded34c1250364eba704c5e4fdac4 upstream.
+
+drivers/rtc/rtc-vr41xx.c:229: warning: ‘vr41xx_rtc_alarm_irq_enable’ defined but not used
+
+Apparently the conversion to alarm_irq_enable forgot to wire up the
+callback.
+
+Fixes: 16380c153a69c378 ("RTC: Convert rtc drivers to use the alarm_irq_enable method")
+Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
+Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/rtc/rtc-vr41xx.c |   13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
+
+--- a/drivers/rtc/rtc-vr41xx.c
++++ b/drivers/rtc/rtc-vr41xx.c
+@@ -272,12 +272,13 @@ static irqreturn_t rtclong1_interrupt(in
+ }
+ static const struct rtc_class_ops vr41xx_rtc_ops = {
+-      .release        = vr41xx_rtc_release,
+-      .ioctl          = vr41xx_rtc_ioctl,
+-      .read_time      = vr41xx_rtc_read_time,
+-      .set_time       = vr41xx_rtc_set_time,
+-      .read_alarm     = vr41xx_rtc_read_alarm,
+-      .set_alarm      = vr41xx_rtc_set_alarm,
++      .release                = vr41xx_rtc_release,
++      .ioctl                  = vr41xx_rtc_ioctl,
++      .read_time              = vr41xx_rtc_read_time,
++      .set_time               = vr41xx_rtc_set_time,
++      .read_alarm             = vr41xx_rtc_read_alarm,
++      .set_alarm              = vr41xx_rtc_set_alarm,
++      .alarm_irq_enable       = vr41xx_rtc_alarm_irq_enable,
+ };
+ static int rtc_probe(struct platform_device *pdev)
index 5a83e2419c1dc778b78113d503fa91bf7cb513c6..5dc384c8c750b417e3c994a17dfb48598480d3b3 100644 (file)
@@ -20,3 +20,8 @@ efi-fix-out-of-bounds-read-in-variable_matches.patch
 workqueue-fix-ghost-pending-flag-while-doing-mq-io.patch
 usb-usbip-fix-potential-out-of-bounds-write.patch
 paride-make-verbose-parameter-an-int-again.patch
+fbdev-da8xx-fb-fix-videomodes-of-lcd-panels.patch
+misc-bmp085-enable-building-as-a-module.patch
+rtc-hym8563-fix-invalid-year-calculation.patch
+rtc-vr41xx-wire-up-alarm_irq_enable.patch
+drivers-misc-ad525x_dpot-ad5274-fix-rdac-read-back-errors.patch