From: Vikas Manocha <vikas.manocha@st.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v7 4/6] spi: cadence_qspi: rename ahbbase to flashbase for clarity
Date: Wed, 23 Sep 2015 17:19:34 -0700 [thread overview]
Message-ID: <1443053976-9112-5-git-send-email-vikas.manocha@st.com> (raw)
In-Reply-To: <1443053976-9112-1-git-send-email-vikas.manocha@st.com>
plat->ahbbase renamed to plat->flashbase for better clarity.
With ahbbase it was not clear which base address it is, flashbase makes
it clear that it is mapped flash memory base address.
Signed-off-by: Vikas Manocha <vikas.manocha@st.com>
---
Changes in v7: added info for renaming the parameter from ahbbase to flashbase
Changes in v6: none
Changes in v5: none
Changes in v4: new
drivers/spi/cadence_qspi.c | 8 ++++----
drivers/spi/cadence_qspi.h | 4 ++--
drivers/spi/cadence_qspi_apb.c | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/spi/cadence_qspi.c b/drivers/spi/cadence_qspi.c
index 0d1abc8..c63f583 100644
--- a/drivers/spi/cadence_qspi.c
+++ b/drivers/spi/cadence_qspi.c
@@ -150,7 +150,7 @@ static int cadence_spi_probe(struct udevice *bus)
struct cadence_spi_priv *priv = dev_get_priv(bus);
priv->regbase = plat->regbase;
- priv->ahbbase = plat->ahbbase;
+ priv->flashbase = plat->flashbase;
if (!priv->qspi_is_init) {
cadence_qspi_apb_controller_init(plat);
@@ -289,7 +289,7 @@ static int cadence_spi_ofdata_to_platdata(struct udevice *bus)
}
plat->regbase = (void *)data[0];
- plat->ahbbase = (void *)data[2];
+ plat->flashbase = (void *)data[2];
plat->trigger_base = (u32 *)fdtdec_get_addr(blob, node,
"cdns,trigger-address");
@@ -313,8 +313,8 @@ static int cadence_spi_ofdata_to_platdata(struct udevice *bus)
plat->tslch_ns = fdtdec_get_int(blob, subnode, "tslch-ns", 20);
plat->sram_size = fdtdec_get_int(blob, node, "sram-size", 128);
- debug("%s: regbase=%p ahbbase=%p trigger_base=%p max-frequency=%d page-size=%d\n",
- __func__, plat->regbase, plat->ahbbase, plat->trigger_base,
+ debug("%s: regbase=%p flashbase=%p trigger_base=%p max-frequency=%d page-size=%d\n",
+ __func__, plat->regbase, plat->flashbase, plat->trigger_base,
plat->max_hz, plat->page_size);
return 0;
}
diff --git a/drivers/spi/cadence_qspi.h b/drivers/spi/cadence_qspi.h
index 2f1bd92..7341339 100644
--- a/drivers/spi/cadence_qspi.h
+++ b/drivers/spi/cadence_qspi.h
@@ -17,7 +17,7 @@
struct cadence_spi_platdata {
unsigned int max_hz;
void *regbase;
- void *ahbbase;
+ void *flashbase;
void *trigger_base;
u32 page_size;
@@ -31,7 +31,7 @@ struct cadence_spi_platdata {
struct cadence_spi_priv {
void *regbase;
- void *ahbbase;
+ void *flashbase;
size_t cmd_len;
u8 cmd_buf[32];
size_t data_len;
diff --git a/drivers/spi/cadence_qspi_apb.c b/drivers/spi/cadence_qspi_apb.c
index 8156b2b..2638f00 100644
--- a/drivers/spi/cadence_qspi_apb.c
+++ b/drivers/spi/cadence_qspi_apb.c
@@ -704,7 +704,7 @@ int cadence_qspi_apb_indirect_read_setup(struct cadence_spi_platdata *plat,
/* Get address */
addr_value = cadence_qspi_apb_cmd2addr(&cmdbuf[1], addr_bytes);
- writel((u32)plat->ahbbase + addr_value,
+ writel((u32)plat->flashbase + addr_value,
plat->regbase + CQSPI_REG_INDIRECTRDSTARTADDR);
/* The remaining lenght is dummy bytes. */
@@ -795,7 +795,7 @@ int cadence_qspi_apb_indirect_write_setup(struct cadence_spi_platdata *plat,
/* Setup write address. */
reg = cadence_qspi_apb_cmd2addr(&cmdbuf[1], addr_bytes);
- writel((u32)plat->ahbbase + reg,
+ writel((u32)plat->flashbase + reg,
plat->regbase + CQSPI_REG_INDIRECTWRSTARTADDR);
reg = readl(plat->regbase + CQSPI_REG_SIZE);
--
1.7.9.5
next prev parent reply other threads:[~2015-09-24 0:19 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-24 0:19 [U-Boot] [PATCH v7 0/6] spi: cadence_qspi: optimize & fix indirect rd-writes Vikas Manocha
2015-09-24 0:19 ` [U-Boot] [PATCH v7 1/6] spi: cadence_qspi: move trigger base configuration in init Vikas Manocha
2015-09-24 7:22 ` Wolfgang Denk
2015-09-24 18:12 ` Vikas MANOCHA
2015-09-24 18:56 ` Wolfgang Denk
2015-09-24 19:39 ` Jagan Teki
2015-09-24 22:32 ` Wolfgang Denk
2015-09-25 23:25 ` Vikas MANOCHA
2015-09-24 0:19 ` [U-Boot] [PATCH v7 2/6] spi: cadence_qspi: fix indirect read/write start address Vikas Manocha
2015-09-24 7:18 ` Wolfgang Denk
2015-09-24 0:19 ` [U-Boot] [PATCH v7 3/6] spi: cadence_qspi: fix base trigger address & transfer " Vikas Manocha
2015-09-24 7:24 ` Wolfgang Denk
2015-09-24 7:49 ` Wolfgang Denk
2015-09-24 0:19 ` Vikas Manocha [this message]
2015-09-24 0:19 ` [U-Boot] [PATCH v7 5/6] spi: cadence_qspi: remove unused macro Vikas Manocha
2015-09-24 0:19 ` [U-Boot] [PATCH v7 6/6] spi: cadence_qspi: get fifo width from device tree Vikas Manocha
2015-09-24 7:34 ` Wolfgang Denk
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=1443053976-9112-5-git-send-email-vikas.manocha@st.com \
--to=vikas.manocha@st.com \
--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