colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drivers: ata: Rename ahci_mvebu

Browse Source 
Rename 'ahci_mvebu' to 'ahci_generic' and select it by default.
The AHCI driver contains no SoC specific code and only expects the
base address to be passed, thus rename it to ahci_generic and add the
DT compatible string "generic-ahci".

Update existing defconfigs to use the new Kconfig name as well.

TEST: Booted on QEMU sbsa using the generic-ahci node.

Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com>
Reviewed-by: Stefan Roese <sr@denx.de>
Cc: Tom Rini <trini@konsulko.com>
Cc: Stefan Roese <sr@denx.de>
Acked-by: Tony Dinh <mibodhi@gmail.com>
This commit is contained in:
Patrick Rudolph
2024-10-23 15:20:00 +02:00
committed by Tom Rini
parent b6fbcb0a56
commit 1289c7ccba
22 changed files with 36 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MAINTAINERS
View File

@@ -356,7 +356,7 @@ S: Maintained
T: git https://source.denx.de/u-boot/custodians/u-boot-marvell.git T: git https://source.denx.de/u-boot/custodians/u-boot-marvell.git
F: arch/arm/mach-kirkwood/ F: arch/arm/mach-kirkwood/
F: arch/arm/mach-mvebu/ F: arch/arm/mach-mvebu/
F: drivers/ata/ahci_mvebu.c F: drivers/ata/ahci_generic.c
F: drivers/clk/mvebu/ F: drivers/clk/mvebu/
F: drivers/ddr/marvell/ F: drivers/ddr/marvell/
F: drivers/gpio/mvebu_gpio.c F: drivers/gpio/mvebu_gpio.c

2
configs/clearfog_defconfig
View File

@@ -52,7 +52,7 @@ CONFIG_ARP_TIMEOUT=200
CONFIG_NET_RETRY_COUNT=50 CONFIG_NET_RETRY_COUNT=50
CONFIG_NET_RANDOM_ETHADDR=y CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_SPL_OF_TRANSLATE=y CONFIG_SPL_OF_TRANSLATE=y
CONFIG_AHCI_MVEBU=y CONFIG_AHCI_GENERIC=y
CONFIG_DM_PCA953X=y CONFIG_DM_PCA953X=y
CONFIG_DM_I2C=y CONFIG_DM_I2C=y
CONFIG_SYS_I2C_MVTWSI=y CONFIG_SYS_I2C_MVTWSI=y

2
configs/clearfog_gt_8k_defconfig
View File

@@ -46,7 +46,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
CONFIG_ARP_TIMEOUT=200 CONFIG_ARP_TIMEOUT=200
CONFIG_NET_RETRY_COUNT=50 CONFIG_NET_RETRY_COUNT=50
CONFIG_NET_RANDOM_ETHADDR=y CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_AHCI_MVEBU=y CONFIG_AHCI_GENERIC=y
CONFIG_LBA48=y CONFIG_LBA48=y
CONFIG_SYS_64BIT_LBA=y CONFIG_SYS_64BIT_LBA=y
CONFIG_DM_I2C=y CONFIG_DM_I2C=y

2
configs/clearfog_sata_defconfig
View File

@@ -52,7 +52,7 @@ CONFIG_ARP_TIMEOUT=200
CONFIG_NET_RETRY_COUNT=50 CONFIG_NET_RETRY_COUNT=50
CONFIG_NET_RANDOM_ETHADDR=y CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_SPL_OF_TRANSLATE=y CONFIG_SPL_OF_TRANSLATE=y
CONFIG_AHCI_MVEBU=y CONFIG_AHCI_GENERIC=y
CONFIG_DM_PCA953X=y CONFIG_DM_PCA953X=y
CONFIG_DM_I2C=y CONFIG_DM_I2C=y
CONFIG_SYS_I2C_MVTWSI=y CONFIG_SYS_I2C_MVTWSI=y

2
configs/clearfog_spi_defconfig
View File

@@ -52,7 +52,7 @@ CONFIG_ARP_TIMEOUT=200
CONFIG_NET_RETRY_COUNT=50 CONFIG_NET_RETRY_COUNT=50
CONFIG_NET_RANDOM_ETHADDR=y CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_SPL_OF_TRANSLATE=y CONFIG_SPL_OF_TRANSLATE=y
CONFIG_AHCI_MVEBU=y CONFIG_AHCI_GENERIC=y
CONFIG_DM_PCA953X=y CONFIG_DM_PCA953X=y
CONFIG_DM_I2C=y CONFIG_DM_I2C=y
CONFIG_SYS_I2C_MVTWSI=y CONFIG_SYS_I2C_MVTWSI=y

2
configs/db-88f6820-gp_defconfig
View File

