public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Matthias Ludwig <mludwig@ultratronik.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH] OMAP3EVM: fix typo. replace CS6 by CS5, no functionality	change
Date: Tue, 2 Jun 2009 12:31:20 +0200	[thread overview]
Message-ID: <20090602103120.GA29947@ultratronik.de> (raw)
In-Reply-To: <20090524154253.GK26561@game.jcrosoft.org>


Signed-off-by: Matthias Ludwig <mludwig@ultratronik.de>
---
> as predently the commit message does not correspond with the code
> 
> it's a typo fix not, the current code work it does use the CS5 in reality

You are right, it's only a "typo fix".
Sorry for delayed fixing...

btw: i hope this kind of inline-commenting of a patch-mail is correct?!

best regards,
Matthias

 board/omap3/evm/evm.c            |   16 ++++++++--------
 include/asm-arm/arch-omap3/cpu.h |    5 +++--
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/board/omap3/evm/evm.c b/board/omap3/evm/evm.c
index c008c2e..5fd5efa 100644
--- a/board/omap3/evm/evm.c
+++ b/board/omap3/evm/evm.c
@@ -92,17 +92,17 @@ void set_muxconf_regs(void)
 static void setup_net_chip(void)
 {
 	gpio_t *gpio3_base = (gpio_t *)OMAP34XX_GPIO3_BASE;
-	gpmc_csx_t *gpmc_cs6_base = (gpmc_csx_t *)GPMC_CONFIG_CS6_BASE;
+	gpmc_csx_t *gpmc_cs5_base = (gpmc_csx_t *)GPMC_CONFIG_CS5_BASE;
 	ctrl_t *ctrl_base = (ctrl_t *)OMAP34XX_CTRL_BASE;
 
 	/* Configure GPMC registers */
-	writel(NET_GPMC_CONFIG1, &gpmc_cs6_base->config1);
-	writel(NET_GPMC_CONFIG2, &gpmc_cs6_base->config2);
-	writel(NET_GPMC_CONFIG3, &gpmc_cs6_base->config3);
-	writel(NET_GPMC_CONFIG4, &gpmc_cs6_base->config4);
-	writel(NET_GPMC_CONFIG5, &gpmc_cs6_base->config5);
-	writel(NET_GPMC_CONFIG6, &gpmc_cs6_base->config6);
-	writel(NET_GPMC_CONFIG7, &gpmc_cs6_base->config7);
+	writel(NET_GPMC_CONFIG1, &gpmc_cs5_base->config1);
+	writel(NET_GPMC_CONFIG2, &gpmc_cs5_base->config2);
+	writel(NET_GPMC_CONFIG3, &gpmc_cs5_base->config3);
+	writel(NET_GPMC_CONFIG4, &gpmc_cs5_base->config4);
+	writel(NET_GPMC_CONFIG5, &gpmc_cs5_base->config5);
+	writel(NET_GPMC_CONFIG6, &gpmc_cs5_base->config6);
+	writel(NET_GPMC_CONFIG7, &gpmc_cs5_base->config7);
 
 	/* Enable off mode for NWE in PADCONF_GPMC_NWE register */
 	writew(readw(&ctrl_base ->gpmc_nwe) | 0x0E00, &ctrl_base->gpmc_nwe);
diff --git a/include/asm-arm/arch-omap3/cpu.h b/include/asm-arm/arch-omap3/cpu.h
index c544e0c..a4ce45a 100644
--- a/include/asm-arm/arch-omap3/cpu.h
+++ b/include/asm-arm/arch-omap3/cpu.h
@@ -84,9 +84,10 @@ typedef struct ctrl_id {
 /* GPMC CS3/cs4/cs6 not avaliable */
 #define GPMC_BASE		(OMAP34XX_GPMC_BASE)
 #define GPMC_CONFIG_CS0		0x60
-#define GPMC_CONFIG_CS6		0x150
+#define GPMC_CONFIG_CS5		0x150
+
 #define GPMC_CONFIG_CS0_BASE	(GPMC_BASE + GPMC_CONFIG_CS0)
-#define GPMC_CONFIG_CS6_BASE	(GPMC_BASE + GPMC_CONFIG_CS6)
+#define GPMC_CONFIG_CS5_BASE	(GPMC_BASE + GPMC_CONFIG_CS5)
 #define GPMC_CONFIG_WP		0x10
 
 #define GPMC_CONFIG_WIDTH	0x30
-- 
1.6.3.9.g6345

  reply	other threads:[~2009-06-02 10:31 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-05-19  7:09 [U-Boot] [PATCHv3 0/5] clean up omap3 configuration structs Matthias Ludwig
2009-05-19  7:09 ` [U-Boot] [PATCHv3 1/5] OMAP3EVM: net_chip uses CS5 not CS6 Matthias Ludwig
2009-05-19  7:09   ` [U-Boot] [PATCHv3 2/5] omap3: embedd gpmc_cs into gpmc config struct Matthias Ludwig
2009-05-19  7:09     ` [U-Boot] [PATCHv3 3/5] omap3: remove typedefs for configuration structs Matthias Ludwig
2009-05-19  7:09       ` [U-Boot] [PATCHv3 4/5] omap3: replace all instances of gpmc config struct by one global Matthias Ludwig
2009-05-19  7:09         ` [U-Boot] [PATCHv3 5/5] omap3: use only fixed-size types inside ctrl_structs Matthias Ludwig
2009-05-24 15:49       ` [U-Boot] [PATCHv3 3/5] omap3: remove typedefs for configuration structs Jean-Christophe PLAGNIOL-VILLARD
2009-05-24 16:12         ` Dirk Behme
2009-05-24 16:12           ` Jean-Christophe PLAGNIOL-VILLARD
2009-05-24 16:30             ` Dirk Behme
2009-05-24 19:58               ` Jean-Christophe PLAGNIOL-VILLARD
2009-05-24 20:22                 ` Wolfgang Denk
2009-08-07 21:39       ` Wolfgang Denk
2009-08-07 21:32     ` [U-Boot] [PATCHv3 2/5] omap3: embedd gpmc_cs into gpmc config struct Wolfgang Denk
2009-05-24 15:42   ` [U-Boot] [PATCHv3 1/5] OMAP3EVM: net_chip uses CS5 not CS6 Jean-Christophe PLAGNIOL-VILLARD
2009-06-02 10:31     ` Matthias Ludwig [this message]
2009-06-04 20:25       ` [U-Boot] [PATCH] OMAP3EVM: fix typo. replace CS6 by CS5, no functionality change Jean-Christophe PLAGNIOL-VILLARD
2009-06-08 11:48         ` Matthias Ludwig
2009-05-20 20:21 ` [U-Boot] [PATCHv3 0/5] clean up omap3 configuration structs Dirk Behme

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=20090602103120.GA29947@ultratronik.de \
    --to=mludwig@ultratronik.de \
    --cc=u-boot@lists.denx.de \
    /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: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox