* [U-Boot] [PATCH 1/2] ARM: mvebu: define board_ahci_enable() for A38x
@ 2019-03-24 11:27 Baruch Siach
2019-03-24 11:27 ` [U-Boot] [PATCH 2/2] ata: ahci_mvebu: add support for Armada 38x Baruch Siach
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Baruch Siach @ 2019-03-24 11:27 UTC (permalink / raw)
To: u-boot
This allows the ahci_mvebu driver to do A38x platform specific
configuration at initialization.
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
arch/arm/mach-mvebu/cpu.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c
index 919d05c88c77..5d3f553b5dd3 100644
--- a/arch/arm/mach-mvebu/cpu.c
+++ b/arch/arm/mach-mvebu/cpu.c
@@ -501,7 +501,6 @@ int board_mmc_init(bd_t *bis)
}
#endif
-#ifdef CONFIG_SCSI_AHCI_PLAT
#define AHCI_VENDOR_SPECIFIC_0_ADDR 0xa0
#define AHCI_VENDOR_SPECIFIC_0_DATA 0xa4
@@ -545,11 +544,19 @@ static void ahci_mvebu_regret_option(void __iomem *base)
writel(0x80, base + AHCI_VENDOR_SPECIFIC_0_DATA);
}
-void scsi_init(void)
+int board_ahci_enable(void)
{
- printf("MVEBU SATA INIT\n");
ahci_mvebu_mbus_config((void __iomem *)MVEBU_SATA0_BASE);
ahci_mvebu_regret_option((void __iomem *)MVEBU_SATA0_BASE);
+
+ return 0;
+}
+
+#ifdef CONFIG_SCSI_AHCI_PLAT
+void scsi_init(void)
+{
+ printf("MVEBU SATA INIT\n");
+ board_ahci_enable();
ahci_init((void __iomem *)MVEBU_SATA0_BASE);
}
#endif
--
2.20.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [U-Boot] [PATCH 2/2] ata: ahci_mvebu: add support for Armada 38x
2019-03-24 11:27 [U-Boot] [PATCH 1/2] ARM: mvebu: define board_ahci_enable() for A38x Baruch Siach
@ 2019-03-24 11:27 ` Baruch Siach
2019-03-25 7:05 ` Stefan Roese
2019-04-11 12:05 ` Stefan Roese
2019-03-25 7:05 ` [U-Boot] [PATCH 1/2] ARM: mvebu: define board_ahci_enable() for A38x Stefan Roese
2019-04-11 12:05 ` Stefan Roese
2 siblings, 2 replies; 6+ messages in thread
From: Baruch Siach @ 2019-03-24 11:27 UTC (permalink / raw)
To: u-boot
With board_ahci_enable() implementation for Armada 38x in place we can
now enable 38x support in the ahci_mvebu driver.
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
drivers/ata/ahci_mvebu.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/ata/ahci_mvebu.c b/drivers/ata/ahci_mvebu.c
index 6e3f17ee276d..48a9d00d1479 100644
--- a/drivers/ata/ahci_mvebu.c
+++ b/drivers/ata/ahci_mvebu.c
@@ -44,6 +44,7 @@ static int mvebu_ahci_probe(struct udevice *dev)
}
static const struct udevice_id mvebu_ahci_ids[] = {
+ { .compatible = "marvell,armada-380-ahci" },
{ .compatible = "marvell,armada-3700-ahci" },
{ .compatible = "marvell,armada-8k-ahci" },
{ }
--
2.20.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [U-Boot] [PATCH 2/2] ata: ahci_mvebu: add support for Armada 38x
2019-03-24 11:27 ` [U-Boot] [PATCH 2/2] ata: ahci_mvebu: add support for Armada 38x Baruch Siach
@ 2019-03-25 7:05 ` Stefan Roese
2019-04-11 12:05 ` Stefan Roese
1 sibling, 0 replies; 6+ messages in thread
From: Stefan Roese @ 2019-03-25 7:05 UTC (permalink / raw)
To: u-boot
On 24.03.19 12:27, Baruch Siach wrote:
> With board_ahci_enable() implementation for Armada 38x in place we can
> now enable 38x support in the ahci_mvebu driver.
>
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> ---
> drivers/ata/ahci_mvebu.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/ata/ahci_mvebu.c b/drivers/ata/ahci_mvebu.c
> index 6e3f17ee276d..48a9d00d1479 100644
> --- a/drivers/ata/ahci_mvebu.c
> +++ b/drivers/ata/ahci_mvebu.c
> @@ -44,6 +44,7 @@ static int mvebu_ahci_probe(struct udevice *dev)
> }
>
> static const struct udevice_id mvebu_ahci_ids[] = {
> + { .compatible = "marvell,armada-380-ahci" },
> { .compatible = "marvell,armada-3700-ahci" },
> { .compatible = "marvell,armada-8k-ahci" },
> { }
>
Reviewed-by: Stefan Roese <sr@denx.de>
Thanks,
Stefan
^ permalink raw reply [flat|nested] 6+ messages in thread* [U-Boot] [PATCH 2/2] ata: ahci_mvebu: add support for Armada 38x
2019-03-24 11:27 ` [U-Boot] [PATCH 2/2] ata: ahci_mvebu: add support for Armada 38x Baruch Siach
2019-03-25 7:05 ` Stefan Roese
@ 2019-04-11 12:05 ` Stefan Roese
1 sibling, 0 replies; 6+ messages in thread
From: Stefan Roese @ 2019-04-11 12:05 UTC (permalink / raw)
To: u-boot
On 24.03.19 12:27, Baruch Siach wrote:
> With board_ahci_enable() implementation for Armada 38x in place we can
> now enable 38x support in the ahci_mvebu driver.
>
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Applied to u-boot-marvell/master.
Thanks,
Stefan
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH 1/2] ARM: mvebu: define board_ahci_enable() for A38x
2019-03-24 11:27 [U-Boot] [PATCH 1/2] ARM: mvebu: define board_ahci_enable() for A38x Baruch Siach
2019-03-24 11:27 ` [U-Boot] [PATCH 2/2] ata: ahci_mvebu: add support for Armada 38x Baruch Siach
@ 2019-03-25 7:05 ` Stefan Roese
2019-04-11 12:05 ` Stefan Roese
2 siblings, 0 replies; 6+ messages in thread
From: Stefan Roese @ 2019-03-25 7:05 UTC (permalink / raw)
To: u-boot
On 24.03.19 12:27, Baruch Siach wrote:
> This allows the ahci_mvebu driver to do A38x platform specific
> configuration at initialization.
>
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> ---
> arch/arm/mach-mvebu/cpu.c | 13 ++++++++++---
> 1 file changed, 10 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c
> index 919d05c88c77..5d3f553b5dd3 100644
> --- a/arch/arm/mach-mvebu/cpu.c
> +++ b/arch/arm/mach-mvebu/cpu.c
> @@ -501,7 +501,6 @@ int board_mmc_init(bd_t *bis)
> }
> #endif
>
> -#ifdef CONFIG_SCSI_AHCI_PLAT
> #define AHCI_VENDOR_SPECIFIC_0_ADDR 0xa0
> #define AHCI_VENDOR_SPECIFIC_0_DATA 0xa4
>
> @@ -545,11 +544,19 @@ static void ahci_mvebu_regret_option(void __iomem *base)
> writel(0x80, base + AHCI_VENDOR_SPECIFIC_0_DATA);
> }
>
> -void scsi_init(void)
> +int board_ahci_enable(void)
> {
> - printf("MVEBU SATA INIT\n");
> ahci_mvebu_mbus_config((void __iomem *)MVEBU_SATA0_BASE);
> ahci_mvebu_regret_option((void __iomem *)MVEBU_SATA0_BASE);
> +
> + return 0;
> +}
> +
> +#ifdef CONFIG_SCSI_AHCI_PLAT
> +void scsi_init(void)
> +{
> + printf("MVEBU SATA INIT\n");
> + board_ahci_enable();
> ahci_init((void __iomem *)MVEBU_SATA0_BASE);
> }
> #endif
>
Reviewed-by: Stefan Roese <sr@denx.de>
Thanks,
Stefan
^ permalink raw reply [flat|nested] 6+ messages in thread* [U-Boot] [PATCH 1/2] ARM: mvebu: define board_ahci_enable() for A38x
2019-03-24 11:27 [U-Boot] [PATCH 1/2] ARM: mvebu: define board_ahci_enable() for A38x Baruch Siach
2019-03-24 11:27 ` [U-Boot] [PATCH 2/2] ata: ahci_mvebu: add support for Armada 38x Baruch Siach
2019-03-25 7:05 ` [U-Boot] [PATCH 1/2] ARM: mvebu: define board_ahci_enable() for A38x Stefan Roese
@ 2019-04-11 12:05 ` Stefan Roese
2 siblings, 0 replies; 6+ messages in thread
From: Stefan Roese @ 2019-04-11 12:05 UTC (permalink / raw)
To: u-boot
On 24.03.19 12:27, Baruch Siach wrote:
> This allows the ahci_mvebu driver to do A38x platform specific
> configuration at initialization.
>
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Applied to u-boot-marvell/master.
Thanks,
Stefan
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-04-11 12:05 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-24 11:27 [U-Boot] [PATCH 1/2] ARM: mvebu: define board_ahci_enable() for A38x Baruch Siach
2019-03-24 11:27 ` [U-Boot] [PATCH 2/2] ata: ahci_mvebu: add support for Armada 38x Baruch Siach
2019-03-25 7:05 ` Stefan Roese
2019-04-11 12:05 ` Stefan Roese
2019-03-25 7:05 ` [U-Boot] [PATCH 1/2] ARM: mvebu: define board_ahci_enable() for A38x Stefan Roese
2019-04-11 12:05 ` Stefan Roese
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.