@@ -58,7 +58,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
CONFIG_ARP_TIMEOUT=200 CONFIG_ARP_TIMEOUT=200
CONFIG_NET_RETRY_COUNT=50 CONFIG_NET_RETRY_COUNT=50
CONFIG_SPL_OF_TRANSLATE=y CONFIG_SPL_OF_TRANSLATE=y
CONFIG_AHCI_MVEBU=y CONFIG_AHCI_GENERIC=y
CONFIG_SYS_I2C_LEGACY=y CONFIG_SYS_I2C_LEGACY=y
CONFIG_SPL_SYS_I2C_LEGACY=y CONFIG_SPL_SYS_I2C_LEGACY=y
CONFIG_SYS_I2C_MVTWSI=y CONFIG_SYS_I2C_MVTWSI=y

2
configs/ds116_defconfig
View File

@@ -65,7 +65,7 @@ CONFIG_NET_RETRY_COUNT=50
CONFIG_NET_RANDOM_ETHADDR=y CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_NETCONSOLE=y CONFIG_NETCONSOLE=y
CONFIG_SPL_OF_TRANSLATE=y CONFIG_SPL_OF_TRANSLATE=y
CONFIG_AHCI_MVEBU=y CONFIG_AHCI_GENERIC=y
CONFIG_LBA48=y CONFIG_LBA48=y
CONFIG_SYS_64BIT_LBA=y CONFIG_SYS_64BIT_LBA=y
CONFIG_DM_I2C=y CONFIG_DM_I2C=y

2
configs/helios4_defconfig
View File

@@ -52,7 +52,7 @@ CONFIG_ARP_TIMEOUT=200
CONFIG_NET_RETRY_COUNT=50 CONFIG_NET_RETRY_COUNT=50
CONFIG_NET_RANDOM_ETHADDR=y CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_SPL_OF_TRANSLATE=y CONFIG_SPL_OF_TRANSLATE=y
CONFIG_AHCI_MVEBU=y CONFIG_AHCI_GENERIC=y
CONFIG_DM_PCA953X=y CONFIG_DM_PCA953X=y
CONFIG_DM_I2C=y CONFIG_DM_I2C=y
CONFIG_SYS_I2C_MVTWSI=y CONFIG_SYS_I2C_MVTWSI=y

2
configs/mvebu_crb_cn9130_defconfig
View File

@@ -46,7 +46,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
CONFIG_SYS_MMC_ENV_DEV=1 CONFIG_SYS_MMC_ENV_DEV=1
CONFIG_ARP_TIMEOUT=200 CONFIG_ARP_TIMEOUT=200
CONFIG_NET_RETRY_COUNT=50 CONFIG_NET_RETRY_COUNT=50
CONFIG_AHCI_MVEBU=y CONFIG_AHCI_GENERIC=y
CONFIG_LBA48=y CONFIG_LBA48=y
CONFIG_SYS_64BIT_LBA=y CONFIG_SYS_64BIT_LBA=y
CONFIG_DM_I2C=y CONFIG_DM_I2C=y

2
configs/mvebu_db-88f3720_defconfig
View File

@@ -43,7 +43,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y
CONFIG_ARP_TIMEOUT=200 CONFIG_ARP_TIMEOUT=200
CONFIG_NET_RETRY_COUNT=50 CONFIG_NET_RETRY_COUNT=50
CONFIG_AHCI_MVEBU=y CONFIG_AHCI_GENERIC=y
CONFIG_LBA48=y CONFIG_LBA48=y
CONFIG_SYS_64BIT_LBA=y CONFIG_SYS_64BIT_LBA=y
CONFIG_CLK=y CONFIG_CLK=y

2
configs/mvebu_db_armada8k_defconfig
View File

@@ -42,7 +42,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y
CONFIG_ARP_TIMEOUT=200 CONFIG_ARP_TIMEOUT=200
CONFIG_NET_RETRY_COUNT=50 CONFIG_NET_RETRY_COUNT=50
CONFIG_AHCI_MVEBU=y CONFIG_AHCI_GENERIC=y
CONFIG_LBA48=y CONFIG_LBA48=y
CONFIG_SYS_64BIT_LBA=y CONFIG_SYS_64BIT_LBA=y
CONFIG_DM_I2C=y CONFIG_DM_I2C=y

2
configs/mvebu_db_cn9130_defconfig
View File

