Re: linux-next: manual merge of the irqchip tree with Linus' tree

[Marc Zyngier]

Hi Stephen, Jason,

On 16/03/15 03:47, Stephen Rothwell wrote:
> Hi Jason,
> 
> Today's linux-next merge of the irqchip tree got a conflict in
> arch/arm/mach-exynos/suspend.c between commit ace283a04a4a ("ARM:
> EXYNOS: Fix wrong hwirq of RTC interrupt for Exynos3250 SoC") from
> Linus' tree and commit be42c9ea7b5f ("ARM: exynos4/5: convert pmu
> wakeup to stacked domains") from the irqchip tree.
> 
> I fixed it up (I just randomly chose to use the irqchip tree version)
> and can carry the fix as necessary (no action is required).
> 

Actually, the fix is slightly less obvious, mostly because I introduced
a bug while converting the code to stacked domains. I noticed that
something was amiss in the Exynos code, but fixed it the wrong way
(I assumed the DT was wrong, while it was the code).

Now, in the light of ace283a04a4a, the fix should be:

diff --git a/arch/arm/boot/dts/exynos3250.dtsi b/arch/arm/boot/dts/exynos3250.dtsi
index 554e9be..580b2109 100644
--- a/arch/arm/boot/dts/exynos3250.dtsi
+++ b/arch/arm/boot/dts/exynos3250.dtsi
@@ -186,7 +186,7 @@
 		rtc: rtc@10070000 {
 			compatible = "samsung,exynos3250-rtc";
 			reg = <0x10070000 0x100>;
-			interrupts = <0 41 0>, <0 42 0>;
+			interrupts = <0 73 0>, <0 74 0>;
 			interrupt-parent = <&pmu_system_controller>;
 			status = "disabled";
 		};
diff --git a/arch/arm/mach-exynos/suspend.c b/arch/arm/mach-exynos/suspend.c
index 891e431..7b09e76 100644
--- a/arch/arm/mach-exynos/suspend.c
+++ b/arch/arm/mach-exynos/suspend.c
@@ -89,8 +89,8 @@ static unsigned int exynos_pmu_spare3;
 static u32 exynos_irqwake_intmask = 0xffffffff;
 
 static const struct exynos_wkup_irq exynos3250_wkup_irq[] = {
-	{ 41, BIT(1) }, /* RTC alarm */
-	{ 42, BIT(2) }, /* RTC tick */
+	{ 73, BIT(1) }, /* RTC alarm */
+	{ 74, BIT(2) }, /* RTC tick */
 	{ /* sentinel */ },
 };
 
Jason, any chance you could apply this on top of be42c9ea7b5f? We'll still
have a conflict when the two branches get merged, but at least we'll know
what the resolution is.

Thanks,

	M.
-- 
Jazz is not dead. It just smells funny...
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/