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
Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
boot
/
dts
/
at91sam9n12.dtsi
diff --git
a/arch/arm/boot/dts/at91sam9n12.dtsi
b/arch/arm/boot/dts/at91sam9n12.dtsi
index 0c53a375ba99d214c1c0b5eabd85e77ec0cc72e6..a9e35dfc12d9d5a763e4484f8a331806da13ad63 100644
(file)
--- a/
arch/arm/boot/dts/at91sam9n12.dtsi
+++ b/
arch/arm/boot/dts/at91sam9n12.dtsi
@@
-757,7
+757,7
@@
};
dbgu: serial@fffff200 {
};
dbgu: serial@fffff200 {
- compatible = "atmel,at91sam9260-usart";
+ compatible = "atmel,at91sam9260-
dbgu", "atmel,at91sam9260-
usart";
reg = <0xfffff200 0x200>;
interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
pinctrl-names = "default";
reg = <0xfffff200 0x200>;
interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
pinctrl-names = "default";
@@
-912,6
+912,15
@@
clocks = <&pwm_clk>;
status = "disabled";
};
clocks = <&pwm_clk>;
status = "disabled";
};
+
+ usb1: gadget@f803c000 {
+ compatible = "atmel,at91sam9260-udc";
+ reg = <0xf803c000 0x4000>;
+ interrupts = <23 IRQ_TYPE_LEVEL_HIGH 2>;
+ clocks = <&udphs_clk>, <&udpck>;
+ clock-names = "pclk", "hclk";
+ status = "disabled";
+ };
};
nand0: nand@40000000 {
};
nand0: nand@40000000 {