From: Jon Hunter <jon-hunter@ti.com> To: Rob Herring <rob.herring@calxeda.com>, Grant Likely <grant.likely@secretlab.ca>, Tony Lindgren <tony@atomide.com>, Benoit Cousson <b-cousson@ti.com> Cc: device-tree <devicetree-discuss@lists.ozlabs.org>, linux-omap <linux-omap@vger.kernel.org>, linux-arm <linux-arm-kernel@lists.infradead.org>, Daniel Mack <zonque@gmail.com>, Ezequiel Garcia <elezegarcia@gmail.com>, Mark Jackson <mpfj-list@mimc.co.uk>, Jon Hunter <jon-hunter@ti.com> Subject: [PATCH V4 16/18] ARM: OMAP2+: Remove unnecesssary GPMC definitions and variable Date: Tue, 19 Mar 2013 11:35:54 -0500 [thread overview] Message-ID: <1363710956-26773-17-git-send-email-jon-hunter@ti.com> (raw) In-Reply-To: <1363710956-26773-1-git-send-email-jon-hunter@ti.com> With commit 21cc2bd (ARM: OMAP2+: Remove apollon board support) the variable "boot_rom_space" is now not needed and the code surrounding this variable can be cleaned up and simplified. Remove unnecessary definitions and clean-up the comment as well. Signed-off-by: Jon Hunter <jon-hunter@ti.com> Tested-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> --- arch/arm/mach-omap2/gpmc.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c index 9797f46..ebb88cf 100644 --- a/arch/arm/mach-omap2/gpmc.c +++ b/arch/arm/mach-omap2/gpmc.c @@ -92,9 +92,7 @@ #define GPMC_CS_SIZE 0x30 #define GPMC_BCH_SIZE 0x10 -#define GPMC_MEM_START 0x00000000 #define GPMC_MEM_END 0x3FFFFFFF -#define BOOT_ROM_SPACE 0x100000 /* 1MB */ #define GPMC_CHUNK_SHIFT 24 /* 16 MB */ #define GPMC_SECTION_SHIFT 28 /* 128 MB */ @@ -790,13 +788,13 @@ static void gpmc_mem_exit(void) static int gpmc_mem_init(void) { int cs, rc; - unsigned long boot_rom_space = 0; - /* never allocate the first page, to facilitate bug detection; - * even if we didn't boot from ROM. + /* + * The first 1MB of GPMC address space is typically mapped to + * the internal ROM. Never allocate the first page, to + * facilitate bug detection; even if we didn't boot from ROM. */ - boot_rom_space = BOOT_ROM_SPACE; - gpmc_mem_root.start = GPMC_MEM_START + boot_rom_space; + gpmc_mem_root.start = SZ_1M; gpmc_mem_root.end = GPMC_MEM_END; /* Reserve all regions that has been set up by bootloader */ -- 1.7.10.4
WARNING: multiple messages have this Message-ID (diff)
From: jon-hunter@ti.com (Jon Hunter) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH V4 16/18] ARM: OMAP2+: Remove unnecesssary GPMC definitions and variable Date: Tue, 19 Mar 2013 11:35:54 -0500 [thread overview] Message-ID: <1363710956-26773-17-git-send-email-jon-hunter@ti.com> (raw) In-Reply-To: <1363710956-26773-1-git-send-email-jon-hunter@ti.com> With commit 21cc2bd (ARM: OMAP2+: Remove apollon board support) the variable "boot_rom_space" is now not needed and the code surrounding this variable can be cleaned up and simplified. Remove unnecessary definitions and clean-up the comment as well. Signed-off-by: Jon Hunter <jon-hunter@ti.com> Tested-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> --- arch/arm/mach-omap2/gpmc.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c index 9797f46..ebb88cf 100644 --- a/arch/arm/mach-omap2/gpmc.c +++ b/arch/arm/mach-omap2/gpmc.c @@ -92,9 +92,7 @@ #define GPMC_CS_SIZE 0x30 #define GPMC_BCH_SIZE 0x10 -#define GPMC_MEM_START 0x00000000 #define GPMC_MEM_END 0x3FFFFFFF -#define BOOT_ROM_SPACE 0x100000 /* 1MB */ #define GPMC_CHUNK_SHIFT 24 /* 16 MB */ #define GPMC_SECTION_SHIFT 28 /* 128 MB */ @@ -790,13 +788,13 @@ static void gpmc_mem_exit(void) static int gpmc_mem_init(void) { int cs, rc; - unsigned long boot_rom_space = 0; - /* never allocate the first page, to facilitate bug detection; - * even if we didn't boot from ROM. + /* + * The first 1MB of GPMC address space is typically mapped to + * the internal ROM. Never allocate the first page, to + * facilitate bug detection; even if we didn't boot from ROM. */ - boot_rom_space = BOOT_ROM_SPACE; - gpmc_mem_root.start = GPMC_MEM_START + boot_rom_space; + gpmc_mem_root.start = SZ_1M; gpmc_mem_root.end = GPMC_MEM_END; /* Reserve all regions that has been set up by bootloader */ -- 1.7.10.4
next prev parent reply other threads:[~2013-03-19 16:35 UTC|newest] Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-03-19 16:35 [PATCH V4 00/18] ARM: OMAP2+: GPMC clean-up and DT update Jon Hunter 2013-03-19 16:35 ` Jon Hunter 2013-03-19 16:35 ` [PATCH V4 01/18] ARM: OMAP2+: Simplify code configuring ONENAND devices Jon Hunter 2013-03-19 16:35 ` Jon Hunter 2013-03-19 16:35 ` [PATCH V4 02/18] ARM: OMAP2+: Add variable to store number of GPMC waitpins Jon Hunter 2013-03-19 16:35 ` Jon Hunter 2013-03-19 16:35 ` [PATCH V4 03/18] ARM: OMAP2+: Add structure for storing GPMC settings Jon Hunter 2013-03-19 16:35 ` Jon Hunter 2013-03-19 16:35 ` [PATCH V4 04/18] ARM: OMAP2+: Add function for configuring " Jon Hunter 2013-03-19 16:35 ` Jon Hunter 2013-03-19 16:35 ` [PATCH V4 05/18] ARM: OMAP2+: Convert ONENAND to use gpmc_cs_program_settings() Jon Hunter 2013-03-19 16:35 ` Jon Hunter 2013-03-19 16:35 ` [PATCH V4 06/18] ARM: OMAP2+: Convert NAND " Jon Hunter 2013-03-19 16:35 ` Jon Hunter 2013-03-19 16:35 ` [PATCH V4 07/18] ARM: OMAP2+: Convert SMC91x " Jon Hunter 2013-03-19 16:35 ` Jon Hunter 2013-03-19 16:35 ` [PATCH V4 08/18] ARM: OMAP2+: Convert TUSB " Jon Hunter 2013-03-19 16:35 ` Jon Hunter 2013-03-19 16:35 ` [PATCH V4 09/18] ARM: OMAP2+: Don't configure of chip-select options in gpmc_cs_configure() Jon Hunter 2013-03-19 16:35 ` Jon Hunter 2013-03-19 16:35 ` [PATCH V4 10/18] ARM: OMAP2+: Add function to read GPMC settings from device-tree Jon Hunter 2013-03-19 16:35 ` Jon Hunter 2013-04-15 13:27 ` Grant Likely 2013-04-15 13:27 ` Grant Likely 2013-04-15 16:54 ` Jon Hunter 2013-04-15 16:54 ` Jon Hunter 2013-03-19 16:35 ` [PATCH V4 11/18] ARM: OMAP2+: Add additional GPMC timing parameters Jon Hunter 2013-03-19 16:35 ` Jon Hunter 2013-03-19 16:35 ` [PATCH V4 12/18] ARM: OMAP2+: Add device-tree support for NOR flash Jon Hunter 2013-03-19 16:35 ` Jon Hunter 2013-03-19 16:35 ` [PATCH V4 13/18] ARM: OMAP2+: Convert NAND to retrieve GPMC settings from DT Jon Hunter 2013-03-19 16:35 ` Jon Hunter 2013-03-19 16:35 ` [PATCH V4 14/18] ARM: OMAP2+: Convert ONENAND " Jon Hunter 2013-03-19 16:35 ` Jon Hunter 2013-03-19 16:35 ` [PATCH V4 15/18] ARM: OMAP2+: Detect incorrectly aligned GPMC base address Jon Hunter 2013-03-19 16:35 ` Jon Hunter 2013-03-19 16:35 ` Jon Hunter [this message] 2013-03-19 16:35 ` [PATCH V4 16/18] ARM: OMAP2+: Remove unnecesssary GPMC definitions and variable Jon Hunter 2013-03-19 16:35 ` [PATCH V4 17/18] ARM: OMAP2+: Allow GPMC probe to complete even if CS mapping fails Jon Hunter 2013-03-19 16:35 ` Jon Hunter 2013-03-19 16:35 ` [PATCH V4 18/18] ARM: OMAP2+: return -ENODEV if GPMC child device creation fails Jon Hunter 2013-03-19 16:35 ` Jon Hunter
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1363710956-26773-17-git-send-email-jon-hunter@ti.com \ --to=jon-hunter@ti.com \ --cc=b-cousson@ti.com \ --cc=devicetree-discuss@lists.ozlabs.org \ --cc=elezegarcia@gmail.com \ --cc=grant.likely@secretlab.ca \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-omap@vger.kernel.org \ --cc=mpfj-list@mimc.co.uk \ --cc=rob.herring@calxeda.com \ --cc=tony@atomide.com \ --cc=zonque@gmail.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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.