android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

usb: renesas_usbhs: move device tree properties parsing

Browse Source 
In the future, each struct renesas_usbhs_driver_param is stored on
the each platform related source code (e.g. rcar3.c) to remove
usbhs_parse_dt(). So, this patch moves device tree properties
parsing to usbhs_probe().

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Yoshihiro Shimoda
2019-06-25 14:38:54 +09:00
committed by Greg Kroah-Hartman
parent f08acaf009
commit b3103d0b02
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/usb/renesas_usbhs/common.c
View File

@ -628,8 +628,6 @@ static struct renesas_usbhs_platform_info *usbhs_parse_dt(struct device *dev)
struct renesas_usbhs_platform_info *info; struct renesas_usbhs_platform_info *info;
struct renesas_usbhs_driver_param *dparam; struct renesas_usbhs_driver_param *dparam;
const struct usbhs_of_data *data; const struct usbhs_of_data *data;
u32 tmp;
int gpio;
info = devm_kzalloc(dev, sizeof(*info), GFP_KERNEL); info = devm_kzalloc(dev, sizeof(*info), GFP_KERNEL);
if (!info) if (!info)
@ -643,13 +641,6 @@ static struct renesas_usbhs_platform_info *usbhs_parse_dt(struct device *dev)
*dparam = data->param; *dparam = data->param;
info->platform_callback = *data->platform_callback; info->platform_callback = *data->platform_callback;
if (!of_property_read_u32(dev_of_node(dev), "renesas,buswait", &tmp))
dparam->buswait_bwait = tmp;
gpio = of_get_named_gpio_flags(dev_of_node(dev), "renesas,enable-gpio",
0, NULL);
if (gpio > 0)
dparam->enable_gpio = gpio;
return info; return info;
} }
@ -659,7 +650,8 @@ static int usbhs_probe(struct platform_device *pdev)
struct usbhs_priv *priv; struct usbhs_priv *priv;
struct resource *res, *irq_res; struct resource *res, *irq_res;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
int ret; int ret, gpio;
u32 tmp;
/* check device node */ /* check device node */
if (dev_of_node(dev)) if (dev_of_node(dev))
@ -720,6 +712,12 @@ static int usbhs_probe(struct platform_device *pdev)
} }
if (!priv->dparam.pio_dma_border) if (!priv->dparam.pio_dma_border)
priv->dparam.pio_dma_border = 64; /* 64byte */ priv->dparam.pio_dma_border = 64; /* 64byte */
if (!of_property_read_u32(dev_of_node(dev), "renesas,buswait", &tmp))
priv->dparam.buswait_bwait = tmp;
gpio = of_get_named_gpio_flags(dev_of_node(dev), "renesas,enable-gpio",
0, NULL);
if (gpio > 0)
priv->dparam.enable_gpio = gpio;
/* FIXME */ /* FIXME */
/* runtime power control ? */ /* runtime power control ? */