Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1339393 > unrolled thread

[PATCH 0/3] nvmem: fixes for v4.6

Back to article view | Back to linux.kernel

Contents

  [PATCH 0/3] nvmem: fixes for v4.6 Srinivas Kandagatla <srinivas.kandagatla@linaro.org> - 2016-02-22 12:30 +0100
    [PATCH 2/3] nvmem: imx-ocotp: Fix return value of imx_ocotp_read Srinivas Kandagatla <srinivas.kandagatla@linaro.org> - 2016-02-22 12:30 +0100
    [PATCH 1/3] nvmem: Fix dependencies for !HAS_IOMEM archs Srinivas Kandagatla <srinivas.kandagatla@linaro.org> - 2016-02-22 12:30 +0100

#1339393 — [PATCH 0/3] nvmem: fixes for v4.6

Hi Greg,

Here are couple of nvmem fixes on the mailing list which are good to go in
v4.6. Could you please take them thru the char-misc tree.

Thanks,
srini

Andrew-CT Chen (1):
  nvmem: mediatek: Fix later provider initialization

Axel Lin (1):
  nvmem: imx-ocotp: Fix return value of imx_ocotp_read

Richard Weinberger (1):
  nvmem: Fix dependencies for !HAS_IOMEM archs

 drivers/nvmem/Kconfig     |  4 ++++
 drivers/nvmem/imx-ocotp.c |  2 +-
 drivers/nvmem/mtk-efuse.c | 23 ++++++++++++++++++++++-
 3 files changed, 27 insertions(+), 2 deletions(-)

-- 
1.9.1

[toc] | [next] | [standalone]

#1339399 — [PATCH 2/3] nvmem: imx-ocotp: Fix return value of imx_ocotp_read

From: Axel Lin <axel.lin@ingics.com>

imx_ocotp_read() should return 0 on success.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
---
 drivers/nvmem/imx-ocotp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/nvmem/imx-ocotp.c b/drivers/nvmem/imx-ocotp.c
index b7971d4..d7796eb 100644
--- a/drivers/nvmem/imx-ocotp.c
+++ b/drivers/nvmem/imx-ocotp.c
@@ -51,7 +51,7 @@ static int imx_ocotp_read(void *context, const void *reg, size_t reg_size,
 		val += 4;
 	}
 
-	return (i - index) * 4;
+	return 0;
 }
 
 static int imx_ocotp_write(void *context, const void *data, size_t count)
-- 
1.9.1

[toc] | [prev] | [next] | [standalone]

#1339400 — [PATCH 1/3] nvmem: Fix dependencies for !HAS_IOMEM archs

From: Richard Weinberger <richard@nod.at>

Not every arch has io memory.
So, unbreak the build by fixing the dependencies.

Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
---
 drivers/nvmem/Kconfig | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/nvmem/Kconfig b/drivers/nvmem/Kconfig
index 5bd18cc..ca52952 100644
--- a/drivers/nvmem/Kconfig
+++ b/drivers/nvmem/Kconfig
@@ -37,6 +37,7 @@ config NVMEM_LPC18XX_EEPROM
 config NVMEM_MXS_OCOTP
 	tristate "Freescale MXS On-Chip OTP Memory Support"
 	depends on ARCH_MXS || COMPILE_TEST
+	depends on HAS_IOMEM
 	help
 	  If you say Y here, you will get readonly access to the
 	  One Time Programmable memory pages that are stored
@@ -59,6 +60,7 @@ config MTK_EFUSE
 config QCOM_QFPROM
 	tristate "QCOM QFPROM Support"
 	depends on ARCH_QCOM || COMPILE_TEST
+	depends on HAS_IOMEM
 	select REGMAP_MMIO
 	help
 	  Say y here to enable QFPROM support. The QFPROM provides access
@@ -70,6 +72,7 @@ config QCOM_QFPROM
 config ROCKCHIP_EFUSE
 	tristate "Rockchip eFuse Support"
 	depends on ARCH_ROCKCHIP || COMPILE_TEST
+	depends on HAS_IOMEM
 	help
 	  This is a simple drive to dump specified values of Rockchip SoC
 	  from eFuse, such as cpu-leakage.
@@ -91,6 +94,7 @@ config NVMEM_SUNXI_SID
 config NVMEM_VF610_OCOTP
 	tristate "VF610 SoC OCOTP support"
 	depends on SOC_VF610 || COMPILE_TEST
+	depends on HAS_IOMEM
 	help
 	  This is a driver for the 'OCOTP' peripheral available on Vybrid
 	  devices like VF5xx and VF6xx.
-- 
1.9.1

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web