lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ARM: mxs: get ocotp base address from device tree

Browse Source 
Instead of using the static definitions, get ocotp base address from
device tree with mapping.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
This commit is contained in:
Shawn Guo
2013-03-29 09:59:28 +08:00
parent 974a9af532
commit 69d75a02db
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/boot/dts/imx23.dtsi
View File

@@ -322,6 +322,7 @@
}; };
ocotp@8002c000 { ocotp@8002c000 {
compatible = "fsl,ocotp";
reg = <0x8002c000 0x2000>; reg = <0x8002c000 0x2000>;
status = "disabled"; status = "disabled";
}; };

1
arch/arm/boot/dts/imx28.dtsi
View File

@@ -677,6 +677,7 @@
}; };
ocotp@8002c000 { ocotp@8002c000 {
compatible = "fsl,ocotp";
reg = <0x8002c000 0x2000>; reg = <0x8002c000 0x2000>;
status = "disabled"; status = "disabled";
}; };

9
arch/arm/mach-mxs/ocotp.c
View File

@@ -15,6 +15,8 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/of.h>
#include <linux/of_address.h>
#include <asm/processor.h> /* for cpu_relax() */ #include <asm/processor.h> /* for cpu_relax() */
@@ -33,7 +35,8 @@ static u32 ocotp_words[OCOTP_WORD_COUNT];
const u32 *mxs_get_ocotp(void) 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; int timeout = 0x400;
size_t i; size_t i;
static int once = 0; static int once = 0;
@@ -41,6 +44,10 @@ const u32 *mxs_get_ocotp(void)
if (once) if (once)
return ocotp_words; 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); mutex_lock(&ocotp_mutex);
/* /*