usb: renesas_usbhs: Add device tree support for R-Car H2 and M2
PATCH 2/2 usb: renesas_usbhs: Add device tree support for R-Car H2 and M2
This driver supports other SoCs, but they need boards/Soc depend code. So, this patch adds device tree support for R-Car H2 and M2 initially.
Signed-off-by Yoshihiro Shimoda <[email protected]>
--- drivers/usb/renesas_usbhs/common.c | 43 ++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+)
drivers/usb/renesas_usbhs/common.c +43 -0
@@ -18,6 +18,7 @@#include <linux/gpio.h> #include <linux/io.h> #include <linux/module.h> +#include <linux/of_gpio.h> #include <linux/pm_runtime.h> #include <linux/slab.h> #include <linux/sysfs.h>
@@ -438,6 +439,34 @@ static int usbhsc_drvcllbck_notify_hotplug(struct platform_device *pdev)/* * platform functions */ +static struct renesas_usbhs_platform_info *usbhs_parse_dt (struct device *dev) +{ +struct renesas_usbhs_platform_info *info; +struct renesas_usbhs_driver_param *dparam; +u32 tmp; +int gpio; + + info =devm_kzalloc (dev,sizeof (*info),GFP_KERNEL ); +if (!info) +return NULL ; + + dparam = &info->driver_param; + +if (of_device_is_compatible (dev->of_node,"renesas,usbhs-r8a7790" )) + dparam->type =USBHS_TYPE_R8A7790 ; + +if (of_device_is_compatible (dev->of_node,"renesas,usbhs-r8a7791" )) + dparam->type =USBHS_TYPE_R8A7791 ; + +if (!of_property_read_u32 (dev->of_node,"buswait_bwait" , &tmp)) + dparam->buswait_bwait = tmp; + gpio =of_get_named_gpio_flags (dev->of_node,"enable-gpio" ,0 ,NULL ); +if (gpio >0 ) + dparam->enable_gpio = gpio; + +return info; +} +static int usbhs_probe (struct platform_device *pdev) {struct renesas_usbhs_platform_info *info =dev_get_platdata (&pdev->dev);
@@ -446,6 +475,10 @@ static int usbhs_probe(struct platform_device *pdev)struct resource *res, *irq_res;int ret; +/* check device node */ +if (pdev->dev.of_node) + info = pdev->dev.platform_data =usbhs_parse_dt (&pdev->dev); +/* check platform information */ if (!info) {dev_err (&pdev->dev,"no platform information\n" );
@@ -685,10 +718,20 @@ static const struct dev_pm_ops usbhsc_pm_ops = { .runtime_resume = usbhsc_runtime_nop, }; +#ifdef CONFIG_OF +static const struct of_device_id usbhs_of_match[] = { + { .compatible ="renesas,usbhs-r8a7790" }, + { .compatible ="renesas,usbhs-r8a7791" }, + { }, +}; +MODULE_DEVICE_TABLE (of, usbhs_of_match); +#endif +static struct platform_driver renesas_usbhs_driver = { .driver = { .name ="renesas_usbhs" , .pm = &usbhsc_pm_ops, + .of_match_table =of_match_ptr (usbhs_of_match), }, .probe = usbhs_probe, .remove = usbhs_remove,
Signature · 1 line
1.7.9.5
Hi Shimoda-san
Quoted 5 lines
This driver supports other SoCs, but they need boards/Soc depend code. So, this patch adds device tree support for R-Car H2 and M2 initially.
Signed-off-by Yoshihiro Shimoda <[email protected]>---
(snip)
Quoted 24 lines
drivers/usb/renesas_usbhs/common.c +24
-0+static struct renesas_usbhs_platform_info *usbhs_parse_dt (struct device *dev) +{ +struct renesas_usbhs_platform_info *info; +struct renesas_usbhs_driver_param *dparam; +u32 tmp; +int gpio; + + info =devm_kzalloc (dev,sizeof (*info),GFP_KERNEL ); +if (!info) +return NULL ; + + dparam = &info->driver_param; + +if (of_device_is_compatible (dev->of_node,"renesas,usbhs-r8a7790" )) + dparam->type =USBHS_TYPE_R8A7790 ; + +if (of_device_is_compatible (dev->of_node,"renesas,usbhs-r8a7791" )) + dparam->type =USBHS_TYPE_R8A7791 ; + +if (!of_property_read_u32 (dev->of_node,"buswait_bwait" , &tmp)) + dparam->buswait_bwait = tmp; + gpio =of_get_named_gpio_flags (dev->of_node,"enable-gpio" ,0 ,NULL ); +if (gpio >0 ) + dparam->enable_gpio = gpio;
(snip)
drivers/usb/renesas_usbhs/common.c static const struct dev_pm_ops usbhsc_pm_ops = { · line 725
Quoted 4 lines
drivers/usb/renesas_usbhs/common.c +4
-0+static const struct of_device_id usbhs_of_match[] = { + { .compatible ="renesas,usbhs-r8a7790" }, + { .compatible ="renesas,usbhs-r8a7791" }, + { },
How about to use "of_device_id :: data" for USBHS_TYPE_xxx ?
Best regards
---
Kuninori Morimoto
Hi Morimoto-san,
Quoted 34 lines · Kuninori Morimoto
Hi Shimoda-san
Quoted 5 lines
This driver supports other SoCs, but they need boards/Soc depend code. So, this patch adds device tree support for R-Car H2 and M2 initially.
Signed-off-by Yoshihiro Shimoda <[email protected]>---
(snip)
Quoted 24 lines
drivers/usb/renesas_usbhs/common.c +24
-0+static struct renesas_usbhs_platform_info *usbhs_parse_dt (struct device *dev) +{ +struct renesas_usbhs_platform_info *info; +struct renesas_usbhs_driver_param *dparam; +u32 tmp; +int gpio; + + info =devm_kzalloc (dev,sizeof (*info),GFP_KERNEL ); +if (!info) +return NULL ; + + dparam = &info->driver_param; + +if (of_device_is_compatible (dev->of_node,"renesas,usbhs-r8a7790" )) + dparam->type =USBHS_TYPE_R8A7790 ; + +if (of_device_is_compatible (dev->of_node,"renesas,usbhs-r8a7791" )) + dparam->type =USBHS_TYPE_R8A7791 ; + +if (!of_property_read_u32 (dev->of_node,"buswait_bwait" , &tmp)) + dparam->buswait_bwait = tmp; + gpio =of_get_named_gpio_flags (dev->of_node,"enable-gpio" ,0 ,NULL ); +if (gpio >0 ) + dparam->enable_gpio = gpio;(snip)
Quoted 6 lines
drivers/usb/renesas_usbhs/common.c static const struct dev_pm_ops usbhsc_pm_ops = { · line 725
Quoted 4 lines
drivers/usb/renesas_usbhs/common.c +4
-0+static const struct of_device_id usbhs_of_match[] = { + { .compatible ="renesas,usbhs-r8a7790" }, + { .compatible ="renesas,usbhs-r8a7791" }, + { },How about to use "
of_device_id:: data" forUSBHS_TYPE_xxx?
Thank you for the suggestion.
To remove the "if (of_device_is_compatible(...))", I will use the "of_device_id :: data" lile a ".data = (void *)USBHS_TYPE_R8A7790".
Best regards,
Yoshihiro Shimoda
Quoted 4 lines
Best regards
---
Kuninori Morimoto