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

Commit c1e31d12 authored by Shawn Guo's avatar Shawn Guo
Browse files

ARM: imx: create mxc_arch_reset_init_dt() for DT boot 



The mxc_arch_reset_init() uses static mapping and calls clk_get_sys() to
get clock.  It's suitable for non-DT boot but not for DT boot where
dynamic mapping and of_clk_get() should be used instead.  Create
mxc_arch_reset_init_dt() as the DT variant of mxc_arch_reset_init(),
and change DT platforms to use it.

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

arch/arm/mach-imx/common.h

+1 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ extern struct platform_device *mxc_register_gpio(char *name, int id, 
extern void mxc_set_cpu_type(unsigned int type);

extern void mxc_restart(char, const char *);

extern void mxc_arch_reset_init(void __iomem *);

extern void mxc_arch_reset_init_dt(void);

extern int mx53_revision(void);

extern int imx6q_revision(void);

extern int mx53_display_revision(void);

arch/arm/mach-imx/imx25-dt.c

+1 −2
Original line number Diff line number Diff line
@@ -15,12 +15,11 @@ 
#include <asm/mach/arch.h>

#include <asm/mach/time.h>

#include "common.h"

#include "hardware.h"

#include "mx25.h"



static void __init imx25_dt_init(void)

{

	mxc_arch_reset_init(MX25_IO_ADDRESS(MX25_WDOG_BASE_ADDR));

	mxc_arch_reset_init_dt();



	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);

}

arch/arm/mach-imx/imx27-dt.c

+1 −2
Original line number Diff line number Diff line
@@ -16,14 +16,13 @@ 
#include <asm/mach/time.h>



#include "common.h"

#include "hardware.h"

#include "mx27.h"



static void __init imx27_dt_init(void)

{

	struct platform_device_info devinfo = { .name = "cpufreq-cpu0", };



	mxc_arch_reset_init(MX27_IO_ADDRESS(MX27_WDOG_BASE_ADDR));

	mxc_arch_reset_init_dt();



	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);

arch/arm/mach-imx/imx31-dt.c

+1 −2
Original line number Diff line number Diff line
@@ -16,12 +16,11 @@ 
#include <asm/mach/time.h>



#include "common.h"

#include "hardware.h"

#include "mx31.h"



static void __init imx31_dt_init(void)

{

	mxc_arch_reset_init(MX31_IO_ADDRESS(MX31_WDOG_BASE_ADDR));

	mxc_arch_reset_init_dt();



	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);

}

arch/arm/mach-imx/imx51-dt.c

+1 −2
Original line number Diff line number Diff line
@@ -17,14 +17,13 @@ 
#include <asm/mach/time.h>



#include "common.h"

#include "hardware.h"

#include "mx51.h"



static void __init imx51_dt_init(void)

{

	struct platform_device_info devinfo = { .name = "cpufreq-cpu0", };



	mxc_arch_reset_init(MX51_IO_ADDRESS(MX51_WDOG1_BASE_ADDR));

	mxc_arch_reset_init_dt();



	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);

	platform_device_register_full(&devinfo);