projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARM: at91/dt: introduce atmel,<chip>-dbgu
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
boot
/
dts
/
at91sam9g45.dtsi
diff --git
a/arch/arm/boot/dts/at91sam9g45.dtsi
b/arch/arm/boot/dts/at91sam9g45.dtsi
index ee80aa9c0759c17f178965181fb28f2a562f6b13..56b66a795df73f10d9efb0d384b018e8d487db6e 100644
(file)
--- a/
arch/arm/boot/dts/at91sam9g45.dtsi
+++ b/
arch/arm/boot/dts/at91sam9g45.dtsi
@@
-893,7
+893,7
@@
};
dbgu: serial@ffffee00 {
};
dbgu: serial@ffffee00 {
- compatible = "atmel,at91sam9260-usart";
+ compatible = "atmel,at91sam9260-
dbgu", "atmel,at91sam9260-
usart";
reg = <0xffffee00 0x200>;
interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
pinctrl-names = "default";
reg = <0xffffee00 0x200>;
interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
pinctrl-names = "default";
@@
-1116,7
+1116,6
@@
atmel,watchdog-type = "hardware";
atmel,reset-type = "all";
atmel,dbg-halt;
atmel,watchdog-type = "hardware";
atmel,reset-type = "all";
atmel,dbg-halt;
- atmel,idle-halt;
status = "disabled";
};
status = "disabled";
};
@@
-1301,7
+1300,7
@@
compatible = "atmel,at91sam9g45-ehci", "usb-ehci";
reg = <0x00800000 0x100000>;
interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;
compatible = "atmel,at91sam9g45-ehci", "usb-ehci";
reg = <0x00800000 0x100000>;
interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;
- clocks = <&u
sb
>, <&uhphs_clk>, <&uhphs_clk>, <&uhpck>;
+ clocks = <&u
tmi
>, <&uhphs_clk>, <&uhphs_clk>, <&uhpck>;
clock-names = "usb_clk", "ehci_clk", "hclk", "uhpck";
status = "disabled";
};
clock-names = "usb_clk", "ehci_clk", "hclk", "uhpck";
status = "disabled";
};