Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c803854 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'berlin-fixes-for-4.3-1' of... 

Merge tag 'berlin-fixes-for-4.3-1' of git://git.infradead.org/users/hesselba/linux-berlin into fixes

Merge "Marvell Berlin fixes for v4.3 take 1" from Sebastian Hesselbarth:
- BG2Q USB PHY compatible fix (also tagged for stable v4.2)

* tag 'berlin-fixes-for-4.3-1' of git://git.infradead.org/users/hesselba/linux-berlin:
  ARM: dts: berlin: change BG2Q's USB PHY compatible
parents d51664ab 1f744fd3

arch/arm/boot/dts/berlin2q.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -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>;