ARM: imx: apalis_imx6: Drop ad-hoc SATA binding
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> 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> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
This commit is contained in:
		
							parent
							
								
									1023c8739b
								
							
						
					
					
						commit
						64c751f635
					
				| 
						 | 
					@ -1131,52 +1131,3 @@ U_BOOT_DEVICE(mxc_serial) = {
 | 
				
			||||||
	.name = "serial_mxc",
 | 
						.name = "serial_mxc",
 | 
				
			||||||
	.platdata = &mxc_serial_plat,
 | 
						.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 */
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue