Skip to contentSkip to conversation

Important changes, please read

DISCUSSION Tony Lindgren 8 participants 17 messages Jan 14, 2009 – Jan 23, 2009

Subsystems (4)
Arm (32-bit) Arm sub-architectures OMAP1 support OMAP clock framework support
lore
Share & tools
lore

Tony Lindgren

author reviewer
#0 lore raw

Hi all,

I'll be merging in v2.6.29-rc1 soonish, and suggest that we make some changes to continue aligning our tree with the mainline tree. So I suggest:

- We move the dspgateway code into a separate branch as discussed earlier.

- We stop using source.mvista.com git tree, and only use the kernel.org git tree. There's no need for having two master trees, and kernel.org is the standard way to go. Big thanks to Monta Vista for hosting us for many years.

- We reset arch/arm/mach-omap1 to be what's in the mainline and tag that patch again with "REMOVE OMAP LEGACY CODE" so it's easy to find later on. Naturally any code in that patch can be reworked so it can be integrated to the mainline kernel.

- We add a clocks branch maintained by Paul Walmsley that's based off the mainline tree

- We change the pm branch maintained by Kevin Hilman to be based on top of the mainline tree

Comments and suggestions anybody?

BTW, I've also re-cloned the omap tree on kernel.org as it had tons of old objects that we don't need. It should not affect local trees, but report problems here. It will take a while to get mirrored, and some branches might be missing until mirroring is done.

I have also set up and empty for-next branch that will contain the reviewed patches for next merge window. This will also get pulled into Stephen Rothwell's linux next tree on daily basis.

Regards,

Tony

#1 lore raw

Op 14 jan 2009, om 14:41 heeft Tony Lindgren het volgende geschreven:

Quoted 19 lines

Hi all,

I'll be merging in v2.6.29-rc1 soonish, and suggest that we make some changes to continue aligning our tree with the mainline tree. So I suggest:

- We move the dspgateway code into a separate branch as discussed earlier.

- We stop using source.mvista.com git tree, and only use the kernel.org git tree. There's no need for having two master trees, and kernel.org is the standard way to go. Big thanks to Monta Vista for hosting us for many years.

- We reset arch/arm/mach-omap1 to be what's in the mainline and tag that patch again with "REMOVE OMAP LEGACY CODE" so it's easy to find later on. Naturally any code in that patch can be reworked so it can be integrated to the mainline kernel.

Quoted 7 lines

- We add a clocks branch maintained by Paul Walmsley that's based off the mainline tree

- We change the pm branch maintained by Kevin Hilman to be based on top of the mainline tree

Comments and suggestions anybody?

Will there be some official 'staging' tree that pulls in trees like bridge, dss2, etc? I'm fine with pulling patches from this mailinglist, but a single source for gathering them would be nice.

Also, what's the medium and long term plan for the clocks and pm branch?

regards,

Koen

Quoted 20 lines

BTW, I've also re-cloned the omap tree on kernel.org as it had tons of old objects that we don't need. It should not affect local trees, but report problems here. It will take a while to get mirrored, and some branches might be missing until mirroring is done.

I have also set up and empty for-next branch that will contain the reviewed patches for next merge window. This will also get pulled into Stephen Rothwell's linux next tree on daily basis.

Regards,

Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

author reviewer
#2 lore raw
Quoted 25 lines · Koen Kooi

Op 14 jan 2009, om 14:41 heeft Tony Lindgren het volgende geschreven:

Quoted 22 lines

Hi all,

I'll be merging in v2.6.29-rc1 soonish, and suggest that we make some changes to continue aligning our tree with the mainline tree. So I suggest:

- We move the dspgateway code into a separate branch as discussed earlier.

- We stop using source.mvista.com git tree, and only use the kernel.org git tree. There's no need for having two master trees, and kernel.org is the standard way to go. Big thanks to Monta Vista for hosting us for many years.

- We reset arch/arm/mach-omap1 to be what's in the mainline and tag that patch again with "REMOVE OMAP LEGACY CODE" so it's easy to find later on. Naturally any code in that patch can be reworked so it can be integrated to the mainline kernel.

- We add a clocks branch maintained by Paul Walmsley that's based off the mainline tree

