dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-02 01:02:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

sunxi: update SATA driver to always use DM_SCSI

Browse Source 
It seems like the Allwinner SATA driver is already quite capable of
using the driver model, so we can force this on all boards and can
remove support for a non-DM_SCSI build.
This removes the warning about boards with SATA ports not being
DM_SCSI compliant.

It also takes the opportunity to move the driver out of the board/sunxi
directory to join its siblings in drivers/ata, and to make it a proper
Kconfig citizen.

The board defconfigs stay untouched.

Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Jagan Teki <jagan@openedev.com>
[jagan: select DM_SCSI separately]
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
This commit is contained in:
Andre Przywara
2019-04-12 16:28:54 +05:30
committed by Jagan Teki
parent bb3362b0ca
commit f8c8669760
6 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
board/sunxi/Makefile
View File

@@ -8,9 +8,6 @@
# Wolfgang Denk, DENX Software Engineering, wd@denx.de. # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
obj-y += board.o obj-y += board.o
obj-$(CONFIG_SUN7I_GMAC) += gmac.o obj-$(CONFIG_SUN7I_GMAC) += gmac.o
ifndef CONFIG_SPL_BUILD
obj-$(CONFIG_SUNXI_AHCI) += ahci.o
endif
obj-$(CONFIG_MACH_SUN4I) += dram_sun4i_auto.o obj-$(CONFIG_MACH_SUN4I) += dram_sun4i_auto.o
obj-$(CONFIG_MACH_SUN5I) += dram_sun5i_auto.o obj-$(CONFIG_MACH_SUN5I) += dram_sun5i_auto.o
obj-$(CONFIG_MACH_SUN7I) += dram_sun5i_auto.o obj-$(CONFIG_MACH_SUN7I) += dram_sun5i_auto.o

8
drivers/ata/Kconfig
View File

@@ -101,6 +101,14 @@ config SATA_SIL3114
help help
Enable this driver to support the SIL3114 SATA controllers. Enable this driver to support the SIL3114 SATA controllers.
config SUNXI_AHCI
bool "Enable Allwinner SATA driver support"
depends on AHCI
default y if ARCH_SUNXI
help
Enable this driver to support the SATA controllers found in the
Allwinner A10, A20 and R40 SoCs.
config AHCI_MVEBU config AHCI_MVEBU
bool "Marvell EBU AHCI SATA support" bool "Marvell EBU AHCI SATA support"
depends on ARCH_MVEBU depends on ARCH_MVEBU

1
drivers/ata/Makefile
View File

@@ -18,3 +18,4 @@ obj-$(CONFIG_SATA_SIL3114) += sata_sil3114.o
obj-$(CONFIG_SATA_SIL) += sata_sil.o obj-$(CONFIG_SATA_SIL) += sata_sil.o
obj-$(CONFIG_SANDBOX) += sata_sandbox.o obj-$(CONFIG_SANDBOX) += sata_sandbox.o
obj-$(CONFIG_AHCI_MVEBU) += ahci_mvebu.o obj-$(CONFIG_AHCI_MVEBU) += ahci_mvebu.o
obj-$(CONFIG_SUNXI_AHCI) += ahci_sunxi.o

10
board/sunxi/ahci.c → drivers/ata/ahci_sunxi.c
View File

@@ -70,15 +70,6 @@ static int sunxi_ahci_phy_init(u8 *reg_base)
return 0; return 0;
} }
#ifndef CONFIG_DM_SCSI
void scsi_init(void)
{
if (sunxi_ahci_phy_init((u8 *)SUNXI_SATA_BASE) < 0)
return;
ahci_init((void __iomem *)SUNXI_SATA_BASE);
}
#else
static int sunxi_sata_probe(struct udevice *dev) static int sunxi_sata_probe(struct udevice *dev)
{ {
ulong base; ulong base;
@@ -132,4 +123,3 @@ U_BOOT_DRIVER(ahci_sunxi_drv) = {
.bind = sunxi_sata_bind, .bind = sunxi_sata_bind,
.probe = sunxi_sata_probe, .probe = sunxi_sata_probe,
}; };
#endif

6
include/configs/sunxi-common.h
View File

@@ -104,13 +104,7 @@
#define PHYS_SDRAM_0_SIZE 0x80000000 /* 2 GiB */ #define PHYS_SDRAM_0_SIZE 0x80000000 /* 2 GiB */
#ifdef CONFIG_AHCI #ifdef CONFIG_AHCI
#define CONFIG_SCSI_AHCI_PLAT
#define CONFIG_SUNXI_AHCI
#define CONFIG_SYS_64BIT_LBA #define CONFIG_SYS_64BIT_LBA
#define CONFIG_SYS_SCSI_MAX_SCSI_ID 1
#define CONFIG_SYS_SCSI_MAX_LUN 1
#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
CONFIG_SYS_SCSI_MAX_LUN)
#endif #endif
#define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_SETUP_MEMORY_TAGS

1
scripts/config_whitelist.txt
View File

@@ -1939,7 +1939,6 @@ CONFIG_STV0991
CONFIG_STV0991_HZ CONFIG_STV0991_HZ
CONFIG_STV0991_HZ_CLOCK CONFIG_STV0991_HZ_CLOCK
CONFIG_ST_SMI CONFIG_ST_SMI
CONFIG_SUNXI_AHCI
CONFIG_SUNXI_GPIO CONFIG_SUNXI_GPIO
CONFIG_SUNXI_MAX_FB_SIZE CONFIG_SUNXI_MAX_FB_SIZE
CONFIG_SUPERH_ON_CHIP_R8A66597 CONFIG_SUPERH_ON_CHIP_R8A66597