From patchwork Wed Apr 3 21:28:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 1076452 X-Patchwork-Delegate: sr@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=walle.cc Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=walle.cc header.i=@walle.cc header.b="fhoAOW34"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44ZK3C3LP5z9sRt for ; Thu, 4 Apr 2019 08:29:27 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 26BB1C21E3A; Wed, 3 Apr 2019 21:29:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 1B75FC21E74; Wed, 3 Apr 2019 21:28:52 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 3AABFC21DFB; Wed, 3 Apr 2019 21:28:48 +0000 (UTC) Received: from ssl.serverraum.org (ssl.serverraum.org [176.9.125.105]) by lists.denx.de (Postfix) with ESMTPS id 7F6D0C21DDC for ; Wed, 3 Apr 2019 21:28:47 +0000 (UTC) Received: from apollo.fritz.box (unknown [IPv6:2a02:810c:c200:2e91:6257:18ff:fec4:ca34]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ssl.serverraum.org (Postfix) with ESMTPSA id 0BC2F22F16; Wed, 3 Apr 2019 23:28:47 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=walle.cc; s=mail2016061301; t=1554326927; bh=dHXqEUFUPWsO0f7SMQUdlbA81C9qE19eqkn3+lyYirU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fhoAOW34Pjln9G4yl31od4bqFc4ITQ2hE3HS+lB5oSpWoCCFWnE9e695AJc9aR297 z6uGr6LyZEeKLj7Y61vBSWNa+zC618LdJ/JCMkm23kDOl0zdp5qzkNiXlkFL4Vr6e6 OLXEzh4sWyIv8uNEay28L55bLDxBD0EU3YQlemhw= From: Michael Walle To: u-boot@lists.denx.de Date: Wed, 3 Apr 2019 23:28:29 +0200 Message-Id: <20190403212831.29886-3-michael@walle.cc> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190403212831.29886-1-michael@walle.cc> References: <20190403212831.29886-1-michael@walle.cc> X-Virus-Scanned: clamav-milter 0.100.2 at web X-Virus-Status: Clean Cc: Stefan Roese , Chris Packham Subject: [U-Boot] [PATCH 2/4] sata: sata_mv: support kirkwood architecture X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Fix the worng include and offset macros. Signed-off-by: Michael Walle Reviewed-by: Stefan Roese --- 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 #include +#include #if defined(CONFIG_KIRKWOOD) -#include #define SATAHC_BASE KW_SATA_BASE #else -#include #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;