From mboxrd@z Thu Jan  1 00:00:00 1970
From: Chris Packham <judge.packham@gmail.com>
Date: Thu, 4 Apr 2019 20:11:18 +1300
Subject: [U-Boot] [PATCH 2/4] sata: sata_mv: support kirkwood
	architecture
In-Reply-To: <20190403212831.29886-3-michael@walle.cc>
References: <20190403212831.29886-1-michael@walle.cc>
 <20190403212831.29886-3-michael@walle.cc>
Message-ID: <CAFOYHZCw6wjMSLXFLCYYR7m-NVZgBGdb0gEs0jBHJ6fH=iDzuQ@mail.gmail.com>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

On Thu, Apr 4, 2019 at 10:28 AM Michael Walle <michael@walle.cc> wrote:
>
> Fix the worng include and offset macros.

Typo worng -> wrong

>
> 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

It might be a better idea to update these defines to be definitions
for these in the soc.h. We're already doing this for some other
peripheral blocks between mach-kirkwood and mach-mvebu. On the other
hand SATAHC_BASE already achieves this so maybe it's not worth
bothering.

>
> @@ -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
>