diff for duplicates of <20100323000927.GX11448@atomide.com> diff --git a/a/1.txt b/N1/1.txt index bf113dc..e4422b0 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -2,9 +2,9 @@ > > > > -----Original Message----- -> > From: Tony Lindgren [mailto:tony@atomide.com] +> > From: Tony Lindgren [mailto:tony at atomide.com] > > Sent: Friday, March 19, 2010 10:03 PM -> > To: linux-arm-kernel@lists.infradead.org; linux-omap@vger.kernel.org +> > To: linux-arm-kernel at lists.infradead.org; linux-omap at vger.kernel.org > > Cc: Pais, Allen; Pandita, Vikram > > Subject: Re: [PATCH] arm: Fix DEBUG_LL for omap zoom2/3 > > diff --git a/a/2.hdr b/a/2.hdr deleted file mode 100644 index d77909b..0000000 --- a/a/2.hdr +++ /dev/null @@ -1,2 +0,0 @@ -Content-Type: text/x-diff; charset=us-ascii -Content-Disposition: inline; filename="zoom-uart.patch" diff --git a/a/2.txt b/a/2.txt deleted file mode 100644 index ec9eca9..0000000 --- a/a/2.txt +++ /dev/null @@ -1,104 +0,0 @@ ->From 5b1cf8010cbb847803db7a1a325f93b3b586005f Mon Sep 17 00:00:00 2001 -From: Tony Lindgren <tony@atomide.com> -Date: Fri, 19 Mar 2010 17:18:45 -0700 -Subject: [PATCH] arm: Fix DEBUG_LL for omap zoom2/3 - -Zoom2 and 3 have UARTs only on the external debug board. -GPMC needs to be mapped early to use it for DEBUG_LL. - -Additionally, 0xfb000000 overlaps with other areas, so -use 0xfa400000 for the virtual address instead. - -Note that with the pending serial.c patches you need to -set console=ttyS0,115200n8 as it will be the only UART -mapped. To use DEBUG_LL, you need to pass also earlyprintk -in cmdline. - -Cc: Allen Pais <allen.pais@ti.com> -Cc: Vikram Pandita <vikram.pandita@ti.com> -Signed-off-by: Tony Lindgren <tony@atomide.com> - -diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S -index eb62bf9..fd870e1 100644 ---- a/arch/arm/kernel/head.S -+++ b/arch/arm/kernel/head.S -@@ -328,6 +328,16 @@ __create_page_tables: - add r0, r4, #0xd8000000 >> 18 - str r3, [r0] - #endif -+#if defined(CONFIG_MACH_OMAP_ZOOM2) || defined(CONFIG_MACH_OMAP_ZOOM3) -+ /* -+ * Zoom2 and Zoom3 have UARTs only on the debug board. -+ * The debug board is connected to the GPMC. -+ */ -+ add r0, r4, #0xfa000000 >> 18 -+ orr r0, r0, #0x00400000 >> 18 @ ZOOM_UART_VIRT -+ orr r3, r7, #0x10000000 @ ZOOM_UART_BASE -+ str r3, [r0] -+#endif - #endif - mov pc, lr - ENDPROC(__create_page_tables) -diff --git a/arch/arm/mach-omap2/board-zoom-debugboard.c b/arch/arm/mach-omap2/board-zoom-debugboard.c -index e15d2e8..1d7f827 100644 ---- a/arch/arm/mach-omap2/board-zoom-debugboard.c -+++ b/arch/arm/mach-omap2/board-zoom-debugboard.c -@@ -82,7 +82,7 @@ static inline void __init zoom_init_smsc911x(void) - - static struct plat_serial8250_port serial_platform_data[] = { - { -- .mapbase = 0x10000000, -+ .mapbase = ZOOM_UART_BASE, - .irq = OMAP_GPIO_IRQ(102), - .flags = UPF_BOOT_AUTOCONF|UPF_IOREMAP|UPF_SHARE_IRQ, - .irqflags = IRQF_SHARED | IRQF_TRIGGER_RISING, -diff --git a/arch/arm/mach-omap2/include/mach/debug-macro.S b/arch/arm/mach-omap2/include/mach/debug-macro.S -index 4a63a2e..231ea27 100644 ---- a/arch/arm/mach-omap2/include/mach/debug-macro.S -+++ b/arch/arm/mach-omap2/include/mach/debug-macro.S -@@ -87,10 +87,10 @@ omap_uart_lsr: .word 0 - b 98f - 44: mov \rx, #UART_OFFSET(OMAP4_UART4_BASE) - b 98f --95: mov \rx, #ZOOM_UART_BASE -+95: ldr \rx, =ZOOM_UART_BASE - ldr \tmp, =omap_uart_phys - str \rx, [\tmp, #0] -- mov \rx, #ZOOM_UART_VIRT -+ ldr \rx, =ZOOM_UART_VIRT - ldr \tmp, =omap_uart_virt - str \rx, [\tmp, #0] - mov \rx, #(UART_LSR << ZOOM_PORT_SHIFT) -diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c -index 87f676a..3cfb425 100644 ---- a/arch/arm/mach-omap2/io.c -+++ b/arch/arm/mach-omap2/io.c -@@ -166,6 +166,15 @@ static struct map_desc omap34xx_io_desc[] __initdata = { - .length = L4_EMU_34XX_SIZE, - .type = MT_DEVICE - }, -+#if defined(CONFIG_DEBUG_LL) && \ -+ (defined(CONFIG_MACH_OMAP_ZOOM2) || defined(CONFIG_MACH_OMAP_ZOOM3)) -+ { -+ .virtual = ZOOM_UART_VIRT, -+ .pfn = __phys_to_pfn(ZOOM_UART_BASE), -+ .length = SZ_1M, -+ .type = MT_DEVICE -+ }, -+#endif - }; - #endif - #ifdef CONFIG_ARCH_OMAP4 -diff --git a/arch/arm/plat-omap/include/plat/serial.h b/arch/arm/plat-omap/include/plat/serial.h -index 83dce4c..9ec7eab 100644 ---- a/arch/arm/plat-omap/include/plat/serial.h -+++ b/arch/arm/plat-omap/include/plat/serial.h -@@ -39,7 +39,7 @@ - - /* External port on Zoom2/3 */ - #define ZOOM_UART_BASE 0x10000000 --#define ZOOM_UART_VIRT 0xfb000000 -+#define ZOOM_UART_VIRT 0xfa400000 - - #define OMAP_PORT_SHIFT 2 - #define OMAP7XX_PORT_SHIFT 0 diff --git a/a/content_digest b/N1/content_digest index d84fab5..c95e787 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,24 +3,19 @@ "ref\020100320024827.GC11448@atomide.com\0" "ref\020100320030239.GD11448@atomide.com\0" "ref\0FCCFB4CDC6E5564B9182F639FC35608703045F314F@dbde02.ent.ti.com\0" - "From\0Tony Lindgren <tony@atomide.com>\0" - "Subject\0Re: [PATCH] arm: Fix DEBUG_LL for omap zoom2/3\0" + "From\0tony@atomide.com (Tony Lindgren)\0" + "Subject\0[PATCH] arm: Fix DEBUG_LL for omap zoom2/3\0" "Date\0Mon, 22 Mar 2010 17:09:28 -0700\0" - "To\0Pandita" - " Vikram <vikram.pandita@ti.com>\0" - "Cc\0linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org>" - linux-omap@vger.kernel.org <linux-omap@vger.kernel.org> - Pais - " Allen <allen.pais@ti.com>\0" - "\01:1\0" + "To\0linux-arm-kernel@lists.infradead.org\0" + "\00:1\0" "b\0" "* Pandita, Vikram <vikram.pandita@ti.com> [100320 15:56]:\n" "> \n" "> \n" "> > -----Original Message-----\n" - "> > From: Tony Lindgren [mailto:tony@atomide.com]\n" + "> > From: Tony Lindgren [mailto:tony at atomide.com]\n" "> > Sent: Friday, March 19, 2010 10:03 PM\n" - "> > To: linux-arm-kernel@lists.infradead.org; linux-omap@vger.kernel.org\n" + "> > To: linux-arm-kernel at lists.infradead.org; linux-omap at vger.kernel.org\n" "> > Cc: Pais, Allen; Pandita, Vikram\n" "> > Subject: Re: [PATCH] arm: Fix DEBUG_LL for omap zoom2/3\n" "> > \n" @@ -55,112 +50,5 @@ "Regards,\n" "\n" Tony - "\01:2\0" - "fn\0zoom-uart.patch\0" - "b\0" - ">From 5b1cf8010cbb847803db7a1a325f93b3b586005f Mon Sep 17 00:00:00 2001\n" - "From: Tony Lindgren <tony@atomide.com>\n" - "Date: Fri, 19 Mar 2010 17:18:45 -0700\n" - "Subject: [PATCH] arm: Fix DEBUG_LL for omap zoom2/3\n" - "\n" - "Zoom2 and 3 have UARTs only on the external debug board.\n" - "GPMC needs to be mapped early to use it for DEBUG_LL.\n" - "\n" - "Additionally, 0xfb000000 overlaps with other areas, so\n" - "use 0xfa400000 for the virtual address instead.\n" - "\n" - "Note that with the pending serial.c patches you need to\n" - "set console=ttyS0,115200n8 as it will be the only UART\n" - "mapped. To use DEBUG_LL, you need to pass also earlyprintk\n" - "in cmdline.\n" - "\n" - "Cc: Allen Pais <allen.pais@ti.com>\n" - "Cc: Vikram Pandita <vikram.pandita@ti.com>\n" - "Signed-off-by: Tony Lindgren <tony@atomide.com>\n" - "\n" - "diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S\n" - "index eb62bf9..fd870e1 100644\n" - "--- a/arch/arm/kernel/head.S\n" - "+++ b/arch/arm/kernel/head.S\n" - "@@ -328,6 +328,16 @@ __create_page_tables:\n" - " \tadd\tr0, r4, #0xd8000000 >> 18\n" - " \tstr\tr3, [r0]\n" - " #endif\n" - "+#if defined(CONFIG_MACH_OMAP_ZOOM2) || defined(CONFIG_MACH_OMAP_ZOOM3)\n" - "+\t/*\n" - "+\t * Zoom2 and Zoom3 have UARTs only on the debug board.\n" - "+\t * The debug board is connected to the GPMC.\n" - "+\t */\n" - "+\tadd\tr0, r4, #0xfa000000 >> 18\n" - "+\torr\tr0, r0, #0x00400000 >> 18\t@ ZOOM_UART_VIRT\n" - "+\torr\tr3, r7, #0x10000000\t\t@ ZOOM_UART_BASE\n" - "+\tstr\tr3, [r0]\n" - "+#endif\n" - " #endif\n" - " \tmov\tpc, lr\n" - " ENDPROC(__create_page_tables)\n" - "diff --git a/arch/arm/mach-omap2/board-zoom-debugboard.c b/arch/arm/mach-omap2/board-zoom-debugboard.c\n" - "index e15d2e8..1d7f827 100644\n" - "--- a/arch/arm/mach-omap2/board-zoom-debugboard.c\n" - "+++ b/arch/arm/mach-omap2/board-zoom-debugboard.c\n" - "@@ -82,7 +82,7 @@ static inline void __init zoom_init_smsc911x(void)\n" - " \n" - " static struct plat_serial8250_port serial_platform_data[] = {\n" - " \t{\n" - "-\t\t.mapbase\t= 0x10000000,\n" - "+\t\t.mapbase\t= ZOOM_UART_BASE,\n" - " \t\t.irq\t\t= OMAP_GPIO_IRQ(102),\n" - " \t\t.flags\t\t= UPF_BOOT_AUTOCONF|UPF_IOREMAP|UPF_SHARE_IRQ,\n" - " \t\t.irqflags\t= IRQF_SHARED | IRQF_TRIGGER_RISING,\n" - "diff --git a/arch/arm/mach-omap2/include/mach/debug-macro.S b/arch/arm/mach-omap2/include/mach/debug-macro.S\n" - "index 4a63a2e..231ea27 100644\n" - "--- a/arch/arm/mach-omap2/include/mach/debug-macro.S\n" - "+++ b/arch/arm/mach-omap2/include/mach/debug-macro.S\n" - "@@ -87,10 +87,10 @@ omap_uart_lsr:\t.word\t0\n" - " \t\tb\t98f\n" - " 44:\t\tmov\t\\rx, #UART_OFFSET(OMAP4_UART4_BASE)\n" - " \t\tb\t98f\n" - "-95:\t\tmov\t\\rx, #ZOOM_UART_BASE\n" - "+95:\t\tldr\t\\rx, =ZOOM_UART_BASE\n" - " \t\tldr\t\\tmp, =omap_uart_phys\n" - " \t\tstr\t\\rx, [\\tmp, #0]\n" - "-\t\tmov\t\\rx, #ZOOM_UART_VIRT\n" - "+\t\tldr\t\\rx, =ZOOM_UART_VIRT\n" - " \t\tldr\t\\tmp, =omap_uart_virt\n" - " \t\tstr\t\\rx, [\\tmp, #0]\n" - " \t\tmov\t\\rx, #(UART_LSR << ZOOM_PORT_SHIFT)\n" - "diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c\n" - "index 87f676a..3cfb425 100644\n" - "--- a/arch/arm/mach-omap2/io.c\n" - "+++ b/arch/arm/mach-omap2/io.c\n" - "@@ -166,6 +166,15 @@ static struct map_desc omap34xx_io_desc[] __initdata = {\n" - " \t\t.length\t\t= L4_EMU_34XX_SIZE,\n" - " \t\t.type\t\t= MT_DEVICE\n" - " \t},\n" - "+#if defined(CONFIG_DEBUG_LL) &&\t\t\t\t\t\t\t\\\n" - "+\t(defined(CONFIG_MACH_OMAP_ZOOM2) || defined(CONFIG_MACH_OMAP_ZOOM3))\n" - "+\t{\n" - "+\t\t.virtual\t= ZOOM_UART_VIRT,\n" - "+\t\t.pfn\t\t= __phys_to_pfn(ZOOM_UART_BASE),\n" - "+\t\t.length\t\t= SZ_1M,\n" - "+\t\t.type\t\t= MT_DEVICE\n" - "+\t},\n" - "+#endif\n" - " };\n" - " #endif\n" - " #ifdef\tCONFIG_ARCH_OMAP4\n" - "diff --git a/arch/arm/plat-omap/include/plat/serial.h b/arch/arm/plat-omap/include/plat/serial.h\n" - "index 83dce4c..9ec7eab 100644\n" - "--- a/arch/arm/plat-omap/include/plat/serial.h\n" - "+++ b/arch/arm/plat-omap/include/plat/serial.h\n" - "@@ -39,7 +39,7 @@\n" - " \n" - " /* External port on Zoom2/3 */\n" - " #define ZOOM_UART_BASE\t\t0x10000000\n" - "-#define ZOOM_UART_VIRT\t\t0xfb000000\n" - "+#define ZOOM_UART_VIRT\t\t0xfa400000\n" - " \n" - " #define OMAP_PORT_SHIFT\t\t2\n" - " #define OMAP7XX_PORT_SHIFT\t0" -053118fc66d7a0f8df9cc9f658cc0ace55ea196131020e6b877910f42801ec9f +81e240a5c8a2ed3ca81b9e260c186437a058b60548951f801ed10f744a6065e6
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.