fiq_debugger: merge from linux 3.10

[firefly-linux-kernel-4.4.55.git] / include / linux / soc / rockchip / rk_fiq_debugger.h

diff --git a/include/linux/soc/rockchip/rk_fiq_debugger.h b/include/linux/soc/rockchip/rk_fiq_debugger.h
index f519fa8cc3bb499e2d48ea25128fc17effb26607..c5ea293026444940cb12e6ec9cbaf1d87a998bc7 100644 (file)
--- a/include/linux/soc/rockchip/rk_fiq_debugger.h
+++ b/include/linux/soc/rockchip/rk_fiq_debugger.h
@@ -2,18 +2,20 @@
 #define __PLAT_RK_FIQ_DEBUGGER_H
 
 #ifdef CONFIG_FIQ_DEBUGGER
-void rk_serial_debug_init(void __iomem *base, int irq, int signal_irq,
+void rk_serial_debug_init(void __iomem *base, phys_addr_t phy_base,
+                         int irq, int signal_irq,
                          int wakeup_irq, unsigned int baudrate);
 #else
 static inline void
-rk_serial_debug_init(void __iomem *base, int irq, int signal_irq,
-                    int wakeup_irq, unsigned int baudrate)
+void rk_serial_debug_init(void __iomem *base, phys_addr_t phy_base,
+                         int irq, int signal_irq,
+                         int wakeup_irq, unsigned int baudrate)
 {
 }
 #endif
 
-#ifdef CONFIG_FIQ_DEBUGGER_EL3_TO_EL1
-void fiq_debugger_fiq(void *regs);
+#ifdef CONFIG_FIQ_DEBUGGER_TRUST_ZONE
+void fiq_debugger_fiq(void *regs, u32 cpu);
 #endif
 
 #endif