| Message ID | 1346202897-27306-4-git-send-email-chanho61.park@samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Chanho, On 29 August 2012 06:44, Chanho Park <chanho61.park@samsung.com> wrote: > This patch define irq numbers of ARM performance monitoring unit for exynos4. > The number of CPU cores and PMU irq numbers are vary according to soc types. > So we need to identify each soc type using soc_is_xxx function and define the > pmu irqs dynamically. In case of exynos4412, there are 4 cpu cores and pmus. > > Signed-off-by: Chanho Park <chanho61.park@samsung.com> > Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> > --- > arch/arm/mach-exynos/common.c | 45 ++++++++++++++++++++++++++++++ > arch/arm/mach-exynos/include/mach/irqs.h | 8 ++++-- > arch/arm/plat-samsung/devs.c | 2 +- > 3 files changed, 52 insertions(+), 3 deletions(-) > > diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c > index be61564..24b78bd 100644 > --- a/arch/arm/mach-exynos/common.c > +++ b/arch/arm/mach-exynos/common.c > @@ -30,11 +30,13 @@ > #include <asm/mach/map.h> > #include <asm/mach/irq.h> > #include <asm/cacheflush.h> > +#include <asm/pmu.h> > > #include <mach/regs-irq.h> > #include <mach/regs-pmu.h> > #include <mach/regs-gpio.h> > #include <mach/pmu.h> > +#include <mach/irqs.h> > > #include <plat/cpu.h> > #include <plat/clock.h> > @@ -1056,3 +1058,46 @@ static int __init exynos_init_irq_eint(void) > return 0; > } > arch_initcall(exynos_init_irq_eint); > + > +#if defined(CONFIG_CPU_EXYNOS4210) || defined(CONFIG_SOC_EXYNOS4212) > +static struct resource exynos42xx_pmu_resource[] = { > + DEFINE_RES_IRQ(EXYNOS4_IRQ_PMU), > + DEFINE_RES_IRQ(EXYNOS4_IRQ_PMU_CPU1), > +}; > + > +static struct platform_device exynos42xx_device_pmu = { > + .name = "arm-pmu", > + .num_resources = ARRAY_SIZE(exynos42xx_pmu_resource), > + .resource = exynos42xx_pmu_resource, > +}; > +#endif > + > +#if defined(CONFIG_SOC_EXYNOS4412) > +static struct resource exynos44xx_pmu_resource[] = { > + DEFINE_RES_IRQ(EXYNOS4_IRQ_PMU), > + DEFINE_RES_IRQ(EXYNOS4_IRQ_PMU_CPU1), > + DEFINE_RES_IRQ(EXYNOS4_IRQ_PMU_CPU2), > + DEFINE_RES_IRQ(EXYNOS4_IRQ_PMU_CPU3), > +}; > + > +static struct platform_device exynos44xx_device_pmu = { > + .name = "arm-pmu", > + .num_resources = ARRAY_SIZE(exynos44xx_pmu_resource), > + .resource = exynos44xx_pmu_resource, > +}; > +#endif > + > +static int __init exynos_armpmu_init(void) > +{ > +#if defined(CONFIG_CPU_EXYNOS4210) || defined(CONFIG_SOC_EXYNOS4212) > + if (soc_is_exynos4210() || soc_is_exynos4212()) > + platform_device_register(&exynos42xx_device_pmu); > +#endif > +#if defined(CONFIG_SOC_EXYNOS4412) > + if (soc_is_exynos4412()) > + platform_device_register(&exynos44xx_device_pmu); > +#endif Do we need both compile time and run-time checks here? > + > + return 0; > +} > +arch_initcall(exynos_armpmu_init); > diff --git a/arch/arm/mach-exynos/include/mach/irqs.h b/arch/arm/mach-exynos/include/mach/irqs.h > index 357ed7f..5e75b19 100644 > --- a/arch/arm/mach-exynos/include/mach/irqs.h > +++ b/arch/arm/mach-exynos/include/mach/irqs.h > @@ -128,7 +128,7 @@ > #define EXYNOS4_IRQ_ADC1 IRQ_SPI(107) > #define EXYNOS4_IRQ_PEN1 IRQ_SPI(108) > #define EXYNOS4_IRQ_KEYPAD IRQ_SPI(109) > -#define EXYNOS4_IRQ_PMU IRQ_SPI(110) > +#define EXYNOS4_IRQ_POWER_PMU IRQ_SPI(110) > #define EXYNOS4_IRQ_GPS IRQ_SPI(111) > #define EXYNOS4_IRQ_INTFEEDCTRL_SSS IRQ_SPI(112) > #define EXYNOS4_IRQ_SLIMBUS IRQ_SPI(113) > @@ -136,6 +136,11 @@ > #define EXYNOS4_IRQ_TSI IRQ_SPI(115) > #define EXYNOS4_IRQ_SATA IRQ_SPI(116) > > +#define EXYNOS4_IRQ_PMU COMBINER_IRQ(2, 2) > +#define EXYNOS4_IRQ_PMU_CPU1 COMBINER_IRQ(3, 2) > +#define EXYNOS4_IRQ_PMU_CPU2 COMBINER_IRQ(18, 2) > +#define EXYNOS4_IRQ_PMU_CPU3 COMBINER_IRQ(19, 2) > + > #define EXYNOS4_IRQ_SYSMMU_MDMA0_0 COMBINER_IRQ(4, 0) > #define EXYNOS4_IRQ_SYSMMU_SSS_0 COMBINER_IRQ(4, 1) > #define EXYNOS4_IRQ_SYSMMU_FIMC0_0 COMBINER_IRQ(4, 2) > @@ -230,7 +235,6 @@ > #define IRQ_TC EXYNOS4_IRQ_PEN0 > > #define IRQ_KEYPAD EXYNOS4_IRQ_KEYPAD > -#define IRQ_PMU EXYNOS4_IRQ_PMU > > #define IRQ_FIMD0_FIFO EXYNOS4_IRQ_FIMD0_FIFO > #define IRQ_FIMD0_VSYNC EXYNOS4_IRQ_FIMD0_VSYNC > diff --git a/arch/arm/plat-samsung/devs.c b/arch/arm/plat-samsung/devs.c > index fc49f3d..3b44dad 100644 > --- a/arch/arm/plat-samsung/devs.c > +++ b/arch/arm/plat-samsung/devs.c > @@ -1125,7 +1125,7 @@ struct platform_device s5p_device_onenand = { > > /* PMU */ > > -#ifdef CONFIG_PLAT_S5P > +#if defined(CONFIG_PLAT_S5P) && !defined(CONFIG_ARCH_EXYNOS) > static struct resource s5p_pmu_resource[] = { > DEFINE_RES_IRQ(IRQ_PMU) > }; > -- > 1.7.9.5 >
> -----Original Message----- > From: Sachin Kamat [mailto:sachin.kamat@linaro.org] > Sent: Wednesday, August 29, 2012 12:39 PM > To: Chanho Park > Cc: kgene.kim@samsung.com; linux-arm-kernel@lists.infradead.org; linux- > samsung-soc@vger.kernel.org; linux@arm.linux.org.uk; > will.deacon@arm.com; thomas.abraham@linaro.org; Kyungmin Park > Subject: Re: [PATCH v3 3/4] ARM: EXYNOS: Enable PMUs for exynos4 > > Hi Chanho, > > On 29 August 2012 06:44, Chanho Park <chanho61.park@samsung.com> > wrote: > > This patch define irq numbers of ARM performance monitoring unit for > exynos4. > > The number of CPU cores and PMU irq numbers are vary according to soc > types. > > So we need to identify each soc type using soc_is_xxx function and > > define the pmu irqs dynamically. In case of exynos4412, there are 4 cpu > cores and pmus. > > > > Signed-off-by: Chanho Park <chanho61.park@samsung.com> > > Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> > > --- > > arch/arm/mach-exynos/common.c | 45 > ++++++++++++++++++++++++++++++ > > arch/arm/mach-exynos/include/mach/irqs.h | 8 ++++-- > > arch/arm/plat-samsung/devs.c | 2 +- > > 3 files changed, 52 insertions(+), 3 deletions(-) > > > > diff --git a/arch/arm/mach-exynos/common.c > > b/arch/arm/mach-exynos/common.c index be61564..24b78bd 100644 > > --- a/arch/arm/mach-exynos/common.c > > +++ b/arch/arm/mach-exynos/common.c > > @@ -30,11 +30,13 @@ > > #include <asm/mach/map.h> > > #include <asm/mach/irq.h> > > #include <asm/cacheflush.h> > > +#include <asm/pmu.h> > > > > #include <mach/regs-irq.h> > > #include <mach/regs-pmu.h> > > #include <mach/regs-gpio.h> > > #include <mach/pmu.h> > > +#include <mach/irqs.h> > > > > #include <plat/cpu.h> > > #include <plat/clock.h> > > @@ -1056,3 +1058,46 @@ static int __init exynos_init_irq_eint(void) > > return 0; > > } > > arch_initcall(exynos_init_irq_eint); > > + > > +#if defined(CONFIG_CPU_EXYNOS4210) || > defined(CONFIG_SOC_EXYNOS4212) > > +static struct resource exynos42xx_pmu_resource[] = { > > + DEFINE_RES_IRQ(EXYNOS4_IRQ_PMU), > > + DEFINE_RES_IRQ(EXYNOS4_IRQ_PMU_CPU1), > > +}; > > + > > +static struct platform_device exynos42xx_device_pmu = { > > + .name = "arm-pmu", > > + .num_resources = ARRAY_SIZE(exynos42xx_pmu_resource), > > + .resource = exynos42xx_pmu_resource, > > +}; > > +#endif > > + > > +#if defined(CONFIG_SOC_EXYNOS4412) > > +static struct resource exynos44xx_pmu_resource[] = { > > + DEFINE_RES_IRQ(EXYNOS4_IRQ_PMU), > > + DEFINE_RES_IRQ(EXYNOS4_IRQ_PMU_CPU1), > > + DEFINE_RES_IRQ(EXYNOS4_IRQ_PMU_CPU2), > > + DEFINE_RES_IRQ(EXYNOS4_IRQ_PMU_CPU3), > > +}; > > + > > +static struct platform_device exynos44xx_device_pmu = { > > + .name = "arm-pmu", > > + .num_resources = ARRAY_SIZE(exynos44xx_pmu_resource), > > + .resource = exynos44xx_pmu_resource, > > +}; > > +#endif > > + > > +static int __init exynos_armpmu_init(void) { #if > > +defined(CONFIG_CPU_EXYNOS4210) || > defined(CONFIG_SOC_EXYNOS4212) > > + if (soc_is_exynos4210() || soc_is_exynos4212()) > > + platform_device_register(&exynos42xx_device_pmu); > > +#endif > > +#if defined(CONFIG_SOC_EXYNOS4412) > > + if (soc_is_exynos4412()) > > + platform_device_register(&exynos44xx_device_pmu); > > +#endif > > Do we need both compile time and run-time checks here? I think we can reduce code size and avoid unnecessary comparison using compile time check if turn off these kernel configurations. And runtime check is helpful when turned on all SoC types in the kernel configurations. Best regards, Chanho Park > > > > + > > + return 0; > > +} > > +arch_initcall(exynos_armpmu_init); > > diff --git a/arch/arm/mach-exynos/include/mach/irqs.h > > b/arch/arm/mach-exynos/include/mach/irqs.h > > index 357ed7f..5e75b19 100644 > > --- a/arch/arm/mach-exynos/include/mach/irqs.h > > +++ b/arch/arm/mach-exynos/include/mach/irqs.h > > @@ -128,7 +128,7 @@ > > #define EXYNOS4_IRQ_ADC1 IRQ_SPI(107) > > #define EXYNOS4_IRQ_PEN1 IRQ_SPI(108) > > #define EXYNOS4_IRQ_KEYPAD IRQ_SPI(109) > > -#define EXYNOS4_IRQ_PMU IRQ_SPI(110) > > +#define EXYNOS4_IRQ_POWER_PMU IRQ_SPI(110) > > #define EXYNOS4_IRQ_GPS IRQ_SPI(111) > > #define EXYNOS4_IRQ_INTFEEDCTRL_SSS IRQ_SPI(112) > > #define EXYNOS4_IRQ_SLIMBUS IRQ_SPI(113) > > @@ -136,6 +136,11 @@ > > #define EXYNOS4_IRQ_TSI IRQ_SPI(115) > > #define EXYNOS4_IRQ_SATA IRQ_SPI(116) > > > > +#define EXYNOS4_IRQ_PMU COMBINER_IRQ(2, 2) > > +#define EXYNOS4_IRQ_PMU_CPU1 COMBINER_IRQ(3, 2) > > +#define EXYNOS4_IRQ_PMU_CPU2 COMBINER_IRQ(18, 2) > > +#define EXYNOS4_IRQ_PMU_CPU3 COMBINER_IRQ(19, 2) > > + > > #define EXYNOS4_IRQ_SYSMMU_MDMA0_0 COMBINER_IRQ(4, 0) > > #define EXYNOS4_IRQ_SYSMMU_SSS_0 COMBINER_IRQ(4, 1) > > #define EXYNOS4_IRQ_SYSMMU_FIMC0_0 COMBINER_IRQ(4, 2) > > @@ -230,7 +235,6 @@ > > #define IRQ_TC EXYNOS4_IRQ_PEN0 > > > > #define IRQ_KEYPAD EXYNOS4_IRQ_KEYPAD > > -#define IRQ_PMU EXYNOS4_IRQ_PMU > > > > #define IRQ_FIMD0_FIFO EXYNOS4_IRQ_FIMD0_FIFO > > #define IRQ_FIMD0_VSYNC EXYNOS4_IRQ_FIMD0_VSYNC > > diff --git a/arch/arm/plat-samsung/devs.c > > b/arch/arm/plat-samsung/devs.c index fc49f3d..3b44dad 100644 > > --- a/arch/arm/plat-samsung/devs.c > > +++ b/arch/arm/plat-samsung/devs.c > > @@ -1125,7 +1125,7 @@ struct platform_device s5p_device_onenand = { > > > > /* PMU */ > > > > -#ifdef CONFIG_PLAT_S5P > > +#if defined(CONFIG_PLAT_S5P) && !defined(CONFIG_ARCH_EXYNOS) > > static struct resource s5p_pmu_resource[] = { > > DEFINE_RES_IRQ(IRQ_PMU) > > }; > > -- > > 1.7.9.5 > > > > > > -- > With warm regards, > Sachin
On Wed, Aug 29, 2012 at 02:14:56AM +0100, Chanho Park wrote: > This patch define irq numbers of ARM performance monitoring unit for exynos4. > The number of CPU cores and PMU irq numbers are vary according to soc types. > So we need to identify each soc type using soc_is_xxx function and define the > pmu irqs dynamically. In case of exynos4412, there are 4 cpu cores and pmus. > > Signed-off-by: Chanho Park <chanho61.park@samsung.com> > Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> > --- > arch/arm/mach-exynos/common.c | 45 ++++++++++++++++++++++++++++++ > arch/arm/mach-exynos/include/mach/irqs.h | 8 ++++-- > arch/arm/plat-samsung/devs.c | 2 +- > 3 files changed, 52 insertions(+), 3 deletions(-) > > diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c > index be61564..24b78bd 100644 > --- a/arch/arm/mach-exynos/common.c > +++ b/arch/arm/mach-exynos/common.c > @@ -30,11 +30,13 @@ > #include <asm/mach/map.h> > #include <asm/mach/irq.h> > #include <asm/cacheflush.h> > +#include <asm/pmu.h> Why do you need this header file? > #include <mach/regs-irq.h> > #include <mach/regs-pmu.h> > #include <mach/regs-gpio.h> > #include <mach/pmu.h> > +#include <mach/irqs.h> > > #include <plat/cpu.h> > #include <plat/clock.h> > @@ -1056,3 +1058,46 @@ static int __init exynos_init_irq_eint(void) > return 0; > } > arch_initcall(exynos_init_irq_eint); > + > +#if defined(CONFIG_CPU_EXYNOS4210) || defined(CONFIG_SOC_EXYNOS4212) > +static struct resource exynos42xx_pmu_resource[] = { > + DEFINE_RES_IRQ(EXYNOS4_IRQ_PMU), > + DEFINE_RES_IRQ(EXYNOS4_IRQ_PMU_CPU1), > +}; > + > +static struct platform_device exynos42xx_device_pmu = { > + .name = "arm-pmu", > + .num_resources = ARRAY_SIZE(exynos42xx_pmu_resource), > + .resource = exynos42xx_pmu_resource, > +}; > +#endif Given that you don't pass an id and your device-tree binding is that for Cortex A15, I assume this patch series is based on my perf/updates branch? That's good because it reduces the potential for conflicts, but you should make sure that whoever you send this to is aware of the dependency. Cheers, Will
> -----Original Message----- > From: linux-arm-kernel-bounces@lists.infradead.org [mailto:linux-arm- > kernel-bounces@lists.infradead.org] On Behalf Of Will Deacon > Sent: Thursday, August 30, 2012 6:34 AM > To: Chanho Park > Cc: linux-samsung-soc@vger.kernel.org; linux@arm.linux.org.uk; > sachin.kamat@linaro.org; Kyungmin Park; kgene.kim@samsung.com; > thomas.abraham@linaro.org; linux-arm-kernel@lists.infradead.org > Subject: Re: [PATCH v3 3/4] ARM: EXYNOS: Enable PMUs for exynos4 > > On Wed, Aug 29, 2012 at 02:14:56AM +0100, Chanho Park wrote: > > This patch define irq numbers of ARM performance monitoring unit for > exynos4. > > The number of CPU cores and PMU irq numbers are vary according to soc > types. > > So we need to identify each soc type using soc_is_xxx function and > > define the pmu irqs dynamically. In case of exynos4412, there are 4 cpu > cores and pmus. > > > > Signed-off-by: Chanho Park <chanho61.park@samsung.com> > > Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> > > --- > > arch/arm/mach-exynos/common.c | 45 > ++++++++++++++++++++++++++++++ > > arch/arm/mach-exynos/include/mach/irqs.h | 8 ++++-- > > arch/arm/plat-samsung/devs.c | 2 +- > > 3 files changed, 52 insertions(+), 3 deletions(-) > > > > diff --git a/arch/arm/mach-exynos/common.c > > b/arch/arm/mach-exynos/common.c index be61564..24b78bd 100644 > > --- a/arch/arm/mach-exynos/common.c > > +++ b/arch/arm/mach-exynos/common.c > > @@ -30,11 +30,13 @@ > > #include <asm/mach/map.h> > > #include <asm/mach/irq.h> > > #include <asm/cacheflush.h> > > +#include <asm/pmu.h> > > Why do you need this header file? Oh, I'll remove it. Thanks. > > > #include <mach/regs-irq.h> > > #include <mach/regs-pmu.h> > > #include <mach/regs-gpio.h> > > #include <mach/pmu.h> > > +#include <mach/irqs.h> > > > > #include <plat/cpu.h> > > #include <plat/clock.h> > > @@ -1056,3 +1058,46 @@ static int __init exynos_init_irq_eint(void) > > return 0; > > } > > arch_initcall(exynos_init_irq_eint); > > + > > +#if defined(CONFIG_CPU_EXYNOS4210) || > defined(CONFIG_SOC_EXYNOS4212) > > +static struct resource exynos42xx_pmu_resource[] = { > > + DEFINE_RES_IRQ(EXYNOS4_IRQ_PMU), > > + DEFINE_RES_IRQ(EXYNOS4_IRQ_PMU_CPU1), > > +}; > > + > > +static struct platform_device exynos42xx_device_pmu = { > > + .name = "arm-pmu", > > + .num_resources = ARRAY_SIZE(exynos42xx_pmu_resource), > > + .resource = exynos42xx_pmu_resource, > > +}; > > +#endif > > Given that you don't pass an id and your device-tree binding is that for > Cortex A15, I assume this patch series is based on my perf/updates branch? > > That's good because it reduces the potential for conflicts, but you should > make sure that whoever you send this to is aware of the dependency. Yes. This patch is based on your latest patchset to avoid conflict because I saw Kukjin had acked your patch. I think he'll resolve the dependency. If not, I'll re-submit this patch after applied your patch. Best regards, Chanho Park > > Cheers, > > Will > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c index be61564..24b78bd 100644 --- a/arch/arm/mach-exynos/common.c +++ b/arch/arm/mach-exynos/common.c @@ -30,11 +30,13 @@ #include <asm/mach/map.h> #include <asm/mach/irq.h> #include <asm/cacheflush.h> +#include <asm/pmu.h> #include <mach/regs-irq.h> #include <mach/regs-pmu.h> #include <mach/regs-gpio.h> #include <mach/pmu.h> +#include <mach/irqs.h> #include <plat/cpu.h> #include <plat/clock.h> @@ -1056,3 +1058,46 @@ static int __init exynos_init_irq_eint(void) return 0; } arch_initcall(exynos_init_irq_eint); + +#if defined(CONFIG_CPU_EXYNOS4210) || defined(CONFIG_SOC_EXYNOS4212) +static struct resource exynos42xx_pmu_resource[] = { + DEFINE_RES_IRQ(EXYNOS4_IRQ_PMU), + DEFINE_RES_IRQ(EXYNOS4_IRQ_PMU_CPU1), +}; + +static struct platform_device exynos42xx_device_pmu = { + .name = "arm-pmu", + .num_resources = ARRAY_SIZE(exynos42xx_pmu_resource), + .resource = exynos42xx_pmu_resource, +}; +#endif + +#if defined(CONFIG_SOC_EXYNOS4412) +static struct resource exynos44xx_pmu_resource[] = { + DEFINE_RES_IRQ(EXYNOS4_IRQ_PMU), + DEFINE_RES_IRQ(EXYNOS4_IRQ_PMU_CPU1), + DEFINE_RES_IRQ(EXYNOS4_IRQ_PMU_CPU2), + DEFINE_RES_IRQ(EXYNOS4_IRQ_PMU_CPU3), +}; + +static struct platform_device exynos44xx_device_pmu = { + .name = "arm-pmu", + .num_resources = ARRAY_SIZE(exynos44xx_pmu_resource), + .resource = exynos44xx_pmu_resource, +}; +#endif + +static int __init exynos_armpmu_init(void) +{ +#if defined(CONFIG_CPU_EXYNOS4210) || defined(CONFIG_SOC_EXYNOS4212) + if (soc_is_exynos4210() || soc_is_exynos4212()) + platform_device_register(&exynos42xx_device_pmu); +#endif +#if defined(CONFIG_SOC_EXYNOS4412) + if (soc_is_exynos4412()) + platform_device_register(&exynos44xx_device_pmu); +#endif + + return 0; +} +arch_initcall(exynos_armpmu_init); diff --git a/arch/arm/mach-exynos/include/mach/irqs.h b/arch/arm/mach-exynos/include/mach/irqs.h index 357ed7f..5e75b19 100644 --- a/arch/arm/mach-exynos/include/mach/irqs.h +++ b/arch/arm/mach-exynos/include/mach/irqs.h @@ -128,7 +128,7 @@ #define EXYNOS4_IRQ_ADC1 IRQ_SPI(107) #define EXYNOS4_IRQ_PEN1 IRQ_SPI(108) #define EXYNOS4_IRQ_KEYPAD IRQ_SPI(109) -#define EXYNOS4_IRQ_PMU IRQ_SPI(110) +#define EXYNOS4_IRQ_POWER_PMU IRQ_SPI(110) #define EXYNOS4_IRQ_GPS IRQ_SPI(111) #define EXYNOS4_IRQ_INTFEEDCTRL_SSS IRQ_SPI(112) #define EXYNOS4_IRQ_SLIMBUS IRQ_SPI(113) @@ -136,6 +136,11 @@ #define EXYNOS4_IRQ_TSI IRQ_SPI(115) #define EXYNOS4_IRQ_SATA IRQ_SPI(116) +#define EXYNOS4_IRQ_PMU COMBINER_IRQ(2, 2) +#define EXYNOS4_IRQ_PMU_CPU1 COMBINER_IRQ(3, 2) +#define EXYNOS4_IRQ_PMU_CPU2 COMBINER_IRQ(18, 2) +#define EXYNOS4_IRQ_PMU_CPU3 COMBINER_IRQ(19, 2) + #define EXYNOS4_IRQ_SYSMMU_MDMA0_0 COMBINER_IRQ(4, 0) #define EXYNOS4_IRQ_SYSMMU_SSS_0 COMBINER_IRQ(4, 1) #define EXYNOS4_IRQ_SYSMMU_FIMC0_0 COMBINER_IRQ(4, 2) @@ -230,7 +235,6 @@ #define IRQ_TC EXYNOS4_IRQ_PEN0 #define IRQ_KEYPAD EXYNOS4_IRQ_KEYPAD -#define IRQ_PMU EXYNOS4_IRQ_PMU #define IRQ_FIMD0_FIFO EXYNOS4_IRQ_FIMD0_FIFO #define IRQ_FIMD0_VSYNC EXYNOS4_IRQ_FIMD0_VSYNC diff --git a/arch/arm/plat-samsung/devs.c b/arch/arm/plat-samsung/devs.c index fc49f3d..3b44dad 100644 --- a/arch/arm/plat-samsung/devs.c +++ b/arch/arm/plat-samsung/devs.c @@ -1125,7 +1125,7 @@ struct platform_device s5p_device_onenand = { /* PMU */ -#ifdef CONFIG_PLAT_S5P +#if defined(CONFIG_PLAT_S5P) && !defined(CONFIG_ARCH_EXYNOS) static struct resource s5p_pmu_resource[] = { DEFINE_RES_IRQ(IRQ_PMU) };