diff options
author | Arnd Bergmann <arnd@arndb.de> | 2015-10-14 11:12:10 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2015-10-14 11:12:10 -0400 |
commit | 8c803854ba06bcd86755c8754943041b110dd537 (patch) | |
tree | 37d8e30b0a9fe37d3efc43a97f5d1593768ea545 | |
parent | d51664ab9e06225a039487990a3b051fed795137 (diff) | |
parent | 1f744fd317dc55cadd7132c57c499e3117aea01d (diff) |
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
-rw-r--r-- | arch/arm/boot/dts/berlin2q.dtsi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/berlin2q.dtsi b/arch/arm/boot/dts/berlin2q.dtsi index 63a48490e2f9..d4dbd28d348c 100644 --- a/arch/arm/boot/dts/berlin2q.dtsi +++ b/arch/arm/boot/dts/berlin2q.dtsi | |||
@@ -152,7 +152,7 @@ | |||
152 | }; | 152 | }; |
153 | 153 | ||
154 | usb_phy2: phy@a2f400 { | 154 | usb_phy2: phy@a2f400 { |
155 | compatible = "marvell,berlin2-usb-phy"; | 155 | compatible = "marvell,berlin2cd-usb-phy"; |
156 | reg = <0xa2f400 0x128>; | 156 | reg = <0xa2f400 0x128>; |
157 | #phy-cells = <0>; | 157 | #phy-cells = <0>; |
158 | resets = <&chip_rst 0x104 14>; | 158 | resets = <&chip_rst 0x104 14>; |
@@ -170,7 +170,7 @@ | |||
170 | }; | 170 | }; |
171 | 171 | ||
172 | usb_phy0: phy@b74000 { | 172 | usb_phy0: phy@b74000 { |
173 | compatible = "marvell,berlin2-usb-phy"; | 173 | compatible = "marvell,berlin2cd-usb-phy"; |
174 | reg = <0xb74000 0x128>; | 174 | reg = <0xb74000 0x128>; |
175 | #phy-cells = <0>; | 175 | #phy-cells = <0>; |
176 | resets = <&chip_rst 0x104 12>; | 176 | resets = <&chip_rst 0x104 12>; |
@@ -178,7 +178,7 @@ | |||
178 | }; | 178 | }; |
179 | 179 | ||
180 | usb_phy1: phy@b78000 { | 180 | usb_phy1: phy@b78000 { |
181 | compatible = "marvell,berlin2-usb-phy"; | 181 | compatible = "marvell,berlin2cd-usb-phy"; |
182 | reg = <0xb78000 0x128>; | 182 | reg = <0xb78000 0x128>; |
183 | #phy-cells = <0>; | 183 | #phy-cells = <0>; |
184 | resets = <&chip_rst 0x104 13>; | 184 | resets = <&chip_rst 0x104 13>; |