2015-07-02 05:04:50

by Tom Hebb

Subject: [PATCH 1/4] phy: berlin-usb: fix divider for BG2CD

The marvell,berlin2cd-usb-phy compatible incorrectly sets the PLL
divider to BG2's value instead of BG2CD/BG2Q's. Change it to the right
value.

Signed-off-by: Thomas Hebb <[email protected]>
Cc: [email protected]
---
drivers/phy/phy-berlin-usb.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/phy/phy-berlin-usb.c b/drivers/phy/phy-berlin-usb.c
index c6fc95b..ab54f28 100644
--- a/drivers/phy/phy-berlin-usb.c
+++ b/drivers/phy/phy-berlin-usb.c
@@ -106,8 +106,8 @@
static const u32 phy_berlin_pll_dividers[] = {
/* Berlin 2 */
CLK_REF_DIV(0xc) | FEEDBACK_CLK_DIV(0x54),
- /* Berlin 2CD */
- CLK_REF_DIV(0x6) | FEEDBACK_CLK_DIV(0x55),
+ /* Berlin 2CD/Q */
+ CLK_REF_DIV(0xc) | FEEDBACK_CLK_DIV(0x54),
};

struct phy_berlin_usb_priv {
--
2.4.4

2015-07-03 09:20:36

by Antoine Tenart

Subject: Re: [PATCH 1/4] phy: berlin-usb: fix divider for BG2CD

Thomas,

On Thu, Jul 02, 2015 at 01:04:18AM -0400, Thomas Hebb wrote:
> The marvell,berlin2cd-usb-phy compatible incorrectly sets the PLL
> divider to BG2's value instead of BG2CD/BG2Q's. Change it to the right
> value.
>
> Signed-off-by: Thomas Hebb <[email protected]>
> Cc: [email protected]

Only this one is sent to stable? The BG2 won't be fixed in stable?

Antoine

> ---
> drivers/phy/phy-berlin-usb.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/phy/phy-berlin-usb.c b/drivers/phy/phy-berlin-usb.c
> index c6fc95b..ab54f28 100644
> --- a/drivers/phy/phy-berlin-usb.c
> +++ b/drivers/phy/phy-berlin-usb.c
> @@ -106,8 +106,8 @@
> static const u32 phy_berlin_pll_dividers[] = {
> /* Berlin 2 */
> CLK_REF_DIV(0xc) | FEEDBACK_CLK_DIV(0x54),
> - /* Berlin 2CD */
> - CLK_REF_DIV(0x6) | FEEDBACK_CLK_DIV(0x55),
> + /* Berlin 2CD/Q */
> + CLK_REF_DIV(0xc) | FEEDBACK_CLK_DIV(0x54),
> };
>
> struct phy_berlin_usb_priv {
> --
> 2.4.4
>

--
Antoine T?nart, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

2015-07-03 14:33:41

by Tom Hebb

Subject: Re: [PATCH 1/4] phy: berlin-usb: fix divider for BG2CD

On 07/03/2015 05:20 AM, Antoine Tenart wrote:
> Thomas,
>
> On Thu, Jul 02, 2015 at 01:04:18AM -0400, Thomas Hebb wrote:
>> The marvell,berlin2cd-usb-phy compatible incorrectly sets the PLL
>> divider to BG2's value instead of BG2CD/BG2Q's. Change it to the right
>> value.
>>
>> Signed-off-by: Thomas Hebb <[email protected]>
>> Cc: [email protected]
>
> Only this one is sent to stable? The BG2 won't be fixed in stable?
>
> Antoine

Since BG2 doesn't currently have its USB PHY enabled in device tree, I
didn't see any reason to mark that fix for stable; we'd have to wait
until next cycle for it to be of use anyway. This is the same division
that Sebastian suggested.

I admit it looks a bit odd to have both dividers be the same. If you
want me to mark the other patches for stable for clarity reasons, I'm
happy to do that.

-Tom

>> ---
>> drivers/phy/phy-berlin-usb.c | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/phy/phy-berlin-usb.c b/drivers/phy/phy-berlin-usb.c
>> index c6fc95b..ab54f28 100644
>> --- a/drivers/phy/phy-berlin-usb.c
>> +++ b/drivers/phy/phy-berlin-usb.c
>> @@ -106,8 +106,8 @@
>> static const u32 phy_berlin_pll_dividers[] = {
>> /* Berlin 2 */
>> CLK_REF_DIV(0xc) | FEEDBACK_CLK_DIV(0x54),
>> - /* Berlin 2CD */
>> - CLK_REF_DIV(0x6) | FEEDBACK_CLK_DIV(0x55),
>> + /* Berlin 2CD/Q */
>> + CLK_REF_DIV(0xc) | FEEDBACK_CLK_DIV(0x54),
>> };
>>
>> struct phy_berlin_usb_priv {
>> --
>> 2.4.4
>>
>