Message ID | 56073CB0.3060607@gmail.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On 27.09.2015 02:47, Thomas Hebb wrote: > Currently, BG2Q shares a compatible with BG2. This is incorrect, since > BG2 and BG2Q use different USB PLL dividers. In reality, BG2Q shares a > divider with BG2CD. Change BG2Q's USB PHY compatible string to reflect > that. > > Signed-off-by: Thomas Hebb<tommyhebb@gmail.com> Sorry, I have missed it. Now applied to berlin/fixes and tagged for v4.2 stable series. Sebastian
diff --git a/arch/arm/boot/dts/berlin2q.dtsi b/arch/arm/boot/dts/berlin2q.dtsi index 63a4849..d4dbd28 100644 --- a/arch/arm/boot/dts/berlin2q.dtsi +++ b/arch/arm/boot/dts/berlin2q.dtsi @@ -152,7 +152,7 @@ }; usb_phy2: phy@a2f400 { - compatible = "marvell,berlin2-usb-phy"; + compatible = "marvell,berlin2cd-usb-phy"; reg = <0xa2f400 0x128>; #phy-cells = <0>; resets = <&chip_rst 0x104 14>; @@ -170,7 +170,7 @@ }; usb_phy0: phy@b74000 { - compatible = "marvell,berlin2-usb-phy"; + compatible = "marvell,berlin2cd-usb-phy"; reg = <0xb74000 0x128>; #phy-cells = <0>; resets = <&chip_rst 0x104 12>; @@ -178,7 +178,7 @@ }; usb_phy1: phy@b78000 { - compatible = "marvell,berlin2-usb-phy"; + compatible = "marvell,berlin2cd-usb-phy"; reg = <0xb78000 0x128>; #phy-cells = <0>; resets = <&chip_rst 0x104 13>;
Currently, BG2Q shares a compatible with BG2. This is incorrect, since BG2 and BG2Q use different USB PLL dividers. In reality, BG2Q shares a divider with BG2CD. Change BG2Q's USB PHY compatible string to reflect that. Signed-off-by: Thomas Hebb <tommyhebb@gmail.com> Cc: stable@vger.kernel.org --- This patch seems to have been missed from my original series (all the rest made it into 4.2), and as a result the BG2Q currently uses the wrong divider. arch/arm/boot/dts/berlin2q.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)