* linux-next: manual merge of the tegra tree with the arm tree
@ 2011-12-09 0:47 Stephen Rothwell
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2011-12-09 0:47 UTC (permalink / raw)
To: Erik Gilling, Colin Cross, Olof Johansson
Cc: linux-next, linux-kernel, Marc Zyngier, Russell King
[-- Attachment #1: Type: text/plain, Size: 1085 bytes --]
Hi all,
Today's linux-next merge of the tegra tree got a conflict in
arch/arm/mach-tegra/board-dt.c between commit afed2a261825 ("ARM: tegra2:
convert to CONFIG_MULTI_IRQ_HANDLER") from the arm tree and commit
0d4f74792e29 ("arm/tegra: convert tegra20 to GIC devicetree binding")
from the tegra tree.
I did the obvious fixup (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-tegra/board-dt.c
index e417a83,2fa599d..0000000
--- a/arch/arm/mach-tegra/board-dt.c
+++ b/arch/arm/mach-tegra/board-dt.c
@@@ -130,10 -150,8 +151,10 @@@ static const char * tegra_dt_board_comp
DT_MACHINE_START(TEGRA_DT, "nVidia Tegra (Flattened Device Tree)")
.map_io = tegra_map_common_io,
.init_early = tegra_init_early,
- .init_irq = tegra_init_irq,
+ .init_irq = tegra_dt_init_irq,
+ .handle_irq = gic_handle_irq,
.timer = &tegra_timer,
.init_machine = tegra_dt_init,
+ .restart = tegra_assert_system_reset,
.dt_compat = tegra_dt_board_compat,
MACHINE_END
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* linux-next: manual merge of the tegra tree with the arm tree
@ 2012-03-13 0:41 Stephen Rothwell
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2012-03-13 0:41 UTC (permalink / raw)
To: Stephen Warren, Colin Cross, Olof Johansson
Cc: linux-next, linux-kernel, Marc Zyngier, Arnd Bergmann, Alan Ott,
Russell King
[-- Attachment #1: Type: text/plain, Size: 1481 bytes --]
Hi all,
Today's linux-next merge of the tegra tree got a conflict in
arch/arm/mach-tegra/Makefile between commit 598695a02180 ("ARM: tegra:
convert to twd_local_timer_register() interface")from the arm tree and
commits 249c5172e80a ("ARM: tegra: build localtimer support only when
needed") and 7ff43eeabd19 ("ARM: tegra: enable tegra30 clock framework")
from the tegra tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-tegra/Makefile
index f7d0443,7bea5d1..0000000
--- a/arch/arm/mach-tegra/Makefile
+++ b/arch/arm/mach-tegra/Makefile
@@@ -13,9 -17,12 +17,11 @@@ obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += teg
obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += pinmux-tegra20-tables.o
obj-$(CONFIG_ARCH_TEGRA_3x_SOC) += pinmux-tegra30-tables.o
obj-$(CONFIG_ARCH_TEGRA_3x_SOC) += board-dt-tegra30.o
-obj-$(CONFIG_SMP) += platsmp.o headsmp.o
+obj-$(CONFIG_SMP) += platsmp.o headsmp.o
+ obj-$(CONFIG_SMP) += reset.o
-obj-$(CONFIG_LOCAL_TIMERS) += localtimer.o
+ obj-$(CONFIG_ARCH_TEGRA_3x_SOC) += tegra30_clocks.o
obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
- obj-$(CONFIG_TEGRA_SYSTEM_DMA) += dma.o
+ obj-$(CONFIG_TEGRA_SYSTEM_DMA) += dma.o apbio.o
obj-$(CONFIG_CPU_FREQ) += cpu-tegra.o
obj-$(CONFIG_TEGRA_PCI) += pcie.o
obj-$(CONFIG_USB_SUPPORT) += usb_phy.o
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* linux-next: manual merge of the tegra tree with the arm tree
@ 2012-02-26 23:40 Stephen Rothwell
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2012-02-26 23:40 UTC (permalink / raw)
To: Stephen Warren, Colin Cross, Olof Johansson
Cc: linux-next, linux-kernel, Nicolas Pitre, Peter De Schrijver,
Russell King
[-- Attachment #1: Type: text/plain, Size: 808 bytes --]
Hi all,
Today's linux-next merge of the tegra tree got a conflict in
arch/arm/mach-tegra/common.c between commit daa14d5e60e0 ("ARM:
mach-tegra: properly disable CPU idle call") from the arm tree and commit
65fe31da5ced ("ARM: tegra: support for Tegra30 CPU powerdomains") from
the tegra tree.
Just context changes. I fixed it up (see below) and can carry the fax as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-tegra/common.c
index 2db20da,09dc37fc..0000000
--- a/arch/arm/mach-tegra/common.c
+++ b/arch/arm/mach-tegra/common.c
@@@ -27,6 -27,8 +27,7 @@@
#include <asm/hardware/gic.h>
#include <mach/iomap.h>
-#include <mach/system.h>
+ #include <mach/powergate.h>
#include "board.h"
#include "clock.h"
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* linux-next: manual merge of the tegra tree with the arm tree
@ 2011-12-19 0:14 Stephen Rothwell
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2011-12-19 0:14 UTC (permalink / raw)
To: Erik Gilling, Colin Cross, Olof Johansson
Cc: linux-next, linux-kernel, Russell King, Peter De Schrijver
[-- Attachment #1: Type: text/plain, Size: 1418 bytes --]
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@canb.auug.org.au
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 #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* linux-next: manual merge of the tegra tree with the arm tree
@ 2011-12-19 0:14 Stephen Rothwell
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2011-12-19 0:14 UTC (permalink / raw)
To: Erik Gilling, Colin Cross, Olof Johansson
Cc: linux-next, linux-kernel, Russell King, Peter De Schrijver
[-- Attachment #1: Type: text/plain, Size: 1012 bytes --]
Hi all,
Today's linux-next merge of the tegra tree got a conflict in
arch/arm/mach-tegra/board-dt-tegra20.c (called
arch/arm/mach-tegra/board-dt.c in the arm tree) 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 change. I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-tegra/board-dt-tegra20.c
index e417a83,ddaa037..0000000
--- a/arch/arm/mach-tegra/board-dt-tegra20.c
+++ b/arch/arm/mach-tegra/board-dt-tegra20.c
@@@ -134,6 -144,5 +144,6 @@@ DT_MACHINE_START(TEGRA_DT, "nVidia Tegr
.handle_irq = gic_handle_irq,
.timer = &tegra_timer,
.init_machine = tegra_dt_init,
+ .restart = tegra_assert_system_reset,
- .dt_compat = tegra_dt_board_compat,
+ .dt_compat = tegra20_dt_board_compat,
MACHINE_END
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* linux-next: manual merge of the tegra tree with the arm tree
@ 2010-07-13 1:23 Stephen Rothwell
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2010-07-13 1:23 UTC (permalink / raw)
To: Erik Gilling, Colin Cross, Olof Johansson
Cc: linux-next, linux-kernel, Will Deacon, Russell King
Hi all,
Today's linux-next merge of the tegra tree got a conflict in
arch/arm/Kconfig between commit bde28b846e7e0ea6fea78f6ad1c43091fdf4d3e0
("ARM: 6218/1: Versatile Express: add support for local timers on CA9X4
daughterboard") from the arm tree and commit
c9dfc86214ffc3bcd0155b38bfe04383accc054a ("[ARM] tegra: SMP support")
from the tegra tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/Kconfig
index 7e73d07,c8f28f8..0000000
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -1155,9 -1187,10 +1170,10 @@@ config LOCAL_TIMER
bool "Use local timer interrupts"
depends on SMP && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || \
REALVIEW_EB_A9MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || \
- ARCH_U8500 || ARCH_VEXPRESS_CA9X4)
- ARCH_U8500 || ARCH_TEGRA)
++ ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_TEGRA)
default y
- select HAVE_ARM_TWD if (ARCH_REALVIEW || ARCH_VEXPRESS || ARCH_OMAP4 || ARCH_U8500)
- select HAVE_ARM_TWD if (ARCH_REALVIEW || ARCH_OMAP4 || ARCH_U8500 || \
++ select HAVE_ARM_TWD if (ARCH_REALVIEW || ARCH_VEXPRESS || ARCH_OMAP4 || ARCH_U8500 || \
+ ARCH_TEGRA)
help
Enable support for local timers on SMP platforms, rather then the
legacy IPI broadcast method. Local timers allows the system
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-03-13 0:41 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-12-09 0:47 linux-next: manual merge of the tegra tree with the arm tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2012-03-13 0:41 Stephen Rothwell
2012-02-26 23:40 Stephen Rothwell
2011-12-19 0:14 Stephen Rothwell
2011-12-19 0:14 Stephen Rothwell
2010-07-13 1:23 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).