Hi all,
Today's linux-next merge of the tegra tree got a conflict in
arch/arm/mach-tegra/common.c between commit b8a0b3079c03 ("ARM: restart:
tegra: use new restart hook") from the arm tree and commit c37c07ddf269
("arm/tegra: prepare early init for multiple tegra variants") from the
tegra tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc arch/arm/mach-tegra/common.c
index 20f396d,8911e62..0000000
--- a/arch/arm/mach-tegra/common.c
+++ b/arch/arm/mach-tegra/common.c
@@@ -31,14 -33,26 +33,24 @@@
#include "clock.h"
#include "fuse.h"
-void (*arch_reset)(char mode, const char *cmd) = tegra_assert_system_reset;
-
+ static const struct of_device_id tegra_dt_irq_match[] __initconst = {
+ { .compatible = "arm,cortex-a9-gic", .data = gic_of_init },
+ { }
+ };
+
+ void __init tegra_dt_init_irq(void)
+ {
+ tegra_init_irq();
+ of_irq_init(tegra_dt_irq_match);
+ }
+
void tegra_assert_system_reset(char mode, const char *cmd)
{
- void __iomem *reset = IO_ADDRESS(TEGRA_CLK_RESET_BASE + 0x04);
+ void __iomem *reset = IO_ADDRESS(TEGRA_PMC_BASE + 0);
u32 reg;
- /* use *_related to avoid spinlock since caches are off */
reg = readl_relaxed(reset);
- reg |= 0x04;
+ reg |= 0x10;
writel_relaxed(reg, reset);
}
Attachment:
pgp_UkhP9rFIN.pgp
Description: PGP signature
