| From 3faf19489a258c77e9e66898ad3ebc5a4f88b740 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 24 Aug 2020 12:10:33 -0700 |
| Subject: irqchip/eznps: Fix build error for !ARC700 builds |
| |
| From: Vineet Gupta <vgupta@synopsys.com> |
| |
| [ Upstream commit 89d29997f103d08264b0685796b420d911658b96 ] |
| |
| eznps driver is supposed to be platform independent however it ends up |
| including stuff from inside arch/arc headers leading to rand config |
| build errors. |
| |
| The quick hack to fix this (proper fix is too much chrun for non active |
| user-base) is to add following to nps platform agnostic header. |
| - copy AUX_IENABLE from arch/arc header |
| - move CTOP_AUX_IACK from arch/arc/plat-eznps/*/** |
| |
| Reported-by: kernel test robot <lkp@intel.com> |
| Reported-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> |
| Link: https://lkml.kernel.org/r/20200824095831.5lpkmkafelnvlpi2@linutronix.de |
| Signed-off-by: Vineet Gupta <vgupta@synopsys.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/arc/plat-eznps/include/plat/ctop.h | 1 - |
| include/soc/nps/common.h | 6 ++++++ |
| 2 files changed, 6 insertions(+), 1 deletion(-) |
| |
| diff --git a/arch/arc/plat-eznps/include/plat/ctop.h b/arch/arc/plat-eznps/include/plat/ctop.h |
| index a4a61531c7fb9..77712c5ffe848 100644 |
| --- a/arch/arc/plat-eznps/include/plat/ctop.h |
| +++ b/arch/arc/plat-eznps/include/plat/ctop.h |
| @@ -33,7 +33,6 @@ |
| #define CTOP_AUX_DPC (CTOP_AUX_BASE + 0x02C) |
| #define CTOP_AUX_LPC (CTOP_AUX_BASE + 0x030) |
| #define CTOP_AUX_EFLAGS (CTOP_AUX_BASE + 0x080) |
| -#define CTOP_AUX_IACK (CTOP_AUX_BASE + 0x088) |
| #define CTOP_AUX_GPA1 (CTOP_AUX_BASE + 0x08C) |
| #define CTOP_AUX_UDMC (CTOP_AUX_BASE + 0x300) |
| |
| diff --git a/include/soc/nps/common.h b/include/soc/nps/common.h |
| index 9b1d43d671a3f..8c18dc6d3fde5 100644 |
| --- a/include/soc/nps/common.h |
| +++ b/include/soc/nps/common.h |
| @@ -45,6 +45,12 @@ |
| #define CTOP_INST_MOV2B_FLIP_R3_B1_B2_INST 0x5B60 |
| #define CTOP_INST_MOV2B_FLIP_R3_B1_B2_LIMM 0x00010422 |
| |
| +#ifndef AUX_IENABLE |
| +#define AUX_IENABLE 0x40c |
| +#endif |
| + |
| +#define CTOP_AUX_IACK (0xFFFFF800 + 0x088) |
| + |
| #ifndef __ASSEMBLY__ |
| |
| /* In order to increase compilation test coverage */ |
| -- |
| 2.25.1 |
| |
