phy: berlin-usb: fix divider for BG2CD
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.
--- drivers/phy/phy-berlin-usb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/phy/phy-berlin-usb.c +2 -2
@@ -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 {
Signature · 1 line
2.4.4
Thomas,
Quoted 6 lines · Thomas Hebb
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 stable at vger.kernel.org
Only this one is sent to stable? The BG2 won't be fixed in stable?
Antoine
Quoted 22 lines
--- drivers/phy/phy-berlin-usb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/phy/phy-berlin-usb.c +2
-2@@ -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 {Signature · 1 line
2.4.4
Signature · 3 lines
Antoine T?nart, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
Quoted 7 lines · Antoine Tenart
Thomas,
Quoted 4 lines · Thomas Hebb
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.
Quoted 6 lines
Quoted 2 lines
Signed-off-by Thomas Hebb <[email protected]>Cc stable at vger.kernel.orgOnly 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
Quoted 23 lines
Quoted 22 lines
--- drivers/phy/phy-berlin-usb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/phy/phy-berlin-usb.c +2
-2@@ -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 {Signature · 1 line
2.4.4