From: shawn.guo@linaro.org (Shawn Guo)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 07/13] ARM: mxs: get ocotp base address from device tree
Date: Fri, 29 Mar 2013 16:55:43 +0800 [thread overview]
Message-ID: <1364547350-30498-8-git-send-email-shawn.guo@linaro.org> (raw)
In-Reply-To: <1364547350-30498-1-git-send-email-shawn.guo@linaro.org>
Instead of using the static definitions, get ocotp base address from
device tree with mapping.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
arch/arm/boot/dts/imx23.dtsi | 1 +
arch/arm/boot/dts/imx28.dtsi | 1 +
arch/arm/mach-mxs/ocotp.c | 9 ++++++++-
3 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/imx23.dtsi b/arch/arm/boot/dts/imx23.dtsi
index 30b410b..ad2d793 100644
--- a/arch/arm/boot/dts/imx23.dtsi
+++ b/arch/arm/boot/dts/imx23.dtsi
@@ -322,6 +322,7 @@
};
ocotp at 8002c000 {
+ compatible = "fsl,ocotp";
reg = <0x8002c000 0x2000>;
status = "disabled";
};
diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi
index 56d84bf..64af238 100644
--- a/arch/arm/boot/dts/imx28.dtsi
+++ b/arch/arm/boot/dts/imx28.dtsi
@@ -677,6 +677,7 @@
};
ocotp at 8002c000 {
+ compatible = "fsl,ocotp";
reg = <0x8002c000 0x2000>;
status = "disabled";
};
diff --git a/arch/arm/mach-mxs/ocotp.c b/arch/arm/mach-mxs/ocotp.c
index 1dff467..c2002eb 100644
--- a/arch/arm/mach-mxs/ocotp.c
+++ b/arch/arm/mach-mxs/ocotp.c
@@ -15,6 +15,8 @@
#include <linux/delay.h>
#include <linux/err.h>
#include <linux/mutex.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
#include <asm/processor.h> /* for cpu_relax() */
@@ -33,7 +35,8 @@ static u32 ocotp_words[OCOTP_WORD_COUNT];
const u32 *mxs_get_ocotp(void)
{
- void __iomem *ocotp_base = MXS_IO_ADDRESS(MXS_OCOTP_BASE_ADDR);
+ struct device_node *np;
+ void __iomem *ocotp_base;
int timeout = 0x400;
size_t i;
static int once = 0;
@@ -41,6 +44,10 @@ const u32 *mxs_get_ocotp(void)
if (once)
return ocotp_words;
+ np = of_find_compatible_node(NULL, NULL, "fsl,ocotp");
+ ocotp_base = of_iomap(np, 0);
+ WARN_ON(!ocotp_base);
+
mutex_lock(&ocotp_mutex);
/*
--
1.7.9.5
next prev parent reply other threads:[~2013-03-29 8:55 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-29 8:55 [PATCH 00/13] mach-mxs header files cleanup Shawn Guo
2013-03-29 8:55 ` Shawn Guo
2013-03-29 8:55 ` Shawn Guo
2013-03-29 8:55 ` [PATCH 01/13] rtc: stmp3xxx: use stmp_reset_block() instead Shawn Guo
2013-03-29 8:55 ` [PATCH 02/13] iio: mxs-lradc: remove unneeded mach header inclusion Shawn Guo
2013-03-29 8:55 ` Shawn Guo
2013-03-29 9:28 ` Jonathan Cameron
2013-03-29 9:28 ` Jonathan Cameron
2013-03-29 8:55 ` [PATCH 03/13] ASoC: mxs-saif: remove " Shawn Guo
2013-03-29 8:55 ` Shawn Guo
2013-04-01 11:45 ` Mark Brown
2013-04-01 11:45 ` Mark Brown
2013-03-29 8:55 ` [PATCH 04/13] ARM: mxs: remove empty hardware.h Shawn Guo
2013-03-29 8:55 ` [PATCH 05/13] ARM: mxs: get reset address from device tree Shawn Guo
2013-03-29 8:55 ` [PATCH 06/13] ARM: mxs: remove system.c Shawn Guo
2013-03-29 8:55 ` Shawn Guo [this message]
2013-03-29 8:55 ` [PATCH 08/13] ARM: mxs: use debug_ll_io_init for low-level debug Shawn Guo
2013-03-29 8:55 ` [PATCH 09/13] ARM: mxs: remove mm.c Shawn Guo
2013-03-29 8:55 ` [PATCH 10/13] ARM: mxs: move mxs_get_ocotp() into mach-mxs.c Shawn Guo
2013-03-29 8:55 ` [PATCH 11/13] ARM: mxs: remove common.h Shawn Guo
2013-03-29 8:55 ` [PATCH 12/13] ARM: mxs: merge imx23 and imx28 into one machine_desc Shawn Guo
2013-03-29 8:55 ` [PATCH 13/13] ARM: mxs: remove unused headers Shawn Guo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1364547350-30498-8-git-send-email-shawn.guo@linaro.org \
--to=shawn.guo@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.