projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branches 'asoc/topic/txx9', 'asoc/topic/wm8750', 'asoc/topic...
[cascardo/linux.git]
/
arch
/
arm
/
boot
/
dts
/
sun5i-a13.dtsi
diff --git
a/arch/arm/boot/dts/sun5i-a13.dtsi
b/arch/arm/boot/dts/sun5i-a13.dtsi
index
c35217e
..
c556688
100644
(file)
--- a/
arch/arm/boot/dts/sun5i-a13.dtsi
+++ b/
arch/arm/boot/dts/sun5i-a13.dtsi
@@
-16,11
+16,6
@@
/ {
interrupt-parent = <&intc>;
/ {
interrupt-parent = <&intc>;
- aliases {
- serial0 = &uart1;
- serial1 = &uart3;
- };
-
cpus {
#address-cells = <1>;
#size-cells = <0>;
cpus {
#address-cells = <1>;
#size-cells = <0>;
@@
-349,8
+344,8
@@
reg-names = "phy_ctrl", "pmu1";
clocks = <&usb_clk 8>;
clock-names = "usb_phy";
reg-names = "phy_ctrl", "pmu1";
clocks = <&usb_clk 8>;
clock-names = "usb_phy";
- resets = <&usb_clk 1>;
- reset-names = "usb1_reset";
+ resets = <&usb_clk
0>, <&usb_clk
1>;
+ reset-names = "usb
0_reset", "usb
1_reset";
status = "disabled";
};
status = "disabled";
};