diff for duplicates of <20100504005709.GE29604@atomide.com> diff --git a/a/2.hdr b/a/2.hdr deleted file mode 100644 index 65cf08a..0000000 --- a/a/2.hdr +++ /dev/null @@ -1,2 +0,0 @@ -Content-Type: text/x-diff; charset=us-ascii -Content-Disposition: inline; filename="omap-debug-ll-memory.patch" diff --git a/a/2.txt b/a/2.txt deleted file mode 100644 index 8c75704..0000000 --- a/a/2.txt +++ /dev/null @@ -1,212 +0,0 @@ ->From 96554d70775e936e870f61d9523c9bab3fd54ad6 Mon Sep 17 00:00:00 2001 -From: Tony Lindgren <tony@atomide.com> -Date: Fri, 30 Apr 2010 17:39:19 -0700 -Subject: [PATCH] omap: Use a memory address for storing the debug port info instead of UART1 scratchpad - -This removes the dependency to the UART1 being available for storing -the debug configuration in uncompress.h. This will simplify the -DEBUG_LL UART configuration for boards that may not have UART1, or -have an external UART as it requires only one mapping for DEBUG_LL. - -The patch has a few limitations. Basically now we're assuming that -the kernel uncompress code won't overlap with OMAP_UART_INFO. We also -assume the printascii is called at least once before paging_init in -order for addruart to have a chance to read the UART setup from -OMAP_UART_INFO. - -As suggested by Cyril Chemparathy <cyril@ti.com>, -Vikram Pandita <vikram.pandita@ti.com> and -Kevin Hilman <khilman@deeprootsystems.com>. Based on an earlier -patch posted for Davinci by Cyril Chemparathy <cyril@ti.com>. - -Signed-off-by: Tony Lindgren <tony@atomide.com> - -diff --git a/arch/arm/mach-omap1/include/mach/debug-macro.S b/arch/arm/mach-omap1/include/mach/debug-macro.S -index b6d9584..e8a8cf3 100644 ---- a/arch/arm/mach-omap1/include/mach/debug-macro.S -+++ b/arch/arm/mach-omap1/include/mach/debug-macro.S -@@ -13,6 +13,8 @@ - - #include <linux/serial_reg.h> - -+#include <asm/memory.h> -+ - #include <plat/serial.h> - - .pushsection .data -@@ -37,23 +39,12 @@ omap_uart_virt: .word 0x0 - cmp \rx, #0 @ is port configured? - bne 99f @ already configured - -- /* Check 7XX UART1 scratchpad register for uart to use */ -+ /* Check the debug UART configuration set in uncompress.h */ - mrc p15, 0, \rx, c1, c0 - tst \rx, #1 @ MMU enabled? -- moveq \rx, #0xff000000 @ physical base address -- movne \rx, #0xfe000000 @ virtual base -- orr \rx, \rx, #0x00fb0000 @ OMAP1UART1 -- ldrb \rx, [\rx, #(UART_SCR << OMAP7XX_PORT_SHIFT)] -- cmp \rx, #0 @ anything in 7XX scratchpad? -- bne 10f @ found 7XX uart -- -- /* Check 15xx/16xx UART1 scratchpad register for uart to use */ -- mrc p15, 0, \rx, c1, c0 -- tst \rx, #1 @ MMU enabled? -- moveq \rx, #0xff000000 @ physical base address -- movne \rx, #0xfe000000 @ virtual base -- orr \rx, \rx, #0x00fb0000 @ OMAP1UART1 -- ldrb \rx, [\rx, #(UART_SCR << OMAP_PORT_SHIFT)] -+ ldreq \rx, =OMAP_UART_INFO -+ ldrne \rx, =__phys_to_virt(OMAP_UART_INFO) -+ ldr \rx, [\rx, #0] - - /* Select the UART to use based on the UART1 scratchpad value */ - 10: cmp \rx, #0 @ no port configured? -diff --git a/arch/arm/mach-omap2/include/mach/debug-macro.S b/arch/arm/mach-omap2/include/mach/debug-macro.S -index 4a63a2e..4976169 100644 ---- a/arch/arm/mach-omap2/include/mach/debug-macro.S -+++ b/arch/arm/mach-omap2/include/mach/debug-macro.S -@@ -13,6 +13,8 @@ - - #include <linux/serial_reg.h> - -+#include <asm/memory.h> -+ - #include <plat/serial.h> - - #define UART_OFFSET(addr) ((addr) & 0x00ffffff) -@@ -40,13 +42,12 @@ omap_uart_lsr: .word 0 - cmp \rx, #0 @ is port configured? - bne 99f @ already configured - -- /* Check UART1 scratchpad register for uart to use */ -+ /* Check the debug UART configuration set in uncompress.h */ - mrc p15, 0, \rx, c1, c0 - tst \rx, #1 @ MMU enabled? -- moveq \rx, #0x48000000 @ physical base address -- movne \rx, #0xfa000000 @ virtual base -- orr \rx, \rx, #0x0006a000 @ uart1 on omap2/3/4 -- ldrb \rx, [\rx, #(UART_SCR << OMAP_PORT_SHIFT)] @ scratchpad -+ ldreq \rx, =OMAP_UART_INFO -+ ldrne \rx, =__phys_to_virt(OMAP_UART_INFO) -+ ldr \rx, [\rx, #0] - - /* Select the UART to use based on the UART1 scratchpad value */ - cmp \rx, #0 @ no port configured? -diff --git a/arch/arm/plat-omap/include/plat/serial.h b/arch/arm/plat-omap/include/plat/serial.h -index 83dce4c..42a6318 100644 ---- a/arch/arm/plat-omap/include/plat/serial.h -+++ b/arch/arm/plat-omap/include/plat/serial.h -@@ -15,6 +15,20 @@ - - #include <linux/init.h> - -+/* -+ * Memory entry used for the DEBUG_LL UART configuration. See also -+ * uncompress.h and debug-macro.S. -+ * -+ * Note that using a memory location for storing the UART configuration -+ * has at least two limitations: -+ * -+ * 1. Kernel uncompress code cannot overlap OMAP_UART_INFO as the -+ * uncompress code could then partially overwrite itself -+ * 2. We assume printascii is called at least once before paging_init, -+ * and addruart has a chance to read OMAP_UART_INFO -+ */ -+#define OMAP_UART_INFO (PHYS_OFFSET + 0x3ffc) -+ - /* OMAP1 serial ports */ - #define OMAP1_UART1_BASE 0xfffb0000 - #define OMAP1_UART2_BASE 0xfffb0800 -diff --git a/arch/arm/plat-omap/include/plat/uncompress.h b/arch/arm/plat-omap/include/plat/uncompress.h -index 81d9ec5..bbedd71 100644 ---- a/arch/arm/plat-omap/include/plat/uncompress.h -+++ b/arch/arm/plat-omap/include/plat/uncompress.h -@@ -20,27 +20,21 @@ - #include <linux/types.h> - #include <linux/serial_reg.h> - -+#include <asm/memory.h> - #include <asm/mach-types.h> - - #include <plat/serial.h> - --static volatile u8 *uart1_base; --static int uart1_shift; -- - static volatile u8 *uart_base; - static int uart_shift; - - /* -- * Store the DEBUG_LL uart number into UART1 scratchpad register. -+ * Store the DEBUG_LL uart number into memory. - * See also debug-macro.S, and serial.c for related code. -- * -- * Please note that we currently assume that: -- * - UART1 clocks are enabled for register access -- * - UART1 scratchpad register can be used - */ --static void set_uart1_scratchpad(unsigned char port) -+static void set_omap_uart_info(unsigned char port) - { -- uart1_base[UART_SCR << uart1_shift] = port; -+ *(volatile u32 *)OMAP_UART_INFO = port; - } - - static void putc(int c) -@@ -60,42 +54,38 @@ static inline void flush(void) - /* - * Macros to configure UART1 and debug UART - */ --#define _DEBUG_LL_ENTRY(mach, uart1_phys, uart1_shft, \ -- dbg_uart, dbg_shft, dbg_id) \ -+#define _DEBUG_LL_ENTRY(mach, dbg_uart, dbg_shft, dbg_id) \ - if (machine_is_##mach()) { \ -- uart1_base = (volatile u8 *)(uart1_phys); \ -- uart1_shift = (uart1_shft); \ - uart_base = (volatile u8 *)(dbg_uart); \ - uart_shift = (dbg_shft); \ - port = (dbg_id); \ -- set_uart1_scratchpad(port); \ -+ set_omap_uart_info(port); \ - break; \ - } - - #define DEBUG_LL_OMAP7XX(p, mach) \ -- _DEBUG_LL_ENTRY(mach, OMAP1_UART1_BASE, OMAP7XX_PORT_SHIFT, \ -- OMAP1_UART##p##_BASE, OMAP7XX_PORT_SHIFT, OMAP1UART##p) -+ _DEBUG_LL_ENTRY(mach, OMAP1_UART##p##_BASE, OMAP7XX_PORT_SHIFT, \ -+ OMAP1UART##p) - - #define DEBUG_LL_OMAP1(p, mach) \ -- _DEBUG_LL_ENTRY(mach, OMAP1_UART1_BASE, OMAP_PORT_SHIFT, \ -- OMAP1_UART##p##_BASE, OMAP_PORT_SHIFT, OMAP1UART##p) -+ _DEBUG_LL_ENTRY(mach, OMAP1_UART##p##_BASE, OMAP_PORT_SHIFT, \ -+ OMAP1UART##p) - - #define DEBUG_LL_OMAP2(p, mach) \ -- _DEBUG_LL_ENTRY(mach, OMAP2_UART1_BASE, OMAP_PORT_SHIFT, \ -- OMAP2_UART##p##_BASE, OMAP_PORT_SHIFT, OMAP2UART##p) -+ _DEBUG_LL_ENTRY(mach, OMAP2_UART##p##_BASE, OMAP_PORT_SHIFT, \ -+ OMAP2UART##p) - - #define DEBUG_LL_OMAP3(p, mach) \ -- _DEBUG_LL_ENTRY(mach, OMAP3_UART1_BASE, OMAP_PORT_SHIFT, \ -- OMAP3_UART##p##_BASE, OMAP_PORT_SHIFT, OMAP3UART##p) -+ _DEBUG_LL_ENTRY(mach, OMAP3_UART##p##_BASE, OMAP_PORT_SHIFT, \ -+ OMAP3UART##p) - - #define DEBUG_LL_OMAP4(p, mach) \ -- _DEBUG_LL_ENTRY(mach, OMAP4_UART1_BASE, OMAP_PORT_SHIFT, \ -- OMAP4_UART##p##_BASE, OMAP_PORT_SHIFT, OMAP4UART##p) -+ _DEBUG_LL_ENTRY(mach, OMAP4_UART##p##_BASE, OMAP_PORT_SHIFT, \ -+ OMAP4UART##p) - - /* Zoom2/3 shift is different for UART1 and external port */ - #define DEBUG_LL_ZOOM(mach) \ -- _DEBUG_LL_ENTRY(mach, OMAP2_UART1_BASE, OMAP_PORT_SHIFT, \ -- ZOOM_UART_BASE, ZOOM_PORT_SHIFT, ZOOM_UART) -+ _DEBUG_LL_ENTRY(mach, ZOOM_UART_BASE, ZOOM_PORT_SHIFT, ZOOM_UART) - - static inline void __arch_decomp_setup(unsigned long arch_id) - { diff --git a/a/content_digest b/N1/content_digest index f47abe3..f8efea1 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -8,17 +8,11 @@ "ref\020100501015050.GM29604@atomide.com\0" "ref\0FCCFB4CDC6E5564B9182F639FC3560870304F5A672@dbde02.ent.ti.com\0" "ref\020100504004001.GB29604@atomide.com\0" - "From\0Tony Lindgren <tony@atomide.com>\0" + "From\0tony@atomide.com (Tony Lindgren)\0" "Subject\0[PATCH 02a/11] omap: Use a memory address for storing the debug port info instead of UART1 scratchpad\0" "Date\0Mon, 3 May 2010 17:57:09 -0700\0" - "To\0Pandita" - " Vikram <vikram.pandita@ti.com>\0" - "Cc\0Kevin Hilman <khilman@deeprootsystems.com>" - linux-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" "Here's this patch one more time. I updated the comments\n" "for what I think the new shortcomings are.\n" @@ -29,220 +23,5 @@ "Regards,\n" "\n" Tony - "\01:2\0" - "fn\0omap-debug-ll-memory.patch\0" - "b\0" - ">From 96554d70775e936e870f61d9523c9bab3fd54ad6 Mon Sep 17 00:00:00 2001\n" - "From: Tony Lindgren <tony@atomide.com>\n" - "Date: Fri, 30 Apr 2010 17:39:19 -0700\n" - "Subject: [PATCH] omap: Use a memory address for storing the debug port info instead of UART1 scratchpad\n" - "\n" - "This removes the dependency to the UART1 being available for storing\n" - "the debug configuration in uncompress.h. This will simplify the\n" - "DEBUG_LL UART configuration for boards that may not have UART1, or\n" - "have an external UART as it requires only one mapping for DEBUG_LL.\n" - "\n" - "The patch has a few limitations. Basically now we're assuming that\n" - "the kernel uncompress code won't overlap with OMAP_UART_INFO. We also\n" - "assume the printascii is called at least once before paging_init in\n" - "order for addruart to have a chance to read the UART setup from\n" - "OMAP_UART_INFO.\n" - "\n" - "As suggested by Cyril Chemparathy <cyril@ti.com>,\n" - "Vikram Pandita <vikram.pandita@ti.com> and\n" - "Kevin Hilman <khilman@deeprootsystems.com>. Based on an earlier\n" - "patch posted for Davinci by Cyril Chemparathy <cyril@ti.com>.\n" - "\n" - "Signed-off-by: Tony Lindgren <tony@atomide.com>\n" - "\n" - "diff --git a/arch/arm/mach-omap1/include/mach/debug-macro.S b/arch/arm/mach-omap1/include/mach/debug-macro.S\n" - "index b6d9584..e8a8cf3 100644\n" - "--- a/arch/arm/mach-omap1/include/mach/debug-macro.S\n" - "+++ b/arch/arm/mach-omap1/include/mach/debug-macro.S\n" - "@@ -13,6 +13,8 @@\n" - " \n" - " #include <linux/serial_reg.h>\n" - " \n" - "+#include <asm/memory.h>\n" - "+\n" - " #include <plat/serial.h>\n" - " \n" - " \t\t.pushsection .data\n" - "@@ -37,23 +39,12 @@ omap_uart_virt:\t.word\t0x0\n" - " \t\tcmp\t\\rx, #0\t\t\t@ is port configured?\n" - " \t\tbne\t99f\t\t\t@ already configured\n" - " \n" - "-\t\t/* Check 7XX UART1 scratchpad register for uart to use */\n" - "+\t\t/* Check the debug UART configuration set in uncompress.h */\n" - " \t\tmrc\tp15, 0, \\rx, c1, c0\n" - " \t\ttst\t\\rx, #1\t\t\t@ MMU enabled?\n" - "-\t\tmoveq\t\\rx, #0xff000000\t@ physical base address\n" - "-\t\tmovne\t\\rx, #0xfe000000\t@ virtual base\n" - "-\t\torr\t\\rx, \\rx, #0x00fb0000\t@ OMAP1UART1\n" - "-\t\tldrb\t\\rx, [\\rx, #(UART_SCR << OMAP7XX_PORT_SHIFT)]\n" - "-\t\tcmp\t\\rx, #0\t\t\t@ anything in 7XX scratchpad?\n" - "-\t\tbne\t10f\t\t\t@ found 7XX uart\n" - "-\n" - "-\t\t/* Check 15xx/16xx UART1 scratchpad register for uart to use */\n" - "-\t\tmrc\tp15, 0, \\rx, c1, c0\n" - "-\t\ttst\t\\rx, #1\t\t\t@ MMU enabled?\n" - "-\t\tmoveq\t\\rx, #0xff000000\t@ physical base address\n" - "-\t\tmovne\t\\rx, #0xfe000000\t@ virtual base\n" - "-\t\torr\t\\rx, \\rx, #0x00fb0000\t@ OMAP1UART1\n" - "-\t\tldrb\t\\rx, [\\rx, #(UART_SCR << OMAP_PORT_SHIFT)]\n" - "+\t\tldreq\t\\rx, =OMAP_UART_INFO\n" - "+\t\tldrne\t\\rx, =__phys_to_virt(OMAP_UART_INFO)\n" - "+\t\tldr\t\\rx, [\\rx, #0]\n" - " \n" - " \t\t/* Select the UART to use based on the UART1 scratchpad value */\n" - " 10:\t\tcmp\t\\rx, #0\t\t\t@ no port configured?\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..4976169 100644\n" - "--- a/arch/arm/mach-omap2/include/mach/debug-macro.S\n" - "+++ b/arch/arm/mach-omap2/include/mach/debug-macro.S\n" - "@@ -13,6 +13,8 @@\n" - " \n" - " #include <linux/serial_reg.h>\n" - " \n" - "+#include <asm/memory.h>\n" - "+\n" - " #include <plat/serial.h>\n" - " \n" - " #define UART_OFFSET(addr)\t((addr) & 0x00ffffff)\n" - "@@ -40,13 +42,12 @@ omap_uart_lsr:\t.word\t0\n" - " \t\tcmp\t\\rx, #0\t\t\t@ is port configured?\n" - " \t\tbne\t99f\t\t\t@ already configured\n" - " \n" - "-\t\t/* Check UART1 scratchpad register for uart to use */\n" - "+\t\t/* Check the debug UART configuration set in uncompress.h */\n" - " \t\tmrc\tp15, 0, \\rx, c1, c0\n" - " \t\ttst\t\\rx, #1\t\t\t@ MMU enabled?\n" - "-\t\tmoveq\t\\rx, #0x48000000\t@ physical base address\n" - "-\t\tmovne\t\\rx, #0xfa000000\t@ virtual base\n" - "-\t\torr\t\\rx, \\rx, #0x0006a000\t@ uart1 on omap2/3/4\n" - "-\t\tldrb\t\\rx, [\\rx, #(UART_SCR << OMAP_PORT_SHIFT)] @ scratchpad\n" - "+\t\tldreq\t\\rx, =OMAP_UART_INFO\n" - "+\t\tldrne\t\\rx, =__phys_to_virt(OMAP_UART_INFO)\n" - "+\t\tldr\t\\rx, [\\rx, #0]\n" - " \n" - " \t\t/* Select the UART to use based on the UART1 scratchpad value */\n" - " \t\tcmp\t\\rx, #0\t\t\t@ no port configured?\n" - "diff --git a/arch/arm/plat-omap/include/plat/serial.h b/arch/arm/plat-omap/include/plat/serial.h\n" - "index 83dce4c..42a6318 100644\n" - "--- a/arch/arm/plat-omap/include/plat/serial.h\n" - "+++ b/arch/arm/plat-omap/include/plat/serial.h\n" - "@@ -15,6 +15,20 @@\n" - " \n" - " #include <linux/init.h>\n" - " \n" - "+/*\n" - "+ * Memory entry used for the DEBUG_LL UART configuration. See also\n" - "+ * uncompress.h and debug-macro.S.\n" - "+ *\n" - "+ * Note that using a memory location for storing the UART configuration\n" - "+ * has at least two limitations:\n" - "+ *\n" - "+ * 1. Kernel uncompress code cannot overlap OMAP_UART_INFO as the\n" - "+ * uncompress code could then partially overwrite itself\n" - "+ * 2. We assume printascii is called at least once before paging_init,\n" - "+ * and addruart has a chance to read OMAP_UART_INFO\n" - "+ */\n" - "+#define OMAP_UART_INFO\t\t(PHYS_OFFSET + 0x3ffc)\n" - "+\n" - " /* OMAP1 serial ports */\n" - " #define OMAP1_UART1_BASE\t0xfffb0000\n" - " #define OMAP1_UART2_BASE\t0xfffb0800\n" - "diff --git a/arch/arm/plat-omap/include/plat/uncompress.h b/arch/arm/plat-omap/include/plat/uncompress.h\n" - "index 81d9ec5..bbedd71 100644\n" - "--- a/arch/arm/plat-omap/include/plat/uncompress.h\n" - "+++ b/arch/arm/plat-omap/include/plat/uncompress.h\n" - "@@ -20,27 +20,21 @@\n" - " #include <linux/types.h>\n" - " #include <linux/serial_reg.h>\n" - " \n" - "+#include <asm/memory.h>\n" - " #include <asm/mach-types.h>\n" - " \n" - " #include <plat/serial.h>\n" - " \n" - "-static volatile u8 *uart1_base;\n" - "-static int uart1_shift;\n" - "-\n" - " static volatile u8 *uart_base;\n" - " static int uart_shift;\n" - " \n" - " /*\n" - "- * Store the DEBUG_LL uart number into UART1 scratchpad register.\n" - "+ * Store the DEBUG_LL uart number into memory.\n" - " * See also debug-macro.S, and serial.c for related code.\n" - "- *\n" - "- * Please note that we currently assume that:\n" - "- * - UART1 clocks are enabled for register access\n" - "- * - UART1 scratchpad register can be used\n" - " */\n" - "-static void set_uart1_scratchpad(unsigned char port)\n" - "+static void set_omap_uart_info(unsigned char port)\n" - " {\n" - "-\tuart1_base[UART_SCR << uart1_shift] = port;\n" - "+\t*(volatile u32 *)OMAP_UART_INFO = port;\n" - " }\n" - " \n" - " static void putc(int c)\n" - "@@ -60,42 +54,38 @@ static inline void flush(void)\n" - " /*\n" - " * Macros to configure UART1 and debug UART\n" - " */\n" - "-#define _DEBUG_LL_ENTRY(mach, uart1_phys, uart1_shft,\t\t\t\\\n" - "-\t\t\tdbg_uart, dbg_shft, dbg_id)\t\t\t\\\n" - "+#define _DEBUG_LL_ENTRY(mach, dbg_uart, dbg_shft, dbg_id)\t\t\\\n" - " \tif (machine_is_##mach()) {\t\t\t\t\t\\\n" - "-\t\tuart1_base = (volatile u8 *)(uart1_phys);\t\t\\\n" - "-\t\tuart1_shift = (uart1_shft);\t\t\t\t\\\n" - " \t\tuart_base = (volatile u8 *)(dbg_uart);\t\t\t\\\n" - " \t\tuart_shift = (dbg_shft);\t\t\t\t\\\n" - " \t\tport = (dbg_id);\t\t\t\t\t\\\n" - "-\t\tset_uart1_scratchpad(port);\t\t\t\t\\\n" - "+\t\tset_omap_uart_info(port);\t\t\t\t\\\n" - " \t\tbreak;\t\t\t\t\t\t\t\\\n" - " \t}\n" - " \n" - " #define DEBUG_LL_OMAP7XX(p, mach)\t\t\t\t\t\\\n" - "-\t_DEBUG_LL_ENTRY(mach, OMAP1_UART1_BASE, OMAP7XX_PORT_SHIFT,\t\\\n" - "-\t\tOMAP1_UART##p##_BASE, OMAP7XX_PORT_SHIFT, OMAP1UART##p)\n" - "+\t_DEBUG_LL_ENTRY(mach, OMAP1_UART##p##_BASE, OMAP7XX_PORT_SHIFT,\t\\\n" - "+\t\tOMAP1UART##p)\n" - " \n" - " #define DEBUG_LL_OMAP1(p, mach)\t\t\t\t\t\t\\\n" - "-\t_DEBUG_LL_ENTRY(mach, OMAP1_UART1_BASE, OMAP_PORT_SHIFT,\t\\\n" - "-\t\tOMAP1_UART##p##_BASE, OMAP_PORT_SHIFT, OMAP1UART##p)\n" - "+\t_DEBUG_LL_ENTRY(mach, OMAP1_UART##p##_BASE, OMAP_PORT_SHIFT,\t\\\n" - "+\t\tOMAP1UART##p)\n" - " \n" - " #define DEBUG_LL_OMAP2(p, mach)\t\t\t\t\t\t\\\n" - "-\t_DEBUG_LL_ENTRY(mach, OMAP2_UART1_BASE, OMAP_PORT_SHIFT,\t\\\n" - "-\t\tOMAP2_UART##p##_BASE, OMAP_PORT_SHIFT, OMAP2UART##p)\n" - "+\t_DEBUG_LL_ENTRY(mach, OMAP2_UART##p##_BASE, OMAP_PORT_SHIFT,\t\\\n" - "+\t\tOMAP2UART##p)\n" - " \n" - " #define DEBUG_LL_OMAP3(p, mach)\t\t\t\t\t\t\\\n" - "-\t_DEBUG_LL_ENTRY(mach, OMAP3_UART1_BASE, OMAP_PORT_SHIFT,\t\\\n" - "-\t\tOMAP3_UART##p##_BASE, OMAP_PORT_SHIFT, OMAP3UART##p)\n" - "+\t_DEBUG_LL_ENTRY(mach, OMAP3_UART##p##_BASE, OMAP_PORT_SHIFT,\t\\\n" - "+\t\tOMAP3UART##p)\n" - " \n" - " #define DEBUG_LL_OMAP4(p, mach)\t\t\t\t\t\t\\\n" - "-\t_DEBUG_LL_ENTRY(mach, OMAP4_UART1_BASE, OMAP_PORT_SHIFT,\t\\\n" - "-\t\tOMAP4_UART##p##_BASE, OMAP_PORT_SHIFT, OMAP4UART##p)\n" - "+\t_DEBUG_LL_ENTRY(mach, OMAP4_UART##p##_BASE, OMAP_PORT_SHIFT,\t\\\n" - "+\t\tOMAP4UART##p)\n" - " \n" - " /* Zoom2/3 shift is different for UART1 and external port */\n" - " #define DEBUG_LL_ZOOM(mach)\t\t\t\t\t\t\\\n" - "-\t_DEBUG_LL_ENTRY(mach, OMAP2_UART1_BASE, OMAP_PORT_SHIFT,\t\\\n" - "-\t\tZOOM_UART_BASE, ZOOM_PORT_SHIFT, ZOOM_UART)\n" - "+\t_DEBUG_LL_ENTRY(mach, ZOOM_UART_BASE, ZOOM_PORT_SHIFT, ZOOM_UART)\n" - " \n" - " static inline void __arch_decomp_setup(unsigned long arch_id)\n" - { -2d2909dcd2545313d965a1c5c4c3dc08851a65f70fbb61cdc94a3c41a92c5e76 +30b48979c667a6ce232011545a4a9af37099a3e3d019808e927c2a5e6d31d43b
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.