[PATCH] irqchip/mmp: use cpu_is_pj4() instead of CONFIG_CPU_MMP2

[PATCH] irqchip/mmp: use cpu_is_pj4() instead of CONFIG_CPU_MMP2

[Lubomir Rintel]

CONFIG_CPU_MMP2 is not there on multiplatform kernels with MACH_MMP2_DT.
The MMP2 platform uses the PJ4 CPU.

Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
---
 drivers/irqchip/irq-mmp.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/drivers/irqchip/irq-mmp.c b/drivers/irqchip/irq-mmp.c
index 25f32e1d7764..10aa2b553145 100644
--- a/drivers/irqchip/irq-mmp.c
+++ b/drivers/irqchip/irq-mmp.c
@@ -22,6 +22,7 @@
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
 
+#include <asm/cputype.h>
 #include <asm/exception.h>
 #include <asm/hardirq.h>
 
@@ -74,11 +75,11 @@ static void icu_mask_ack_irq(struct irq_data *d)
 		r |= data->conf_disable;
 		writel_relaxed(r, mmp_icu_base + (hwirq << 2));
 	} else {
-#ifdef CONFIG_CPU_MMP2
-		if ((data->virq_base == data->clr_mfp_irq_base)
-			&& (hwirq == data->clr_mfp_hwirq))
-			mmp2_clear_pmic_int();
-#endif
+		if (cpu_is_pj4()) {
+			if ((data->virq_base == data->clr_mfp_irq_base)
+				&& (hwirq == data->clr_mfp_hwirq))
+				mmp2_clear_pmic_int();
+		}
 		r = readl_relaxed(data->reg_mask) | (1 << hwirq);
 		writel_relaxed(r, data->reg_mask);
 	}
-- 
2.17.1

Re: [PATCH] irqchip/mmp: use cpu_is_pj4() instead of CONFIG_CPU_MMP2

[Lubomir Rintel]

On Mon, 2018-09-10 at 14:13 +0200, Lubomir Rintel wrote:
> CONFIG_CPU_MMP2 is not there on multiplatform kernels with
> MACH_MMP2_DT.
> The MMP2 platform uses the PJ4 CPU.

Actually, this patch breaks the DT-only build.

Please ignore it, sorry for the noise.

Lubo

> 
> Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
> ---
>  drivers/irqchip/irq-mmp.c | 11 ++++++-----
>  1 file changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/irqchip/irq-mmp.c b/drivers/irqchip/irq-mmp.c
> index 25f32e1d7764..10aa2b553145 100644
> --- a/drivers/irqchip/irq-mmp.c
> +++ b/drivers/irqchip/irq-mmp.c
> @@ -22,6 +22,7 @@
>  #include <linux/of_address.h>
>  #include <linux/of_irq.h>
>  
> +#include <asm/cputype.h>
>  #include <asm/exception.h>
>  #include <asm/hardirq.h>
>  
> @@ -74,11 +75,11 @@ static void icu_mask_ack_irq(struct irq_data *d)
>  		r |= data->conf_disable;
>  		writel_relaxed(r, mmp_icu_base + (hwirq << 2));
>  	} else {
> -#ifdef CONFIG_CPU_MMP2
> -		if ((data->virq_base == data->clr_mfp_irq_base)
> -			&& (hwirq == data->clr_mfp_hwirq))
> -			mmp2_clear_pmic_int();
> -#endif
> +		if (cpu_is_pj4()) {
> +			if ((data->virq_base == data->clr_mfp_irq_base)
> +				&& (hwirq == data->clr_mfp_hwirq))
> +				mmp2_clear_pmic_int();
> +		}
>  		r = readl_relaxed(data->reg_mask) | (1 << hwirq);
>  		writel_relaxed(r, data->reg_mask);
>  	}

Re: [PATCH] irqchip/mmp: use cpu_is_pj4() instead of CONFIG_CPU_MMP2

[kbuild test robot]

[-- Attachment #1: Type: text/plain, Size: 1083 bytes --]

Hi Lubomir,

I love your patch! Yet something to improve:

[auto build test ERROR on tip/irq/core]
[also build test ERROR on v4.19-rc4 next-20180913]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url:    https://github.com/0day-ci/linux/commits/Lubomir-Rintel/irqchip-mmp-use-cpu_is_pj4-instead-of-CONFIG_CPU_MMP2/20180911-040041
config: arm-multi_v7_defconfig (attached as .config)
compiler: arm-linux-gnueabi-gcc (Debian 7.2.0-11) 7.2.0
reproduce:
        wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # save the attached .config to linux build tree
        GCC_VERSION=7.2.0 make.cross ARCH=arm 

All errors (new ones prefixed by >>):

   drivers/irqchip/irq-mmp.o: In function `icu_mask_ack_irq':
>> irq-mmp.c:(.text+0x148): undefined reference to `mmp2_clear_pmic_int'

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation

[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 44086 bytes --]