Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69d75a02 authored by Shawn Guo's avatar Shawn Guo
Browse files

ARM: mxs: get ocotp base address from device tree 



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

Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
parent 974a9af5

arch/arm/boot/dts/imx23.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -322,6 +322,7 @@ 
			};



			ocotp@8002c000 {

				compatible = "fsl,ocotp";

				reg = <0x8002c000 0x2000>;

				status = "disabled";

			};

arch/arm/boot/dts/imx28.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -677,6 +677,7 @@ 
			};



			ocotp@8002c000 {

				compatible = "fsl,ocotp";

				reg = <0x8002c000 0x2000>;

				status = "disabled";

			};

arch/arm/mach-mxs/ocotp.c

+8 −1
Original line number Diff line number Diff line
@@ -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);



	/*