diff for duplicates of <20100211034624.GE21755@atomide.com> diff --git a/a/1.txt b/N1/1.txt index 5538e77..8b13789 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,168 +1 @@ ->From ff8b5c4a3d1fa6bbb1dab3d7b443e611fc997a05 Mon Sep 17 00:00:00 2001 -From: Vimal Singh <vimalsingh@ti.com> -Date: Wed, 10 Feb 2010 18:22:55 -0800 -Subject: [PATCH] omap3: Add support for flash on 3430SDP board -This patch adds support for flashes on 3430SDP boards. All three -NAND, NOR and OneNAND are supported. I have tested it on -3430SDP (ES2 and ES3.1). - -This patch can be treated as an example to "how to utilize": -'gpmc-nand.c' and 'board-sdp-flash.c'. - -Similar patches can be created for 2430sdp and 3630sdp or any other -similar board. - -Signed-off-by: Vimal Singh <vimalsingh@ti.com> -Signed-off-by: Tony Lindgren <tony@atomide.com> - -diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile -index 0b17dca..af5853f 100644 ---- a/arch/arm/mach-omap2/Makefile -+++ b/arch/arm/mach-omap2/Makefile -@@ -100,7 +100,8 @@ obj-$(CONFIG_MACH_OMAP3EVM) += board-omap3evm.o \ - obj-$(CONFIG_MACH_OMAP3_PANDORA) += board-omap3pandora.o \ - mmc-twl4030.o - obj-$(CONFIG_MACH_OMAP_3430SDP) += board-3430sdp.o \ -- mmc-twl4030.o -+ mmc-twl4030.o \ -+ board-sdp-flash.o - obj-$(CONFIG_MACH_NOKIA_N8X0) += board-n8x0.o - obj-$(CONFIG_MACH_NOKIA_RX51) += board-rx51.o \ - board-rx51-sdram.o \ -diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c -index eda4f64..2e38e5b 100644 ---- a/arch/arm/mach-omap2/board-3430sdp.c -+++ b/arch/arm/mach-omap2/board-3430sdp.c -@@ -41,6 +41,8 @@ - #include <plat/control.h> - #include <plat/gpmc-smc91x.h> - -+#include <mach/board-sdp.h> -+ - #include "mux.h" - #include "sdram-qimonda-hyb18m512160af-6.h" - #include "mmc-twl4030.h" -@@ -650,6 +652,114 @@ static struct omap_board_mux board_mux[] __initdata = { - #define board_mux NULL - #endif - -+static struct mtd_partition sdp_nor_partitions[] = { -+ /* bootloader (U-Boot, etc) in first sector */ -+ { -+ .name = "Bootloader-NOR", -+ .offset = 0, -+ .size = SZ_256K, -+ .mask_flags = MTD_WRITEABLE, /* force read-only */ -+ }, -+ /* bootloader params in the next sector */ -+ { -+ .name = "Params-NOR", -+ .offset = MTDPART_OFS_APPEND, -+ .size = SZ_256K, -+ .mask_flags = 0, -+ }, -+ /* kernel */ -+ { -+ .name = "Kernel-NOR", -+ .offset = MTDPART_OFS_APPEND, -+ .size = SZ_2M, -+ .mask_flags = 0 -+ }, -+ /* file system */ -+ { -+ .name = "Filesystem-NOR", -+ .offset = MTDPART_OFS_APPEND, -+ .size = MTDPART_SIZ_FULL, -+ .mask_flags = 0 -+ } -+}; -+ -+static struct mtd_partition sdp_onenand_partitions[] = { -+ { -+ .name = "X-Loader-OneNAND", -+ .offset = 0, -+ .size = 4 * (64 * 2048), -+ .mask_flags = MTD_WRITEABLE /* force read-only */ -+ }, -+ { -+ .name = "U-Boot-OneNAND", -+ .offset = MTDPART_OFS_APPEND, -+ .size = 2 * (64 * 2048), -+ .mask_flags = MTD_WRITEABLE /* force read-only */ -+ }, -+ { -+ .name = "U-Boot Environment-OneNAND", -+ .offset = MTDPART_OFS_APPEND, -+ .size = 1 * (64 * 2048), -+ }, -+ { -+ .name = "Kernel-OneNAND", -+ .offset = MTDPART_OFS_APPEND, -+ .size = 16 * (64 * 2048), -+ }, -+ { -+ .name = "File System-OneNAND", -+ .offset = MTDPART_OFS_APPEND, -+ .size = MTDPART_SIZ_FULL, -+ }, -+}; -+ -+static struct mtd_partition sdp_nand_partitions[] = { -+ /* All the partition sizes are listed in terms of NAND block size */ -+ { -+ .name = "X-Loader-NAND", -+ .offset = 0, -+ .size = 4 * (64 * 2048), -+ .mask_flags = MTD_WRITEABLE, /* force read-only */ -+ }, -+ { -+ .name = "U-Boot-NAND", -+ .offset = MTDPART_OFS_APPEND, /* Offset = 0x80000 */ -+ .size = 10 * (64 * 2048), -+ .mask_flags = MTD_WRITEABLE, /* force read-only */ -+ }, -+ { -+ .name = "Boot Env-NAND", -+ -+ .offset = MTDPART_OFS_APPEND, /* Offset = 0x1c0000 */ -+ .size = 6 * (64 * 2048), -+ }, -+ { -+ .name = "Kernel-NAND", -+ .offset = MTDPART_OFS_APPEND, /* Offset = 0x280000 */ -+ .size = 40 * (64 * 2048), -+ }, -+ { -+ .name = "File System - NAND", -+ .size = MTDPART_SIZ_FULL, -+ .offset = MTDPART_OFS_APPEND, /* Offset = 0x780000 */ -+ }, -+}; -+ -+static struct flash_partitions sdp_flash_partitions[] = { -+ { -+ .parts = sdp_nor_partitions, -+ .nr_parts = ARRAY_SIZE(sdp_nor_partitions), -+ }, -+ { -+ .parts = sdp_onenand_partitions, -+ .nr_parts = ARRAY_SIZE(sdp_onenand_partitions), -+ }, -+ { -+ .parts = sdp_nand_partitions, -+ .nr_parts = ARRAY_SIZE(sdp_nand_partitions), -+ }, -+}; -+ - static void __init omap_3430sdp_init(void) - { - omap3_mux_init(board_mux, OMAP_PACKAGE_CBB); -@@ -666,6 +776,7 @@ static void __init omap_3430sdp_init(void) - omap_serial_init(); - usb_musb_init(); - board_smc91x_init(); -+ sdp_flash_init(sdp_flash_partitions); - sdp3430_display_init(); - enable_board_wakeup_source(); - usb_ehci_init(&ehci_pdata); diff --git a/a/content_digest b/N1/content_digest index 8017a26..0d9c06b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,178 +1,9 @@ "ref\020100211033310.1624.80025.stgit@baageli.muru.com\0" - "From\0Tony Lindgren <tony@atomide.com>\0" + "From\0tony@atomide.com (Tony Lindgren)\0" "Subject\0[PATCH 17/17] omap3: Add support for flash on 3430SDP board\0" "Date\0Wed, 10 Feb 2010 19:46:25 -0800\0" "To\0linux-arm-kernel@lists.infradead.org\0" - "Cc\0linux-omap@vger.kernel.org\0" "\00:1\0" "b\0" - ">From ff8b5c4a3d1fa6bbb1dab3d7b443e611fc997a05 Mon Sep 17 00:00:00 2001\n" - "From: Vimal Singh <vimalsingh@ti.com>\n" - "Date: Wed, 10 Feb 2010 18:22:55 -0800\n" - "Subject: [PATCH] omap3: Add support for flash on 3430SDP board\n" - "\n" - "This patch adds support for flashes on 3430SDP boards. All three\n" - "NAND, NOR and OneNAND are supported. I have tested it on\n" - "3430SDP (ES2 and ES3.1).\n" - "\n" - "This patch can be treated as an example to \"how to utilize\":\n" - "'gpmc-nand.c' and 'board-sdp-flash.c'.\n" - "\n" - "Similar patches can be created for 2430sdp and 3630sdp or any other\n" - "similar board.\n" - "\n" - "Signed-off-by: Vimal Singh <vimalsingh@ti.com>\n" - "Signed-off-by: Tony Lindgren <tony@atomide.com>\n" - "\n" - "diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile\n" - "index 0b17dca..af5853f 100644\n" - "--- a/arch/arm/mach-omap2/Makefile\n" - "+++ b/arch/arm/mach-omap2/Makefile\n" - "@@ -100,7 +100,8 @@ obj-$(CONFIG_MACH_OMAP3EVM)\t\t+= board-omap3evm.o \\\n" - " obj-$(CONFIG_MACH_OMAP3_PANDORA)\t+= board-omap3pandora.o \\\n" - " \t\t\t\t\t mmc-twl4030.o\n" - " obj-$(CONFIG_MACH_OMAP_3430SDP)\t\t+= board-3430sdp.o \\\n" - "-\t\t\t\t\t mmc-twl4030.o\n" - "+\t\t\t\t\t mmc-twl4030.o \\\n" - "+\t\t\t\t\t board-sdp-flash.o\n" - " obj-$(CONFIG_MACH_NOKIA_N8X0)\t\t+= board-n8x0.o\n" - " obj-$(CONFIG_MACH_NOKIA_RX51)\t\t+= board-rx51.o \\\n" - " \t\t\t\t\t board-rx51-sdram.o \\\n" - "diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c\n" - "index eda4f64..2e38e5b 100644\n" - "--- a/arch/arm/mach-omap2/board-3430sdp.c\n" - "+++ b/arch/arm/mach-omap2/board-3430sdp.c\n" - "@@ -41,6 +41,8 @@\n" - " #include <plat/control.h>\n" - " #include <plat/gpmc-smc91x.h>\n" - " \n" - "+#include <mach/board-sdp.h>\n" - "+\n" - " #include \"mux.h\"\n" - " #include \"sdram-qimonda-hyb18m512160af-6.h\"\n" - " #include \"mmc-twl4030.h\"\n" - "@@ -650,6 +652,114 @@ static struct omap_board_mux board_mux[] __initdata = {\n" - " #define board_mux\tNULL\n" - " #endif\n" - " \n" - "+static struct mtd_partition sdp_nor_partitions[] = {\n" - "+\t/* bootloader (U-Boot, etc) in first sector */\n" - "+\t{\n" - "+\t\t.name\t\t= \"Bootloader-NOR\",\n" - "+\t\t.offset\t\t= 0,\n" - "+\t\t.size\t\t= SZ_256K,\n" - "+\t\t.mask_flags\t= MTD_WRITEABLE, /* force read-only */\n" - "+\t},\n" - "+\t/* bootloader params in the next sector */\n" - "+\t{\n" - "+\t\t.name\t\t= \"Params-NOR\",\n" - "+\t\t.offset\t\t= MTDPART_OFS_APPEND,\n" - "+\t\t.size\t\t= SZ_256K,\n" - "+\t\t.mask_flags\t= 0,\n" - "+\t},\n" - "+\t/* kernel */\n" - "+\t{\n" - "+\t\t.name\t\t= \"Kernel-NOR\",\n" - "+\t\t.offset\t\t= MTDPART_OFS_APPEND,\n" - "+\t\t.size\t\t= SZ_2M,\n" - "+\t\t.mask_flags\t= 0\n" - "+\t},\n" - "+\t/* file system */\n" - "+\t{\n" - "+\t\t.name\t\t= \"Filesystem-NOR\",\n" - "+\t\t.offset\t\t= MTDPART_OFS_APPEND,\n" - "+\t\t.size\t\t= MTDPART_SIZ_FULL,\n" - "+\t\t.mask_flags\t= 0\n" - "+\t}\n" - "+};\n" - "+\n" - "+static struct mtd_partition sdp_onenand_partitions[] = {\n" - "+\t{\n" - "+\t\t.name\t\t= \"X-Loader-OneNAND\",\n" - "+\t\t.offset\t\t= 0,\n" - "+\t\t.size\t\t= 4 * (64 * 2048),\n" - "+\t\t.mask_flags\t= MTD_WRITEABLE /* force read-only */\n" - "+\t},\n" - "+\t{\n" - "+\t\t.name\t\t= \"U-Boot-OneNAND\",\n" - "+\t\t.offset\t\t= MTDPART_OFS_APPEND,\n" - "+\t\t.size\t\t= 2 * (64 * 2048),\n" - "+\t\t.mask_flags\t= MTD_WRITEABLE /* force read-only */\n" - "+\t},\n" - "+\t{\n" - "+\t\t.name\t\t= \"U-Boot Environment-OneNAND\",\n" - "+\t\t.offset\t\t= MTDPART_OFS_APPEND,\n" - "+\t\t.size\t\t= 1 * (64 * 2048),\n" - "+\t},\n" - "+\t{\n" - "+\t\t.name\t\t= \"Kernel-OneNAND\",\n" - "+\t\t.offset\t\t= MTDPART_OFS_APPEND,\n" - "+\t\t.size\t\t= 16 * (64 * 2048),\n" - "+\t},\n" - "+\t{\n" - "+\t\t.name\t\t= \"File System-OneNAND\",\n" - "+\t\t.offset\t\t= MTDPART_OFS_APPEND,\n" - "+\t\t.size\t\t= MTDPART_SIZ_FULL,\n" - "+\t},\n" - "+};\n" - "+\n" - "+static struct mtd_partition sdp_nand_partitions[] = {\n" - "+\t/* All the partition sizes are listed in terms of NAND block size */\n" - "+\t{\n" - "+\t\t.name\t\t= \"X-Loader-NAND\",\n" - "+\t\t.offset\t\t= 0,\n" - "+\t\t.size\t\t= 4 * (64 * 2048),\n" - "+\t\t.mask_flags\t= MTD_WRITEABLE,\t/* force read-only */\n" - "+\t},\n" - "+\t{\n" - "+\t\t.name\t\t= \"U-Boot-NAND\",\n" - "+\t\t.offset\t\t= MTDPART_OFS_APPEND,\t/* Offset = 0x80000 */\n" - "+\t\t.size\t\t= 10 * (64 * 2048),\n" - "+\t\t.mask_flags\t= MTD_WRITEABLE,\t/* force read-only */\n" - "+\t},\n" - "+\t{\n" - "+\t\t.name\t\t= \"Boot Env-NAND\",\n" - "+\n" - "+\t\t.offset\t\t= MTDPART_OFS_APPEND,\t/* Offset = 0x1c0000 */\n" - "+\t\t.size\t\t= 6 * (64 * 2048),\n" - "+\t},\n" - "+\t{\n" - "+\t\t.name\t\t= \"Kernel-NAND\",\n" - "+\t\t.offset\t\t= MTDPART_OFS_APPEND,\t/* Offset = 0x280000 */\n" - "+\t\t.size\t\t= 40 * (64 * 2048),\n" - "+\t},\n" - "+\t{\n" - "+\t\t.name\t\t= \"File System - NAND\",\n" - "+\t\t.size\t\t= MTDPART_SIZ_FULL,\n" - "+\t\t.offset\t\t= MTDPART_OFS_APPEND,\t/* Offset = 0x780000 */\n" - "+\t},\n" - "+};\n" - "+\n" - "+static struct flash_partitions sdp_flash_partitions[] = {\n" - "+\t{\n" - "+\t\t.parts = sdp_nor_partitions,\n" - "+\t\t.nr_parts = ARRAY_SIZE(sdp_nor_partitions),\n" - "+\t},\n" - "+\t{\n" - "+\t\t.parts = sdp_onenand_partitions,\n" - "+\t\t.nr_parts = ARRAY_SIZE(sdp_onenand_partitions),\n" - "+\t},\n" - "+\t{\n" - "+\t\t.parts = sdp_nand_partitions,\n" - "+\t\t.nr_parts = ARRAY_SIZE(sdp_nand_partitions),\n" - "+\t},\n" - "+};\n" - "+\n" - " static void __init omap_3430sdp_init(void)\n" - " {\n" - " \tomap3_mux_init(board_mux, OMAP_PACKAGE_CBB);\n" - "@@ -666,6 +776,7 @@ static void __init omap_3430sdp_init(void)\n" - " \tomap_serial_init();\n" - " \tusb_musb_init();\n" - " \tboard_smc91x_init();\n" - "+\tsdp_flash_init(sdp_flash_partitions);\n" - " \tsdp3430_display_init();\n" - " \tenable_board_wakeup_source();\n" - " \tusb_ehci_init(&ehci_pdata);" -5a136ac19269240cd0726b396f2dc8da8e69fdef8d9c94dd032f0769b2e4ef5a +30a459af8e9398e20c27b897def82d0b2ab30d2bc82e2d616fb529a203356cb0
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.