--- /dev/null
+From 2ec8258fe4d039ce312a1e59ba4b8419ad96d808 Mon Sep 17 00:00:00 2001
+From: Georgi Djakov <georgi.djakov@linaro.org>
+Date: Thu, 17 Nov 2016 17:20:26 +0200
+Subject: ARM: qcom_defconfig: Enable RPM/RPM-SMD clocks
+
+From: Georgi Djakov <georgi.djakov@linaro.org>
+
+commit 2ec8258fe4d039ce312a1e59ba4b8419ad96d808 upstream.
+
+Enable support for clocks, controlled by the RPM processor on
+Qualcomm platforms.
+
+Signed-off-by: Georgi Djakov <georgi.djakov@linaro.org>
+Signed-off-by: Andy Gross <andy.gross@linaro.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/arm/configs/qcom_defconfig | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/arch/arm/configs/qcom_defconfig
++++ b/arch/arm/configs/qcom_defconfig
+@@ -157,6 +157,8 @@ CONFIG_DMADEVICES=y
+ CONFIG_QCOM_BAM_DMA=y
+ CONFIG_STAGING=y
+ CONFIG_COMMON_CLK_QCOM=y
++CONFIG_QCOM_CLK_RPM=y
++CONFIG_QCOM_CLK_SMD_RPM=y
+ CONFIG_APQ_MMCC_8084=y
+ CONFIG_IPQ_LCC_806X=y
+ CONFIG_MSM_GCC_8660=y
--- /dev/null
+From ca8d8e03b4c9ad447d1e882cc8014e538f653018 Mon Sep 17 00:00:00 2001
+From: William Breathitt Gray <vilhelm.gray@gmail.com>
+Date: Thu, 9 Feb 2017 10:03:41 -0500
+Subject: iio: 104-quad-8: Fix off-by-one error when addressing flag register
+
+From: William Breathitt Gray <vilhelm.gray@gmail.com>
+
+commit ca8d8e03b4c9ad447d1e882cc8014e538f653018 upstream.
+
+The flag register is offset by 1 from the respective channel data
+register. This patch fixes an off-by-one error when attempting to read a
+channel flag register where the base address was not properly offset.
+
+Fixes: 28e5d3bb0325 ("iio: 104-quad-8: Add IIO support for the ACCES 104-QUAD-8")
+Signed-off-by: William Breathitt Gray <vilhelm.gray@gmail.com>
+Signed-off-by: Jonathan Cameron <jic23@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/iio/counter/104-quad-8.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/iio/counter/104-quad-8.c
++++ b/drivers/iio/counter/104-quad-8.c
+@@ -76,7 +76,7 @@ static int quad8_read_raw(struct iio_dev
+ return IIO_VAL_INT;
+ }
+
+- flags = inb(base_offset);
++ flags = inb(base_offset + 1);
+ borrow = flags & BIT(0);
+ carry = !!(flags & BIT(1));
+