Quoted 8 lines
Quoted 4 lines

- We change the pm branch maintained by Kevin Hilman to be based on top of the mainline tree

Comments and suggestions anybody?

Will there be some official 'staging' tree that pulls in trees like bridge, dss2, etc? I'm fine with pulling patches from this mailinglist, but a single source for gathering them would be nice.

We could have something like that that automatically merges those in.

Quoted 1 line

Also, what's the medium and long term plan for the clocks and pm branch?

The clocks branch patches we should start sending to Russell asap so we can get them into the mainline kernel hopefully for the next merge window. Then we should start feeding the pm branch patches after the dependencies to the clock patches are merged.

Quoted 20 lines

regards,

Koen

Quoted 15 lines

BTW, I've also re-cloned the omap tree on kernel.org as it had tons of old objects that we don't need. It should not affect local trees, but report problems here. It will take a while to get mirrored, and some branches might be missing until mirroring is done.

I have also set up and empty for-next branch that will contain the reviewed patches for next merge window. This will also get pulled into Stephen Rothwell's linux next tree on daily basis.

Regards,

Tony

author reviewer
#3 lore raw
Quoted 29 lines · Tony Lindgren
Quoted 28 lines · Koen Kooi

Op 14 jan 2009, om 14:41 heeft Tony Lindgren het volgende geschreven:

Quoted 25 lines

Hi all,

I'll be merging in v2.6.29-rc1 soonish, and suggest that we make some changes to continue aligning our tree with the mainline tree. So I suggest:

- We move the dspgateway code into a separate branch as discussed earlier.

- We stop using source.mvista.com git tree, and only use the kernel.org git tree. There's no need for having two master trees, and kernel.org is the standard way to go. Big thanks to Monta Vista for hosting us for many years.

- We reset arch/arm/mach-omap1 to be what's in the mainline and tag that patch again with "REMOVE OMAP LEGACY CODE" so it's easy to find later on. Naturally any code in that patch can be reworked so it can be integrated to the mainline kernel.

- We add a clocks branch maintained by Paul Walmsley that's based off the mainline tree

- We change the pm branch maintained by Kevin Hilman to be based on top of the mainline tree

Quoted 7 lines
Quoted 5 lines
Quoted 1 line

Comments and suggestions anybody?

Will there be some official 'staging' tree that pulls in trees like bridge, dss2, etc? I'm fine with pulling patches from this mailinglist, but a single source for gathering them would be nice.

We could have something like that that automatically merges those in.

A staging branch I mean.

Quoted 32 lines
Quoted 1 line

Also, what's the medium and long term plan for the clocks and pm branch?

The clocks branch patches we should start sending to Russell asap so we can get them into the mainline kernel hopefully for the next merge window. Then we should start feeding the pm branch patches after the dependencies to the clock patches are merged.

Quoted 20 lines

regards,

Koen

Quoted 15 lines

BTW, I've also re-cloned the omap tree on kernel.org as it had tons of old objects that we don't need. It should not affect local trees, but report problems here. It will take a while to get mirrored, and some branches might be missing until mirroring is done.

I have also set up and empty for-next branch that will contain the reviewed patches for next merge window. This will also get pulled into Stephen Rothwell's linux next tree on daily basis.

Regards,

Tony

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

#4 lore raw
In reply to Tony Lindgren
Quoted 4 lines

- We reset arch/arm/mach-omap1 to be what's in the mainline and tag that patch again with "REMOVE OMAP LEGACY CODE" so it's easy to find later on. Naturally any code in that patch can be reworked so it can be integrated to the mainline kernel.

What is the status of OMAP1 devices in 2.6.28-omap1 tree compared to this tree that will be there? Has anybody made tests whether devices like innovator are still either with this 2.6.28-omap1 or with 2.6.29-rc1-omap?

Mika

author reviewer
#5 lore raw
Quoted 9 lines · Mika Laitio
Quoted 4 lines

- We reset arch/arm/mach-omap1 to be what's in the mainline and tag that patch again with "REMOVE OMAP LEGACY CODE" so it's easy to find later on. Naturally any code in that patch can be reworked so it can be integrated to the mainline kernel.

