1 From 15753b6586710d788f36cfd5fbb98d0805b390ab Mon Sep 17 00:00:00 2001
2 From: John Crispin <blogic@openwrt.org>
3 Date: Fri, 9 Nov 2012 13:31:51 +0100
4 Subject: [PATCH 2/6] MIPS: lantiq: fix bootselect bits on XRX200 SoC
6 The XRX200 SoC family has a different register layout for reading the boot
9 Signed-off-by: John Crispin <blogic@openwrt.org>
10 Patchwork: http://patchwork.linux-mips.org/patch/4519
12 arch/mips/lantiq/xway/reset.c | 22 +++++++++++++++-------
13 1 file changed, 15 insertions(+), 7 deletions(-)
15 diff --git a/arch/mips/lantiq/xway/reset.c b/arch/mips/lantiq/xway/reset.c
16 index 22c55f7..2799212 100644
17 --- a/arch/mips/lantiq/xway/reset.c
18 +++ b/arch/mips/lantiq/xway/reset.c
21 #define RCU_STAT_SHIFT 26
23 -#define RCU_BOOT_SEL_SHIFT 26
24 -#define RCU_BOOT_SEL_MASK 0x7
25 +#define RCU_BOOT_SEL(x) ((x >> 18) & 0x7)
26 +#define RCU_BOOT_SEL_XRX200(x) (((x >> 17) & 0xf) | ((x >> 8) & 0x10))
28 /* remapped base addr of the reset control unit */
29 static void __iomem *ltq_rcu_membase;
30 +static struct device_node *ltq_rcu_np;
32 /* This function is used by the watchdog driver */
33 int ltq_reset_cause(void)
34 @@ -52,7 +53,11 @@ EXPORT_SYMBOL_GPL(ltq_reset_cause);
35 unsigned char ltq_boot_select(void)
37 u32 val = ltq_rcu_r32(RCU_RST_STAT);
38 - return (val >> RCU_BOOT_SEL_SHIFT) & RCU_BOOT_SEL_MASK;
40 + if (of_device_is_compatible(ltq_rcu_np, "lantiq,rcu-xrx200"))
41 + return RCU_BOOT_SEL_XRX200(val);
43 + return RCU_BOOT_SEL(val);
46 /* reset a io domain for u micro seconds */
47 @@ -85,14 +90,17 @@ static void ltq_machine_power_off(void)
48 static int __init mips_reboot_setup(void)
51 - struct device_node *np =
52 - of_find_compatible_node(NULL, NULL, "lantiq,rcu-xway");
54 + ltq_rcu_np = of_find_compatible_node(NULL, NULL, "lantiq,rcu-xway");
56 + ltq_rcu_np = of_find_compatible_node(NULL, NULL,
57 + "lantiq,rcu-xrx200");
59 /* check if all the reset register range is available */
62 panic("Failed to load reset resources from devicetree");
64 - if (of_address_to_resource(np, 0, &res))
65 + if (of_address_to_resource(ltq_rcu_np, 0, &res))
66 panic("Failed to get rcu memory range");
68 if (request_mem_region(res.start, resource_size(&res), res.name) < 0)