[U-Boot] [PATCH] ARM: imx: apalis_imx6: Drop ad-hoc SATA binding

Marcel Ziswiler
2019-05-23T10:48:23Z

On Sun, 2019-05-12 at 22:43 +0200, Marek Vasut wrote:
> Drop the ad-hoc AHCI binding code, this is superseded by
> CONFIG_DWC_AHSATA_AHCI=y resp. drivers/ata/dwc_ahsata.c
>
> Signed-off-by: Marek Vasut <marex@denx.de>

Works fine, thanks!

Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>

> Cc: Fabio Estevam <fabio.estevam@nxp.com>
> Cc: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> Cc: Max Krummenacher <max.krummenacher@toradex.com>
> Cc: Stefan Agner <stefan.agner@toradex.com>
> Cc: Stefano Babic <sbabic@denx.de>
> ---
> board/toradex/apalis_imx6/apalis_imx6.c | 49 ---------------------
> ----
> 1 file changed, 49 deletions(-)
>
> diff --git a/board/toradex/apalis_imx6/apalis_imx6.c
> b/board/toradex/apalis_imx6/apalis_imx6.c
> index 3e59185438..b502d4ef13 100644
> --- a/board/toradex/apalis_imx6/apalis_imx6.c
> +++ b/board/toradex/apalis_imx6/apalis_imx6.c
> @@ -1131,52 +1131,3 @@ U_BOOT_DEVICE(mxc_serial) = {
> .name = "serial_mxc",
> .platdata = &mxc_serial_plat,
> };
> -
> -#if CONFIG_IS_ENABLED(AHCI)
> -static int sata_imx_probe(struct udevice *dev)
> -{
> - int i, err;
> -
> - for (i = 0; i < APALIS_IMX6_SATA_INIT_RETRIES; i++) {
> - err = setup_sata();
> - if (err) {
> - printf("SATA setup failed: %d\n", err);
> - return err;
> - }
> -
> - udelay(100);
> -
> - err = dwc_ahsata_probe(dev);
> - if (!err)
> - break;
> -
> - /* There is no device on the SATA port */
> - if (sata_dm_port_status(0, 0) == 0)
> - break;
> -
> - /* There's a device, but link not established. Retry */
> - device_remove(dev, DM_REMOVE_NORMAL);
> - }
> -
> - return 0;
> -}
> -
> -struct ahci_ops sata_imx_ops = {
> - .port_status = dwc_ahsata_port_status,
> - .reset = dwc_ahsata_bus_reset,
> - .scan = dwc_ahsata_scan,
> -};
> -
> -static const struct udevice_id sata_imx_ids[] = {
> - { .compatible = "fsl,imx6q-ahci" },
> - { }
> -};
> -
> -U_BOOT_DRIVER(sata_imx) = {
> - .name = "dwc_ahci",
> - .id = UCLASS_AHCI,
> - .of_match = sata_imx_ids,
> - .ops = &sata_imx_ops,
> - .probe = sata_imx_probe,
> -};
> -#endif /* AHCI */