aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2017-08-19 18:18:16 -0400
committerRalf Baechle <ralf@linux-mips.org>2017-09-04 15:19:02 -0400
commit333b2707a0ec6769179ac8161394536f4663b77b (patch)
treee36715dbefc5d649a234ae67d9cd2d4d0119df2b
parentc20b3b8019823ad8a77c968a702115f735b64a79 (diff)
MIPS: lantiq: remove ltq_reset_cause() and ltq_boot_select()
Do not export the ltq_reset_cause() and ltq_boot_select() function any more. ltq_reset_cause() was accessed by the watchdog driver before to see why the last reset happened, this is now done through direct access of the register over regmap. The bits in this register are anyway different between the xrx200 and the falcon SoC. ltq_boot_select() is not used any more and was used by the flash drivers to check if the system was booted from this flash type, now the drivers should depend on the device tree only. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Acked-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> Cc: john@phrozen.org Cc: robh@kernel.org Cc: andy.shevchenko@gmail.com Cc: p.zabel@pengutronix.de Cc: kishon@ti.com Cc: mark.rutland@arm.com Cc: linux-mips@linux-mips.org Cc: linux-mtd@lists.infradead.org Cc: linux-watchdog@vger.kernel.org Cc: devicetree@vger.kernel.org Cc: linux-spi@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/17126/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r--arch/mips/include/asm/mach-lantiq/lantiq.h2
-rw-r--r--arch/mips/lantiq/falcon/reset.c13
-rw-r--r--arch/mips/lantiq/xway/reset.c19
3 files changed, 0 insertions, 34 deletions
diff --git a/arch/mips/include/asm/mach-lantiq/lantiq.h b/arch/mips/include/asm/mach-lantiq/lantiq.h
index 8064d7a4b33d..d750f93232e4 100644
--- a/arch/mips/include/asm/mach-lantiq/lantiq.h
+++ b/arch/mips/include/asm/mach-lantiq/lantiq.h
@@ -46,8 +46,6 @@ extern struct clk *clk_get_ppe(void);
46 46
47/* find out what bootsource we have */ 47/* find out what bootsource we have */
48extern unsigned char ltq_boot_select(void); 48extern unsigned char ltq_boot_select(void);
49/* find out what caused the last cpu reset */
50extern int ltq_reset_cause(void);
51/* find out the soc type */ 49/* find out the soc type */
52extern int ltq_soc_type(void); 50extern int ltq_soc_type(void);
53 51
diff --git a/arch/mips/lantiq/falcon/reset.c b/arch/mips/lantiq/falcon/reset.c
index 7a535d72f541..3b22a541b685 100644
--- a/arch/mips/lantiq/falcon/reset.c
+++ b/arch/mips/lantiq/falcon/reset.c
@@ -15,12 +15,6 @@
15 15
16#include <lantiq_soc.h> 16#include <lantiq_soc.h>
17 17
18/* CPU0 Reset Source Register */
19#define SYS1_CPU0RS 0x0040
20/* reset cause mask */
21#define CPU0RS_MASK 0x0003
22/* CPU0 Boot Mode Register */
23#define SYS1_BM 0x00a0
24/* boot mode mask */ 18/* boot mode mask */
25#define BM_MASK 0x0005 19#define BM_MASK 0x0005
26 20
@@ -30,13 +24,6 @@ unsigned char ltq_boot_select(void)
30 return ltq_sys1_r32(SYS1_BM) & BM_MASK; 24 return ltq_sys1_r32(SYS1_BM) & BM_MASK;
31} 25}
32 26
33/* allow the watchdog driver to find out what the boot reason was */
34int ltq_reset_cause(void)
35{
36 return ltq_sys1_r32(SYS1_CPU0RS) & CPU0RS_MASK;
37}
38EXPORT_SYMBOL_GPL(ltq_reset_cause);
39
40#define BOOT_REG_BASE (KSEG1 | 0x1F200000) 27#define BOOT_REG_BASE (KSEG1 | 0x1F200000)
41#define BOOT_PW1_REG (BOOT_REG_BASE | 0x20) 28#define BOOT_PW1_REG (BOOT_REG_BASE | 0x20)
42#define BOOT_PW2_REG (BOOT_REG_BASE | 0x24) 29#define BOOT_PW2_REG (BOOT_REG_BASE | 0x24)
diff --git a/arch/mips/lantiq/xway/reset.c b/arch/mips/lantiq/xway/reset.c
index b6752c95a600..2dedcf939901 100644
--- a/arch/mips/lantiq/xway/reset.c
+++ b/arch/mips/lantiq/xway/reset.c
@@ -119,25 +119,6 @@ static void ltq_rcu_w32_mask(uint32_t clr, uint32_t set, uint32_t reg_off)
119 spin_unlock_irqrestore(&ltq_rcu_lock, flags); 119 spin_unlock_irqrestore(&ltq_rcu_lock, flags);
120} 120}
121 121
122/* This function is used by the watchdog driver */
123int ltq_reset_cause(void)
124{
125 u32 val = ltq_rcu_r32(RCU_RST_STAT);
126 return val >> RCU_STAT_SHIFT;
127}
128EXPORT_SYMBOL_GPL(ltq_reset_cause);
129
130/* allow platform code to find out what source we booted from */
131unsigned char ltq_boot_select(void)
132{
133 u32 val = ltq_rcu_r32(RCU_RST_STAT);
134
135 if (of_device_is_compatible(ltq_rcu_np, "lantiq,rcu-xrx200"))
136 return RCU_BOOT_SEL_XRX200(val);
137
138 return RCU_BOOT_SEL(val);
139}
140
141struct ltq_gphy_reset { 122struct ltq_gphy_reset {
142 u32 rd; 123 u32 rd;
143 u32 addr; 124 u32 addr;