[PATCHv2] ata: intf_platform_ide: add OF bindings

[Lucas Stach]

Am Montag, den 07.09.2015, 18:44 +0300 schrieb Peter Mamonov:
> Signed-off-by: Peter Mamonov <pmamonov at gmail.com>
> ---
>  drivers/ata/intf_platform_ide.c | 36 +++++++++++++++++++++++++++++++-----
>  1 file changed, 31 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/ata/intf_platform_ide.c b/drivers/ata/intf_platform_ide.c
> index 0d392d8..e46c2c8 100644
> --- a/drivers/ata/intf_platform_ide.c
> +++ b/drivers/ata/intf_platform_ide.c
> @@ -29,6 +29,7 @@
>  #include <ata_drive.h>
>  #include <platform_ide.h>
>  #include <linux/err.h>
> +#include <of.h>
>  
>  /**
>   * Setup the register specific addresses for an ATA like divice
> @@ -85,8 +86,24 @@ static int platform_ide_probe(struct device_d *dev)
>  	void *reg_base, *alt_base = NULL;
>  	struct resource *reg, *alt;
>  	int mmio = 0;
> -
> -	if (pdata == NULL) {
> +	struct device_node *dn = dev->device_node;
> +	unsigned ioport_shift = 0;
> +	int dataif_be = 0;
> +	void (*reset)(int) = NULL;
> +
> +	if (pdata) {
> +		ioport_shift = pdata->ioport_shift;
> +		dataif_be = pdata->dataif_be;
> +		reset = pdata->reset;
> +	} else if (dn) {
> +		/* try to get platform data from the device tree */
> +		u32 tmp32;
> +
> +		if (of_property_read_u32(dn, "reg-shift", &tmp32) == 0)
> +			ioport_shift = (unsigned)tmp32;

This is okay, as it's already used by the established precedent in
Linux.

> +		if (of_property_read_bool(dn, "dataif-be"))
> +			dataif_be = 1;

This is not okay, there is no precedent for this property in Linux and
there is no binding specifying this property.

> +	} else {
>  		dev_err(dev, "No platform data. Cannot continue\n");
>  		return -EINVAL;
>  	}
> @@ -123,9 +140,9 @@ static int platform_ide_probe(struct device_d *dev)
>  	ide = xzalloc(sizeof(*ide));
>  	ide->io.mmio = mmio;
>  
> -	platform_ide_setup_port(reg_base, alt_base, &ide->io, pdata->ioport_shift);
> -	ide->io.reset = pdata->reset;
> -	ide->io.dataif_be = pdata->dataif_be;
> +	platform_ide_setup_port(reg_base, alt_base, &ide->io, ioport_shift);
> +	ide->io.reset = reset;
> +	ide->io.dataif_be = dataif_be;
>  
>  	rc = ide_port_register(ide);
>  	if (rc != 0) {
> @@ -136,9 +153,18 @@ static int platform_ide_probe(struct device_d *dev)
>  	return rc;
>  }
>  
> +static __maybe_unused struct of_device_id platform_ide_dt_ids[] = {
> +	{
> +		.compatible = "ata-generic",
> +	}, {
> +		/* sentinel */
> +	}
> +};
> +
>  static struct driver_d platform_ide_driver = {
>  	.name   = "ide_intf",
>  	.probe  = platform_ide_probe,
> +	.of_compatible = DRV_OF_COMPAT(platform_ide_dt_ids),
>  };
>  device_platform_driver(platform_ide_driver);
>  

-- 
Pengutronix e.K.             | Lucas Stach                 |
Industrial Linux Solutions   | http://www.pengutronix.de/  |