@@ -47,7 +47,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
CONFIG_SYS_MMC_ENV_DEV=1 CONFIG_SYS_MMC_ENV_DEV=1
CONFIG_ARP_TIMEOUT=200 CONFIG_ARP_TIMEOUT=200
CONFIG_NET_RETRY_COUNT=50 CONFIG_NET_RETRY_COUNT=50
CONFIG_AHCI_MVEBU=y CONFIG_AHCI_GENERIC=y
CONFIG_LBA48=y CONFIG_LBA48=y
CONFIG_SYS_64BIT_LBA=y CONFIG_SYS_64BIT_LBA=y
CONFIG_DM_GPIO_LOOKUP_LABEL=y CONFIG_DM_GPIO_LOOKUP_LABEL=y

2
configs/mvebu_espressobin-88f3720_defconfig
View File

@@ -54,7 +54,7 @@ CONFIG_ARP_TIMEOUT=200
CONFIG_NET_RETRY_COUNT=50 CONFIG_NET_RETRY_COUNT=50
CONFIG_NET_RANDOM_ETHADDR=y CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_AHCI_PCI=y CONFIG_AHCI_PCI=y
CONFIG_AHCI_MVEBU=y CONFIG_AHCI_GENERIC=y
CONFIG_LBA48=y CONFIG_LBA48=y
CONFIG_SYS_64BIT_LBA=y CONFIG_SYS_64BIT_LBA=y
CONFIG_CLK=y CONFIG_CLK=y

2
configs/mvebu_espressobin_ultra-88f3720_defconfig
View File

@@ -53,7 +53,7 @@ CONFIG_ARP_TIMEOUT=200
CONFIG_NET_RETRY_COUNT=50 CONFIG_NET_RETRY_COUNT=50
CONFIG_NET_RANDOM_ETHADDR=y CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_AHCI_PCI=y CONFIG_AHCI_PCI=y
CONFIG_AHCI_MVEBU=y CONFIG_AHCI_GENERIC=y
CONFIG_LBA48=y CONFIG_LBA48=y
CONFIG_SYS_64BIT_LBA=y CONFIG_SYS_64BIT_LBA=y
CONFIG_CLK=y CONFIG_CLK=y

2
configs/mvebu_mcbin-88f8040_defconfig
View File

@@ -46,7 +46,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
CONFIG_ARP_TIMEOUT=200 CONFIG_ARP_TIMEOUT=200
CONFIG_NET_RETRY_COUNT=50 CONFIG_NET_RETRY_COUNT=50
CONFIG_NET_RANDOM_ETHADDR=y CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_AHCI_MVEBU=y CONFIG_AHCI_GENERIC=y
CONFIG_LBA48=y CONFIG_LBA48=y
CONFIG_SYS_64BIT_LBA=y CONFIG_SYS_64BIT_LBA=y
CONFIG_DM_I2C=y CONFIG_DM_I2C=y

2
configs/mvebu_puzzle-m801-88f8040_defconfig
View File

@@ -49,7 +49,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
CONFIG_ARP_TIMEOUT=200 CONFIG_ARP_TIMEOUT=200
CONFIG_NET_RETRY_COUNT=50 CONFIG_NET_RETRY_COUNT=50
CONFIG_NET_RANDOM_ETHADDR=y CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_AHCI_MVEBU=y CONFIG_AHCI_GENERIC=y
CONFIG_LBA48=y CONFIG_LBA48=y
CONFIG_SYS_64BIT_LBA=y CONFIG_SYS_64BIT_LBA=y
CONFIG_DM_PCA953X=y CONFIG_DM_PCA953X=y

2
configs/n2350_defconfig
View File

@@ -65,7 +65,7 @@ CONFIG_NET_RETRY_COUNT=50
CONFIG_NET_RANDOM_ETHADDR=y CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_NETCONSOLE=y CONFIG_NETCONSOLE=y
CONFIG_SPL_OF_TRANSLATE=y CONFIG_SPL_OF_TRANSLATE=y
CONFIG_AHCI_MVEBU=y CONFIG_AHCI_GENERIC=y
CONFIG_LBA48=y CONFIG_LBA48=y
CONFIG_SYS_64BIT_LBA=y CONFIG_SYS_64BIT_LBA=y
CONFIG_DM_I2C=y CONFIG_DM_I2C=y

2
configs/octeon_nic23_defconfig
View File

@@ -46,7 +46,7 @@ CONFIG_EFI_PARTITION=y
CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_TFTP_TSIZE=y CONFIG_TFTP_TSIZE=y
CONFIG_SATA=y CONFIG_SATA=y
CONFIG_AHCI_MVEBU=y CONFIG_AHCI_GENERIC=y
CONFIG_LBA48=y CONFIG_LBA48=y
CONFIG_SYS_64BIT_LBA=y CONFIG_SYS_64BIT_LBA=y
CONFIG_CLK=y CONFIG_CLK=y

2
configs/turris_omnia_defconfig
View File

