[U-Boot] [PATCH 1/2] ARM: mvebu: define board_ahci_enable() for A38x

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

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" }, { }

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

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

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

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
participants (2)
-
Baruch Siach
-
Stefan Roese