evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ARM: mxs: get reset address from device tree

Browse source 
Instead of using static address definition, get reset address from
device tree with mapping, so that core_initcall mxs_arch_reset_init()
can be killed.

The "rtc" clock code in mxs_arch_reset_init() seems to be zombie, since
there is no clk lookup defined in clock driver at all.  Remove it
together.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
This commit is contained in:
Shawn Guo 2013-03-29 09:33:09 +08:00
parent c226221359
commit 8f7cf8815f
3 changed files with 19 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/boot/dts/imx23.dtsi
View file

@ -361,7 +361,7 @@
ranges; ranges;
clks: clkctrl@80040000 { clks: clkctrl@80040000 {
compatible = "fsl,imx23-clkctrl"; compatible = "fsl,imx23-clkctrl", "fsl,clkctrl";
reg = <0x80040000 0x2000>; reg = <0x80040000 0x2000>;
#clock-cells = <1>; #clock-cells = <1>;
}; };

2
arch/arm/boot/dts/imx28.dtsi
View file

@ -756,7 +756,7 @@
ranges; ranges;
clks: clkctrl@80040000 { clks: clkctrl@80040000 {
compatible = "fsl,imx28-clkctrl"; compatible = "fsl,imx28-clkctrl", "fsl,clkctrl";
reg = <0x80040000 0x2000>; reg = <0x80040000 0x2000>;
#clock-cells = <1>; #clock-cells = <1>;
}; };

36
arch/arm/mach-mxs/system.c
View file

@ -23,6 +23,8 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/of.h>
#include <linux/of_address.h>
#include <asm/proc-fns.h> #include <asm/proc-fns.h>
#include <asm/system_misc.h> #include <asm/system_misc.h>
@ -37,41 +39,37 @@
#define MXS_MODULE_CLKGATE (1 << 30) #define MXS_MODULE_CLKGATE (1 << 30)
#define MXS_MODULE_SFTRST (1 << 31) #define MXS_MODULE_SFTRST (1 << 31)
static void __iomem *mxs_clkctrl_reset_addr;
/* /*
* Reset the system. It is called by machine_restart(). * Reset the system. It is called by machine_restart().
*/ */
void mxs_restart(char mode, const char *cmd) void mxs_restart(char mode, const char *cmd)
{ {
struct device_node *np;
void __iomem *reset_addr;
np = of_find_compatible_node(NULL, NULL, "fsl,clkctrl");
reset_addr = of_iomap(np, 0);
if (!reset_addr)
goto soft;
if (of_device_is_compatible(np, "fsl,imx23-clkctrl"))
reset_addr += MX23_CLKCTRL_RESET_OFFSET;
else
reset_addr += MX28_CLKCTRL_RESET_OFFSET;
/* reset the chip */ /* reset the chip */
__mxs_setl(MXS_CLKCTRL_RESET_CHIP, mxs_clkctrl_reset_addr); __mxs_setl(MXS_CLKCTRL_RESET_CHIP, reset_addr);
pr_err("Failed to assert the chip reset\n"); pr_err("Failed to assert the chip reset\n");
/* Delay to allow the serial port to show the message */ /* Delay to allow the serial port to show the message */
mdelay(50); mdelay(50);
soft:
/* We'll take a jump through zero as a poor second */ /* We'll take a jump through zero as a poor second */
soft_restart(0); soft_restart(0);
} }
static int __init mxs_arch_reset_init(void)
{
struct clk *clk;
mxs_clkctrl_reset_addr = MXS_IO_ADDRESS(MXS_CLKCTRL_BASE_ADDR) +
(cpu_is_mx23() ? MX23_CLKCTRL_RESET_OFFSET :
MX28_CLKCTRL_RESET_OFFSET);
clk = clk_get_sys("rtc", NULL);
if (!IS_ERR(clk))
clk_prepare_enable(clk);
return 0;
}
core_initcall(mxs_arch_reset_init);
/* /*
* Clear the bit and poll it cleared. This is usually called with * Clear the bit and poll it cleared. This is usually called with
* a reset address and mask being either SFTRST(bit 31) or CLKGATE * a reset address and mask being either SFTRST(bit 31) or CLKGATE