| Message ID | 1429724452-26563-1-git-send-email-marc.zyngier@arm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
2015-04-23 2:40 GMT+09:00 Marc Zyngier <marc.zyngier@arm.com>: > Commit 8b283c025443 (ARM: exynos4/5: convert pmu wakeup to > stacked domains) changed the Exynos PMU code to use stacked > domains. This has led to a number of interrupt numbers to be > fixed. > > In the meantime, support for Exynos 3250 was added, missing > the required change to this platform. This amounts to revert > ace283a04a4a (ARM: EXYNOS: Fix wrong hwirq of RTC interrupt > for Exynos3250 SoC), as the initial patch was right, just a > bit early... > > Cc: Chanwoo Choi <cw00.choi@samsung.com> > Cc: Kyungmin Park <kyungmin.park@samsung.com> > Cc: Krzysztof Kozlowski <k.kozlowski@samsung.com> > Cc: Kukjin Kim <kgene@kernel.org> > Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> > --- > arch/arm/mach-exynos/suspend.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Acked-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Thanks for fixing this! Best regards, Krzysztof -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Marc, On 04/23/2015 02:40 AM, Marc Zyngier wrote: > Commit 8b283c025443 (ARM: exynos4/5: convert pmu wakeup to > stacked domains) changed the Exynos PMU code to use stacked > domains. This has led to a number of interrupt numbers to be > fixed. > > In the meantime, support for Exynos 3250 was added, missing > the required change to this platform. This amounts to revert > ace283a04a4a (ARM: EXYNOS: Fix wrong hwirq of RTC interrupt > for Exynos3250 SoC), as the initial patch was right, just a > bit early... > > Cc: Chanwoo Choi <cw00.choi@samsung.com> > Cc: Kyungmin Park <kyungmin.park@samsung.com> > Cc: Krzysztof Kozlowski <k.kozlowski@samsung.com> > Cc: Kukjin Kim <kgene@kernel.org> > Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> > --- > arch/arm/mach-exynos/suspend.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/mach-exynos/suspend.c b/arch/arm/mach-exynos/suspend.c > index 3e6aea7..40dce36 100644 > --- a/arch/arm/mach-exynos/suspend.c > +++ b/arch/arm/mach-exynos/suspend.c > @@ -87,8 +87,8 @@ static unsigned int exynos_pmu_spare3; > static u32 exynos_irqwake_intmask = 0xffffffff; > > static const struct exynos_wkup_irq exynos3250_wkup_irq[] = { > - { 105, BIT(1) }, /* RTC alarm */ > - { 106, BIT(2) }, /* RTC tick */ > + { 73, BIT(1) }, /* RTC alarm */ > + { 74, BIT(2) }, /* RTC tick */ > { /* sentinel */ }, > }; > > Reviewed-by: Chanwoo Choi <cw00.choi@samsung.com> Thanks, Chanwoo Choi -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Krzysztof Kozlowski wrote: > > 2015-04-23 2:40 GMT+09:00 Marc Zyngier <marc.zyngier@arm.com>: > > Commit 8b283c025443 (ARM: exynos4/5: convert pmu wakeup to > > stacked domains) changed the Exynos PMU code to use stacked > > domains. This has led to a number of interrupt numbers to be > > fixed. > > > > In the meantime, support for Exynos 3250 was added, missing > > the required change to this platform. This amounts to revert > > ace283a04a4a (ARM: EXYNOS: Fix wrong hwirq of RTC interrupt > > for Exynos3250 SoC), as the initial patch was right, just a > > bit early... > > > > Cc: Chanwoo Choi <cw00.choi@samsung.com> > > Cc: Kyungmin Park <kyungmin.park@samsung.com> > > Cc: Krzysztof Kozlowski <k.kozlowski@samsung.com> > > Cc: Kukjin Kim <kgene@kernel.org> > > Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> > > --- > > arch/arm/mach-exynos/suspend.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > Acked-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> > Thanks and applied. - Kukjin -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 27/04/15 01:53, Kukjin Kim wrote: > Krzysztof Kozlowski wrote: >> >> 2015-04-23 2:40 GMT+09:00 Marc Zyngier <marc.zyngier@arm.com>: >>> Commit 8b283c025443 (ARM: exynos4/5: convert pmu wakeup to >>> stacked domains) changed the Exynos PMU code to use stacked >>> domains. This has led to a number of interrupt numbers to be >>> fixed. >>> >>> In the meantime, support for Exynos 3250 was added, missing >>> the required change to this platform. This amounts to revert >>> ace283a04a4a (ARM: EXYNOS: Fix wrong hwirq of RTC interrupt >>> for Exynos3250 SoC), as the initial patch was right, just a >>> bit early... >>> >>> Cc: Chanwoo Choi <cw00.choi@samsung.com> >>> Cc: Kyungmin Park <kyungmin.park@samsung.com> >>> Cc: Krzysztof Kozlowski <k.kozlowski@samsung.com> >>> Cc: Kukjin Kim <kgene@kernel.org> >>> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> >>> --- >>> arch/arm/mach-exynos/suspend.c | 4 ++-- >>> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> Acked-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> >> > Thanks and applied. Looks like this fix never made it to mainline. What happened? Thanks, M.
On 28.05.2015 18:55, Marc Zyngier wrote: > On 27/04/15 01:53, Kukjin Kim wrote: >> Krzysztof Kozlowski wrote: >>> >>> 2015-04-23 2:40 GMT+09:00 Marc Zyngier <marc.zyngier@arm.com>: >>>> Commit 8b283c025443 (ARM: exynos4/5: convert pmu wakeup to >>>> stacked domains) changed the Exynos PMU code to use stacked >>>> domains. This has led to a number of interrupt numbers to be >>>> fixed. >>>> >>>> In the meantime, support for Exynos 3250 was added, missing >>>> the required change to this platform. This amounts to revert >>>> ace283a04a4a (ARM: EXYNOS: Fix wrong hwirq of RTC interrupt >>>> for Exynos3250 SoC), as the initial patch was right, just a >>>> bit early... >>>> >>>> Cc: Chanwoo Choi <cw00.choi@samsung.com> >>>> Cc: Kyungmin Park <kyungmin.park@samsung.com> >>>> Cc: Krzysztof Kozlowski <k.kozlowski@samsung.com> >>>> Cc: Kukjin Kim <kgene@kernel.org> >>>> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> >>>> --- >>>> arch/arm/mach-exynos/suspend.c | 4 ++-- >>>> 1 file changed, 2 insertions(+), 2 deletions(-) >>> >>> Acked-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> >>> >> Thanks and applied. > > Looks like this fix never made it to mainline. What happened? Indeed, good question - what happened? Anyway I applied this to my tree so it won't get lost again. I will push it to Kukjin this weekend. Best regards, Krzysztof -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/mach-exynos/suspend.c b/arch/arm/mach-exynos/suspend.c index 3e6aea7..40dce36 100644 --- a/arch/arm/mach-exynos/suspend.c +++ b/arch/arm/mach-exynos/suspend.c @@ -87,8 +87,8 @@ static unsigned int exynos_pmu_spare3; static u32 exynos_irqwake_intmask = 0xffffffff; static const struct exynos_wkup_irq exynos3250_wkup_irq[] = { - { 105, BIT(1) }, /* RTC alarm */ - { 106, BIT(2) }, /* RTC tick */ + { 73, BIT(1) }, /* RTC alarm */ + { 74, BIT(2) }, /* RTC tick */ { /* sentinel */ }, };
Commit 8b283c025443 (ARM: exynos4/5: convert pmu wakeup to stacked domains) changed the Exynos PMU code to use stacked domains. This has led to a number of interrupt numbers to be fixed. In the meantime, support for Exynos 3250 was added, missing the required change to this platform. This amounts to revert ace283a04a4a (ARM: EXYNOS: Fix wrong hwirq of RTC interrupt for Exynos3250 SoC), as the initial patch was right, just a bit early... Cc: Chanwoo Choi <cw00.choi@samsung.com> Cc: Kyungmin Park <kyungmin.park@samsung.com> Cc: Krzysztof Kozlowski <k.kozlowski@samsung.com> Cc: Kukjin Kim <kgene@kernel.org> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> --- arch/arm/mach-exynos/suspend.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)