What is the status of OMAP1 devices in 2.6.28-omap1 tree compared to this tree that will be there? Has anybody made tests whether devices like innovator are still either with this 2.6.28-omap1 or with 2.6.29-rc1-omap?

Well that would mean mostly leaving out some device init code that's not in the mainline kernel. I have not been able to boot my 1510 for a while since the SDRAM seems to be broken on it. But at least the 16xx devices are working, except for the MMC bug posted by Ladislav.

Below is a rough diff of the stuff that needs to be looked through for what can be removed.

The clock changes and mailbox updates we don't want to remove, those should go into the mainline kernel. The MMU code in the patch should go into the dspgateway branch.

Tony

arch/arm/mach-omap1/board-h2.c +4 -9
diff -Nrup --exclude-from=/home/tmlind/src/dontdiff-tony /home/tmlind/src/kernel/linux-omap-2.6/arch/arm/mach-omap1/board-h2.c ./arch/arm/mach-omap1/board-h2.c
@@ -20,7 +20,6 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/delay.h>
 #include <linux/i2c.h>

@@ -29,8 +28,6 @@
 #include <linux/mtd/partitions.h>
 #include <linux/input.h>
 #include <linux/i2c/tps65010.h>
-#include <linux/workqueue.h>
-#include <linux/clk.h>
 
 #include <mach/hardware.h>
 #include <asm/gpio.h>

@@ -40,8 +37,6 @@
 #include <asm/mach/flash.h>
 #include <asm/mach/map.h>
 
-#include <mach/dma.h>
-#include <mach/gpio.h>
 #include <mach/gpio-switch.h>
 #include <mach/mux.h>
 #include <mach/tc.h>

@@ -411,10 +406,10 @@ static void __init h2_init(void)
 	/* Irda */
 #if defined(CONFIG_OMAP_IR) || defined(CONFIG_OMAP_IR_MODULE)
 	omap_writel(omap_readl(FUNC_MUX_CTRL_A) | 7, FUNC_MUX_CTRL_A);
-	if (!(gpio_request(H2_IRDA_FIRSEL_GPIO_PIN, "irda firsel"))) {
-		gpio_direction_output(H2_IRDA_FIRSEL_GPIO_PIN);
-		h2_irda_data.transceiver_mode = h2_transceiver_mode;
-	}
+	if (gpio_request(H2_IRDA_FIRSEL_GPIO_PIN, "IRDA mode") < 0)
+		BUG();
+	gpio_direction_output(H2_IRDA_FIRSEL_GPIO_PIN, 0);
+	h2_irda_data.transceiver_mode = h2_transceiver_mode;
 #endif
 
 	platform_add_devices(h2_devices, ARRAY_SIZE(h2_devices));
arch/arm/mach-omap1/board-h3.c +61 -195

325 lines not on this page · raw message

arch/arm/mach-omap1/board-nokia770.c +1 -43

63 lines not on this page · raw message

arch/arm/mach-omap1/board-osk.c +3 -0
diff -Nrup --exclude-from=/home/tmlind/src/dontdiff-tony /home/tmlind/src/kernel/linux-omap-2.6/arch/arm/mach-omap1/board-osk.c ./arch/arm/mach-omap1/board-osk.c
@@ -223,6 +223,9 @@ static struct i2c_board_info __initdata 
 	{
 		I2C_BOARD_INFO("tlv320aic23", 0x1B),
 	},
+	/* TODO when driver support is ready:
+	 *  - optionally on Mistral, ov9640 camera sensor at 0x30
+	 */
 };
 
 static void __init osk_init_smc91x(void)
arch/arm/mach-omap1/board-palmte.c +0 -36
diff -Nrup --exclude-from=/home/tmlind/src/dontdiff-tony /home/tmlind/src/kernel/linux-omap-2.6/arch/arm/mach-omap1/board-palmte.c ./arch/arm/mach-omap1/board-palmte.c
@@ -42,7 +42,6 @@
 #include <mach/irda.h>
 #include <mach/keypad.h>
 #include <mach/common.h>
-#include <mach/gpio-switch.h>
 
 static void __init omap_palmte_init_irq(void)
 {

@@ -315,37 +314,6 @@ static void palmte_headphones_detect(voi
 	}
 }
 
