[U-Boot] [PATCH v5 04/11] usb: host: xhci-rockchip: use fixed regulator to control vbus

[rock-chips(daniel.meng)]

On 2017/6/13 17:11, Marek Vasut wrote:
> On 06/12/2017 11:19 AM, Meng Dongyang wrote:
>> Use fixed regulator to control the voltage of vbus and turn off
>> vbus when usb stop.
>>
>> Signed-off-by: Meng Dongyang <daniel.meng at rock-chips.com>
>> ---
>>
>> Changes in v5:
>> - Propagate return value and print error message when failed
>>
>> Changes in v4:
>> - Splited from patch [Uboot,v3,04/10]
>> - Define set vbus as empty function if the macros aren't set
>>
>> Changes in v3: None
>> Changes in v2:
>> - Use fixed regulator to control vbus instead of gpio
>>
>>   drivers/usb/host/xhci-rockchip.c | 55 ++++++++++++++++++++++++++++++----------
>>   1 file changed, 42 insertions(+), 13 deletions(-)
>>
>> diff --git a/drivers/usb/host/xhci-rockchip.c b/drivers/usb/host/xhci-rockchip.c
>> index f559830..15df6ef 100644
>> --- a/drivers/usb/host/xhci-rockchip.c
>> +++ b/drivers/usb/host/xhci-rockchip.c
>> @@ -11,10 +11,10 @@
>>   #include <malloc.h>
>>   #include <usb.h>
>>   #include <watchdog.h>
>> -#include <asm/gpio.h>
>>   #include <linux/errno.h>
>>   #include <linux/compat.h>
>>   #include <linux/usb/dwc3.h>
>> +#include <power/regulator.h>
>>   
>>   #include "xhci.h"
>>   
>> @@ -23,7 +23,7 @@ DECLARE_GLOBAL_DATA_PTR;
>>   struct rockchip_xhci_platdata {
>>   	fdt_addr_t hcd_base;
>>   	fdt_addr_t phy_base;
>> -	struct gpio_desc vbus_gpio;
>> +	struct udevice *vbus_supply;
>>   };
>>   
>>   /*
>> @@ -48,7 +48,7 @@ static int xhci_usb_ofdata_to_platdata(struct udevice *dev)
>>   	 */
>>   	plat->hcd_base = dev_get_addr(dev);
>>   	if (plat->hcd_base == FDT_ADDR_T_NONE) {
>> -		debug("Can't get the XHCI register base address\n");
>> +		error("Can't get the XHCI register base address\n");
>>   		return -ENXIO;
>>   	}
>>   
>> @@ -62,19 +62,39 @@ static int xhci_usb_ofdata_to_platdata(struct udevice *dev)
>>   	}
>>   
>>   	if (plat->phy_base == FDT_ADDR_T_NONE) {
>> -		debug("Can't get the usbphy register address\n");
>> +		error("Can't get the usbphy register address\n");
>>   		return -ENXIO;
>>   	}
>>   
>> -	/* Vbus gpio */
>> -	ret = gpio_request_by_name(dev, "rockchip,vbus-gpio", 0,
>> -				   &plat->vbus_gpio, GPIOD_IS_OUT);
>> +#if defined(CONFIG_DM_USB) && defined(CONFIG_DM_REGULATOR)
> I don't think you need the CONFIG_DM_USB , the driver depends on it (or
> should) already anyway.

Yes, I will remove it in v6.
>
>> +	/* Vbus regulator */
>> +	ret = device_get_supply_regulator(dev, "vbus-supply",
>> +					  &plat->vbus_supply);
> So I was curious, does this expand to empty function or is this not
> defined if CONFIG_DM_REGULATOR is not defined ?
This is not defined if CONFIG_DM_REGULATOR is not defined.
>
>>   	if (ret)
>> -		debug("rockchip,vbus-gpio node missing!");
>> +		debug("Can't get VBus regulator!\n");
>> +#endif
>>   
>>   	return 0;
>>   }
>>   
>> +#if defined(CONFIG_DM_USB) && defined(CONFIG_DM_REGULATOR)
>> +static int rockchip_xhci_set_vbus(struct udevice *vbus_supply, bool value)
>> +{
>> +	int ret;
>> +
>> +	ret = regulator_set_enable(vbus_supply, value);
>> +	if (ret)
>> +		error("XHCI: Failed to set vbus supply\n");
> Please be consistent with the VBus usage. You use VBus above and vbus here.
OK
>
>> +
>> +	return ret;
>> +}
>> +#else
>> +static int rockchip_xhci_set_vbus(struct udevice *vbus_supply, bool value)
>> +{
>> +	return 0;
>> +}
>> +#endif
>> +
>>   /*
>>    * rockchip_dwc3_phy_setup() - Configure USB PHY Interface of DWC3 Core
>>    * @dwc: Pointer to our controller context structure
>> @@ -124,7 +144,7 @@ static int rockchip_xhci_core_init(struct rockchip_xhci *rkxhci,
>>   
>>   	ret = dwc3_core_init(rkxhci->dwc3_reg);
>>   	if (ret) {
>> -		debug("failed to initialize core\n");
>> +		error("failed to initialize core\n");
>>   		return ret;
>>   	}
>>   
>> @@ -153,13 +173,15 @@ static int xhci_usb_probe(struct udevice *dev)
>>   	hcor = (struct xhci_hcor *)((uint64_t)ctx->hcd +
>>   			HC_LENGTH(xhci_readl(&ctx->hcd->cr_capbase)));
>>   
>> -	/* setup the Vbus gpio here */
>> -	if (dm_gpio_is_valid(&plat->vbus_gpio))
>> -		dm_gpio_set_value(&plat->vbus_gpio, 1);
>> +	if (plat->vbus_supply) {
>> +		ret = rockchip_xhci_set_vbus(plat->vbus_supply, true);
>> +		if (ret)
>> +			return ret;
>> +	}
>>   
>>   	ret = rockchip_xhci_core_init(ctx, dev);
>>   	if (ret) {
>> -		debug("XHCI: failed to initialize controller\n");
>> +		error("XHCI: failed to initialize controller\n");
>>   		return ret;
>>   	}
>>   
>> @@ -168,6 +190,7 @@ static int xhci_usb_probe(struct udevice *dev)
>>   
>>   static int xhci_usb_remove(struct udevice *dev)
>>   {
>> +	struct rockchip_xhci_platdata *plat = dev_get_platdata(dev);
>>   	struct rockchip_xhci *ctx = dev_get_priv(dev);
>>   	int ret;
>>   
>> @@ -178,6 +201,12 @@ static int xhci_usb_remove(struct udevice *dev)
>>   	if (ret)
>>   		return ret;
>>   
>> +	if (plat->vbus_supply) {
>> +		ret = rockchip_xhci_set_vbus(plat->vbus_supply, false);
>> +		if (ret)
>> +			return ret;
>> +	}
>> +
>>   	return 0;
> Just do return ret here, then you don't need the if (ret) above.
OK
>
>>   }
>>   
>>
>