aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorChen-Yu Tsai <wens@csie.org>2014-12-18 06:10:35 -0500
committerMaxime Ripard <maxime.ripard@free-electrons.com>2014-12-21 17:50:17 -0500
commit4dba4185e3d984a7a856dfaeb7e8aec26633e845 (patch)
tree7471431e66a453fac2c4a5cf609b4479a8f001f3 /arch/arm
parent97bf6af1f928216fd6c5a66e8a57bfa95a659672 (diff)
ARM: dts: sunxi: Fix usb-phy support for sun4i/sun5i
usbphy0 support in the sunxi usb-phy driver has been merged, but the dtsi's for sun4i/sun5i haven't been updated. This results in the phy driver failing to load, breaking usb support. Fixes: 6827a46f5994 ('phy: sun4i: add support for USB phy0') Signed-off-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/sun4i-a10.dtsi4
-rw-r--r--arch/arm/boot/dts/sun5i-a10s.dtsi4
-rw-r--r--arch/arm/boot/dts/sun5i-a13.dtsi4
3 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi
index 7b4099fcf817..e3422309e54b 100644
--- a/arch/arm/boot/dts/sun4i-a10.dtsi
+++ b/arch/arm/boot/dts/sun4i-a10.dtsi
@@ -438,8 +438,8 @@
438 reg-names = "phy_ctrl", "pmu1", "pmu2"; 438 reg-names = "phy_ctrl", "pmu1", "pmu2";
439 clocks = <&usb_clk 8>; 439 clocks = <&usb_clk 8>;
440 clock-names = "usb_phy"; 440 clock-names = "usb_phy";
441 resets = <&usb_clk 1>, <&usb_clk 2>; 441 resets = <&usb_clk 0>, <&usb_clk 1>, <&usb_clk 2>;
442 reset-names = "usb1_reset", "usb2_reset"; 442 reset-names = "usb0_reset", "usb1_reset", "usb2_reset";
443 status = "disabled"; 443 status = "disabled";
444 }; 444 };
445 445
diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi
index 1b76667f3182..3c3c1920788a 100644
--- a/arch/arm/boot/dts/sun5i-a10s.dtsi
+++ b/arch/arm/boot/dts/sun5i-a10s.dtsi
@@ -390,8 +390,8 @@
390 reg-names = "phy_ctrl", "pmu1"; 390 reg-names = "phy_ctrl", "pmu1";
391 clocks = <&usb_clk 8>; 391 clocks = <&usb_clk 8>;
392 clock-names = "usb_phy"; 392 clock-names = "usb_phy";
393 resets = <&usb_clk 1>; 393 resets = <&usb_clk 0>, <&usb_clk 1>;
394 reset-names = "usb1_reset"; 394 reset-names = "usb0_reset", "usb1_reset";
395 status = "disabled"; 395 status = "disabled";
396 }; 396 };
397 397
diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi
index c35217ea1f64..2448d7f38d6b 100644
--- a/arch/arm/boot/dts/sun5i-a13.dtsi
+++ b/arch/arm/boot/dts/sun5i-a13.dtsi
@@ -349,8 +349,8 @@
349 reg-names = "phy_ctrl", "pmu1"; 349 reg-names = "phy_ctrl", "pmu1";
350 clocks = <&usb_clk 8>; 350 clocks = <&usb_clk 8>;
351 clock-names = "usb_phy"; 351 clock-names = "usb_phy";
352 resets = <&usb_clk 1>; 352 resets = <&usb_clk 0>, <&usb_clk 1>;
353 reset-names = "usb1_reset"; 353 reset-names = "usb0_reset", "usb1_reset";
354 status = "disabled"; 354 status = "disabled";
355 }; 355 };
356 356