-static struct omap_gpio_switch palmte_switches[] __initdata = {
-	/* Speaker-enable pin is an output */
-	{
-		.name	= "speaker-enable",
-		.gpio	= PALMTE_SPEAKER_GPIO,
-		.type	= OMAP_GPIO_SWITCH_TYPE_ACTIVITY,
-		.flags	= OMAP_GPIO_SWITCH_FLAG_OUTPUT |
-			OMAP_GPIO_SWITCH_FLAG_INVERTED,
-	},
-	/* Indicates whether power is from DC-IN or battery */
-	{
-		.name	= "dc-in",
-		.gpio	= PALMTE_DC_GPIO,
-		.type	= OMAP_GPIO_SWITCH_TYPE_CONNECTION,
-		.flags	= OMAP_GPIO_SWITCH_FLAG_INVERTED,
-	},
-	/* Indicates whether a USB host is on the other end of the cable */
-	{
-		.name	= "usb",
-		.gpio	= PALMTE_USBDETECT_GPIO,
-		.type	= OMAP_GPIO_SWITCH_TYPE_CONNECTION,
-	},
-	/* High when headphones jack is plugged in */
-	{
-		.name	= "headphones",
-		.gpio	= PALMTE_HEADPHONES_GPIO,
-		.type	= OMAP_GPIO_SWITCH_TYPE_CONNECTION,
-		.notify	= palmte_headphones_detect,
-	},
-};
-
 static void __init palmte_misc_gpio_setup(void)
 {
 	/* Set TSC2102 PINTDAV pin as input (used by TSC2102 driver) */

@@ -371,10 +339,6 @@ static void __init omap_palmte_init(void
 	platform_add_devices(palmte_devices, ARRAY_SIZE(palmte_devices));
 
 	spi_register_board_info(palmte_spi_info, ARRAY_SIZE(palmte_spi_info));
-
-	omap_register_gpio_switches(palmte_switches,
-			ARRAY_SIZE(palmte_switches));
-
 	palmte_misc_gpio_setup();
 	omap_serial_init();
 	omap_register_i2c_bus(1, 100, NULL, 0);
arch/arm/mach-omap1/board-sx1.c +0 -1
diff -Nrup --exclude-from=/home/tmlind/src/dontdiff-tony /home/tmlind/src/kernel/linux-omap-2.6/arch/arm/mach-omap1/board-sx1.c ./arch/arm/mach-omap1/board-sx1.c
@@ -33,7 +33,6 @@
 #include <asm/mach/map.h>
 
 #include <mach/gpio.h>
-#include <mach/gpio-switch.h>
 #include <mach/mux.h>
 #include <mach/irda.h>
 #include <mach/usb.h>
arch/arm/mach-omap1/clock.c +86 -78

298 lines not on this page · raw message

arch/arm/mach-omap1/clock.h +67 -67

380 lines not on this page · raw message

arch/arm/mach-omap1/devices.c +1 -1
diff -Nrup --exclude-from=/home/tmlind/src/dontdiff-tony /home/tmlind/src/kernel/linux-omap-2.6/arch/arm/mach-omap1/devices.c ./arch/arm/mach-omap1/devices.c
@@ -86,7 +86,7 @@ static struct resource mbox_resources[] 
 };
 
 static struct platform_device mbox_device = {
-	.name		= "omap1-mailbox",
+	.name		= "mailbox",
 	.id		= -1,
 	.num_resources	= ARRAY_SIZE(mbox_resources),
 	.resource	= mbox_resources,
arch/arm/mach-omap1/Kconfig +4 -0
diff -Nrup --exclude-from=/home/tmlind/src/dontdiff-tony /home/tmlind/src/kernel/linux-omap-2.6/arch/arm/mach-omap1/Kconfig ./arch/arm/mach-omap1/Kconfig
@@ -4,16 +4,19 @@ comment "OMAP Core Type"
 config ARCH_OMAP730
 	depends on ARCH_OMAP1
 	bool "OMAP730 Based System"
+	select CPU_ARM926T
 	select ARCH_OMAP_OTG
 
 config ARCH_OMAP15XX
 	depends on ARCH_OMAP1
 	default y
 	bool "OMAP15xx Based System"
+	select CPU_ARM925T
 
 config ARCH_OMAP16XX
 	depends on ARCH_OMAP1
 	bool "OMAP16xx Based System"
+	select CPU_ARM926T
 	select ARCH_OMAP_OTG
 
 comment "OMAP Board Type"

@@ -38,6 +41,7 @@ config MACH_OMAP_H2
 config MACH_OMAP_H3
 	bool "TI H3 Support"
 	depends on ARCH_OMAP1 && ARCH_OMAP16XX
+#	select GPIOEXPANDER_OMAP
     	help
 	  TI OMAP 1710 H3 board support. Say Y here if you have such
 	  a board.
arch/arm/mach-omap1/mailbox.c +14 -17
diff -Nrup --exclude-from=/home/tmlind/src/dontdiff-tony /home/tmlind/src/kernel/linux-omap-2.6/arch/arm/mach-omap1/mailbox.c ./arch/arm/mach-omap1/mailbox.c
@@ -1,7 +1,7 @@
 /*
  * Mailbox reservation modules for DSP
  *
- * Copyright (C) 2006-2008 Nokia Corporation
+ * Copyright (C) 2006 Nokia Corporation
  * Written by: Hiroshi DOYU <[email protected]>
  *
  * This file is subject to the terms and conditions of the GNU General Public

@@ -17,8 +17,6 @@
 #include <mach/mailbox.h>
 #include <mach/irqs.h>
 
-#define DRV_NAME "omap1-mailbox"
-
 #define MAILBOX_ARM2DSP1		0x00
 #define MAILBOX_ARM2DSP1b		0x04
 #define MAILBOX_DSP2ARM1		0x08

@@ -29,7 +27,7 @@
 #define MAILBOX_DSP2ARM1_Flag		0x1c
 #define MAILBOX_DSP2ARM2_Flag		0x20
 
-static void __iomem *mbox_base;
+unsigned long mbox_base;
 
 struct omap_mbox1_fifo {
 	unsigned long cmd;

@@ -42,14 +40,14 @@ struct omap_mbox1_priv {
 	struct omap_mbox1_fifo rx_fifo;
 };
 
-static inline int mbox_read_reg(size_t ofs)
+static inline int mbox_read_reg(unsigned int reg)
 {
-	return __raw_readw(mbox_base + ofs);
+	return __raw_readw(mbox_base + reg);
 }
 
-static inline void mbox_write_reg(u32 val, size_t ofs)
+static inline void mbox_write_reg(unsigned int val, unsigned int reg)
 {
-	__raw_writew(val, mbox_base + ofs);
+	__raw_writew(val, mbox_base + reg);
 }
 
 /* msg */

@@ -145,7 +143,7 @@ struct omap_mbox mbox_dsp_info = {
 };
 EXPORT_SYMBOL(mbox_dsp_info);
 
-static int __devinit omap1_mbox_probe(struct platform_device *pdev)
+static int __init omap1_mbox_probe(struct platform_device *pdev)
 {
 	struct resource *res;
 	int ret = 0;

@@ -172,10 +170,12 @@ static int __devinit omap1_mbox_probe(st
 	}
 	mbox_dsp_info.irq = res->start;
 
-	return omap_mbox_register(&pdev->dev, &mbox_dsp_info);
+	ret = omap_mbox_register(&mbox_dsp_info);
+
+	return ret;
 }
 
-static int __devexit omap1_mbox_remove(struct platform_device *pdev)
+static int omap1_mbox_remove(struct platform_device *pdev)
 {
 	omap_mbox_unregister(&mbox_dsp_info);
 

@@ -184,9 +184,9 @@ static int __devexit omap1_mbox_remove(s
 
 static struct platform_driver omap1_mbox_driver = {
 	.probe	= omap1_mbox_probe,
-	.remove	= __devexit_p(omap1_mbox_remove),
+	.remove	= omap1_mbox_remove,
 	.driver	= {
-		.name	= DRV_NAME,
+		.name	= "mailbox",
 	},
 };
 

@@ -203,7 +203,4 @@ static void __exit omap1_mbox_exit(void)
 module_init(omap1_mbox_init);
 module_exit(omap1_mbox_exit);
 
-MODULE_LICENSE("GPL v2");
-MODULE_DESCRIPTION("omap mailbox: omap1 architecture specific functions");
-MODULE_AUTHOR("Hiroshi DOYU" <[email protected]>);
-MODULE_ALIAS("platform:"DRV_NAME);
+MODULE_LICENSE("GPL");
arch/arm/mach-omap1/Makefile +0 -6
diff -Nrup --exclude-from=/home/tmlind/src/dontdiff-tony /home/tmlind/src/kernel/linux-omap-2.6/arch/arm/mach-omap1/Makefile ./arch/arm/mach-omap1/Makefile
@@ -13,12 +13,6 @@ obj-$(CONFIG_OMAP_32K_TIMER)	+= timer32k
 # Power Management
 obj-$(CONFIG_PM) += pm.o sleep.o
 
-# DSP
-obj-$(CONFIG_OMAP_MMU_FWK)	+= mmu_mach.o
-obj-$(CONFIG_OMAP_MBOX_FWK)	+= mailbox_mach.o
-mailbox_mach-objs		:= mailbox.o
-mmu_mach-objs			:= mmu.o
-
 led-y := leds.o
 
 # Specific board support
arch/arm/mach-omap1/mcbsp.c +2 -0
diff -Nrup --exclude-from=/home/tmlind/src/dontdiff-tony /home/tmlind/src/kernel/linux-omap-2.6/arch/arm/mach-omap1/mcbsp.c ./arch/arm/mach-omap1/mcbsp.c
@@ -17,7 +17,9 @@
 #include <linux/io.h>
 #include <linux/platform_device.h>
 
+#include <mach/irqs.h>
 #include <mach/dma.h>
+#include <mach/irqs.h>
 #include <mach/mux.h>
 #include <mach/cpu.h>
 #include <mach/mcbsp.h>
arch/arm/mach-omap1/mmu.c +0 -351

351 lines not on this page · raw message

arch/arm/mach-omap1/mmu.h +0 -119

119 lines not on this page · raw message

arch/arm/mach-omap1/time.c +1 -1
diff -Nrup --exclude-from=/home/tmlind/src/dontdiff-tony /home/tmlind/src/kernel/linux-omap-2.6/arch/arm/mach-omap1/time.c ./arch/arm/mach-omap1/time.c
@@ -173,7 +173,7 @@ static __init void omap_init_mpu_timer(u
 	clockevent_mpu_timer1.min_delta_ns =
 		clockevent_delta2ns(1, &clockevent_mpu_timer1);
 
-	clockevent_mpu_timer1.cpumask = cpumask_of_cpu(0);
+	clockevent_mpu_timer1.cpumask = cpumask_of(0);
 	clockevents_register_device(&clockevent_mpu_timer1);
 }
arch/arm/mach-omap1/timer32k.c +1 -1
diff -Nrup --exclude-from=/home/tmlind/src/dontdiff-tony /home/tmlind/src/kernel/linux-omap-2.6/arch/arm/mach-omap1/timer32k.c ./arch/arm/mach-omap1/timer32k.c
@@ -187,7 +187,7 @@ static __init void omap_init_32k_timer(v
 	clockevent_32k_timer.min_delta_ns =
 		clockevent_delta2ns(1, &clockevent_32k_timer);
 
-	clockevent_32k_timer.cpumask = cpumask_of_cpu(0);
+	clockevent_32k_timer.cpumask = cpumask_of(0);
 	clockevents_register_device(&clockevent_32k_timer);
 }
#6 lore raw
In reply to Tony Lindgren
Quoted 19 lines · Tony Lindgren

Hi all,

I'll be merging in v2.6.29-rc1 soonish, and suggest that we make some changes to continue aligning our tree with the mainline tree. So I suggest:

- We move the dspgateway code into a separate branch as discussed earlier.

- We stop using source.mvista.com git tree, and only use the kernel.org git tree. There's no need for having two master trees, and kernel.org is the standard way to go. Big thanks to Monta Vista for hosting us for many years.

- We reset arch/arm/mach-omap1 to be what's in the mainline and tag that patch again with "REMOVE OMAP LEGACY CODE" so it's easy to find later on. Naturally any code in that patch can be reworked so it can be integrated to the mainline kernel.

Quoted 7 lines

- We add a clocks branch maintained by Paul Walmsley that's based off the mainline tree

- We change the pm branch maintained by Kevin Hilman to be based on top of the mainline tree

Comments and suggestions anybody?

Perhaps remove old unused branches?

Signature · 1 line
Felipe Contreras
author reviewer
#7 lore raw
Quoted 23 lines · Felipe Contreras
Quoted 22 lines · Tony Lindgren

Hi all,

I'll be merging in v2.6.29-rc1 soonish, and suggest that we make some changes to continue aligning our tree with the mainline tree. So I suggest:

- We move the dspgateway code into a separate branch as discussed earlier.

- We stop using source.mvista.com git tree, and only use the kernel.org git tree. There's no need for having two master trees, and kernel.org is the standard way to go. Big thanks to Monta Vista for hosting us for many years.

- We reset arch/arm/mach-omap1 to be what's in the mainline and tag that patch again with "REMOVE OMAP LEGACY CODE" so it's easy to find later on. Naturally any code in that patch can be reworked so it can be integrated to the mainline kernel.

- We add a clocks branch maintained by Paul Walmsley that's based off the mainline tree

Quoted 6 lines
Quoted 4 lines

- We change the pm branch maintained by Kevin Hilman to be based on top of the mainline tree

Comments and suggestions anybody?

Perhaps remove old unused branches?

Those are already gone on kernel.org.

Tony

#8 lore raw
Quoted 4 lines · Tony Lindgren
Quoted 4 lines
Quoted 4 lines

- We stop using source.mvista.com git tree, and only use the kernel.org git tree. There's no need for having two master trees, and kernel.org is the standard way to go. Big thanks to Monta Vista for hosting us for many years.

The git path at http://vger.kernel.org/vger-lists.html#linux-omap needs to be changed.

rtg

Signature · 1 line
Tim Gardner [email protected]
author reviewer
#9 lore raw
Quoted 8 lines · Tim Gardner
Quoted 4 lines · Tony Lindgren
Quoted 4 lines
Quoted 4 lines

- We stop using source.mvista.com git tree, and only use the kernel.org git tree. There's no need for having two master trees, and kernel.org is the standard way to go. Big thanks to Monta Vista for hosting us for many years.

The git path at http://vger.kernel.org/vger-lists.html#linux-omap needs to be changed.

Good point. Also needs to be changed at:

http://www.muru.com/linux/omap/README_OMAP_GIT

Tony

author reviewer
#10 lore raw

Please update linux-omap git link at vger (Re: Important changes, please read)

Hi Dave,

Could you please change the linux-omap git link to point to kernel.org instead of source.mvista.com as discussed in the thread below?

Quoted 7 lines · Tony Lindgren
Quoted 6 lines · Tim Gardner
Quoted 4 lines · Tony Lindgren
Quoted 4 lines
Quoted 4 lines

- We stop using source.mvista.com git tree, and only use the kernel.org git tree. There's no need for having two master trees, and kernel.org is the standard way to go. Big thanks to Monta Vista for hosting us for many years.

Quoted 6 lines
Quoted 2 lines

The git path at http://vger.kernel.org/vger-lists.html#linux-omap needs to be changed.

Good point. Also needs to be changed at:

http://www.muru.com/linux/omap/README_OMAP_GIT

I've changed the above link.

Dave, patch against vger-lists.html is attached.

Regards,

Tony

vger-lists.html +1 -1
diff -Nru a/vger-lists.html b/vger-lists.html
@@ -1442,7 +1442,7 @@
 series. Send OMAP related infos, bugs or patches to this list, at least in          
 CC if they affect other subsystems. See
 
-<a href="http://source.mvista.com/git/?p=linux-omap-2.6.git;a=summary">http://source.mvista.com/git/?p=linux-omap-2.6.git;a=summary
+<a href="http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=summary">http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=summary
 </a>
 for OMAP git kernel discussed on this list.
 </pre></td></tr>
#11 lore raw

Re: Please update linux-omap git link at vger

From: Tony Lindgren <[email protected]>
Date: Thu, 15 Jan 2009 11:13:16 +0200

Quoted 3 lines

Could you please change the linux-omap git link to point to kernel.org instead of source.mvista.com as discussed in the thread below?

Done.

It will show up on the web site the next time the cron jobs runs.

author reviewer
#12 lore raw

Re: Please update linux-omap git link at vger

Quoted 11 lines · David Miller

From: Tony Lindgren <[email protected]>
Date: Thu, 15 Jan 2009 11:13:16 +0200

Quoted 3 lines

Could you please change the linux-omap git link to point to kernel.org instead of source.mvista.com as discussed in the thread below?

Done.

It will show up on the web site the next time the cron jobs runs.

Thanks!

Tony

#13 lore raw

Re: Please update linux-omap git link at vger (Re: Important changes, please read)

In reply to Tony Lindgren
Quoted 1 line · Tony Lindgren

Dave, patch against vger-lists.html is attached.

Nope. That file is generated from text files elsewere. Supply clean new data, not HTML junk.

Quoted 16 lines

Regards,

Tony

diff -Nru a/vger-lists.html b/vger-lists.html

vger-lists.html +1 -1
@@ -1442,7 +1442,7 @@
 series. Send OMAP related infos, bugs or patches to this list, at least in          
 CC if they affect other subsystems. See
 
-<a href="http://source.mvista.com/git/?p=linux-omap-2.6.git;a=summary">http://source.mvista.com/git/?p=linux-omap-2.6.git;a=summary
+<a href="http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=summary">http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=summary
 </a>
 for OMAP git kernel discussed on this list.
 </pre></td></tr>
author reviewer
#14 lore raw

Re: Please update linux-omap git link at vger (Re: Important changes, please read)

Quoted 5 lines · Matti Aarnio
Quoted 1 line · Tony Lindgren

Dave, patch against vger-lists.html is attached.

Nope. That file is generated from text files elsewere. Supply clean new data, not HTML junk.

Thanks for the info, next updates will be just data. Looks like Dave already updated the link in the original source.

Tony

Quoted 17 lines
Quoted 16 lines

Regards,

Tony

diff -Nru a/vger-lists.html b/vger-lists.html

vger-lists.html +1 -1
@@ -1442,7 +1442,7 @@
 series. Send OMAP related infos, bugs or patches to this list, at least in          
 CC if they affect other subsystems. See
 
-<a href="http://source.mvista.com/git/?p=linux-omap-2.6.git;a=summary">http://source.mvista.com/git/?p=linux-omap-2.6.git;a=summary
+<a href="http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=summary">http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=summary
 </a>
 for OMAP git kernel discussed on this list.
 </pre></td></tr>
#15 lore raw
In reply to Tony Lindgren
Quoted 4 lines · Tony Lindgren

- We stop using source.mvista.com git tree, and only use the kernel.org git tree. There's no need for having two master trees, and kernel.org is the standard way to go. Big thanks to Monta Vista for hosting us for many years.

This means that the new "OMAP and DaVinci for Dummies" book needs updating already. ;)

I see the DaVinci tree there includes a "WARNING..." that points to the kernel.org tree .. maybe the OMAP tree should do the same.

- Dave
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

author reviewer
#16 lore raw
Quoted 6 lines · David Brownell
Quoted 4 lines · Tony Lindgren

- We stop using source.mvista.com git tree, and only use the kernel.org git tree. There's no need for having two master trees, and kernel.org is the standard way to go. Big thanks to Monta Vista for hosting us for many years.

Quoted 6 lines

This means that the new "OMAP and DaVinci for Dummies" book needs updating already. ;)

I see the DaVinci tree there includes a "WARNING..." that points to the kernel.org tree .. maybe the OMAP tree should do the same.

OK, I've added a warning too, and move linux-omap-2.6.git into linux-omap-2.6-historic.git. So that means it's no longer being updated, but still available for reference.

Please everybody, update your .git/config to point to kernel.org:

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git

or if behind a firewall:

http://www.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git

Regards,

Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html