All of lore.kernel.org
 help / color / mirror / Atom feed
From: Michael Walle <michael@walle.cc>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 2/4] sata: sata_mv: support kirkwood architecture
Date: Wed,  3 Apr 2019 23:28:29 +0200	[thread overview]
Message-ID: <20190403212831.29886-3-michael@walle.cc> (raw)
In-Reply-To: <20190403212831.29886-1-michael@walle.cc>

Fix the worng include and offset macros.

Signed-off-by: Michael Walle <michael@walle.cc>
---
 drivers/ata/sata_mv.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index 87ea95f75d..b691107dc0 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -44,11 +44,10 @@
 #include <asm/io.h>
 #include <linux/mbus.h>
 
+#include <asm/arch/soc.h>
 #if defined(CONFIG_KIRKWOOD)
-#include <asm/arch/kirkwood.h>
 #define SATAHC_BASE		KW_SATA_BASE
 #else
-#include <asm/arch/soc.h>
 #define SATAHC_BASE		MVEBU_AXP_SATA_BASE
 #endif
 
@@ -218,8 +217,8 @@ struct crqb {
 #define CRQB_SECTCOUNT_COUNT_EXP_MASK	(0xff << 8)
 #define CRQB_SECTCOUNT_COUNT_EXP_SHIFT	8
 
-#define MVSATA_WIN_CONTROL(w)	(MVEBU_AXP_SATA_BASE + 0x30 + ((w) << 4))
-#define MVSATA_WIN_BASE(w)	(MVEBU_AXP_SATA_BASE + 0x34 + ((w) << 4))
+#define MVSATA_WIN_CONTROL(w)	(SATAHC_BASE + 0x30 + ((w) << 4))
+#define MVSATA_WIN_BASE(w)	(SATAHC_BASE + 0x34 + ((w) << 4))
 
 struct eprd {
 	u32 phyaddr_low;
-- 
2.11.0

  parent reply	other threads:[~2019-04-03 21:28 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-03 21:28 [U-Boot] [PATCH 0/4] ARM: kirkwood: lsxl: enable DM for SATA Michael Walle
2019-04-03 21:28 ` [U-Boot] [PATCH 1/4] sata: sata_mv: use correct format specifier in debug() Michael Walle
2019-04-04  7:01   ` Chris Packham
2019-04-04 15:16   ` Stefan Roese
2019-04-11 12:10   ` Stefan Roese
2019-04-03 21:28 ` Michael Walle [this message]
2019-04-04  7:11   ` [U-Boot] [PATCH 2/4] sata: sata_mv: support kirkwood architecture Chris Packham
2019-04-04 15:21     ` Stefan Roese
2019-04-04 15:18   ` Stefan Roese
2019-04-11 12:10   ` Stefan Roese
2019-04-03 21:28 ` [U-Boot] [PATCH 3/4] sata: sata_mv: add orion-sata compatible string Michael Walle
2019-04-04  7:11   ` Chris Packham
2019-04-04 15:21   ` Stefan Roese
2019-04-11 12:11   ` Stefan Roese
2019-04-03 21:28 ` [U-Boot] [PATCH 4/4] arm: kirkwood: lsxl: enable DM for SATA Michael Walle
2019-04-04 15:26   ` Stefan Roese
2019-04-11 12:12   ` Stefan Roese
2019-04-04  7:13 ` [U-Boot] [PATCH 0/4] ARM: " Chris Packham

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=20190403212831.29886-3-michael@walle.cc \
    --to=michael@walle.cc \
    --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 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.