diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-04-13 10:37:39 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-04-13 10:37:39 +0200 |
| commit | 1c1bf62c5892b1db1da8d385018c712e3d845e03 (patch) | |
| tree | d839ef4277ef9a9811d69b80fdaebf21520b42e2 /dts/src/arm/at91sam9260.dtsi | |
| parent | 38504401dae231611f489b10734d9e9ab34082d5 (diff) | |
| download | barebox-1c1bf62c5892b1db1da8d385018c712e3d845e03.tar.gz barebox-1c1bf62c5892b1db1da8d385018c712e3d845e03.tar.xz | |
dts: update to v4.0-rc4
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'dts/src/arm/at91sam9260.dtsi')
| -rw-r--r-- | dts/src/arm/at91sam9260.dtsi | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/dts/src/arm/at91sam9260.dtsi b/dts/src/arm/at91sam9260.dtsi index fff0ee69aa..e7f0a4ae27 100644 --- a/dts/src/arm/at91sam9260.dtsi +++ b/dts/src/arm/at91sam9260.dtsi @@ -494,12 +494,12 @@ pinctrl_usart3_rts: usart3_rts-0 { atmel,pins = - <AT91_PIOB 8 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PC8 periph B */ + <AT91_PIOC 8 AT91_PERIPH_B AT91_PINCTRL_NONE>; }; pinctrl_usart3_cts: usart3_cts-0 { atmel,pins = - <AT91_PIOB 10 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PC10 periph B */ + <AT91_PIOC 10 AT91_PERIPH_B AT91_PINCTRL_NONE>; }; }; @@ -853,7 +853,7 @@ }; usb1: gadget@fffa4000 { - compatible = "atmel,at91rm9200-udc"; + compatible = "atmel,at91sam9260-udc"; reg = <0xfffa4000 0x4000>; interrupts = <10 IRQ_TYPE_LEVEL_HIGH 2>; clocks = <&udc_clk>, <&udpck>; @@ -976,7 +976,6 @@ atmel,watchdog-type = "hardware"; atmel,reset-type = "all"; atmel,dbg-halt; - atmel,idle-halt; status = "disabled"; }; |