UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

usb: renesas_usbhs: Add a common function for the .get_id 

All platform related codes (rcar[23].c and rza{2}.c) has its own
.get_id function as "USBHS_GADGET". So, we can use a common
function for it.

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:55 +09:00 committed by Greg Kroah-Hartman
parent b3103d0b02
commit be0a42a7d6
6 changed files with 15 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,6 +84,11 @@ struct usbhs_priv *usbhs_pdev_to_priv(struct platform_device *pdev)
return dev_get_drvdata(&pdev->dev);
}
int usbhs_get_id_as_gadget(struct platform_device *pdev)
{
return USBHS_GADGET;
}
/*
* syscfg functions
*/

2
drivers/usb/renesas_usbhs/common.h
View File

@ -297,6 +297,8 @@ void usbhs_bset(struct usbhs_priv *priv, u32 reg, u16 mask, u16 data);
#define usbhs_lock(p, f) spin_lock_irqsave(usbhs_priv_to_lock(p), f)
#define usbhs_unlock(p, f) spin_unlock_irqrestore(usbhs_priv_to_lock(p), f)
int usbhs_get_id_as_gadget(struct platform_device *pdev);
/*
* sysconfig
*/

8
drivers/usb/renesas_usbhs/rcar2.c
View File

@ -3,6 +3,7 @@
* Renesas USB driver R-Car Gen. 2 initialization and power control
*
* Copyright (C) 2014 Ulrich Hecht
* Copyright (C) 2019 Renesas Electronics Corporation
*/
#include <linux/gpio.h>
@ -62,14 +63,9 @@ static int usbhs_rcar2_power_ctrl(struct platform_device *pdev,
return retval;
}
static int usbhs_rcar2_get_id(struct platform_device *pdev)
{
return USBHS_GADGET;
}
const struct renesas_usbhs_platform_callback usbhs_rcar2_ops = {
.hardware_init = usbhs_rcar2_hardware_init,
.hardware_exit = usbhs_rcar2_hardware_exit,
.power_ctrl = usbhs_rcar2_power_ctrl,
.get_id = usbhs_rcar2_get_id,
.get_id = usbhs_get_id_as_gadget,
};

11
drivers/usb/renesas_usbhs/rcar3.c
View File

@ -2,7 +2,7 @@
/*
* Renesas USB driver R-Car Gen. 3 initialization and power control
*
* Copyright (C) 2016 Renesas Electronics Corporation
* Copyright (C) 2016-2019 Renesas Electronics Corporation
*/
#include <linux/delay.h>
@ -95,17 +95,12 @@ static int usbhs_rcar3_power_and_pll_ctrl(struct platform_device *pdev,
return 0;
}
static int usbhs_rcar3_get_id(struct platform_device *pdev)
{
return USBHS_GADGET;
}
const struct renesas_usbhs_platform_callback usbhs_rcar3_ops = {
.power_ctrl = usbhs_rcar3_power_ctrl,
.get_id = usbhs_rcar3_get_id,
.get_id = usbhs_get_id_as_gadget,
};
const struct renesas_usbhs_platform_callback usbhs_rcar3_with_pll_ops = {
.power_ctrl = usbhs_rcar3_power_and_pll_ctrl,
.get_id = usbhs_rcar3_get_id,
.get_id = usbhs_get_id_as_gadget,
};

9
drivers/usb/renesas_usbhs/rza.c
View File

@ -3,7 +3,7 @@
* Renesas USB driver RZ/A initialization and power control
*
* Copyright (C) 2018 Chris Brandt
* Copyright (C) 2018 Renesas Electronics Corporation
* Copyright (C) 2018-2019 Renesas Electronics Corporation
*/
#include <linux/delay.h>
@ -41,12 +41,7 @@ static int usbhs_rza1_hardware_init(struct platform_device *pdev)
return 0;
}
static int usbhs_rza_get_id(struct platform_device *pdev)
{
return USBHS_GADGET;
}
const struct renesas_usbhs_platform_callback usbhs_rza1_ops = {
.hardware_init = usbhs_rza1_hardware_init,
.get_id = usbhs_rza_get_id,
.get_id = usbhs_get_id_as_gadget,
};

7
drivers/usb/renesas_usbhs/rza2.c
View File

@ -59,14 +59,9 @@ static int usbhs_rza2_power_ctrl(struct platform_device *pdev,
return retval;
}
static int usbhs_rza2_get_id(struct platform_device *pdev)
{
return USBHS_GADGET;
}
const struct renesas_usbhs_platform_callback usbhs_rza2_ops = {
.hardware_init = usbhs_rza2_hardware_init,
.hardware_exit = usbhs_rza2_hardware_exit,
.power_ctrl = usbhs_rza2_power_ctrl,
.get_id = usbhs_rza2_get_id,
.get_id = usbhs_get_id_as_gadget,
};