[PATCH] ata: intf_platform_ide: add OF bindings

[Antony Pavlov]

On Thu,  3 Sep 2015 16:38:46 +0300
Peter Mamonov <pmamonov at gmail.com> wrote:

> Signed-off-by: Peter Mamonov <pmamonov at gmail.com>
> ---
>  drivers/ata/intf_platform_ide.c | 35 +++++++++++++++++++++++++++++++++--
>  1 file changed, 33 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/ata/intf_platform_ide.c b/drivers/ata/intf_platform_ide.c
> index 0d392d8..f20e0e0 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,10 +86,31 @@ static int platform_ide_probe(struct device_d *dev)
>  	void *reg_base, *alt_base = NULL;
>  	struct resource *reg, *alt;
>  	int mmio = 0;
> +	struct device_node *dn = dev->device_node;
> +	u32 tmp32;

Can we move dn and tmp32 declarations under 'if (pdata == NULL) {' ?

>  
>  	if (pdata == NULL) {
> -		dev_err(dev, "No platform data. Cannot continue\n");
> -		return -EINVAL;
> +		/* try to get platform data from the device tree */
> +		if (dn == NULL) {
> +			dev_err(dev, "No platform data. Cannot continue\n");
> +			return -EINVAL;
> +		}
> +
> +		pdata = xzalloc(sizeof(struct ide_port_info));
> +
> +		if (!pdata) {

xzalloc() can't return NULL.

Please drop this 'if' operator.

> +			dev_err(dev, "Platform data allocation failed\n");
> +			return -ENOMEM;
> +		}
> +		device_add_data(dev, pdata, sizeof(struct ide_port_info));
> +
> +		if (of_property_read_bool(dn, "dataif-be"))
> +			pdata->dataif_be = 1;
> +
> +		if (of_property_read_u32(dn, "reg-shift", &tmp32) == 0)
> +			pdata->ioport_shift = (unsigned)tmp32;
> +
> +		dev->platform_data = pdata;
>  	}
>  
>  	reg_base = dev_request_mem_region(dev, 0);
> @@ -136,9 +158,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);
>  
> -- 
> 2.1.4
> 
> 
> _______________________________________________
> barebox mailing list
> barebox at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox


-- 
-- 
Best regards,
  Antony Pavlov