[PATCH] ata: intf_platform_ide: add OF bindings

Sascha Hauer s.hauer at pengutronix.de
Thu Sep 3 11:13:52 PDT 2015


On Thu, Sep 03, 2015 at 07:04:18PM +0300, Peter Mamonov wrote:
> Signed-off-by: Peter Mamonov <pmamonov at gmail.com>
> ---
>  drivers/ata/intf_platform_ide.c | 30 ++++++++++++++++++++++++++++--
>  1 file changed, 28 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/ata/intf_platform_ide.c b/drivers/ata/intf_platform_ide.c
> index 0d392d8..ba28f17 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
> @@ -87,8 +88,24 @@ static int platform_ide_probe(struct device_d *dev)
>  	int mmio = 0;
>  
>  	if (pdata == NULL) {
> -		dev_err(dev, "No platform data. Cannot continue\n");
> -		return -EINVAL;
> +		/* try to get platform data from the device tree */
> +		struct device_node *dn = dev->device_node;
> +		u32 tmp32;
> +
> +		if (dn == NULL) {
> +			dev_err(dev, "No platform data. Cannot continue\n");
> +			return -EINVAL;
> +		}
> +
> +		pdata = xzalloc(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;

No need to allocate extra memory for platform_data which is solely used
in this function. Please just use two local variables dataif_be and
ioport_shift which you either fill in from platform_data or from device
tree.

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |



More information about the barebox mailing list