Subject: [PATCH v8 03/14] mfd: omap-usb-host: Use clock names as per function for reference clocks

From: [email-masked] (Roger Quadros)
Date: Tue, 25 Feb 2014 11:02:33 +0200

Hi,

On 02/25/2014 10:52 AM, Lee Jones wrote:
>> Use a meaningful name for the reference clocks so that it indicates the function.
>>
>> CC: Lee Jones <[email-masked]>
>> CC: Samuel Ortiz <[email-masked]>
>> Signed-off-by: Roger Quadros <[email-masked]>
>> ---
>>  drivers/mfd/omap-usb-host.c | 12 ++++++------
>>  1 file changed, 6 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
>> index 865c276..651e249 100644
>> --- a/drivers/mfd/omap-usb-host.c
>> +++ b/drivers/mfd/omap-usb-host.c
>> @@ -718,24 +718,24 @@ static int usbhs_omap_probe(struct platform_device *pdev)
>>  		goto err_mem;
>>  	}
>>  
>> -	omap->xclk60mhsp1_ck = devm_clk_get(dev, "xclk60mhsp1_ck");
>> +	omap->xclk60mhsp1_ck = devm_clk_get(dev, "refclk_60m_ext_p1");
>>  	if (IS_ERR(omap->xclk60mhsp1_ck)) {
>>  		ret = PTR_ERR(omap->xclk60mhsp1_ck);
>> -		dev_err(dev, "xclk60mhsp1_ck failed error:%d\n", ret);
>> +		dev_err(dev, "refclk_60m_ext_p1 failed error:%d\n", ret);
>>  		goto err_mem;
>>  	}
> 
> Will anything break if I were to apply the MFD patches seperately?
> 

Nothing will break for OMAP3, but OMAP4 USB host will break (e.g. Panda board).
OMAP5 USB host was never working so it doesn't matter there.

To make sure nothing breaks, we need at least these 2 patches to go in together with mfd changes.

[PATCH v8 08/14] ARM: dts: omap4: Update omap-usb-host node
[PATCH v8 09/14] ARM: dts: omap5: Update omap-usb-host node

Any suggestions about how we can proceed?

cheers,
-roger

>> -	omap->xclk60mhsp2_ck = devm_clk_get(dev, "xclk60mhsp2_ck");
>> +	omap->xclk60mhsp2_ck = devm_clk_get(dev, "refclk_60m_ext_p2");
>>  	if (IS_ERR(omap->xclk60mhsp2_ck)) {
>>  		ret = PTR_ERR(omap->xclk60mhsp2_ck);
>> -		dev_err(dev, "xclk60mhsp2_ck failed error:%d\n", ret);
>> +		dev_err(dev, "refclk_60m_ext_p2 failed error:%d\n", ret);
>>  		goto err_mem;
>>  	}
>>  
>> -	omap->init_60m_fclk = devm_clk_get(dev, "init_60m_fclk");
>> +	omap->init_60m_fclk = devm_clk_get(dev, "refclk_60m_int");
>>  	if (IS_ERR(omap->init_60m_fclk)) {
>>  		ret = PTR_ERR(omap->init_60m_fclk);
>> -		dev_err(dev, "init_60m_fclk failed error:%d\n", ret);
>> +		dev_err(dev, "refclk_60m_int failed error:%d\n", ret);
>>  		goto err_mem;
>>  	}
>>  
>