@@ -90,7 +90,7 @@ CONFIG_NET_RETRY_COUNT=50
CONFIG_NETCONSOLE=y CONFIG_NETCONSOLE=y
CONFIG_SPL_OF_TRANSLATE=y CONFIG_SPL_OF_TRANSLATE=y
CONFIG_AHCI_PCI=y CONFIG_AHCI_PCI=y
CONFIG_AHCI_MVEBU=y CONFIG_AHCI_GENERIC=y
CONFIG_DM_PCA953X=y CONFIG_DM_PCA953X=y
CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_MV=y CONFIG_MMC_SDHCI_MV=y

12
drivers/ata/Kconfig
View File

@@ -78,14 +78,16 @@ config MTK_AHCI
Enable this driver to support Sata devices through Enable this driver to support Sata devices through
Mediatek AHCI controller (e.g. MT7622). Mediatek AHCI controller (e.g. MT7622).
config AHCI_MVEBU config AHCI_GENERIC
bool "Marvell EBU AHCI SATA support" bool "Generic AHCI SATA support"
depends on ARCH_MVEBU || ARCH_OCTEON depends on OF_CONTROL
select SCSI_AHCI select SCSI_AHCI
select SCSI select SCSI
help help
This option enables support for the Marvell EBU SoC's This option enables support for generic onboard AHCI SATA controller
onboard AHCI SATA. that do not need platform specific quirks, like emulated devices,
Marvell EBU SoC's onboard AHCI SATA controllers or Cavium's Octeon
7130 AHCI controllers.
If unsure, say N. If unsure, say N.

2
drivers/ata/Makefile
View File

@@ -14,6 +14,6 @@ obj-$(CONFIG_SATA) += sata.o sata_bootdev.o
obj-$(CONFIG_SATA_CEVA) += sata_ceva.o obj-$(CONFIG_SATA_CEVA) += sata_ceva.o
obj-$(CONFIG_SATA_MV) += sata_mv.o obj-$(CONFIG_SATA_MV) += sata_mv.o
obj-$(CONFIG_SATA_SIL) += sata_sil.o obj-$(CONFIG_SATA_SIL) += sata_sil.o
obj-$(CONFIG_AHCI_MVEBU) += ahci_mvebu.o obj-$(CONFIG_AHCI_GENERIC) += ahci_generic.o
obj-$(CONFIG_SUNXI_AHCI) += ahci_sunxi.o obj-$(CONFIG_SUNXI_AHCI) += ahci_sunxi.o
obj-$(CONFIG_MTK_AHCI) += mtk_ahci.o obj-$(CONFIG_MTK_AHCI) += mtk_ahci.o

17
drivers/ata/ahci_mvebu.c → drivers/ata/ahci_generic.c
View File

@@ -16,7 +16,7 @@ __weak int board_ahci_enable(void)
return 0; return 0;
} }
static int mvebu_ahci_bind(struct udevice *dev) static int generic_ahci_bind(struct udevice *dev)
{ {
struct udevice *scsi_dev; struct udevice *scsi_dev;
int ret; int ret;
@@ -30,7 +30,7 @@ static int mvebu_ahci_bind(struct udevice *dev)
return 0; return 0;
} }
static int mvebu_ahci_probe(struct udevice *dev) static int generic_ahci_probe(struct udevice *dev)
{ {
/* /*
* Board specific SATA / AHCI enable code, e.g. enable the * Board specific SATA / AHCI enable code, e.g. enable the
@@ -43,18 +43,19 @@ static int mvebu_ahci_probe(struct udevice *dev)
return 0; return 0;
} }
static const struct udevice_id mvebu_ahci_ids[] = { static const struct udevice_id generic_ahci_ids[] = {
{ .compatible = "marvell,armada-380-ahci" }, { .compatible = "marvell,armada-380-ahci" },
{ .compatible = "marvell,armada-3700-ahci" }, { .compatible = "marvell,armada-3700-ahci" },
{ .compatible = "marvell,armada-8k-ahci" }, { .compatible = "marvell,armada-8k-ahci" },
{ .compatible = "cavium,octeon-7130-ahci" }, { .compatible = "cavium,octeon-7130-ahci" },
{ .compatible = "generic-ahci" },
{ } { }
}; };
U_BOOT_DRIVER(ahci_mvebu_drv) = { U_BOOT_DRIVER(ahci_generic_drv) = {
.name = "ahci_mvebu", .name = "ahci_generic",
.id = UCLASS_AHCI, .id = UCLASS_AHCI,
.of_match = mvebu_ahci_ids, .of_match = generic_ahci_ids,
.bind = mvebu_ahci_bind, .bind = generic_ahci_bind,
.probe = mvebu_ahci_probe, .probe = generic_ahci_probe,
}; };